head 1.13; access; symbols pkgsrc-2026Q1:1.13.0.86 pkgsrc-2026Q1-base:1.13 pkgsrc-2025Q4:1.13.0.84 pkgsrc-2025Q4-base:1.13 pkgsrc-2025Q3:1.13.0.82 pkgsrc-2025Q3-base:1.13 pkgsrc-2025Q2:1.13.0.80 pkgsrc-2025Q2-base:1.13 pkgsrc-2025Q1:1.13.0.78 pkgsrc-2025Q1-base:1.13 pkgsrc-2024Q4:1.13.0.76 pkgsrc-2024Q4-base:1.13 pkgsrc-2024Q3:1.13.0.74 pkgsrc-2024Q3-base:1.13 pkgsrc-2024Q2:1.13.0.72 pkgsrc-2024Q2-base:1.13 pkgsrc-2024Q1:1.13.0.70 pkgsrc-2024Q1-base:1.13 pkgsrc-2023Q4:1.13.0.68 pkgsrc-2023Q4-base:1.13 pkgsrc-2023Q3:1.13.0.66 pkgsrc-2023Q3-base:1.13 pkgsrc-2023Q2:1.13.0.64 pkgsrc-2023Q2-base:1.13 pkgsrc-2023Q1:1.13.0.62 pkgsrc-2023Q1-base:1.13 pkgsrc-2022Q4:1.13.0.60 pkgsrc-2022Q4-base:1.13 pkgsrc-2022Q3:1.13.0.58 pkgsrc-2022Q3-base:1.13 pkgsrc-2022Q2:1.13.0.56 pkgsrc-2022Q2-base:1.13 pkgsrc-2022Q1:1.13.0.54 pkgsrc-2022Q1-base:1.13 pkgsrc-2021Q4:1.13.0.52 pkgsrc-2021Q4-base:1.13 pkgsrc-2021Q3:1.13.0.50 pkgsrc-2021Q3-base:1.13 pkgsrc-2021Q2:1.13.0.48 pkgsrc-2021Q2-base:1.13 pkgsrc-2021Q1:1.13.0.46 pkgsrc-2021Q1-base:1.13 pkgsrc-2020Q4:1.13.0.44 pkgsrc-2020Q4-base:1.13 pkgsrc-2020Q3:1.13.0.42 pkgsrc-2020Q3-base:1.13 pkgsrc-2020Q2:1.13.0.38 pkgsrc-2020Q2-base:1.13 pkgsrc-2020Q1:1.13.0.18 pkgsrc-2020Q1-base:1.13 pkgsrc-2019Q4:1.13.0.40 pkgsrc-2019Q4-base:1.13 pkgsrc-2019Q3:1.13.0.36 pkgsrc-2019Q3-base:1.13 pkgsrc-2019Q2:1.13.0.34 pkgsrc-2019Q2-base:1.13 pkgsrc-2019Q1:1.13.0.32 pkgsrc-2019Q1-base:1.13 pkgsrc-2018Q4:1.13.0.30 pkgsrc-2018Q4-base:1.13 pkgsrc-2018Q3:1.13.0.28 pkgsrc-2018Q3-base:1.13 pkgsrc-2018Q2:1.13.0.26 pkgsrc-2018Q2-base:1.13 pkgsrc-2018Q1:1.13.0.24 pkgsrc-2018Q1-base:1.13 pkgsrc-2017Q4:1.13.0.22 pkgsrc-2017Q4-base:1.13 pkgsrc-2017Q3:1.13.0.20 pkgsrc-2017Q3-base:1.13 pkgsrc-2017Q2:1.13.0.16 pkgsrc-2017Q2-base:1.13 pkgsrc-2017Q1:1.13.0.14 pkgsrc-2017Q1-base:1.13 pkgsrc-2016Q4:1.13.0.12 pkgsrc-2016Q4-base:1.13 pkgsrc-2016Q3:1.13.0.10 pkgsrc-2016Q3-base:1.13 pkgsrc-2016Q2:1.13.0.8 pkgsrc-2016Q2-base:1.13 pkgsrc-2016Q1:1.13.0.6 pkgsrc-2016Q1-base:1.13 pkgsrc-2015Q4:1.13.0.4 pkgsrc-2015Q4-base:1.13 pkgsrc-2015Q3:1.13.0.2 pkgsrc-2015Q3-base:1.13 pkgsrc-2015Q2:1.12.0.28 pkgsrc-2015Q2-base:1.12 pkgsrc-2015Q1:1.12.0.26 pkgsrc-2015Q1-base:1.12 pkgsrc-2014Q4:1.12.0.24 pkgsrc-2014Q4-base:1.12 pkgsrc-2014Q3:1.12.0.22 pkgsrc-2014Q3-base:1.12 pkgsrc-2014Q2:1.12.0.20 pkgsrc-2014Q2-base:1.12 pkgsrc-2014Q1:1.12.0.18 pkgsrc-2014Q1-base:1.12 pkgsrc-2013Q4:1.12.0.16 pkgsrc-2013Q4-base:1.12 pkgsrc-2013Q3:1.12.0.14 pkgsrc-2013Q3-base:1.12 pkgsrc-2013Q2:1.12.0.12 pkgsrc-2013Q2-base:1.12 pkgsrc-2013Q1:1.12.0.10 pkgsrc-2013Q1-base:1.12 pkgsrc-2012Q4:1.12.0.8 pkgsrc-2012Q4-base:1.12 pkgsrc-2012Q3:1.12.0.6 pkgsrc-2012Q3-base:1.12 pkgsrc-2012Q2:1.12.0.4 pkgsrc-2012Q2-base:1.12 pkgsrc-2012Q1:1.12.0.2 pkgsrc-2012Q1-base:1.12 pkgsrc-2011Q4:1.11.0.18 pkgsrc-2011Q4-base:1.11 pkgsrc-2011Q3:1.11.0.16 pkgsrc-2011Q3-base:1.11 pkgsrc-2011Q2:1.11.0.14 pkgsrc-2011Q2-base:1.11 pkgsrc-2011Q1:1.11.0.12 pkgsrc-2011Q1-base:1.11 pkgsrc-2010Q4:1.11.0.10 pkgsrc-2010Q4-base:1.11 pkgsrc-2010Q3:1.11.0.8 pkgsrc-2010Q3-base:1.11 pkgsrc-2010Q2:1.11.0.6 pkgsrc-2010Q2-base:1.11 pkgsrc-2010Q1:1.11.0.4 pkgsrc-2010Q1-base:1.11 pkgsrc-2009Q4:1.11.0.2 pkgsrc-2009Q4-base:1.11 pkgsrc-2009Q3:1.10.0.28 pkgsrc-2009Q3-base:1.10 pkgsrc-2009Q2:1.10.0.26 pkgsrc-2009Q2-base:1.10 pkgsrc-2009Q1:1.10.0.24 pkgsrc-2009Q1-base:1.10 pkgsrc-2008Q4:1.10.0.22 pkgsrc-2008Q4-base:1.10 pkgsrc-2008Q3:1.10.0.20 pkgsrc-2008Q3-base:1.10 cube-native-xorg:1.10.0.18 cube-native-xorg-base:1.10 pkgsrc-2008Q2:1.10.0.16 pkgsrc-2008Q2-base:1.10 cwrapper:1.10.0.14 pkgsrc-2008Q1:1.10.0.12 pkgsrc-2008Q1-base:1.10 pkgsrc-2007Q4:1.10.0.10 pkgsrc-2007Q4-base:1.10 pkgsrc-2007Q3:1.10.0.8 pkgsrc-2007Q3-base:1.10 pkgsrc-2007Q2:1.10.0.6 pkgsrc-2007Q2-base:1.10 pkgsrc-2007Q1:1.10.0.4 pkgsrc-2007Q1-base:1.10 pkgsrc-2006Q4:1.10.0.2 pkgsrc-2006Q4-base:1.10 pkgsrc-2006Q3:1.9.0.6 pkgsrc-2006Q3-base:1.9 pkgsrc-2006Q2:1.9.0.4 pkgsrc-2006Q2-base:1.9 pkgsrc-2006Q1:1.9.0.2 pkgsrc-2006Q1-base:1.9 pkgsrc-2005Q4:1.8.0.14 pkgsrc-2005Q4-base:1.8 pkgsrc-2005Q3:1.8.0.12 pkgsrc-2005Q3-base:1.8 pkgsrc-2005Q2:1.8.0.10 pkgsrc-2005Q2-base:1.8 pkgsrc-2005Q1:1.8.0.8 pkgsrc-2005Q1-base:1.8 pkgsrc-2004Q4:1.8.0.6 pkgsrc-2004Q4-base:1.8 pkgsrc-2004Q3:1.8.0.4 pkgsrc-2004Q3-base:1.8 pkgsrc-2004Q2:1.8.0.2 pkgsrc-2004Q2-base:1.8 pkgsrc-2004Q1:1.7.0.6 pkgsrc-2004Q1-base:1.7 pkgsrc-2003Q4:1.7.0.4 pkgsrc-2003Q4-base:1.7 netbsd-1-6-1:1.7.0.2 netbsd-1-6-1-base:1.7 netbsd-1-6:1.6.0.8 netbsd-1-6-RELEASE-base:1.6 pkgviews:1.6.0.4 pkgviews-base:1.6 buildlink2:1.6.0.2 buildlink2-base:1.6 netbsd-1-5-PATCH003:1.4 netbsd-1-5-PATCH001:1.4 netbsd-1-5-RELEASE:1.4 netbsd-1-4-PATCH003:1.4 netbsd-1-4-PATCH002:1.4 comdex-fall-1999:1.3 netbsd-1-4-PATCH001:1.1.1.1 netbsd-1-4-RELEASE:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.13 date 2015.07.04.16.18.28; author joerg; state Exp; branches; next 1.12; commitid EoZkjndZ4qhBbZry; 1.12 date 2012.02.17.13.49.47; author hans; state Exp; branches; next 1.11; 1.11 date 2009.12.17.21.49.22; author abs; state Exp; branches; next 1.10; 1.10 date 2006.10.06.22.14.44; author reed; state Exp; branches; next 1.9; 1.9 date 2006.02.22.16.13.48; author joerg; state Exp; branches; next 1.8; 1.8 date 2004.06.07.14.47.34; author minskim; state Exp; branches; next 1.7; 1.7 date 2002.09.21.23.17.25; author jlam; state Exp; branches; next 1.6; 1.6 date 2002.04.17.18.58.52; author briggs; state Exp; branches; next 1.5; 1.5 date 2002.04.17.04.45.09; author fredb; state Exp; branches; next 1.4; 1.4 date 99.11.14.22.53.22; author frueauf; state Exp; branches; next 1.3; 1.3 date 99.09.05.04.15.36; author hubertf; state Exp; branches; next 1.2; 1.2 date 99.08.26.19.01.45; author jlam; state Exp; branches; next 1.1; 1.1 date 98.12.03.15.08.53; author frueauf; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 98.12.03.15.08.53; author frueauf; state Exp; branches; next ; desc @@ 1.13 log @Remove USE_X11BASE and X11PREFIX. @ text @$NetBSD: patch-aa,v 1.12 2012/02/17 13:49:47 hans Exp $ --- Makefile.orig 2005-11-07 00:38:22.000000000 +0000 +++ Makefile @@@@ -12,12 +12,12 @@@@ # Compilation/installation vars (global for all following sections) | #===================================================================== # -CC = gcc -PREFIX = /usr/local -X11PREFIX = /usr/X11R6 -INCX11 = $(X11PREFIX)/include -LIBX11 = $(X11PREFIX)/lib -INCFORMS = $(X11PREFIX)/include +#CC = gcc +#PREFIX = /usr/local +#X11PREFIX = /usr/X11R6 +INCX11 = $(X11BASE)/include +LIBX11 = $(X11BASE)/lib +INCFORMS = $(PREFIX)/include/X11 -LIBFORMS = $(X11PREFIX)/lib +LIBFORMS = $(X11BASE)/lib MODEM_DEV = modem MODEM_PATH = /dev/$(MODEM_DEV) @@@@ -29,26 +29,26 @@@@ MODEM_PATH = /dev/$(MODEM_DEV) # Normal (i.e. SuSE-[6789].x) vars; for SuSE-5.x use the lines which # DO NOT include -lcrypt for EXTRALIBS and -DGLIBC2 for EXTRADEFS. #------------------------------------------------------------------- -BINX11 = $(X11PREFIX)/bin -USRLOCAL = $(PREFIX)/bin -SBINDIR = /usr/sbin -VARRUN = /var/run -USRLIBPPP = /etc/ppp -OPTSDIR = /etc/ppp -MANDIR = $(X11PREFIX)/man/man1 -ETCPPP = /etc/ppp -INSTPPPDIR = $(ETCPPP) -PPPDLCKDIR = /var/lock -DESTDIR = -GROUP = uucp -CCFLAGS = -Wall -O -EXTRADEFS = -DMODEM_DEVICE=\"$(MODEM_PATH)\" -DGLIBC2 -DHAVE_STRERROR +#BINX11 = $(X11PREFIX)/bin +#USRLOCAL = $(PREFIX)/bin +#SBINDIR = /usr/sbin +#VARRUN = /var/run +#USRLIBPPP = /etc/ppp +#OPTSDIR = /etc/ppp +#MANDIR = $(X11PREFIX)/man/man1 +#ETCPPP = /etc/ppp +#INSTPPPDIR = $(ETCPPP) +#PPPDLCKDIR = /var/lock +#DESTDIR = +#GROUP = uucp +#CCFLAGS = -Wall -O +#EXTRADEFS = -DMODEM_DEVICE=\"$(MODEM_PATH)\" -DGLIBC2 -DHAVE_STRERROR #EXTRADEFS = -DMODEM_DEVICE=\"$(MODEM_PATH)\" -EXTRALIBS = -lcrypt +#EXTRALIBS = -lcrypt #EXTRALIBS = -LINKX11 = -LINKFORMS = -L$(LIBFORMS) -lforms -INSTALL = install +#LINKX11 = +#LINKFORMS = -L$(LIBFORMS) -lforms +#INSTALL = install # # Debian vars (if your Debian distribution is relatively # old and does not use glibc2, use the lines which DO NOT @@@@ -186,25 +186,28 @@@@ INSTALL = install # # NetBSD vars #------------- -#BINX11 = $(X11PREFIX)/bin -#USRLOCAL = $(BINX11) -#SBINDIR = /usr/sbin -#VARRUN = /var/run -#USRLIBPPP = $(PREFIX)/libexec -#MANDIR = $(PREFIX)/man/man1 -#ETCPPP = /etc/ppp -#OPTSDIR = $(ETCPPP) +BINX11 = $(PREFIX)/bin +USRLOCAL = $(BINX11) +SBINDIR = /usr/sbin +VARRUN = $(VARBASE)/run +USRLIBPPP = $(PREFIX)/libexec +MANDIR = $(PREFIX)/$(PKGMANDIR)/man1 +ETCPPP = /etc/ppp +OPTSDIR = $(ETCPPP) #INSTPPPDIR = $(ETCPPP) -##INSTPPPDIR = $(PREFIX)/share/examples/xisp -#PPPDLCKDIR = /var/spool/lock -#DESTDIR = -#GROUP = dialer -#CCFLAGS = -Wall -O -#EXTRADEFS = -DMODEM_DEVICE=\"$(MODEM_PATH)\" -DHAVE_STRERROR -#EXTRALIBS = -lcrypt -#LINKX11 = -Wl,-R$(LIBX11) -#LINKFORMS = -L$(LIBFORMS) -lforms -#INSTALL = /usr/bin/install +INSTPPPDIR = $(PREFIX)/share/examples/xisp +PPPDLCKDIR = $(VARBASE)/spool/lock +DESTDIR = +GROUP = $(DIALER_GROUP) +CCFLAGS = -Wall -O ${CFLAGS} +EXTRADEFS = -DMODEM_DEVICE=\"$(MODEM_PATH)\" -DHAVE_STRERROR +.if defined(OPSYS) && ${OPSYS} == "DragonFly" +EXTRALIBS = -lcipher +.else +EXTRALIBS = -lcrypt +.endif +LINKX11 = -Wl,-R$(LIBX11) ${LDFLAGS} +LINKFORMS = -Wl,-R$(LIBFORMS) -L$(LIBFORMS) -lforms # # FreeBSD vars #------------- @@@@ -324,19 +327,19 @@@@ network.o: network.h network.c $(CC) $(CCOPTS) -c network.c xispdial: xispdial.o $(SHAREOBJ) - $(CC) $(CCOPTS) -o xispdial xispdial.o $(SHAREOBJ) + $(CC) $(CCOPTS) $(LINKX11) -o xispdial xispdial.o $(SHAREOBJ) xispdial.o: xispdial.c common.h version.h $(CC) $(CCOPTS) -c xispdial.c xisprccv: xisprccv.o pcode.o $(SHAREOBJ) - $(CC) -o xisprccv xisprccv.o pcode.o $(SHAREOBJ) $(EXTRALIBS) -lm + $(CC) -o xisprccv xisprccv.o pcode.o $(SHAREOBJ) $(EXTRALIBS) $(LINKX11) -lm xisprccv.o: xisprccv.c common.h version.h pcode.h logs.h $(CC) $(CCOPTS) -c xisprccv.c xispterm: xispterm.h xispterm.c - $(CC) $(CCOPTS) -I$(INCX11) -I$(INCFORMS) -o xispterm xispterm.c \ + $(CC) $(CCOPTS) $(LINKX11) -I$(INCX11) -I$(INCFORMS) -o xispterm xispterm.c \ $(EXTRALIBS) -L$(LIBX11) $(LINKFORMS) -lXpm -lX11 -lm rcio.o: rcio.h rcio.c common.h version.h @@@@ -349,7 +352,7 @@@@ xisp_euidaccess.o: xisp_euidaccess.c $(CC) $(CCOPTS) -c xisp_euidaccess.c xispid: xispid.c - $(CC) $(CCOPTS) -o xispid xispid.c + $(CC) $(CCOPTS) $(LINKX11) -o xispid xispid.c xisp.1: xisp.man sed -e s,@@ETCPPP@@,$(DESTDIR)$(ETCPPP),g \ @ 1.12 log @Fix build on SunOS. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.11 2009/12/17 21:49:22 abs Exp $ d20 3 a22 2 +INCFORMS = $(X11PREFIX)/include/X11 LIBFORMS = $(X11PREFIX)/lib d82 1 a82 1 +BINX11 = $(X11PREFIX)/bin @ 1.11 log @Updated comms/xisp to 2.7p4 Updated from 2.7p1 to 2.7p4 as original distfile no longer available No changelog available added PKG_DESTDIR_SUPPORT @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.10 2006/10/06 22:14:44 reed Exp $ d69 1 a69 1 @@@@ -186,25 +186,29 @@@@ INSTALL = install d104 1 a104 1 +CCFLAGS = -Wall -O d111 1 a111 1 +LINKX11 = -Wl,-R$(LIBX11) a112 1 +INSTALL = /usr/bin/install d116 1 a116 1 @@@@ -324,19 +328,19 @@@@ network.o: network.h network.c d139 1 a139 1 @@@@ -349,7 +353,7 @@@@ xisp_euidaccess.o: xisp_euidaccess.c @ 1.10 log @This adds a mk.conf setting for the xisp "dialer" group. I call it "DIALER_GROUP" instead of "XISP_GROUP" as maybe it can be used for other packages also later. This is for PR pkg/19566. Update MESSAGE to use LOCALBASE instead of X11BASE. (From Manuel Bouyer) And update MESSAGE to not hardcode the "group". This also updates patch-ac because of conflicting types for fprintf and printf. I don't know how this package built before on NetBSD recently. Also this patch honors VARBASE and PKGMANDIR. Thank you Manuel Bouyer for testing this. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.9 2006/02/22 16:13:48 joerg Exp $ d3 1 a3 1 --- Makefile.orig 2003-06-28 14:03:03.000000000 +0000 d25 1 a25 1 # Normal (i.e. SuSE-[678].x) vars; for SuSE-5.x use the lines which d69 1 a69 1 @@@@ -187,25 +187,29 @@@@ INSTALL = install d106 1 a106 1 +.if ${OPSYS} == "DragonFly" d117 1 a117 1 @@@@ -325,19 +329,19 @@@@ network.o: network.h network.c d140 1 a140 1 @@@@ -350,7 +354,7 @@@@ xisp_euidaccess.o: xisp_euidaccess.c @ 1.9 log @setkey and friends are in libcipher on DragonFly. Add some conditional parts for DragonFly. @ text @d1 1 a1 1 $NetBSD$ d84 1 a84 1 +VARRUN = /var/run d86 1 a86 1 +MANDIR = $(PREFIX)/man/man1 d101 1 a101 1 +PPPDLCKDIR = /var/spool/lock d103 1 a103 1 +GROUP = dialer @ 1.8 log @Update xisp to 2.7p1, because 2.6p1 doesn't build with gcc>=3.3. This partially addresses PR pkg/19566. See http://xisp.hellug.gr/history.html for changes since 2.6p1. @ text @d3 1 a3 1 --- Makefile.orig 2003-06-28 09:03:03.000000000 -0500 d69 1 a69 1 @@@@ -187,25 +187,25 @@@@ INSTALL = install d106 3 d110 1 d117 1 a117 1 @@@@ -325,19 +325,19 @@@@ network.o: network.h network.c d140 1 a140 1 @@@@ -350,7 +350,7 @@@@ xisp_euidaccess.o: xisp_euidaccess.c @ 1.7 log @LINKX11 contains flags to cc, so it's wrong to say "-L$(LINKX11)". @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.6 2002/04/17 18:58:52 briggs Exp $ d3 3 a5 3 --- Makefile.orig Thu Aug 26 08:08:51 1999 +++ Makefile Wed Apr 17 14:55:31 2002 @@@@ -8,11 +8,11 @@@@ d9 1 d15 1 d24 4 a27 4 @@@@ -24,25 +24,25 @@@@ # Normal (i.e. SuSE-6.x) vars; for SuSE-5.x use the lines which # DO NOT include -lcrypt in EXTRALIBS and -DGLIBC2 in EXTRADEFS. #---------------------------------------------------------------- d37 1 d40 2 a41 2 -GCCFLAGS = -Wall -O -EXTRADEFS = -DMODEM_DEVICE=\"$(MODEM_PATH)\" -DGLIBC2 d51 1 d54 2 a55 2 +#GCCFLAGS = -Wall -O +#EXTRADEFS = -DMODEM_DEVICE=\"$(MODEM_PATH)\" -DGLIBC2 d69 1 a69 1 @@@@ -166,24 +166,24 @@@@ d91 1 d94 1 a94 1 -#GCCFLAGS = -Wall -O d101 1 d104 1 a104 1 +GCCFLAGS = -Wall -O d107 2 a108 2 +LINKX11 = -Wl,-R$(LIBX11) -Wl,-R$(LOCALBASE)/lib +LINKFORMS = -L$(LIBFORMS) -L$(LOCALBASE)/lib -lforms -ljpeg -lXpm d113 2 a114 10 @@@@ -261,16 +261,16 @@@@ gcc $(GCCOPTS) -c network.c xispdial: xispdial.c common.h version.h - gcc $(GCCOPTS) -o xispdial xispdial.c + gcc $(GCCOPTS) $(LINKX11) -o xispdial xispdial.c xisprccv: xisprccv.o pcode.o - gcc -o xisprccv xisprccv.o pcode.o $(EXTRALIBS) -lm + gcc -o xisprccv xisprccv.o pcode.o $(EXTRALIBS) $(LINKX11) -lm d116 11 d128 1 a128 1 gcc $(GCCOPTS) -c xisprccv.c d131 3 a133 2 - gcc $(GCCOPTS) -I$(INCX11) -I$(INCFORMS) -o xispterm xispterm.c $(EXTRALIBS) -L$(LIBX11) $(LINKFORMS) -lX11 -lm + gcc $(GCCOPTS) $(LINKX11) -I$(INCX11) -I$(INCFORMS) -o xispterm xispterm.c $(EXTRALIBS) -L$(LIBX11) $(LINKFORMS) -lX11 -lm d136 2 a137 3 gcc $(GCCOPTS) -c rcio.c @@@@ -279,7 +279,7 @@@@ gcc $(GCCOPTS) -c logs.c d140 2 a141 2 - gcc $(GCCOPTS) -o xispid xispid.c + gcc $(GCCOPTS) $(LINKX11) -o xispid xispid.c d143 2 a144 2 install: xisp xispdial xisprccv xispterm xispid if [ ! -d $(DESTDIR)$(BINX11) ]; then $(INSTALL) -d $(DESTDIR)$(BINX11); fi @ 1.6 log @Remove redefinition of X11PREFIX and use X11PREFIX for location of forms and X11BASE as (gasp) location of X11. This helps installation with xpkgwedge. Resolves, along with bsd.pkg.mk update, my own PR pkg/16350. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.5 2002/04/17 04:45:09 fredb Exp $ d112 1 a112 1 + gcc $(GCCOPTS) -L$(LINKX11) -o xispdial xispdial.c d116 1 a116 1 + gcc -o xisprccv xisprccv.o pcode.o $(EXTRALIBS) -L$(LINKX11) -lm @ 1.5 log @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. @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- Makefile.orig Thu Aug 26 07:08:51 1999 +++ Makefile d11 3 d15 3 a17 4 +X11PREFIX = ${X11BASE} INCX11 = $(X11PREFIX)/include LIBX11 = $(X11PREFIX)/lib -INCFORMS = $(X11PREFIX)/include @ 1.4 log @Make xisp (xispdial & xispterm) really work on ELF. @ text @d3 2 a4 2 --- Makefile.orig Thu Aug 26 14:08:51 1999 +++ Makefile Sun Nov 14 23:40:47 1999 d99 2 a100 2 +LINKX11 = -Wl,-R$(LIBX11) +LINKFORMS = -L$(LIBFORMS) -lforms @ 1.3 log @xforms header is in $X11BASE/include/X11 @ text @d1 2 d4 1 a4 1 +++ Makefile Sun Sep 5 06:08:36 1999 d105 29 @ 1.2 log @Update xisp to 2.6. Numerous bug-fixes and feature enhancements. @ text @d1 3 a3 5 $NetBSD$ --- Makefile.orig Thu Aug 26 08:08:51 1999 +++ Makefile Thu Aug 26 14:53:57 1999 @@@@ -8,8 +8,8 @@@@ d13 5 a17 1 INCFORMS = $(X11PREFIX)/include @ 1.1 log @Initial revision @ text @d3 3 a5 3 --- Makefile.orig Mon Oct 26 11:35:01 1998 +++ Makefile Thu Dec 3 15:25:01 1998 @@@@ -8,10 +8,13 @@@@ d9 89 a97 12 -INCX11 = /usr/X11R6/include -LIBX11 = /usr/X11R6/lib -INCFORMS = /usr/X11R6/include/X11 -LIBFORMS = /usr/X11R6/lib +X11PREFIX != echo ${X11BASE} | sed "s,^/,," +BASEPREFIX!= echo ${PREFIX} | sed "s,^/,," +# +INCX11 = ${X11BASE}/include +LIBX11 = ${X11BASE}/lib +INCFORMS = ${X11BASE}/include/X11 +LIBFORMS = ${X11BASE}/lib MODEMDEV = modem d99 2 a100 140 #===================================================================== @@@@ -20,20 +23,20 @@@@ # # Normal vars (e.g. Slackware) #------------------------------ -BINX11 = usr/X11R6/bin -USRLOCAL = usr/local/bin -SBINDIR = usr/sbin -VARRUN = var/run -USRLIBPPP = usr/lib/ppp -OPTSDIR = usr/lib/ppp -MANDIR = usr/X11R6/man/man1 -ETCPPP = etc/ppp -DESTDIR = -GROUP = uucp -GCCFLAGS = -Wall -O -EXTRADEFS = -EXTRALIBS = -INSTALL = install +#BINX11 = usr/X11R6/bin +#USRLOCAL = usr/local/bin +#SBINDIR = usr/sbin +#VARRUN = var/run +#USRLIBPPP = usr/lib/ppp +#OPTSDIR = usr/lib/ppp +#MANDIR = usr/X11R6/man/man1 +#ETCPPP = etc/ppp +#DESTDIR = +#GROUP = uucp +#GCCFLAGS = -Wall -O +#EXTRADEFS = +#EXTRALIBS = +#INSTALL = install # # Linux on the Alpha #-------------------- @@@@ -112,7 +115,7 @@@@ #DESTDIR = #GROUP = uucp #GCCFLAGS = -Wall -O -#EXTRADEFS = -DSUNOS41x +#EXTRADEFS = -DSUNOS41x -DBROKEN_VSPRINTF=1 #EXTRALIBS = -L./SunOS/ufc-crypt -lufc #INSTALL = install # @@@@ -129,11 +132,34 @@@@ #DESTDIR = #GROUP = uucp #GCCFLAGS = -Wall -O -#EXTRADEFS = -DSUNOS5x +#EXTRADEFS = -DSUNOS5x -DHAVE_STRERROR=1 #EXTRALIBS = -lcrypt -lsocket -lnsl #INSTALL = /usr/ucb/install # #===================================================================== +# NetBSD Section | +#===================================================================== +# +# NetBSD vars +#----------- +BINX11 = ${BASEPREFIX}/bin +USRLOCAL = ${BINX11} +SBINDIR = usr/sbin +VARRUN = var/run +USRLIBPPP = ${BASEPREFIX}/libexec +OPTSDIR = ${BASEPREFIX}/etc +MANDIR = ${BASEPREFIX}/man/man1 +ETCPPP = etc/ppp +EGDIR = ${BASEPREFIX}/share/examples/xisp +DESTDIR = +GROUP = dialer +GCCFLAGS = -Wall -O +EXTRADEFS = -DHAVE_STRERROR=1 +EXTRALIBS = -lcrypt +LINKX11 = -Wl,-R${LIBX11} +INSTALL = /usr/bin/install +# +#===================================================================== # Program configuration options | #===================================================================== # @@@@ -170,7 +196,7 @@@@ all: xisp xispdial xisprccv xispterm xispid xisp: xisp.o pcode.o network.o rcio.o logs.o - gcc -o xisp xisp.o pcode.o network.o rcio.o logs.o $(EXTRALIBS) -L$(LIBX11) -L$(LIBFORMS) -lforms -lXpm -lX11 -lm + gcc $(LINKX11) -o xisp xisp.o pcode.o network.o rcio.o logs.o $(EXTRALIBS) -L$(LIBX11) -L$(LIBFORMS) -lforms -lXpm -lX11 -lm xisp.o: xisp.h xisp.c xisp.xpm version.h common.h pcode.h network.h rcio.h logs.h help.c peHelp.c excl.xpm gcc $(GCCOPTS) -I$(INCX11) -I$(INCFORMS) -c xisp.c @@@@ -188,7 +214,7 @@@@ gcc $(GCCOPTS) -o xispdial xispdial.c xisprccv: xisprccv.o pcode.o - gcc -o xisprccv xisprccv.o pcode.o $(EXTRALIBS) -lm + gcc $(LINKX11) -o xisprccv xisprccv.o pcode.o $(EXTRALIBS) -lm xisprccv.o: xisprccv.c common.h version.h pcode.h logs.h gcc $(GCCOPTS) -c xisprccv.c @@@@ -216,29 +242,25 @@@@ $(INSTALL) -g $(GROUP) -m 750 -o root -s xispid $(DESTDIR)/$(USRLOCAL)/xispid # if [ ! -d $(DESTDIR)/$(OPTSDIR) ]; then $(INSTALL) -d $(DESTDIR)/$(OPTSDIR); fi # $(INSTALL) -g $(GROUP) -m 640 -o root options.xisp $(DESTDIR)/$(OPTSDIR)/options.xisp + sed -e s,@@ETCPPP@@,${DESTDIR}/${ETCPPP},g \ + -e s,@@USRLIBPPP@@,${DESTDIR}/${USRLIBPPP},g \ + -e s,@@USRLOCAL@@,${DESTDIR}/${USRLOCAL},g \ + < xisp.man > xisp.1 if [ ! -d $(DESTDIR)/$(MANDIR) ]; then $(INSTALL) -d $(DESTDIR)/$(MANDIR); fi - $(INSTALL) -g $(GROUP) -m 644 -o root xisp.man $(DESTDIR)/$(MANDIR)/xisp.1 + $(INSTALL) -g $(GROUP) -m 644 -o root xisp.1 $(DESTDIR)/$(MANDIR)/xisp.1 sed -e s/__XISPGROUP/$(GROUP)/ \ -e sM__XISPIDM/$(DESTDIR)/$(USRLOCAL)/xispidM < ip-up.xisp > ip-up.install sed -e s/__XISPGROUP/$(GROUP)/ \ -e sM__XISPIDM/$(DESTDIR)/$(USRLOCAL)/xispidM < ip-down.xisp > ip-down.install - if [ ! -d $(DESTDIR)/$(ETCPPP) ]; then $(INSTALL) -d $(DESTDIR)/$(ETCPPP); fi - if [ -f $(DESTDIR)/$(ETCPPP)/ip-up ]; then \ - mv -f $(DESTDIR)/$(ETCPPP)/ip-up $(DESTDIR)/$(ETCPPP)/ip-up.bak; fi - $(INSTALL) -g $(GROUP) -m 750 -o root ip-up.install $(DESTDIR)/$(ETCPPP)/ip-up - if [ -f $(DESTDIR)/$(ETCPPP)/ip-down ]; then \ - mv -f $(DESTDIR)/$(ETCPPP)/ip-down $(DESTDIR)/$(ETCPPP)/ip-down.bak; fi - $(INSTALL) -g $(GROUP) -m 750 -o root ip-down.install $(DESTDIR)/$(ETCPPP)/ip-down + if [ ! -d $(DESTDIR)/$(EGDIR) ]; then $(INSTALL) -d $(DESTDIR)/$(EGDIR); fi + $(INSTALL) -g $(GROUP) -m 750 -o root ip-up.install $(DESTDIR)/$(EGDIR)/ip-up + $(INSTALL) -g $(GROUP) -m 750 -o root ip-down.install $(DESTDIR)/$(EGDIR)/ip-down rm -f ip-up.install ip-down.install sed -e s/__DEVICE/$(MODEMDEV)/ < xisp.peers.device > xisp_$(MODEMDEV) sed -e sM__DIALER_PATHM$(DESTDIR)/$(USRLIBPPP)M < xisp.peers.dialer > xisp_dialer - if [ ! -d $(DESTDIR)/$(ETCPPP)/peers ]; then $(INSTALL) -d $(DESTDIR)/$(ETCPPP)/peers; fi - if [ -f $(DESTDIR)/$(ETCPPP)/peers/xisp_$(MODEMDEV) ]; then \ - mv -f $(DESTDIR)/$(ETCPPP)/peers/xisp_$(MODEMDEV) $(DESTDIR)/$(ETCPPP)/peers/xisp_$(MODEMDEV).bak; fi - $(INSTALL) -g $(GROUP) -m 640 -o root xisp_$(MODEMDEV) $(DESTDIR)/$(ETCPPP)/peers/xisp_$(MODEMDEV) - if [ -f $(DESTDIR)/$(ETCPPP)/peers/xisp_dialer ]; then \ - mv -f $(DESTDIR)/$(ETCPPP)/peers/xisp_dialer $(DESTDIR)/$(ETCPPP)/peers/xisp_dialer.bak; fi - $(INSTALL) -g $(GROUP) -m 640 -o root xisp_dialer $(DESTDIR)/$(ETCPPP)/peers/xisp_dialer + if [ ! -d $(DESTDIR)/$(EGDIR)/peers ]; then $(INSTALL) -d $(DESTDIR)/$(EGDIR)/peers; fi + $(INSTALL) -g $(GROUP) -m 640 -o root xisp_$(MODEMDEV) $(DESTDIR)/$(EGDIR)/peers/xisp_$(MODEMDEV) + $(INSTALL) -g $(GROUP) -m 640 -o root xisp_dialer $(DESTDIR)/$(EGDIR)/peers/xisp_dialer rm -f xisp_$(MODEMDEV) xisp_dialer clean: @ 1.1.1.1 log @Initial import of xisp-2.5p4, a user-friendly X11 interface to pppd/chat. Based on pr 6518 by Johnny C. Lam with some rework by me. @ text @@