sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Prepare for xforms update.

Browse source
This commit is contained in:
Mike Heffner 2002-07-04 08:09:05 +00:00
parent 786cad9c3e
commit db59d15a8e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=62419
15 changed files with 138 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
audio/dap/Makefile
View file

@ -13,7 +13,7 @@ EXTRACT_SUFX=.tgz
MAINTAINER= yoshiaki@kt.rim.or.jp MAINTAINER= yoshiaki@kt.rim.or.jp
LIB_DEPENDS= xforms.0:${PORTSDIR}/x11-toolkits/xforms LIB_DEPENDS= forms.0:${PORTSDIR}/x11-toolkits/xforms
MAKEFILE= Makefile.linux MAKEFILE= Makefile.linux
USE_X_PREFIX= yes USE_X_PREFIX= yes

14
audio/dap/files/patch-ad
View file

@ -1,6 +1,6 @@
--- spkit/spkit/Makefile.linux.orig Sun Jul 1 13:36:58 2001 --- spkit/spkit/Makefile.linux.orig Wed Aug 9 18:27:20 2000
+++ spkit/spkit/Makefile.linux Sun Jul 1 13:38:17 2001 +++ spkit/spkit/Makefile.linux Tue Jul 2 02:11:41 2002
@@ -1,16 +1,16 @@ @@ -1,16 +1,19 @@
-CC = gcc -CC = gcc
-CXX = g++ -CXX = g++
+CC ?= gcc +CC ?= gcc
@ -12,9 +12,13 @@
MAINDIR = ../../main MAINDIR = ../../main
HOMEDIR = $(HOME) HOMEDIR = $(HOME)
-X11DIR = /usr/X11R6 -X11DIR = /usr/X11R6
+X11DIR = ${X11BASE} -INCDIR = -I. -I.. -I../.. -I$(SOUND) -I$(FORMS) -I$(MAINDIR) -I$(TOOLTIP) -I$(X11DIR)/include
INCDIR = -I. -I.. -I../.. -I$(SOUND) -I$(FORMS) -I$(MAINDIR) -I$(TOOLTIP) -I$(X11DIR)/include
-CCFLAGS = $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused -CCFLAGS = $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
+X11DIR = ${X11BASE}
+.if exists(${X11BASE}/include/X11/forms.h)
+XFORMSINC = -I${X11BASE}/include/X11
+.endif
+INCDIR = -I. -I.. -I../.. -I$(SOUND) -I$(FORMS) -I$(MAINDIR) -I$(TOOLTIP) -I$(X11DIR)/include ${XFORMSINC}
+CCFLAGS += $(INCDIR) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused +CCFLAGS += $(INCDIR) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
DEBUG = -g3 DEBUG = -g3
-OPTIM = -O2 -OPTIM = -O2

16
audio/dap/files/patch-ae
View file

