Bug 189645 - Update net/netpipes for staging
Summary: Update net/netpipes for staging
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: freebsd-ports-bugs (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-05-11 05:30 UTC by Daniel O'Connor
Modified: 2014-06-04 10:31 UTC (History)
2 users (show)

See Also:


Attachments
Fix (5.30 KB, patch)
2014-06-03 10:59 UTC, Daniel O'Connor
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Daniel O'Connor 2014-05-11 05:30:00 UTC

Fix: 

or http://www.dons.net.au/~darius/netpipes-stagedir.diff--MLe3MGCZZnRdhbSbABV3eKCYpCWfkDGkX769Df9VN7DTw4T8
Content-Type: text/plain; name="file.shar"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="file.shar"

# 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
Comment 1 Daniel O'Connor 2014-05-11 06:17:47 UTC
On 11 May 2014, at 14:00, FreeBSD-gnats-submit@FreeBSD.org wrote:
> Thank you very much for your problem report.
> It has the internal identification `ports/189645'.
> The individual assigned to look at your
> report is: freebsd-ports-bugs. 
> 
> You can access the state of your problem report at any time
> via this link:
> 
> http://www.freebsd.org/cgi/query-pr.cgi?pr=189645


I have just realised the do-install target..
X+do-install:
X+	${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKDIR} STAGEDIR=${STAGEDIR} install

Should be replaced with
MAKE_ENV+=	STAGEDIR=${STAGEDIR}

(Although I don't understand why it isn't routinely available)

--
Daniel O'Connor software and network engineer
for Genesis Software - http://www.gsoft.com.au
"The nice thing about standards is that there
are so many of them to choose from."
  -- Andrew Tanenbaum
GPG Fingerprint - 5596 B766 97C0 0E94 4347 295E E593 DC20 7B3F CE8C





Comment 2 Carlo Strub freebsd_committer freebsd_triage 2014-06-03 09:32:41 UTC
Can you please re-submit the entre shar file as an attachement:

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=189645
Comment 3 Daniel O'Connor 2014-06-03 10:59:00 UTC
Created attachment 143327 [details]
Fix
Comment 4 commit-hook freebsd_committer freebsd_triage 2014-06-04 10:31:24 UTC
A commit references this bug:

Author: miwi
Date: Wed Jun  4 10:30:31 UTC 2014
New revision: 356454
URL: http://svnweb.freebsd.org/changeset/ports/356454

Log:
  - Stage support

  PR:		189645

Changes:
  head/net/netpipes/Makefile
  head/net/netpipes/files/patch-Makefile
  head/net/netpipes/files/patch-aa
  head/net/netpipes/pkg-plist