Date: Sun, 11 May 2014 13:37:26 +0930 (CST) From: "Daniel O'Connor" <doconnor@gsoft.com.au> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/189645: Update net/netpipes for staging Message-ID: <201405110407.s4B47QRo074113@cain.gsoft.com.au> Resent-Message-ID: <201405110430.s4B4U0HF067683@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 189645
>Category: ports
>Synopsis: Update net/netpipes for staging
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun May 11 04:30:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Daniel O'Connor
>Release: FreeBSD 9.1-PRERELEASE amd64
>Organization:
>Environment:
System: FreeBSD midget.dons.net.au 9.1-PRERELEASE FreeBSD 9.1-PRERELEASE #10 r24
1435M: Thu Oct 11 15:03:22 CST 2012 darius@midget.dons.net.au:/usr/obj/usr/src/s
ys/MIDGET amd64
>Description:
>How-To-Repeat:
>Fix:
# This is a shell archive. Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file". Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
# netpipes-stagedir.diff
#
echo x - netpipes-stagedir.diff
sed 's/^X//' >netpipes-stagedir.diff << '213277db8d00723c5f37ea8b900903bb'
Xdiff -uNr /usr/ports/net/netpipes/Makefile netpipes/Makefile
X--- /usr/ports/net/netpipes/Makefile 2014-01-23 03:30:46.000000000 +1030
X+++ netpipes/Makefile 2014-05-11 13:26:58.130502174 +0930
X@@ -14,8 +14,8 @@
X CONFLICTS= timelimit-[0-9]*
X
X NO_WRKSUBDIR= yes
X-MAN1= faucet.1 hose.1 sockdown.1 getpeername.1 encapsulate.1 \
X- timelimit.1 netpipes.1
X
X-NO_STAGE= yes
X+do-install:
X+ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKDIR} STAGEDIR=${STAGEDIR} install
X+
X .include <bsd.port.mk>
Xdiff -uNr /usr/ports/net/netpipes/files/patch-Makefile netpipes/files/patch-Makefile
X--- /usr/ports/net/netpipes/files/patch-Makefile 1970-01-01 09:30:00.000000000 +0930
X+++ netpipes/files/patch-Makefile 2014-05-11 13:28:42.966482771 +0930
X@@ -0,0 +1,67 @@
X+--- Makefile.orig 1998-10-29 07:00:03.000000000 +1030
X++++ Makefile 2014-05-11 13:28:21.742500328 +0930
X+@@ -17,7 +17,7 @@
X+
X+ # You probably want to change this:
X+ #INSTROOT = ${HOME}
X+-INSTROOT = /depot/collections0/netpipes4.1
X++INSTROOT = ${STAGEDIR}/${PREFIX}
X+ #INSTROOT = /usr/local
X+ INSTBIN = ${INSTROOT}/bin
X+ INSTMAN = ${INSTROOT}/man
X+@@ -59,7 +59,7 @@
X+ #CFLAGS = -DPOSIX_SIG -DHAVE_INET_ATON $(CDEBUGFLAGS)
X+
X+ # Linux (developed with RedHat 4.2, libc5)
X+-CFLAGS = -DUSE_IOCTL -DPOSIX_SIG -DHAVE_INET_ATON $(CDEBUGFLAGS)
X++#CFLAGS = -DUSE_IOCTL -DPOSIX_SIG -DHAVE_INET_ATON $(CDEBUGFLAGS)
X+
X+ # SGI
X+ #CFLAGS = -DSYSV $(CDEBUGFLAGS)
X+@@ -71,7 +71,7 @@
X+ #CFLAGS = -DPOSIX_SIG $(CDEBUGFLAGS)
X+
X+ # FreeBSD
X+-#CFLAGS = -DPOSIX_SIG $(CDEBUGFLAGS)
X++CFLAGS += -DPOSIX_SIG $(CDEBUGFLAGS)
X+
X+ # AIX 4.1.4 and 3.2.5
X+ #CFLAGS = -DPOSIX_SIG -DAIX $(CDEBUGFLAGS)
X+@@ -86,7 +86,7 @@
X+
X+ # gcc can handle both -O and -g at once
X+ #CDEBUGFLAGS = -g # -Wall -DDEBUG
X+-CDEBUGFLAGS = -O
X++#CDEBUGFLAGS = -O
X+
X+ ######################################################################
X+
X+@@ -104,8 +104,7 @@
X+ SSLLIB = -L../SSLeay-0.8.1 -lssl -lcrypto
X+
X+ MANPAGES = netpipes.1 faucet.1 hose.1 \
X+- sockdown.1 getpeername.1 timelimit.1 encapsulate.1 \
X+- ssl-auth.1
X++ sockdown.1 getpeername.1 timelimit.1 encapsulate.1
X+ PROGRAMS = faucet hose sockdown getpeername timelimit encapsulate
X+
X+ all : ${PROGRAMS}
X+@@ -138,15 +137,9 @@
X+ ${CC} ${CFLAGS} ${SSLINC} -c $<
X+
X+ install : all
X+- test -d ${INSTROOT} || mkdir ${INSTROOT}
X+- test -d ${INSTBIN} || mkdir ${INSTBIN}
X+- cp ${PROGRAMS} ${INSTBIN}/
X+- - rm -f ${INSTBIN}/getsockname
X+- ln -s getpeername ${INSTBIN}/getsockname
X+- - [ -x ssl-auth ] && cp ssl-auth ${INSTBIN}/
X+- test -d ${INSTMAN} || mkdir ${INSTMAN}
X+- test -d ${INSTMAN}/man1 || mkdir ${INSTMAN}/man1
X+- cp ${MANPAGES} ${INSTMAN}/man1/
X++ ${BSD_INSTALL_MAN} ${MANPAGES} ${INSTMAN}/man1/
X++ ${BSD_INSTALL_PROGRAM} ${PROGRAMS} ${INSTBIN}/
X++ ln -f -s getpeername ${INSTBIN}/getsockname
X+
X+ #
X+
Xdiff -uNr /usr/ports/net/netpipes/files/patch-aa netpipes/files/patch-aa
X--- /usr/ports/net/netpipes/files/patch-aa 2014-01-23 04:10:44.000000000 +1030
X+++ netpipes/files/patch-aa 1970-01-01 09:30:00.000000000 +0930
X@@ -1,67 +0,0 @@
X---- Makefile.orig Wed Oct 28 12:30:03 1998
X-+++ Makefile Fri Jun 7 00:23:28 2002
X-@@ -17,7 +17,7 @@
X-
X- # You probably want to change this:
X- #INSTROOT = ${HOME}
X--INSTROOT = /depot/collections0/netpipes4.1
X-+INSTROOT = ${PREFIX}
X- #INSTROOT = /usr/local
X- INSTBIN = ${INSTROOT}/bin
X- INSTMAN = ${INSTROOT}/man
X-@@ -59,7 +59,7 @@
X- #CFLAGS = -DPOSIX_SIG -DHAVE_INET_ATON $(CDEBUGFLAGS)
X-
X- # Linux (developed with RedHat 4.2, libc5)
X--CFLAGS = -DUSE_IOCTL -DPOSIX_SIG -DHAVE_INET_ATON $(CDEBUGFLAGS)
X-+#CFLAGS = -DUSE_IOCTL -DPOSIX_SIG -DHAVE_INET_ATON $(CDEBUGFLAGS)
X-
X- # SGI
X- #CFLAGS = -DSYSV $(CDEBUGFLAGS)
X-@@ -71,7 +71,7 @@
X- #CFLAGS = -DPOSIX_SIG $(CDEBUGFLAGS)
X-
X- # FreeBSD
X--#CFLAGS = -DPOSIX_SIG $(CDEBUGFLAGS)
X-+CFLAGS += -DPOSIX_SIG $(CDEBUGFLAGS)
X-
X- # AIX 4.1.4 and 3.2.5
X- #CFLAGS = -DPOSIX_SIG -DAIX $(CDEBUGFLAGS)
X-@@ -86,7 +86,7 @@
X-
X- # gcc can handle both -O and -g at once
X- #CDEBUGFLAGS = -g # -Wall -DDEBUG
X--CDEBUGFLAGS = -O
X-+#CDEBUGFLAGS = -O
X-
X- ######################################################################
X-
X-@@ -104,8 +104,7 @@
X- SSLLIB = -L../SSLeay-0.8.1 -lssl -lcrypto
X-
X- MANPAGES = netpipes.1 faucet.1 hose.1 \
X-- sockdown.1 getpeername.1 timelimit.1 encapsulate.1 \
X-- ssl-auth.1
X-+ sockdown.1 getpeername.1 timelimit.1 encapsulate.1
X- PROGRAMS = faucet hose sockdown getpeername timelimit encapsulate
X-
X- all : ${PROGRAMS}
X-@@ -138,15 +137,9 @@
X- ${CC} ${CFLAGS} ${SSLINC} -c $<
X-
X- install : all
X-- test -d ${INSTROOT} || mkdir ${INSTROOT}
X-- test -d ${INSTBIN} || mkdir ${INSTBIN}
X-- cp ${PROGRAMS} ${INSTBIN}/
X-- - rm -f ${INSTBIN}/getsockname
X-- ln -s getpeername ${INSTBIN}/getsockname
X-- - [ -x ssl-auth ] && cp ssl-auth ${INSTBIN}/
X-- test -d ${INSTMAN} || mkdir ${INSTMAN}
X-- test -d ${INSTMAN}/man1 || mkdir ${INSTMAN}/man1
X-- cp ${MANPAGES} ${INSTMAN}/man1/
X-+ ${BSD_INSTALL_MAN} ${MANPAGES} ${INSTMAN}/man1/
X-+ ${BSD_INSTALL_PROGRAM} ${PROGRAMS} ${INSTBIN}/
X-+ ln -f -s ${INSTBIN}/getpeername ${INSTBIN}/getsockname
X-
X- #
X-
Xdiff -uNr /usr/ports/net/netpipes/pkg-plist netpipes/pkg-plist
X--- /usr/ports/net/netpipes/pkg-plist 2014-01-23 01:46:56.000000000 +1030
X+++ netpipes/pkg-plist 2014-05-11 13:13:34.492507751 +0930
X@@ -5,3 +5,11 @@
X bin/hose
X bin/sockdown
X bin/timelimit
X+man/man1/encapsulate.1.gz
X+man/man1/faucet.1.gz
X+man/man1/getpeername.1.gz
X+man/man1/hose.1.gz
X+man/man1/netpipes.1.gz
X+man/man1/sockdown.1.gz
X+man/man1/timelimit.1.gz
X+
213277db8d00723c5f37ea8b900903bb
exit
or http://www.dons.net.au/~darius/netpipes-stagedir.diff
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405110407.s4B47QRo074113>