diff options
| author | fredb <fredb> | 2002-04-17 04:45:06 +0000 |
|---|---|---|
| committer | fredb <fredb> | 2002-04-17 04:45:06 +0000 |
| commit | 5e7b13a24e020e183d482d0d682db2c68b3fabe0 (patch) | |
| tree | dc783e63ef8448e3a620be967f9233cff8ff8e71 | |
| parent | 373bc484f19d30af59db71e20bd3aa1b8b7593f9 (diff) | |
| download | pkgsrc-5e7b13a24e020e183d482d0d682db2c68b3fabe0.tar.gz | |
Update dependency on xforms. We're mainly bumping the dependency
and package revision, since we may now link against the forms shared
library, and because we also have to add a dependency on jpeg lib.
27 files changed, 194 insertions, 136 deletions
diff --git a/audio/dap/Makefile b/audio/dap/Makefile index 441a68402ed..bd6036b4d13 100644 --- a/audio/dap/Makefile +++ b/audio/dap/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.12 2002/04/01 15:26:36 fredb Exp $ +# $NetBSD: Makefile,v 1.13 2002/04/17 04:45:06 fredb Exp $ DISTNAME= dap-2.1.2 +PKGREVISION= 1 CATEGORIES= audio MASTER_SITES= http://www.cee.hw.ac.uk/~richardk/ EXTRACT_SUFX= .tgz @@ -9,7 +10,8 @@ MAINTAINER= scw@netbsd.org HOMEPAGE= http://www.cee.hw.ac.uk/~richardk/ COMMENT= Digital audio recording and processing package -DEPENDS+= xforms>=0.88nb1:../../x11/xforms +DEPENDS+= jpeg-6b:../../graphics/jpeg +DEPENDS+= xforms>=0.9999:../../x11/xforms MAKEFILE= Makefile.netbsd diff --git a/audio/dap/distinfo b/audio/dap/distinfo index 6fe60660deb..336095a4ac5 100644 --- a/audio/dap/distinfo +++ b/audio/dap/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.4 2002/04/01 15:26:37 fredb Exp $ +$NetBSD: distinfo,v 1.5 2002/04/17 04:45:06 fredb Exp $ SHA1 (dap-2.1.2.tgz) = 42bfc1a79507fe5f5d175fd2d27a7a5264f1398b Size (dap-2.1.2.tgz) = 290292 bytes -SHA1 (patch-aa) = 259348b27efdf898003e78f35ebd7aaa8c3e6fb0 +SHA1 (patch-aa) = c081de78507a3bd03ab1b8e739c1da5340d6dae8 SHA1 (patch-ab) = 0ccf4aa10dfc059eb45f60794c10844b28c2fd1a SHA1 (patch-ad) = 01d6e14e7e9fffb9e16a85ddfaf60c96cb98afab SHA1 (patch-af) = 28d7ef813ea4147b0a2413bbfc3d9fc1bb90993c diff --git a/audio/dap/patches/patch-aa b/audio/dap/patches/patch-aa index 9de0fe9d144..80457dce0ee 100644 --- a/audio/dap/patches/patch-aa +++ b/audio/dap/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.5 2001/05/31 12:30:12 agc Exp $ +$NetBSD: patch-aa,v 1.6 2002/04/17 04:45:07 fredb Exp $ ---- main/Makefile.netbsd.orig Wed Feb 23 23:56:39 2000 -+++ main/Makefile.netbsd Thu May 31 12:41:20 2001 -@@ -8,11 +8,11 @@ +--- main/Makefile.netbsd.orig Mon May 22 18:07:21 2000 ++++ main/Makefile.netbsd +@@ -8,13 +8,13 @@ AUDIOF = ../libaudiofile BACKDIR = ../bak/main HOMEDIR = $(HOME) @@ -10,11 +10,14 @@ $NetBSD: patch-aa,v 1.5 2001/05/31 12:30:12 agc Exp $ -INCDIR = -I. -I.. -I$(SOUND) -I$(SPKIT) -I$(FORMS) -I$(TOOLTIP) -I$(X11DIR)/include -I$(X11DIR)/include/X11 -LIBDIR = -L$(SPKIT)/spkit -L$(FORMS) -L$(AUDIO) -L$(AUDIOF) -L$(TOOLTIP) -L$(X11DIR)/lib +X11DIR = ${X11BASE} -+INCDIR = -I. -I.. -I$(SOUND) -I$(SPKIT) -I$(FORMS) -I$(TOOLTIP) -I$(X11DIR)/include -I$(X11DIR)/include/X11 -I${X11PREFIX}/include -I${X11PREFIX}/include/X11 -+LIBDIR = -Wl,-R$(X11DIR)/lib -L$(SPKIT)/spkit -L$(FORMS) -L$(AUDIO) -L$(AUDIOF) -L$(TOOLTIP) -L$(X11DIR)/lib -Wl,-R${X11PREFIX}/lib -L${X11PREFIX}/lib ++INCDIR = -I. -I.. -I$(SOUND) -I$(SPKIT) -I$(FORMS) -I$(TOOLTIP) -I$(X11DIR)/include -I$(X11DIR)/include/X11 -I${X11PREFIX}/include -I${X11PREFIX}/include/X11 -I${LOCALBASE}/include ++LIBDIR = -Wl,-R$(X11DIR)/lib -L$(SPKIT)/spkit -L$(FORMS) -L$(AUDIO) -L$(AUDIOF) -L$(TOOLTIP) -L$(X11DIR)/lib -Wl,-R${X11PREFIX}/lib -L${X11PREFIX}/lib -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib CCFLAGS = $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DNETBSD -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused -DEBUG = -g3 +DEBUG = #-g3 OPTIM = -O1 - LDFLAGS = $(LIBDIR) -ldsp -laudio -laudiofile -ltooltips -lforms -lXpm -lX11 -lm -lossaudio +-LDFLAGS = $(LIBDIR) -ldsp -laudio -laudiofile -ltooltips -lforms -lXpm -lX11 -lm -lossaudio ++LDFLAGS = $(LIBDIR) -ldsp -laudio -laudiofile -ltooltips -lforms -ljpeg -lXpm -lX11 -lm -lossaudio + PROGS = DAP + OBJS = DPTich.o DPTich_cb.o DPTich_DSP.o DPTich_edit_cb.o DPTich_macros.o \ diff --git a/cad/xchiplogo/Makefile b/cad/xchiplogo/Makefile index 0b040a047bb..b7acb78533b 100644 --- a/cad/xchiplogo/Makefile +++ b/cad/xchiplogo/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.4 2001/09/27 23:17:47 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2002/04/17 04:45:08 fredb Exp $ # DISTNAME= xchiplogo PKGNAME= xchiplogo-19991222 +PKGREVISION= 1 CATEGORIES= cad MASTER_SITES= http://www.eleceng.adelaide.edu.au/Personal/moini/ @@ -10,7 +11,8 @@ MAINTAINER= dmcmahill@netbsd.org HOMEPAGE= http://www.eleceng.adelaide.edu.au/Personal/moini/chiplogo.html COMMENT= Program for generating pretty logos on VLSI chips -DEPENDS+= xforms-[0-9]*:../../x11/xforms +DEPENDS+= jpeg-6b:../../graphics/jpeg +DEPENDS+= xforms>=0.9999:../../x11/xforms USE_X11= YES USE_XPM= YES diff --git a/cad/xchiplogo/distinfo b/cad/xchiplogo/distinfo index dd5a2a3b5cd..1a465b64e70 100644 --- a/cad/xchiplogo/distinfo +++ b/cad/xchiplogo/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.2 2001/04/19 16:27:03 agc Exp $ +$NetBSD: distinfo,v 1.3 2002/04/17 04:45:08 fredb Exp $ SHA1 (xchiplogo.tar.gz) = 2884f2375a389aa5427efecef7d8cf3e74974d98 Size (xchiplogo.tar.gz) = 46652 bytes -SHA1 (patch-aa) = 4b001740468c1559c8c88812ea252b42c136193f +SHA1 (patch-aa) = 1235622f36c63bdeb5e453ac4fa1bce9bb6ec9c1 diff --git a/cad/xchiplogo/patches/patch-aa b/cad/xchiplogo/patches/patch-aa index 90383615be1..9b7bde10b46 100644 --- a/cad/xchiplogo/patches/patch-aa +++ b/cad/xchiplogo/patches/patch-aa @@ -1,8 +1,9 @@ -$NetBSD: patch-aa,v 1.1.1.1 1999/12/23 03:57:12 dmcmahill Exp $ +$NetBSD: patch-aa,v 1.2 2002/04/17 04:45:08 fredb Exp $ ---- Makefile.orig Sun Nov 17 17:43:29 1996 -+++ Makefile Wed Dec 22 20:05:59 1999 -@@ -4,24 +4,21 @@ +--- Makefile.orig Sun Nov 17 16:43:29 1996 ++++ Makefile +@@ -3,27 +3,24 @@ + # then all you need is to type make and let it go # -CC= gcc @@ -16,7 +17,7 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/12/23 03:57:12 dmcmahill Exp $ -XFORMSINC=-I/usr/local/X11/include -XFORMSLIB=-L/usr/local/X11/lib +XFORMSINC=-I${X11BASE}/include -+XFORMSLIB=-L${X11BASE}/lib -Wl,-R${X11BASE}/lib ++XFORMSLIB=-L${X11BASE}/lib -Wl,-R${X11BASE}/lib -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib # SYSLIB=-lXpm -lX11 -lm @@ -29,7 +30,10 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/12/23 03:57:12 dmcmahill Exp $ -CFLAGS=$(CCFLAG) $(XFORMSINC) $(XINCLUDE) -LDFLAGS = $(LDFLAG) +-LIBS=$(XFORMSLIB) -lforms $(SYSLIB) +CFLAGS+= $(XFORMSINC) $(XINCLUDE) +LDFLAGS+= $(LDFLAG) - LIBS=$(XFORMSLIB) -lforms $(SYSLIB) ++LIBS=$(XFORMSLIB) -lforms -ljpeg $(SYSLIB) + # + SRCS = main.c xchiplogo.c help.c diff --git a/comms/xisp/Makefile b/comms/xisp/Makefile index 5efdc031e93..6c1fa727c94 100644 --- a/comms/xisp/Makefile +++ b/comms/xisp/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.12 2002/03/14 14:14:42 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2002/04/17 04:45:08 fredb Exp $ # DISTNAME= xisp-2.6p1 +PKGREVISION= 1 CATEGORIES= comms x11 MASTER_SITES= ${MASTER_SITE_SUNSITE:=system/network/serial/} \ http://xisp.hellug.gr/release/ \ @@ -11,7 +12,8 @@ MAINTAINER= jlam@netbsd.org HOMEPAGE= http://xisp.hellug.gr/ COMMENT= User-friendly X11 interface to pppd/chat -DEPENDS+= xforms>=0.88nb1:../../x11/xforms +DEPENDS+= jpeg-6b:../../graphics/jpeg +DEPENDS+= xforms>=0.9999:../../x11/xforms USE_X11BASE= YES USE_XPM= YES diff --git a/comms/xisp/distinfo b/comms/xisp/distinfo index 4ffc501fbf6..cb68e7f4eb1 100644 --- a/comms/xisp/distinfo +++ b/comms/xisp/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.2 2001/04/20 09:04:27 agc Exp $ +$NetBSD: distinfo,v 1.3 2002/04/17 04:45:09 fredb Exp $ SHA1 (xisp-2.6p1.tar.gz) = 5e6f1795f20b22fd26212215b86b505e00d43b9e Size (xisp-2.6p1.tar.gz) = 260645 bytes -SHA1 (patch-aa) = 81b575e77095a133015313a47424ca882c662f3b +SHA1 (patch-aa) = df706174b5f90d0f0543bf8c6e0027aee249c37e diff --git a/comms/xisp/patches/patch-aa b/comms/xisp/patches/patch-aa index 4d645aba348..9c71a0f5731 100644 --- a/comms/xisp/patches/patch-aa +++ b/comms/xisp/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.4 1999/11/14 22:53:22 frueauf Exp $ +$NetBSD: patch-aa,v 1.5 2002/04/17 04:45:09 fredb Exp $ ---- Makefile.orig Thu Aug 26 14:08:51 1999 -+++ Makefile Sun Nov 14 23:40:47 1999 +--- Makefile.orig Thu Aug 26 07:08:51 1999 ++++ Makefile @@ -8,11 +8,11 @@ # Compilation/installation vars (global for all following sections) | #===================================================================== @@ -96,8 +96,8 @@ $NetBSD: patch-aa,v 1.4 1999/11/14 22:53:22 frueauf Exp $ +GCCFLAGS = -Wall -O +EXTRADEFS = -DMODEM_DEVICE=\"$(MODEM_PATH)\" -DHAVE_STRERROR +EXTRALIBS = -lcrypt -+LINKX11 = -Wl,-R$(LIBX11) -+LINKFORMS = -L$(LIBFORMS) -lforms ++LINKX11 = -Wl,-R$(LIBX11) -Wl,-R$(LOCALBASE)/lib ++LINKFORMS = -L$(LIBFORMS) -L$(LOCALBASE)/lib -lforms -ljpeg -lXpm +INSTALL = /usr/bin/install # # FreeBSD vars diff --git a/databases/xmysql/Makefile b/databases/xmysql/Makefile index 3d5e29ecd8c..c35c9290d70 100644 --- a/databases/xmysql/Makefile +++ b/databases/xmysql/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.8 2001/03/26 14:54:20 bad Exp $ +# $NetBSD: Makefile,v 1.9 2002/04/17 04:45:09 fredb Exp $ # DISTNAME= xmysql-1.10 +PKGREVISION= 1 CATEGORIES= databases x11 MASTER_SITES= http://web.wt.net/~dblhack/ @@ -9,8 +10,9 @@ MAINTAINER= bad@netbsd.org HOMEPAGE= http://web.wt.net/~dblhack COMMENT= Graphical front end to the MySQL database engine -DEPENDS= mysql-client>=3.23.35:../../databases/mysql-client -DEPENDS+= xforms>=0.88nb1:../../x11/xforms +DEPENDS+= mysql-client>=3.23.35:../../databases/mysql-client +DEPENDS+= jpeg-6b:../../graphics/jpeg +DEPENDS+= xforms>=0.9999:../../x11/xforms MAKE_ENV+= X11PREFIX=${X11PREFIX} USE_X11= YES diff --git a/databases/xmysql/distinfo b/databases/xmysql/distinfo index 852744534ed..5c535eef95d 100644 --- a/databases/xmysql/distinfo +++ b/databases/xmysql/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.2 2001/04/18 16:11:06 agc Exp $ +$NetBSD: distinfo,v 1.3 2002/04/17 04:45:10 fredb Exp $ SHA1 (xmysql-1.10.tar.gz) = 241860b2c4550f70acbd7ef6cf327cb5df403b78 Size (xmysql-1.10.tar.gz) = 187321 bytes -SHA1 (patch-aa) = 48dc8992d6c7b25049d04fd8415d7572f077f80d +SHA1 (patch-aa) = 3522b0f39ff5d18bc9cadd62192b4d7f0e401d48 diff --git a/databases/xmysql/patches/patch-aa b/databases/xmysql/patches/patch-aa index f0e824a7791..7d10b0183a5 100644 --- a/databases/xmysql/patches/patch-aa +++ b/databases/xmysql/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.2 2000/11/03 20:52:47 veego Exp $ +$NetBSD: patch-aa,v 1.3 2002/04/17 04:45:10 fredb Exp $ ---- Makefile.orig Wed Nov 18 05:19:06 1998 -+++ Makefile Thu Aug 5 18:57:34 1999 +--- Makefile.orig Tue Nov 17 22:19:06 1998 ++++ Makefile @@ -31,24 +31,24 @@ PROGRAM = xmysql @@ -31,13 +31,22 @@ $NetBSD: patch-aa,v 1.2 2000/11/03 20:52:47 veego Exp $ +STDLFLAGS = ${LDFLAGS} +MYSQLINC = -I${PREFIX}/include/mysql +MYSQLLOAD = -Wl,-R${PREFIX}/lib/mysql -L${PREFIX}/lib/mysql -lmysqlclient -+XFORMLIBDIR = ++XFORMLIBDIR = -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib +XFORMINCDIR = -I${X11PREFIX}/include/X11 +XINC = -I${X11BASE}/include +XLOAD = -lX11 # objects needed for the program OBJS = Xmysql.o \ +@@ -60,7 +60,7 @@ + ${PROGRAM}: $(OBJS) + $(CC) -o ${PROGRAM} $(OBJS) $(MYSQLINC) $(XFORMINCDIR) \ + $(XINC) $(STDLFLAGS) $(MYSQLLOAD) \ +- $(XLOAD) $(XFORMLIBDIR) -lforms -lXpm -lm ++ $(XLOAD) $(XFORMLIBDIR) -lforms -ljpeg -lXpm -lm + + .c.o: + $(CC) $*.c $(STDCFLAGS) $(XFORMINCDIR) $(MYSQLINC) $(XINC) @@ -69,8 +69,8 @@ rm -f ${PROGRAM} $(OBJS) diff --git a/databases/xmysqladmin/Makefile b/databases/xmysqladmin/Makefile index 1b566a470df..2d8dc9775ec 100644 --- a/databases/xmysqladmin/Makefile +++ b/databases/xmysqladmin/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.8 2001/03/26 14:54:20 bad Exp $ +# $NetBSD: Makefile,v 1.9 2002/04/17 04:45:11 fredb Exp $ # DISTNAME= xmysqladmin-1.0 +PKGREVISION= 1 CATEGORIES= databases x11 MASTER_SITES= http://www.mysql.com/Contrib/ @@ -10,7 +11,8 @@ HOMEPAGE= http://www.mysql.com/ COMMENT= Graphical front end for administering MySQL databases DEPENDS= mysql-client>=3.23.35:../../databases/mysql-client -DEPENDS+= xforms>=0.88nb1:../../x11/xforms +DEPENDS+= jpeg-6b:../../graphics/jpeg +DEPENDS+= xforms>=0.9999:../../x11/xforms MAKE_ENV+= X11PREFIX=${X11PREFIX} diff --git a/databases/xmysqladmin/distinfo b/databases/xmysqladmin/distinfo index 35491019d24..f40200ae13d 100644 --- a/databases/xmysqladmin/distinfo +++ b/databases/xmysqladmin/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.2 2001/04/18 16:11:06 agc Exp $ +$NetBSD: distinfo,v 1.3 2002/04/17 04:45:11 fredb Exp $ SHA1 (xmysqladmin-1.0.tar.gz) = 60697568fef51c2361a7a31262cb1691c25c3d46 Size (xmysqladmin-1.0.tar.gz) = 65673 bytes -SHA1 (patch-aa) = a72cc20c578c90cfc668ac539c5a660ba01ea0ef +SHA1 (patch-aa) = 64fd43bbbdf96614d7ac9121be21a3f1c30ced3c diff --git a/databases/xmysqladmin/patches/patch-aa b/databases/xmysqladmin/patches/patch-aa index 910ba31ae25..177678b8e2e 100644 --- a/databases/xmysqladmin/patches/patch-aa +++ b/databases/xmysqladmin/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.2 2000/11/03 20:56:32 veego Exp $ +$NetBSD: patch-aa,v 1.3 2002/04/17 04:45:12 fredb Exp $ ---- Makefile.orig Mon Dec 7 12:52:39 1998 -+++ Makefile Thu Aug 5 19:08:30 1999 +--- Makefile.orig Mon Dec 7 05:52:39 1998 ++++ Makefile @@ -34,7 +34,7 @@ # This is used by 'make install' command #------------------------------------------------------- @@ -76,7 +76,7 @@ $NetBSD: patch-aa,v 1.2 2000/11/03 20:56:32 veego Exp $ #------------------------------------------------------- #XFORMLIBDIR = -L/opt/local/i386/lib -XFORMLIBDIR = -L/usr/lib -+XFORMLIBDIR = ++XFORMLIBDIR = -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}lib ######################################################## @@ -107,8 +107,9 @@ $NetBSD: patch-aa,v 1.2 2000/11/03 20:56:32 veego Exp $ ${PROGRAM}: $(OBJS) $(CC) -o ${PROGRAM} $(OBJS) $(MYSQLINC) $(XFORMINCDIR) \ $(XINC) $(STDLFLAGS) $(MYSQLLOAD) \ - $(XLOAD) $(XFORMLIBDIR) -lforms $(LIBS) +- $(XLOAD) $(XFORMLIBDIR) -lforms $(LIBS) - ./$(PROGRAM) ++ $(XLOAD) $(XFORMLIBDIR) -lforms -ljpeg $(LIBS) .c.o: $(CC) $*.c $(STDCFLAGS) $(XFORMINCDIR) $(MYSQLINC) $(MYSQLDBDIR) $(XINC) diff --git a/databases/xsqlmenu/Makefile b/databases/xsqlmenu/Makefile index 8ee38d6685a..c92933e2771 100644 --- a/databases/xsqlmenu/Makefile +++ b/databases/xsqlmenu/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2001/04/15 01:11:16 hubertf Exp $ +# $NetBSD: Makefile,v 1.3 2002/04/17 04:45:12 fredb Exp $ # DISTNAME= xsqlmenu-2.10 +PKGREVISION= 1 CATEGORIES= databases MASTER_SITES= http://www.jlab.org/~saw/xsqlmenu/ @@ -9,10 +10,12 @@ MAINTAINER= hubertf@netbsd.org HOMEPAGE= http://www.jlab.org/~saw/xsqlmenu/ COMMENT= X based GUI for MySQL -DEPENDS+= xforms-0.8*:../../x11/xforms DEPENDS+= mysql-client-3.*:../mysql-client +DEPENDS+= jpeg-6b:../../graphics/jpeg +DEPENDS+= xforms>=0.9999:../../x11/xforms USE_GMAKE= yes +USE_XPM= yes MAKE_ENV+= MAKE=gmake do-install: diff --git a/databases/xsqlmenu/distinfo b/databases/xsqlmenu/distinfo index 8267e436748..1bc48778686 100644 --- a/databases/xsqlmenu/distinfo +++ b/databases/xsqlmenu/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.2 2001/04/18 16:11:06 agc Exp $ +$NetBSD: distinfo,v 1.3 2002/04/17 04:45:13 fredb Exp $ SHA1 (xsqlmenu-2.10.tar.gz) = d97c3237d5bfd2213648067196b5f6d4a57fe706 Size (xsqlmenu-2.10.tar.gz) = 31458 bytes -SHA1 (patch-aa) = 854bdd562eaa93bfaa3979baa87049898794154b +SHA1 (patch-aa) = 68c45a0787adf3a840343cf968d1c2172822a080 diff --git a/databases/xsqlmenu/patches/patch-aa b/databases/xsqlmenu/patches/patch-aa index 34d7d450a13..c387773818d 100644 --- a/databases/xsqlmenu/patches/patch-aa +++ b/databases/xsqlmenu/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/03/27 02:18:07 hubertf Exp $ +$NetBSD: patch-aa,v 1.2 2002/04/17 04:45:13 fredb Exp $ ---- Makefile.orig Mon Aug 28 05:57:00 2000 +--- Makefile.orig Sun Aug 27 22:57:00 2000 +++ Makefile -@@ -8,13 +8,13 @@ +@@ -8,36 +8,43 @@ all: xsqlmenu #XFORMSBASE = /opt/lib @@ -18,7 +18,13 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/03/27 02:18:07 hubertf Exp $ endif ifeq (${DB},msql) -@@ -26,18 +26,21 @@ + CFLAGS = -O -Wall -I$(MSQLBASE)/include + LDFLAGS = -L $(MSQLBASE)/lib -lmsql -L$(XFORMSBASE) -lforms -lXpm \ ++ -L$(LOCALBASE)/lib -ljpeg \ + -L/usr/X11R6/lib -lX11 -lm + LDSTATICFLAGS= -L $(MSQLBASE)/lib -lmsql $(XFORMSBASE)/libforms.a \ ++ $(LOCALBASE)/lib/libjpeg.a \ + $(XFORMSBASE)/libXpm.a -L/usr/X11R6/lib -lX11 -lm .msql: touch .msql rm -f .mysql @@ -34,8 +40,10 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/03/27 02:18:07 hubertf Exp $ + -I${X11BASE}/include \ + -I${LOCALBASE}/include +LDFLAGS = -L$(MYSQLPREFIX)/lib/mysql -Wl,-R$(MYSQLPREFIX)/lib/mysql -lmysqlclient -L$(XFORMSBASE) -Wl,-R$(XFORMSBASE) -lforms \ ++ -L$(LOCALBASE)/lib -Wl,-R$(LOCALBASE)/lib -ljpeg \ + -lXpm -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lX11 -lm LDSTATICFLAGS= -L $(MYSQLPREFIX)/lib/mysql -lmysqlclient $(XFORMSBASE)/libforms.a \ ++ $(LOCALBASE)/lib/libjpeg.a \ $(XFORMSBASE)/libXpm.a -L/usr/X11R6/lib -lX11 -lm .mysql: touch .mysql diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile index 3f4d383d331..43e91a263c9 100644 --- a/mail/xfmail/Makefile +++ b/mail/xfmail/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.22 2001/12/20 09:48:03 tron Exp $ +# $NetBSD: Makefile,v 1.23 2002/04/17 04:45:14 fredb Exp $ DISTNAME= xfmail-1.4.7 +PKGREVISION= 1 CATEGORIES= mail x11 MASTER_SITES= ftp://xfmail.ufies.org/pub/xfmail/release/1.4.7/source/ EXTRACT_SUFX= .tar.bz2 @@ -19,6 +20,7 @@ NO_SRC_ON_CDROM= ${RESTRICTED} NO_BIN_ON_CDROM= ${RESTRICTED} USE_X11BASE= YES +USE_XPM= YES GNU_CONFIGURE= YES CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} @@ -32,6 +34,7 @@ post-install: .include "../../databases/gdbm/buildlink.mk" .include "../../devel/glib/buildlink.mk" +.include "../../graphics/jpeg/buildlink.mk" .include "../../graphics/xpm/buildlink.mk" .include "../../x11/xforms/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/xfmail/distinfo b/mail/xfmail/distinfo index fe2beb8a192..98ac061ee8b 100644 --- a/mail/xfmail/distinfo +++ b/mail/xfmail/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.3 2001/10/12 19:49:25 tron Exp $ +$NetBSD: distinfo,v 1.4 2002/04/17 04:45:14 fredb Exp $ SHA1 (xfmail-1.4.7.tar.bz2) = 3d4df175c67433330fd1e8418f8f12c27323e64c Size (xfmail-1.4.7.tar.bz2) = 452411 bytes SHA1 (patch-aa) = 117ebc7c64c278ec9faeb9168b4c014d85ae7608 SHA1 (patch-ab) = 83e6abecd67fbdfcbd2e6c1372b3997b53505b3b SHA1 (patch-ac) = 38aa66b7446ad007e2e0b26e21c21f519442360d -SHA1 (patch-ad) = e9dee799655661b36de19992e205ef4ed367c65d +SHA1 (patch-ad) = c9eb240fbfb3d4bc8b69107b690c75d325232d93 SHA1 (patch-ae) = e51f9ef076cd751fd8abb93c4f9122ad5f921520 SHA1 (patch-af) = d9dcf7c83a0c956c8126fcb36758c52ceaa67c40 diff --git a/mail/xfmail/patches/patch-ad b/mail/xfmail/patches/patch-ad index 47517184204..2d1b65cda2c 100644 --- a/mail/xfmail/patches/patch-ad +++ b/mail/xfmail/patches/patch-ad @@ -1,6 +1,6 @@ -$NetBSD: patch-ad,v 1.4 2001/02/26 22:32:09 tron Exp $ +$NetBSD: patch-ad,v 1.5 2002/04/17 04:45:14 fredb Exp $ ---- config/configure.in.orig Wed Nov 8 21:14:50 2000 +--- config/configure.in.orig Wed Nov 8 14:14:50 2000 +++ config/configure.in @@ -62,7 +62,7 @@ fi]) @@ -20,7 +20,21 @@ $NetBSD: patch-ad,v 1.4 2001/02/26 22:32:09 tron Exp $ [int x; x=0], xfmail_cv_permiss=yes, xfmail_cv_permiss=no)]) if test x$xfmail_cv_permiss = xno; then CPPFLAGS="-fpermissive $CPPFLAGS" -@@ -217,14 +217,14 @@ +@@ -95,8 +95,12 @@ + AC_CHECK_LIB(Xpm, XpmCreateBufferFromImage,LIBS="-lXpm $LIBS", + [XFMAIL_LIB_ERROR(libXpm,libXpm)]) + ++dnl Check for jpeg library ++AC_CHECK_LIB(jpeg, jpeg_set_defaults,LIBS="-ljpeg $LIBS", ++ [XFMAIL_LIB_ERROR(libjpeg,libjpeg)]) ++ + dnl Check for libforms or libxforms +-AC_CHECK_LIB(forms, fl_initialize, LIBS="-lforms $LIBS", ++AC_CHECK_LIB(forms, fl_initialize, LIBS="-lforms -ljpeg -lXpm $LIBS", + [AC_CHECK_LIB(xforms, fl_initialize, LIBS="-lxforms $LIBS", + [XFMAIL_LIB_ERROR(libforms nor libxforms,libforms)])]) + +@@ -217,14 +221,14 @@ AC_CHECK_HEADER(X11/xpm.h,[],XFMAIL_LIB_ERROR(X11/xpm.h,libXpm)) dnl Check for xforms headers diff --git a/math/xldlas/Makefile b/math/xldlas/Makefile index 456ead307aa..689072aa195 100644 --- a/math/xldlas/Makefile +++ b/math/xldlas/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.12 2001/02/25 04:18:01 hubertf Exp $ +# $NetBSD: Makefile,v 1.13 2002/04/17 04:45:15 fredb Exp $ # FreeBSD Id: Makefile,v 1.5 1998/09/26 23:18:07 steve Exp # DISTNAME= xldlas-0.85 +PKGREVISION= 1 WRKSRC= ${WRKDIR}/xldlas CATEGORIES= math MASTER_SITES= http://sunsite.math.klte.hu/mirrors/xldlas/ \ @@ -13,12 +14,14 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://sunsite.math.klte.hu/mirrors/xldlas/ COMMENT= XForms-based statistics package -DEPENDS= xforms>=0.88nb1:../../x11/xforms +DEPENDS+= jpeg-6b:../../graphics/jpeg +DEPENDS+= xforms>=0.9999:../../x11/xforms ONLY_FOR_PLATFORM= NetBSD-*-alpha NetBSD-*-arm32 NetBSD-*-i386 NetBSD-*-m68k \ NetBSD-*-mipsel NetBSD-*-ns32k NetBSD-*-sparc NetBSD-*-powerpc USE_X11BASE= yes +USE_XPM= yes do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xldlas ${PREFIX}/bin diff --git a/math/xldlas/distinfo b/math/xldlas/distinfo index c655cb7a3f9..de806b3df31 100644 --- a/math/xldlas/distinfo +++ b/math/xldlas/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.2 2001/04/19 08:45:46 agc Exp $ +$NetBSD: distinfo,v 1.3 2002/04/17 04:45:15 fredb Exp $ SHA1 (xldlas-0.85-source.tgz) = 84434282d0fcba0745fe6d1bfdc8baf5d7842fbd Size (xldlas-0.85-source.tgz) = 119146 bytes -SHA1 (patch-aa) = b7ba66fab8258f54093065a920e287a44654fe6a +SHA1 (patch-aa) = 97d150343be1a0e15372208984f238eead198612 SHA1 (patch-ab) = 88c45901cf3095e5f86ef0f1e50832292278cf46 diff --git a/math/xldlas/patches/patch-aa b/math/xldlas/patches/patch-aa index dba3af48763..c38be34c35e 100644 --- a/math/xldlas/patches/patch-aa +++ b/math/xldlas/patches/patch-aa @@ -1,67 +1,43 @@ -$NetBSD: patch-aa,v 1.2 2000/05/14 00:57:41 dmcmahill Exp $ +$NetBSD: patch-aa,v 1.3 2002/04/17 04:45:15 fredb Exp $ -*** Makefile.orig Tue Apr 1 12:13:32 1997 ---- Makefile Mon Apr 27 01:10:50 1998 -*************** -*** 16,26 **** - # want to remove the -DXFORMS86 declaration in the CCFLAG - # assignment. - # -! CCFLAG = -O2 -Wall -DXFORMS86 -! CC = gcc -! COMMONLIBS = -L/usr/X11R6/lib/ -lX11 -lm -! SHAREDLIBS = -lforms -! STATICLIBS = -lXpm /usr/X11R6/lib/libforms.a - ECHO = echo - RM = rm - RMOPTS = -f ---- 16,26 ---- - # want to remove the -DXFORMS86 declaration in the CCFLAG - # assignment. - # -! CCFLAG = ${CFLAGS} -DXFORMS86 -DPREFIX=\"${PREFIX}\" -I${PREFIX}/include -I${PREFIX}/include/X11 -! #CC = gcc -! COMMONLIBS = -L${X11BASE}/lib/ -Wl,-R${X11BASE}/lib -lX11 -lm -! SHAREDLIBS = -lxforms -lXpm -! STATICLIBS = -lXpm ${PREFIX}/lib/libxforms.a - ECHO = echo - RM = rm - RMOPTS = -f -*************** -*** 29,37 **** - INSTALL = install - INSTALLOPTS = -d - -! BINDIR = /usr/local/bin -! MANDIR = /usr/man/man1 -! HELPDIR = /usr/local/xldlas/help - SRCDIR := $$PWD - USER := $$LOGNAME - ---- 29,37 ---- - INSTALL = install - INSTALLOPTS = -d - -! BINDIR = ${PREFIX}/bin -! MANDIR = ${PREFIX}/man/man1 -! HELPDIR = ${PREFIX}/share/xldlas/help - SRCDIR := $$PWD - USER := $$LOGNAME - -*************** -*** 115,121 **** - so the following commands will probably fail"; fi - @$(ECHO) - @$(CP) $(CPOPTS) xldlas $(BINDIR) -! @if test '/usr/local/xldlas' = $(SRCDIR); then \ - $(ECHO) Help Files Already in Place; else \ - $(INSTALL) $(INSTALLOPTS) ./help $(HELPDIR); fi - install.man: ---- 115,121 ---- - so the following commands will probably fail"; fi - @$(ECHO) - @$(CP) $(CPOPTS) xldlas $(BINDIR) -! @if test "${PREFIX}/share/xldlas" = $(SRCDIR); then \ - $(ECHO) Help Files Already in Place; else \ - $(INSTALL) $(INSTALLOPTS) ./help $(HELPDIR); fi - install.man: +--- Makefile.orig Tue Apr 1 11:13:32 1997 ++++ Makefile +@@ -16,11 +16,11 @@ + # want to remove the -DXFORMS86 declaration in the CCFLAG + # assignment. + # +-CCFLAG = -O2 -Wall -DXFORMS86 +-CC = gcc +-COMMONLIBS = -L/usr/X11R6/lib/ -lX11 -lm +-SHAREDLIBS = -lforms +-STATICLIBS = -lXpm /usr/X11R6/lib/libforms.a ++CCFLAG = ${CFLAGS} -DXFORMS86 -DPREFIX=\"${PREFIX}\" -I${PREFIX}/include -I${PREFIX}/include/X11 ++#CC = gcc ++COMMONLIBS = -L${X11BASE}/lib/ -Wl,-R${X11BASE}/lib -lX11 -lm ++SHAREDLIBS = -lforms -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -ljpeg -lXpm ++STATICLIBS = -lXpm ${PREFIX}/lib/libxforms.a ${LOCALBASE}/lib/libjpeg.a + ECHO = echo + RM = rm + RMOPTS = -f +@@ -29,9 +29,9 @@ + INSTALL = install + INSTALLOPTS = -d + +-BINDIR = /usr/local/bin +-MANDIR = /usr/man/man1 +-HELPDIR = /usr/local/xldlas/help ++BINDIR = ${PREFIX}/bin ++MANDIR = ${PREFIX}/man/man1 ++HELPDIR = ${PREFIX}/share/xldlas/help + SRCDIR := $$PWD + USER := $$LOGNAME + +@@ -115,7 +115,7 @@ + so the following commands will probably fail"; fi + @$(ECHO) + @$(CP) $(CPOPTS) xldlas $(BINDIR) +- @if test '/usr/local/xldlas' = $(SRCDIR); then \ ++ @if test "${PREFIX}/share/xldlas" = $(SRCDIR); then \ + $(ECHO) Help Files Already in Place; else \ + $(INSTALL) $(INSTALLOPTS) ./help $(HELPDIR); fi + install.man: diff --git a/print/lyx/Makefile b/print/lyx/Makefile index 4286ccbce2b..d03922fa49e 100644 --- a/print/lyx/Makefile +++ b/print/lyx/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.41 2002/03/13 17:37:37 fredb Exp $ +# $NetBSD: Makefile,v 1.42 2002/04/17 04:45:16 fredb Exp $ # FreeBSD Id: Makefile,v 1.14 1998/02/14 16:46:50 andreas Exp # DISTNAME= lyx-1.1.6fix4 PKGNAME= lyx-1.1.6.4 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= print MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/ \ ftp://gd.tuwien.ac.at/publishing/tex/lyx/stable/ \ @@ -16,7 +16,8 @@ COMMENT= Graphical frontend for LaTeX (nearly WYSIWYG) DEPENDS= ispell-base-[0-9]*:../../textproc/ispell-base DEPENDS+= teTeX>=1.0.6:../../print/teTeX -DEPENDS+= xforms>=0.88nb1:../../x11/xforms +DEPENDS+= jpeg-6b:../../graphics/jpeg +DEPENDS+= xforms>=0.9999:../../x11/xforms USE_PERL5= YES USE_XPM= YES diff --git a/print/lyx/distinfo b/print/lyx/distinfo index 70bca26d60e..a4b34cda654 100644 --- a/print/lyx/distinfo +++ b/print/lyx/distinfo @@ -1,4 +1,5 @@ -$NetBSD: distinfo,v 1.6 2002/01/20 08:09:50 martti Exp $ +$NetBSD: distinfo,v 1.7 2002/04/17 04:45:16 fredb Exp $ SHA1 (lyx-1.1.6fix4.tar.gz) = 0256ba5955bf98068f8dc0768224d70840858418 Size (lyx-1.1.6fix4.tar.gz) = 5564584 bytes +SHA1 (patch-aa) = 4ebd6cab59d6db11c5a8e49db610573fb8bb80f2 diff --git a/print/lyx/patches/patch-aa b/print/lyx/patches/patch-aa new file mode 100644 index 00000000000..0175ae8d588 --- /dev/null +++ b/print/lyx/patches/patch-aa @@ -0,0 +1,22 @@ +$NetBSD: patch-aa,v 1.7 2002/04/17 04:45:17 fredb Exp $ + +--- configure.orig Fri Aug 3 07:21:35 2001 ++++ configure +@@ -8175,7 +8175,7 @@ + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" +-LIBS="-lforms $LYX_LIBS $LIBS" ++LIBS="-lforms -ljpeg -lXpm $LYX_LIBS $LIBS" + cat > conftest.$ac_ext <<EOF + #line 8181 "configure" + #include "confdefs.h" +@@ -8206,7 +8206,7 @@ + fi + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 +- LYX_LIBS="-lforms $LYX_LIBS" ++ LYX_LIBS="-lforms -ljpeg -lXpm $LYX_LIBS" + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for fl_initialize in -lxforms""... $ac_c" 1>&6 |