@ -1,5 +1,5 @@
--- main/Makefile.linux.orig Sun Jul 1 13:42:55 2001 --- main/Makefile.linux.orig Tue Nov 7 18:16:54 2000
+++ main/Makefile.linux Sun Jul 1 13:42:31 2001 +++ main/Makefile.linux Tue Jul 2 02:16:04 2002
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
-CC = gcc -CC = gcc
-CXX = g++ -CXX = g++
@ -8,21 +8,23 @@
FORMS = ../../xforms/FORMS FORMS = ../../xforms/FORMS
SOUND = ../sound SOUND = ../sound
SPKIT = ../spkit SPKIT = ../spkit
@@ -8,13 +8,13 @@ @@ -8,12 +8,15 @@
AUDIOF = ../libaudiofile AUDIOF = ../libaudiofile
BACKDIR = ../bak/main BACKDIR = ../bak/main
HOMEDIR = $(HOME) HOMEDIR = $(HOME)
-X11DIR = /usr/X11R6 -X11DIR = /usr/X11R6
-INCDIR = -I. -I.. -I$(SOUND) -I$(SPKIT) -I$(FORMS) -I$(TOOLTIP) -I$(X11DIR)/include
+X11DIR = ${X11BASE} +X11DIR = ${X11BASE}
INCDIR = -I. -I.. -I$(SOUND) -I$(SPKIT) -I$(FORMS) -I$(TOOLTIP) -I$(X11DIR)/include +.if exists(${X11BASE}/include/X11/forms.h)
+XFORMSINC = -I${X11BASE}/include/X11
+.endif
+INCDIR = -I. -I.. -I$(SOUND) -I$(SPKIT) -I$(FORMS) -I$(TOOLTIP) -I$(X11DIR)/include ${XFORMSINC}
LIBDIR = -L$(SPKIT)/spkit -L$(FORMS) -L$(AUDIO) -L$(AUDIOF) -L$(TOOLTIP) -L$(X11DIR)/lib LIBDIR = -L$(SPKIT)/spkit -L$(FORMS) -L$(AUDIO) -L$(AUDIOF) -L$(TOOLTIP) -L$(X11DIR)/lib
-CCFLAGS = $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused -CCFLAGS = $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
+CCFLAGS = $(INCDIR) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused +CCFLAGS = $(INCDIR) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
DEBUG = -g3 DEBUG = -g3
-OPTIM = -O1 -OPTIM = -O1
-LDFLAGS = $(LIBDIR) -ldsp -laudio -laudiofile -ltooltips -lforms -lXpm -lX11 -lm
+OPTIM = ${CXXFLAGS} +OPTIM = ${CXXFLAGS}
+LDFLAGS = $(LIBDIR) -ldsp -laudio -laudiofile -ltooltips -lxforms -lXpm -lX11 -lm LDFLAGS = $(LIBDIR) -ldsp -laudio -laudiofile -ltooltips -lforms -lXpm -lX11 -lm
PROGS = DAP PROGS = DAP
OBJS = DPTich.o DPTich_cb.o DPTich_DSP.o DPTich_edit_cb.o DPTich_macros.o \

2
audio/xtuner/Makefile
View file

@ -13,7 +13,7 @@ DISTNAME= Xtuner-${PORTVERSION}
MAINTAINER= Lars.Koeller@Uni-Bielefeld.DE MAINTAINER= Lars.Koeller@Uni-Bielefeld.DE
LIB_DEPENDS= xforms.0:${PORTSDIR}/x11-toolkits/xforms LIB_DEPENDS= forms.0:${PORTSDIR}/x11-toolkits/xforms
USE_IMAKE= YES USE_IMAKE= YES
USE_XPM= YES USE_XPM= YES

9
audio/xtuner/files/patch-ab
View file

@ -1,5 +1,5 @@
--- Imakefile.orig Fri Dec 20 04:31:12 1996 --- Imakefile.orig Thu Dec 19 14:31:12 1996
+++ Imakefile Sun Dec 10 17:12:58 2000 +++ Imakefile Mon Jul 1 00:30:04 2002
@@ -25,9 +25,13 @@ @@ -25,9 +25,13 @@
*/ */
@ -7,10 +7,11 @@
- CC= gcc - CC= gcc
+XCOMM CC= gcc +XCOMM CC= gcc
EXTRA_DEFINES= -D_HAVE_PARAM_H EXTRA_DEFINES= -D_HAVE_PARAM_H
- LOCAL_LIBRARIES= -lxforms -lXpm -lX11 -lm
+#if defined (AlphaArchitecture) +#if defined (AlphaArchitecture)
+ LOCAL_LIBRARIES= -lxforms -lXpm -lX11 -lm -lio + LOCAL_LIBRARIES= -lforms -lXpm -lX11 -lm -lio
+#else +#else
LOCAL_LIBRARIES= -lxforms -lXpm -lX11 -lm + LOCAL_LIBRARIES= -lforms -lXpm -lX11 -lm
+#endif +#endif
#else #else
CFLAGS= -O2 -m486 CFLAGS= -O2 -m486

4
emulators/bfe/Makefile
View file

