ports/93792: [PATCH] net/xisp: update to 2.7p4
Renato Botelho
garga at FreeBSD.org
Fri Feb 24 12:30:10 UTC 2006
>Number: 93792
>Category: ports
>Synopsis: [PATCH] net/xisp: update to 2.7p4
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Feb 24 12:30:08 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Renato Botelho
>Release: FreeBSD 6.0-STABLE i386
>Organization:
>Environment:
System: FreeBSD data.galle.com.br 6.0-STABLE FreeBSD 6.0-STABLE #0: Mon Jan 30 16:42:01 BRDT 2006
>Description:
- Update to 2.7p4
- UNBREAK
- Respect CC/CFLAGS
- Respect PREFIX
- Rework pkg-plist
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:
--- xisp-2.7p4.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/net/xisp/Makefile,v
retrieving revision 1.12
diff -u -u -r1.12 Makefile
--- Makefile 5 Feb 2006 20:19:51 -0000 1.12
+++ Makefile 24 Feb 2006 12:25:52 -0000
@@ -6,7 +6,7 @@
#
PORTNAME= xisp
-PORTVERSION= 2.7p1
+PORTVERSION= 2.7p4
CATEGORIES= net
MASTER_SITES= http://xisp.hellug.gr/release/
@@ -17,10 +17,15 @@
LIB_DEPENDS= forms.1:${PORTSDIR}/x11-toolkits/xforms
-BROKEN= Installs into etc/ppp and doesn't clean it up
-
USE_XPM= yes
+USE_X_PREFIX= yes
+
+MAKE_ENV+= CCFLAGS="${CFLAGS}"
MAN1= xisp.1
+post-patch:
+ @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
+ ${WRKSRC}/Makefile
+
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/net/xisp/distinfo,v
retrieving revision 1.4
diff -u -u -r1.4 distinfo
--- distinfo 22 Jan 2006 21:24:03 -0000 1.4
+++ distinfo 24 Feb 2006 12:25:52 -0000
@@ -1,3 +1,3 @@
-MD5 (xisp-2.7p1.tar.gz) = f0147d99320a1f7e35c0ef8e41741ba1
-SHA256 (xisp-2.7p1.tar.gz) = 726af8e6a6d6e6c4423c38c4711503bc288a20329070d51645e352e93b55e868
-SIZE (xisp-2.7p1.tar.gz) = 294492
+MD5 (xisp-2.7p4.tar.gz) = 45744144b3d99cdc47e1e3cefb603eab
+SHA256 (xisp-2.7p4.tar.gz) = 1f8c743abac77e3de19f1741e48a711e353992848e5d9d6b9c92bb8c78136791
+SIZE (xisp-2.7p4.tar.gz) = 300156
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/net/xisp/pkg-plist,v
retrieving revision 1.2
diff -u -u -r1.2 pkg-plist
--- pkg-plist 3 Feb 2003 13:12:07 -0000 1.2
+++ pkg-plist 24 Feb 2006 12:25:52 -0000
@@ -1,21 +1,15 @@
- at cwd /etc/ppp
-ip-down
-ip-up
-
- at exec mkdir -p %D/peers
-peers/xisp_cuaa0
-peers/xisp_cuaa1
-peers/xisp_cuaa2
-peers/xisp_cuaa3
-peers/xisp_umodem
-peers/xisp_dialer
-
- at cwd /usr/X11R6
bin/xisp
bin/xispid
bin/xisprccv
-
- at cwd /usr/local
- at exec mkdir -p %D/libexec
+etc/ppp/ip-down
+etc/ppp/ip-up
+etc/ppp/peers/xisp_cuaa0
+etc/ppp/peers/xisp_cuaa1
+etc/ppp/peers/xisp_cuaa2
+etc/ppp/peers/xisp_cuaa3
+etc/ppp/peers/xisp_dialer
+etc/ppp/peers/xisp_umodem
libexec/xispdial
libexec/xispterm
+ at dirrm etc/ppp/peers
+ at dirrmtry etc/ppp
Index: files/patch-Makefile
===================================================================
RCS file: /home/pcvs/ports/net/xisp/files/patch-Makefile,v
retrieving revision 1.3
diff -u -u -r1.3 patch-Makefile
--- files/patch-Makefile 14 Mar 2004 17:13:58 -0000 1.3
+++ files/patch-Makefile 24 Feb 2006 12:25:52 -0000
@@ -1,12 +1,14 @@
---- Makefile.orig Sun Mar 7 17:37:41 2004
-+++ Makefile Sun Feb 22 06:14:06 2004
-@@ -13,11 +13,11 @@
+--- Makefile.orig Sun Nov 6 22:38:22 2005
++++ Makefile Fri Feb 24 07:46:24 2006
+@@ -12,12 +12,12 @@
+ # Compilation/installation vars (global for all following sections) |
#=====================================================================
#
- CC = gcc
+-CC = gcc
-PREFIX = /usr/local
-X11PREFIX = /usr/X11R6
-+PREFIX = ${LOCALBASE}
++CC ?= gcc
++PREFIX = %%PREFIX%%
+X11PREFIX = ${X11BASE}
INCX11 = $(X11PREFIX)/include
LIBX11 = $(X11PREFIX)/lib
@@ -16,7 +18,7 @@
MODEM_DEV = modem
MODEM_PATH = /dev/$(MODEM_DEV)
@@ -29,26 +29,26 @@
- # Normal (i.e. SuSE-[678].x) vars; for SuSE-5.x use the lines which
+ # 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
@@ -60,7 +62,7 @@
#
# Debian vars (if your Debian distribution is relatively
# old and does not use glibc2, use the lines which DO NOT
-@@ -209,29 +209,29 @@
+@@ -208,29 +208,29 @@
#
# FreeBSD vars
#-------------
@@ -93,7 +95,7 @@
+VARRUN = /var/run
+USRLIBPPP = $(PREFIX)/libexec
+MANDIR = $(PREFIX)/man/man1
-+ETCPPP = /etc/ppp
++ETCPPP = ${PREFIX}/etc/ppp
+OPTSDIR = $(ETCPPP)
+INSTPPPDIR = $(ETCPPP)
+PPPDLCKDIR = /var/spool/lock
@@ -101,7 +103,7 @@
+GROUP = dialer
+CHAT_PATH = /usr/bin
+PPPD_PATH = /usr/sbin
-+CCFLAGS = -Wall -O -DUSE_OPENSSL
++CCFLAGS ?= -Wall -O -DUSE_OPENSSL
+EXTRALIBS = -lcrypto
+LINKX11 = -Wl,-R$(LIBX11)
+LINKFORMS = -L$(LIBFORMS) -lforms
@@ -113,7 +115,7 @@
#
#=====================================================================
# Program configuration options |
-@@ -407,23 +407,32 @@
+@@ -406,23 +406,32 @@
$(INSTALL) -g $(GROUP) -m 750 -o root \
ip-down.install $(DESTDIR)$(INSTPPPDIR)/ip-down
rm -f ip-up.install ip-down.install
@@ -153,7 +155,7 @@
clean:
rm -f *.o xisp xispdial xisprccv xispterm xispid xisp.xpm xisp.1
-@@ -435,10 +444,12 @@
+@@ -434,10 +443,12 @@
$(DESTDIR)$(USRLOCAL)/xisprccv \
$(DESTDIR)$(USRLOCAL)/xispid \
$(DESTDIR)$(MANDIR)/xisp.1 \
--- xisp-2.7p4.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list