46f75bea5d
"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.
148 lines
4.5 KiB
Text
148 lines
4.5 KiB
Text
$NetBSD: patch-aa,v 1.10 2006/10/06 22:14:44 reed Exp $
|
|
|
|
--- Makefile.orig 2003-06-28 14:03:03.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 = $(X11PREFIX)/include/X11
|
|
LIBFORMS = $(X11PREFIX)/lib
|
|
MODEM_DEV = modem
|
|
MODEM_PATH = /dev/$(MODEM_DEV)
|
|
@@ -29,26 +29,26 @@ MODEM_PATH = /dev/$(MODEM_DEV)
|
|
# Normal (i.e. SuSE-[678].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
|
|
@@ -187,25 +187,29 @@ 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 = $(X11PREFIX)/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
|
|
+EXTRADEFS = -DMODEM_DEVICE=\"$(MODEM_PATH)\" -DHAVE_STRERROR
|
|
+.if ${OPSYS} == "DragonFly"
|
|
+EXTRALIBS = -lcipher
|
|
+.else
|
|
+EXTRALIBS = -lcrypt
|
|
+.endif
|
|
+LINKX11 = -Wl,-R$(LIBX11)
|
|
+LINKFORMS = -Wl,-R$(LIBFORMS) -L$(LIBFORMS) -lforms
|
|
+INSTALL = /usr/bin/install
|
|
#
|
|
# FreeBSD vars
|
|
#-------------
|
|
@@ -325,19 +329,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
|
|
@@ -350,7 +354,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 \
|