@ -12,16 +12,18 @@ MASTER_SITES= http://www.qzx.com/bfe/_download/
MAINTAINER= greid@FreeBSD.org MAINTAINER= greid@FreeBSD.org
LIB_DEPENDS= xforms.0:${PORTSDIR}/x11-toolkits/xforms LIB_DEPENDS= forms.0:${PORTSDIR}/x11-toolkits/xforms
RUN_DEPENDS= bochs:${PORTSDIR}/emulators/bochs RUN_DEPENDS= bochs:${PORTSDIR}/emulators/bochs
USE_X_PREFIX= yes USE_X_PREFIX= yes
USE_XPM= yes
WRKSRC= ${WRKDIR}/bfe WRKSRC= ${WRKDIR}/bfe
pre-build: pre-build:
${PERL} -pi -e "s@/usr/X11R6@${X11BASE}@g; \ ${PERL} -pi -e "s@/usr/X11R6@${X11BASE}@g; \
s@/usr/local@${LOCALBASE}@g; \ s@/usr/local@${LOCALBASE}@g; \
s@-lforms@-lforms -lXpm@g; \
s@gcc@${CC}@g; s@-O2@${CFLAGS}@g" ${WRKSRC}/Makefile s@gcc@${CC}@g; s@-O2@${CFLAGS}@g" ${WRKSRC}/Makefile
do-install: do-install:

2
ftp/xrmftp/Makefile
View file

@ -14,7 +14,7 @@ EXTRACT_SUFX= .src.tgz
MAINTAINER= matt@LUCIDA.CA MAINTAINER= matt@LUCIDA.CA
LIB_DEPENDS= xforms.0:${PORTSDIR}/x11-toolkits/xforms LIB_DEPENDS= forms.0:${PORTSDIR}/x11-toolkits/xforms
USE_X_PREFIX= yes USE_X_PREFIX= yes
WRKSRC= ${WRKDIR}/xrmftp-1.2.4.src WRKSRC= ${WRKDIR}/xrmftp-1.2.4.src

13
ftp/xrmftp/files/patch-aa
View file

@ -1,18 +1,23 @@
--- Makefile.orig Tue Nov 17 19:25:43 1998 --- Makefile.orig Tue Nov 17 19:25:43 1998
+++ Makefile Sun Mar 11 05:59:19 2001 +++ Makefile Mon Jul 1 01:56:44 2002
@@ -1,17 +1,20 @@ @@ -1,17 +1,24 @@
-CC=gcc -CC=gcc
-XFORMSLIBPATH=/usr/X11R6/lib # path to xforms library -XFORMSLIBPATH=/usr/X11R6/lib # path to xforms library
-XFORMSINCPATH=/usr/X11R6/include # path to xforms header file <forms.h> -XFORMSINCPATH=/usr/X11R6/include # path to xforms header file <forms.h>
-XLIBSPATH=/usr/X11R6/lib # path to standard X libraries -XLIBSPATH=/usr/X11R6/lib # path to standard X libraries
-XINCPATH=/usr/X11R6/include # path to standard X header files -XINCPATH=/usr/X11R6/include # path to standard X header files
-LIBS= -lm -lX11 -lforms # libraries
+X11BASE?=/usr/X11R6 +X11BASE?=/usr/X11R6
+CC ?=gcc +CC ?=gcc
+XFORMSLIBPATH=${X11BASE}/lib # path to xforms library +XFORMSLIBPATH=${X11BASE}/lib # path to xforms library
+XFORMSINCPATH=${X11BASE}/include # path to xforms header file <forms.h> +.if exists (${X11BASE}/include/X11/forms.h)
+XFORMSINCPATH=${X11BASE}/include/X11
+.else
+XFORMSINCPATH=${X11BASE}/include
+.endif
+XLIBSPATH=${X11BASE}/lib # path to standard X libraries +XLIBSPATH=${X11BASE}/lib # path to standard X libraries
+XINCPATH=${X11BASE}/include # path to standard X header files +XINCPATH=${X11BASE}/include # path to standard X header files
LIBS= -lm -lX11 -lforms # libraries +LIBS= -lm -lX11 -lforms -lXpm # libraries
#EXTRALIBS=-lnsl -lsocket # additional libraries needed by some unices #EXTRALIBS=-lnsl -lsocket # additional libraries needed by some unices
SRC=xftp.c fd_xftp.c SRC=xftp.c fd_xftp.c
OBJ=$(SRC:.c=.o) OBJ=$(SRC:.c=.o)

13
graphics/xmrm/files/patch-aa
View file

