mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-02 06:03:50 +00:00
- Unbreak on CURRENT: malloc.h -> stdlib.h.
- Remove -lxpg4. - Cosmetique.
This commit is contained in:
parent
fb76c325a9
commit
7b1715fb10
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=58007
@ -84,9 +84,10 @@ post-extract:
|
||||
|
||||
post-patch:
|
||||
@cd ${WRKSRC}/vje30/bin && ${RM} swingall.jar
|
||||
@find ${WRKSRC} -name '*.orig' -delete
|
||||
@${FIND} ${WRKSRC} -name '*.orig' -delete
|
||||
@${CP} ${FILESDIR}/vje.sh ${WRKSRC}/etc/rc.d/
|
||||
@${PERL} -i -pe 's,/usr/X11R6,${X11BASE},g' ${BUILD_WRKSRC}/${MAKEFILE}
|
||||
@${PERL} -i -pe 's,^(#include\s*)\<malloc\.h\>,$$1<stdlib.h>,' ${BUILD_WRKSRC}/*.c
|
||||
.if defined(NOPORTDOCS)
|
||||
@cd ${WRKSRC}/vje30 && ${RM} -rf doc README FAQ REQUEST
|
||||
.endif
|
||||
|
@ -1,5 +1,5 @@
|
||||
--- delta/newFrontend/Makefile.FreeBSD.orig Tue Aug 1 03:00:00 2000
|
||||
+++ delta/newFrontend/Makefile.FreeBSD Thu Jan 11 21:22:45 2001
|
||||
+++ delta/newFrontend/Makefile.FreeBSD Tue Apr 23 06:20:41 2002
|
||||
@@ -16,14 +16,14 @@
|
||||
DEST = .
|
||||
HDRS = . -I/usr/X11R6/include
|
||||
@ -7,8 +7,10 @@
|
||||
-CFLAGS = -g -DBSD=1 -DUSE_XPM=0 -DPCUNIX=1 -Dunix -DUSER_DIC -DVJE -DSINGLE=0 -DDLL_SRCH=1 -DADELTA=1 -DDELTA=1 -DUCS -I$(HDRS)
|
||||
+CFLAGS += -DBSD=1 -DUSE_XPM=0 -DPCUNIX=1 -Dunix -DUSER_DIC -DVJE -DSINGLE=0 -DDLL_SRCH=1 -DADELTA=1 -DDELTA=1 -DUCS -I$(HDRS)
|
||||
|
||||
BSDLIBS = -lxpg4
|
||||
#BSDLIBS =
|
||||
-BSDLIBS = -lxpg4
|
||||
-#BSDLIBS =
|
||||
+#BSDLIBS = -lxpg4
|
||||
+BSDLIBS =
|
||||
#XPMLIB = -lXpm
|
||||
XPMLIB =
|
||||
LIBS = $(BSDLIBS) $(XPMLIB) -lXmu -L/usr/X11R6/lib -lXt -lX11 -lXext
|
||||
|
@ -1,28 +1,20 @@
|
||||
--- delta/newFrontend/ximsub1.c.orig Tue Aug 1 03:00:00 2000
|
||||
+++ delta/newFrontend/ximsub1.c Thu Jan 11 21:24:21 2001
|
||||
@@ -259,10 +259,11 @@
|
||||
|
||||
+++ delta/newFrontend/ximsub1.c Tue Apr 23 06:24:39 2002
|
||||
@@ -260,7 +260,7 @@
|
||||
if (&fxim_table[i].client == xim_client) {
|
||||
FreeRecvQueue(fxim_table[i].client.pending);
|
||||
+
|
||||
#if 1/*991109*/
|
||||
- if (xim_client->v_data) {
|
||||
+ /* if (xim_client->v_data) { */
|
||||
+ if (1) { /* (xim_client->v_data) { */
|
||||
CloseVJE (xim_client);
|
||||
- }
|
||||
+ /* } */
|
||||
}
|
||||
#endif
|
||||
fxim_table[i].client.used = False;
|
||||
if (xim_client->preedit->FontName) {
|
||||
@@ -295,9 +296,9 @@
|
||||
@@ -295,7 +295,7 @@
|
||||
FreeRecvQueue(fxim_table[i].client.pending);
|
||||
#if 1/*991109*/
|
||||
xim_client = &fxim_table[i].client;
|
||||
- if (xim_client->v_data) {
|
||||
+ /* if (xim_client->v_data) { */
|
||||
+ if (1) { /* (xim_client->v_data) { */
|
||||
CloseVJE (xim_client);
|
||||
- }
|
||||
+ /* } */
|
||||
}
|
||||
#endif
|
||||
fxim_table[i].client.used = False;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user