mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-25 04:43:33 +00:00
60f4c26121
- UNBREAK
- Respect CC/CFLAGS
- Respect PREFIX
- Rework pkg-plist
- Install files on ${PREFIX}/ppp and rename ip-* to ip-*.xisp
PR: ports/93792
Submitted by: garga
Approved by: portmgr (clement), maintainer
182 lines
6.1 KiB
Plaintext
182 lines
6.1 KiB
Plaintext
--- Makefile.orig Sun Nov 6 22:38:22 2005
|
|
+++ Makefile Mon Feb 27 08:22:22 2006
|
|
@@ -12,12 +12,12 @@
|
|
# Compilation/installation vars (global for all following sections) |
|
|
#=====================================================================
|
|
#
|
|
-CC = gcc
|
|
-PREFIX = /usr/local
|
|
-X11PREFIX = /usr/X11R6
|
|
+CC ?= gcc
|
|
+PREFIX = %%PREFIX%%
|
|
+X11PREFIX = ${X11BASE}
|
|
INCX11 = $(X11PREFIX)/include
|
|
LIBX11 = $(X11PREFIX)/lib
|
|
-INCFORMS = $(X11PREFIX)/include
|
|
+INCFORMS = $(X11PREFIX)/include/X11
|
|
LIBFORMS = $(X11PREFIX)/lib
|
|
MODEM_DEV = modem
|
|
MODEM_PATH = /dev/$(MODEM_DEV)
|
|
@@ -29,26 +29,26 @@
|
|
# 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
|
|
@@ -208,29 +208,29 @@
|
|
#
|
|
# FreeBSD vars
|
|
#-------------
|
|
-#BINX11 = $(X11PREFIX)/bin
|
|
-#USRLOCAL = $(BINX11)
|
|
-#SBINDIR = /usr/sbin
|
|
-#VARRUN = /var/run
|
|
-#USRLIBPPP = $(PREFIX)/libexec
|
|
-#MANDIR = $(PREFIX)/man/man1
|
|
-#ETCPPP = /etc/ppp
|
|
-#OPTSDIR = $(ETCPPP)
|
|
-#INSTPPPDIR = $(ETCPPP)
|
|
-#PPPDLCKDIR = /var/spool/lock
|
|
-#DESTDIR =
|
|
-#NAMEFORMS = xforms
|
|
-#GROUP = dialer
|
|
-#CHAT_PATH = /usr/bin
|
|
-#PPPD_PATH = /usr/sbin
|
|
-#CCFLAGS = -Wall -O
|
|
-#EXTRALIBS = -lcipher
|
|
-#LINKX11 = -Wl,-R$(LIBX11)
|
|
-#LINKFORMS = -L$(LIBFORMS) -lxforms
|
|
-#INSTALL = /usr/bin/install
|
|
-##MODEM_DEV = cuaa0
|
|
-#EXTRADEFS = -DMODEM_DEVICE=\"$(MODEM_PATH)\" -DHAVE_STRERROR \
|
|
-# -DCHAT_PATH=\"$(CHAT_PATH)\" -DPPPD_PATH=\"$(PPPD_PATH)\"
|
|
+BINX11 = $(X11PREFIX)/bin
|
|
+USRLOCAL = $(BINX11)
|
|
+SBINDIR = /usr/sbin
|
|
+VARRUN = /var/run
|
|
+USRLIBPPP = $(PREFIX)/libexec
|
|
+MANDIR = $(PREFIX)/man/man1
|
|
+ETCPPP = ${PREFIX}/etc/ppp
|
|
+OPTSDIR = $(ETCPPP)
|
|
+INSTPPPDIR = $(ETCPPP)
|
|
+PPPDLCKDIR = /var/spool/lock
|
|
+DESTDIR =
|
|
+GROUP = dialer
|
|
+CHAT_PATH = /usr/bin
|
|
+PPPD_PATH = /usr/sbin
|
|
+CCFLAGS ?= -Wall -O -DUSE_OPENSSL
|
|
+EXTRALIBS = -lcrypto
|
|
+LINKX11 = -Wl,-R$(LIBX11)
|
|
+LINKFORMS = -L$(LIBFORMS) -lforms
|
|
+INSTALL = /usr/bin/install
|
|
+MODEM_DEV = cuaa0
|
|
+MODEM_DEVS = cuaa0 cuaa1 cuaa2 cuaa3 umodem
|
|
+EXTRADEFS = -DMODEM_DEVICE=\"$(MODEM_PATH)\" -DHAVE_STRERROR \
|
|
+ -DCHAT_PATH=\"$(CHAT_PATH)\" -DPPPD_PATH=\"$(PPPD_PATH)\"
|
|
#
|
|
#=====================================================================
|
|
# Program configuration options |
|
|
@@ -399,30 +399,39 @@
|
|
mv -f $(DESTDIR)$(INSTPPPDIR)/ip-up \
|
|
$(DESTDIR)$(INSTPPPDIR)/ip-up.bak; fi
|
|
$(INSTALL) -g $(GROUP) -m 750 -o root \
|
|
- ip-up.install $(DESTDIR)$(INSTPPPDIR)/ip-up
|
|
+ ip-up.install $(DESTDIR)$(INSTPPPDIR)/ip-up.xisp
|
|
if [ -f $(DESTDIR)$(INSTPPPDIR)/ip-down ]; then \
|
|
mv -f $(DESTDIR)$(INSTPPPDIR)/ip-down \
|
|
$(DESTDIR)$(INSTPPPDIR)/ip-down.bak; fi
|
|
$(INSTALL) -g $(GROUP) -m 750 -o root \
|
|
- ip-down.install $(DESTDIR)$(INSTPPPDIR)/ip-down
|
|
+ ip-down.install $(DESTDIR)$(INSTPPPDIR)/ip-down.xisp
|
|
rm -f ip-up.install ip-down.install
|
|
- sed -e sM__DEVICEM$(MODEM_PATH)M \
|
|
- < xisp.peers.device > xisp_$(MODEM_DEV)
|
|
+ for i in $(MODEM_DEVS); do \
|
|
+ sed -e sM__DEVICEM/dev/$${i}M \
|
|
+ < xisp.peers.device > xisp_$${i}; \
|
|
+ done
|
|
sed -e sM__DIALER_PATHM$(DESTDIR)$(USRLIBPPP)M \
|
|
< xisp.peers.dialer > xisp_dialer
|
|
if [ ! -d $(DESTDIR)$(INSTPPPDIR)/peers ]; then \
|
|
$(INSTALL) -d $(DESTDIR)$(INSTPPPDIR)/peers; fi
|
|
- if [ -f $(DESTDIR)$(INSTPPPDIR)/peers/xisp_$(MODEM_DEV) ]; then \
|
|
- mv -f $(DESTDIR)$(INSTPPPDIR)/peers/xisp_$(MODEM_DEV) \
|
|
- $(DESTDIR)$(INSTPPPDIR)/peers/xisp_$(MODEM_DEV).bak; fi
|
|
+ for i in $(MODEM_DEVS); do \
|
|
+ if [ -f $(DESTDIR)$(INSTPPPDIR)/peers/xisp_$${i} ]; then \
|
|
+ mv -f $(DESTDIR)$(INSTPPPDIR)/peers/xisp_$${i} \
|
|
+ $(DESTDIR)$(INSTPPPDIR)/peers/xisp_$${i}.bak; fi; \
|
|
+ done
|
|
+ for i in $(MODEM_DEVS); do \
|
|
$(INSTALL) -g $(GROUP) -m 640 -o root \
|
|
- xisp_$(MODEM_DEV) $(DESTDIR)$(INSTPPPDIR)/peers/xisp_$(MODEM_DEV)
|
|
+ xisp_$$i $(DESTDIR)$(INSTPPPDIR)/peers/xisp_$${i}; \
|
|
+ done
|
|
if [ -f $(DESTDIR)$(INSTPPPDIR)/peers/xisp_dialer ]; then \
|
|
mv -f $(DESTDIR)$(INSTPPPDIR)/peers/xisp_dialer \
|
|
$(DESTDIR)$(INSTPPPDIR)/peers/xisp_dialer.bak; fi
|
|
$(INSTALL) -g $(GROUP) -m 640 -o root \
|
|
xisp_dialer $(DESTDIR)$(INSTPPPDIR)/peers/xisp_dialer
|
|
- rm -f xisp_$(MODEM_DEV) xisp_dialer
|
|
+ for i in $(MODEM_DEVS); do \
|
|
+ rm -f xisp_$${i}; \
|
|
+ done
|
|
+ rm -f xisp_dialer
|
|
|
|
clean:
|
|
rm -f *.o xisp xispdial xisprccv xispterm xispid xisp.xpm xisp.1
|
|
@@ -434,10 +443,12 @@
|
|
$(DESTDIR)$(USRLOCAL)/xisprccv \
|
|
$(DESTDIR)$(USRLOCAL)/xispid \
|
|
$(DESTDIR)$(MANDIR)/xisp.1 \
|
|
- $(DESTDIR)$(INSTPPPDIR)/peers/xisp_$(MODEM_DEV) \
|
|
- $(DESTDIR)$(INSTPPPDIR)/peers/xisp_$(MODEM_DEV).bak \
|
|
$(DESTDIR)$(INSTPPPDIR)/peers/xisp_dialer \
|
|
$(DESTDIR)$(INSTPPPDIR)/peers/xisp_dialer.bak
|
|
+ for i in $(MODEM_DEVS); do \
|
|
+ rm -f $(DESTDIR)$(INSTPPPDIR)/peers/xisp_$${i} \
|
|
+ $(DESTDIR)$(INSTPPPDIR)/peers/xisp_$${i}.bak; \
|
|
+ done
|
|
mv -f $(DESTDIR)$(INSTPPPDIR)/ip-up \
|
|
$(DESTDIR)$(INSTPPPDIR)/ip-up.xisp
|
|
if [ -f $(DESTDIR)$(INSTPPPDIR)/ip-up.bak ]; then \
|