@ -1,5 +1,5 @@
--- Makefile.orig Tue Mar 10 00:00:00 1998 --- Makefile.orig Mon Mar 9 18:00:00 1998
+++ Makefile Sun Mar 11 15:48:25 2001 +++ Makefile Mon Jul 1 03:46:01 2002
@@ -16,8 +16,8 @@ @@ -16,8 +16,8 @@
# #
############################################################################## ##############################################################################
@ -11,12 +11,17 @@
# -c: don't link yet # -c: don't link yet
# -g: produce debugging-information, don't use together with link_flag -s # -g: produce debugging-information, don't use together with link_flag -s
@@ -29,14 +29,14 @@ @@ -28,15 +28,19 @@
# -c: don't link yet
#COMPILE_FLAGS = -O3 -m486 -c #COMPILE_FLAGS = -O3 -m486 -c
+.if exists(${X11BASE}/include/X11/forms.h)
+XFORMSINC = -I${X11BASE}/include/X11
+.endif
+
# -O: normal optimization level -c: don't link yet # -O: normal optimization level -c: don't link yet
-COMPILE_FLAGS = -O -c -COMPILE_FLAGS = -O -c
+COMPILE_FLAGS = ${CFLAGS} -I${PREFIX}/include -I${X11BASE}/include -c +COMPILE_FLAGS = ${CFLAGS} -I${PREFIX}/include -I${X11BASE}/include ${XFORMSINC} -c
# -s: DESTROYS symbol-table # -s: DESTROYS symbol-table
-LINK_FLAGS = -s -LINK_FLAGS = -s

13
graphics/xmrm/files/patch-ab
View file

@ -1,6 +1,6 @@
--- const.h.orig Mon Mar 9 17:00:00 1998 --- const.h.orig Mon Mar 9 18:00:00 1998
+++ const.h Tue Mar 28 15:23:34 2000 +++ const.h Mon Jul 1 03:46:45 2002
@@ -3,7 +3,7 @@ @@ -3,12 +3,14 @@
// Programming: Gerhard Waldhör, Andreas Artmann // Programming: Gerhard Waldhör, Andreas Artmann
#include <stdio.h> #include <stdio.h>
@ -9,3 +9,10 @@
#include <errno.h> #include <errno.h>
#include <math.h> #include <math.h>
+#ifndef TRUE
#define TRUE 1
#define FALSE 0
+#endif
#define MAX_PIC_NUM 999

2
japanese/lyx/Makefile
View file

@ -22,7 +22,7 @@ MAINTAINER= flathill@FreeBSD.ORG
#.if defined(WITH_ISPELL) #.if defined(WITH_ISPELL)
#RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell #RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell
#.endif #.endif
LIB_DEPENDS= xforms.0:${PORTSDIR}/x11-toolkits/xforms LIB_DEPENDS= forms.0:${PORTSDIR}/x11-toolkits/xforms
USE_XPM= yes USE_XPM= yes
USE_PERL5= yes USE_PERL5= yes

57
japanese/lyx/files/patch-ab Normal file
View file

@ -0,0 +1,57 @@
--- src/main.C.orig Tue Jul 2 00:11:14 2002
+++ src/main.C Tue Jul 2 00:11:52 2002
@@ -21,16 +21,6 @@
static char vcid[] = "$Id: main.C,v 1.2 1998/06/22 05:50:57 arrae Exp $";
#endif /* lint */
-// I keep these here so that it will be processed as early in
-// the compilation process as possible.
-#if !defined(FL_REVISION) || (FL_REVISION != 81 && FL_REVISION != 86 &&\
- FL_REVISION != 87 && FL_REVISION != 88) \
- || FL_VERSION != 0
-#error LyX will not compile with this version of XForms.\
- Please get version 0.88 (0.81 and 0.86 also work).\
- If you want to try to compile anyway, delete this test in src/main.C.
-#endif
-
int main(int argc, char *argv[])
{
--- src/lyx_gui_misc.h.orig Tue Jul 2 00:23:13 2002
+++ src/lyx_gui_misc.h Tue Jul 2 00:23:32 2002
@@ -64,7 +64,7 @@
inline
void LyXBell() {
// if (audio()) ON/OFF switch yet to be implemented
-#if FL_REVISION > 85
+#if FL_VERSION > 0 || FL_REVISION > 85
fl_ringbell(20);
#else
ringbell();
--- src/lyx_gui_misc.C.orig Tue Jul 2 00:27:17 2002
+++ src/lyx_gui_misc.C Tue Jul 2 00:30:10 2002
@@ -379,7 +379,7 @@
{
fl_set_resource("flQuestion.yes.label", idex(_("Yes|Yy#y")));
fl_set_resource("flQuestion.no.label", idex(_("No|Nn#n")));
-#if FL_REVISION > 85
+#if FL_VERSION > 0 || FL_REVISION > 85
return fl_show_question((s1 + "\n" + s2 + "\n" + s3).c_str(), 0);
#else
return fl_show_question(s1.c_str(), s2.c_str(), s3.c_str());
@@ -392,13 +392,12 @@
fl_set_choices_shortcut(scex(_("Yes|Yy#y")),
scex(_("No|Nn#n")),
scex(_("Cancel|^[")));
-#if FL_REVISION < 86
+#if FL_VERSION == 0 && FL_REVISION < 86
return fl_show_choice(s1.c_str(), s2.c_str(), s3.c_str(),
3, idex(_("Yes|Yy#y")),
idex(_("No|Nn#n")),
idex(_("Cancel|^[")));
-#endif
-#if FL_REVISION > 85
+#else
return fl_show_choice(s1.c_str(), s2.c_str(), s3.c_str(),
3, idex(_("Yes|Yy#y")),
idex(_("No|Nn#n")),

12
japanese/lyx/files/patch-ac Normal file
View file

@ -0,0 +1,12 @@
--- src/screen.C.orig Tue Jul 2 00:53:03 2002
+++ src/screen.C Tue Jul 2 00:53:23 2002
@@ -809,9 +809,6 @@
// I want the buttons back before 0.12. OK, this is very simple,
// like what is done in xforms sources. (Ale)
- // This one is too dirty. Get rid of it.
- extern GC fl_gc;
-
// Please comment this annonymous variable.
int d = 2;

2
math/apc/Makefile
View file

@ -12,7 +12,7 @@ MASTER_SITES= http://members.global2000.net/~eagriff/
MAINTAINER= eagriff@global2000.net MAINTAINER= eagriff@global2000.net
LIB_DEPENDS= xforms.0:${PORTSDIR}/x11-toolkits/xforms LIB_DEPENDS= forms.0:${PORTSDIR}/x11-toolkits/xforms
USE_X_PREFIX= yes USE_X_PREFIX= yes
MAN1= apc.1 MAN1= apc.1

15
math/apc/files/patch-aa
View file

@ -1,11 +1,16 @@
--- Makefile.orig Fri Aug 31 23:39:56 2001 --- Makefile.orig Mon Oct 13 15:25:38 1997
+++ Makefile Fri Aug 31 23:40:02 2001 +++ Makefile Tue Jul 2 01:04:00 2002
@@ -2,7 +2,7 @@ @@ -1,8 +1,11 @@
# New Makefile for apc (13 October 1997)
# #
CFLAGS+=-DOS=\"$(OSTYPE)\" -I${X11BASE}/include -CFLAGS+=-DOS=\"$(OSTYPE)\" -I${X11BASE}/include
+.if exists(${X11BASE}/include/X11/forms.h)
+XFORMSINC=-I${X11BASE}/include/X11
+.endif
+CFLAGS+=-DOS=\"$(OSTYPE)\" -I${X11BASE}/include ${XFORMSINC}
LDFLAGS+=-L${X11BASE}/lib LDFLAGS+=-L${X11BASE}/lib
-LDADD+=-lxforms -lX11 -lm -LDADD+=-lxforms -lX11 -lm
+LDADD+=-lxforms -lX11 -lm -lXpm +LDADD+=-lforms -lX11 -lm -lXpm
BINDIR=${X11BASE}/bin BINDIR=${X11BASE}/bin
MANDIR=${X11BASE}/man/man MANDIR=${X11BASE}/man/man
PROG= apc PROG= apc