Attachment 143327 Details for Bug 189645 – Fix

[patch] Fix

netpipes-stagedir.diff (text/plain), 5.30 KB, created by Daniel O'Connor on 2014-06-03 10:59:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel O'Connor

Created: 2014-06-03 10:59:00 UTC

Size: 5.30 KB

patch

obsolete

>diff -uNr /usr/ports/net/netpipes/Makefile netpipes/Makefile
>--- /usr/ports/net/netpipes/Makefile	2014-01-23 03:30:46.000000000 +1030
>+++ netpipes/Makefile	2014-05-11 13:26:58.130502174 +0930
>@@ -14,8 +14,8 @@
> CONFLICTS=	timelimit-[0-9]*
> 
> NO_WRKSUBDIR=	yes
>-MAN1=		faucet.1 hose.1 sockdown.1 getpeername.1 encapsulate.1 \
>-		timelimit.1 netpipes.1
> 
>-NO_STAGE=	yes
>+do-install:
>+	${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKDIR} STAGEDIR=${STAGEDIR} install
>+
> .include <bsd.port.mk>
>diff -uNr /usr/ports/net/netpipes/files/patch-Makefile netpipes/files/patch-Makefile
>--- /usr/ports/net/netpipes/files/patch-Makefile	1970-01-01 09:30:00.000000000 +0930
>+++ netpipes/files/patch-Makefile	2014-05-11 13:28:42.966482771 +0930
>@@ -0,0 +1,67 @@
>+--- Makefile.orig	1998-10-29 07:00:03.000000000 +1030
>++++ Makefile	2014-05-11 13:28:21.742500328 +0930
>+@@ -17,7 +17,7 @@
>+ 
>+ # You probably want to change this:
>+ #INSTROOT = ${HOME}
>+-INSTROOT = /depot/collections0/netpipes4.1
>++INSTROOT = ${STAGEDIR}/${PREFIX}
>+ #INSTROOT = /usr/local
>+ INSTBIN = ${INSTROOT}/bin
>+ INSTMAN = ${INSTROOT}/man
>+@@ -59,7 +59,7 @@
>+ #CFLAGS = -DPOSIX_SIG -DHAVE_INET_ATON $(CDEBUGFLAGS)
>+ 
>+ # Linux (developed with RedHat 4.2, libc5)
>+-CFLAGS = -DUSE_IOCTL -DPOSIX_SIG -DHAVE_INET_ATON $(CDEBUGFLAGS)
>++#CFLAGS = -DUSE_IOCTL -DPOSIX_SIG -DHAVE_INET_ATON $(CDEBUGFLAGS)
>+ 
>+ # SGI
>+ #CFLAGS = -DSYSV $(CDEBUGFLAGS)
>+@@ -71,7 +71,7 @@
>+ #CFLAGS = -DPOSIX_SIG $(CDEBUGFLAGS)
>+ 
>+ # FreeBSD
>+-#CFLAGS = -DPOSIX_SIG $(CDEBUGFLAGS)
>++CFLAGS += -DPOSIX_SIG $(CDEBUGFLAGS)
>+ 
>+ # AIX 4.1.4 and 3.2.5
>+ #CFLAGS = -DPOSIX_SIG -DAIX $(CDEBUGFLAGS)
>+@@ -86,7 +86,7 @@
>+ 
>+ # gcc can handle both -O and -g at once
>+ #CDEBUGFLAGS = -g # -Wall -DDEBUG
>+-CDEBUGFLAGS = -O
>++#CDEBUGFLAGS = -O
>+ 
>+ ######################################################################
>+ 
>+@@ -104,8 +104,7 @@
>+ SSLLIB = -L../SSLeay-0.8.1 -lssl -lcrypto
>+ 
>+ MANPAGES = netpipes.1 faucet.1 hose.1 \
>+-	sockdown.1 getpeername.1 timelimit.1 encapsulate.1 \
>+-	ssl-auth.1
>++	sockdown.1 getpeername.1 timelimit.1 encapsulate.1
>+ PROGRAMS = faucet hose sockdown getpeername timelimit encapsulate
>+ 
>+ all	: ${PROGRAMS}
>+@@ -138,15 +137,9 @@
>+ 	${CC} ${CFLAGS} ${SSLINC} -c $<
>+ 
>+ install : all
>+-	test -d ${INSTROOT}  || mkdir ${INSTROOT}
>+-	test -d ${INSTBIN}  || mkdir ${INSTBIN}
>+-	cp ${PROGRAMS} ${INSTBIN}/
>+-	- rm -f ${INSTBIN}/getsockname
>+-	ln -s getpeername ${INSTBIN}/getsockname
>+-	- [ -x ssl-auth ] && cp ssl-auth ${INSTBIN}/
>+-	test -d ${INSTMAN}  || mkdir ${INSTMAN}
>+-	test -d ${INSTMAN}/man1  || mkdir ${INSTMAN}/man1
>+-	cp ${MANPAGES} ${INSTMAN}/man1/
>++	${BSD_INSTALL_MAN} ${MANPAGES} ${INSTMAN}/man1/
>++	${BSD_INSTALL_PROGRAM} ${PROGRAMS} ${INSTBIN}/
>++	ln -f -s getpeername ${INSTBIN}/getsockname
>+ 
>+ #
>+ 
>diff -uNr /usr/ports/net/netpipes/files/patch-aa netpipes/files/patch-aa
>--- /usr/ports/net/netpipes/files/patch-aa	2014-01-23 04:10:44.000000000 +1030
>+++ netpipes/files/patch-aa	1970-01-01 09:30:00.000000000 +0930
>@@ -1,67 +0,0 @@
>---- Makefile.orig	Wed Oct 28 12:30:03 1998
>-+++ Makefile	Fri Jun  7 00:23:28 2002
>-@@ -17,7 +17,7 @@
>- 
>- # You probably want to change this:
>- #INSTROOT = ${HOME}
>--INSTROOT = /depot/collections0/netpipes4.1
>-+INSTROOT = ${PREFIX}
>- #INSTROOT = /usr/local
>- INSTBIN = ${INSTROOT}/bin
>- INSTMAN = ${INSTROOT}/man
>-@@ -59,7 +59,7 @@
>- #CFLAGS = -DPOSIX_SIG -DHAVE_INET_ATON $(CDEBUGFLAGS)
>- 
>- # Linux (developed with RedHat 4.2, libc5)
>--CFLAGS = -DUSE_IOCTL -DPOSIX_SIG -DHAVE_INET_ATON $(CDEBUGFLAGS)
>-+#CFLAGS = -DUSE_IOCTL -DPOSIX_SIG -DHAVE_INET_ATON $(CDEBUGFLAGS)
>- 
>- # SGI
>- #CFLAGS = -DSYSV $(CDEBUGFLAGS)
>-@@ -71,7 +71,7 @@
>- #CFLAGS = -DPOSIX_SIG $(CDEBUGFLAGS)
>- 
>- # FreeBSD
>--#CFLAGS = -DPOSIX_SIG $(CDEBUGFLAGS)
>-+CFLAGS += -DPOSIX_SIG $(CDEBUGFLAGS)
>- 
>- # AIX 4.1.4 and 3.2.5
>- #CFLAGS = -DPOSIX_SIG -DAIX $(CDEBUGFLAGS)
>-@@ -86,7 +86,7 @@
>- 
>- # gcc can handle both -O and -g at once
>- #CDEBUGFLAGS = -g # -Wall -DDEBUG
>--CDEBUGFLAGS = -O
>-+#CDEBUGFLAGS = -O
>- 
>- ######################################################################
>- 
>-@@ -104,8 +104,7 @@
>- SSLLIB = -L../SSLeay-0.8.1 -lssl -lcrypto
>- 
>- MANPAGES = netpipes.1 faucet.1 hose.1 \
>--	sockdown.1 getpeername.1 timelimit.1 encapsulate.1 \
>--	ssl-auth.1
>-+	sockdown.1 getpeername.1 timelimit.1 encapsulate.1
>- PROGRAMS = faucet hose sockdown getpeername timelimit encapsulate
>- 
>- all	: ${PROGRAMS}
>-@@ -138,15 +137,9 @@
>- 	${CC} ${CFLAGS} ${SSLINC} -c $<
>- 
>- install : all
>--	test -d ${INSTROOT}  || mkdir ${INSTROOT}
>--	test -d ${INSTBIN}  || mkdir ${INSTBIN}
>--	cp ${PROGRAMS} ${INSTBIN}/
>--	- rm -f ${INSTBIN}/getsockname
>--	ln -s getpeername ${INSTBIN}/getsockname
>--	- [ -x ssl-auth ] && cp ssl-auth ${INSTBIN}/
>--	test -d ${INSTMAN}  || mkdir ${INSTMAN}
>--	test -d ${INSTMAN}/man1  || mkdir ${INSTMAN}/man1
>--	cp ${MANPAGES} ${INSTMAN}/man1/
>-+	${BSD_INSTALL_MAN} ${MANPAGES} ${INSTMAN}/man1/
>-+	${BSD_INSTALL_PROGRAM} ${PROGRAMS} ${INSTBIN}/
>-+	ln -f -s ${INSTBIN}/getpeername ${INSTBIN}/getsockname
>- 
>- #
>- 
>diff -uNr /usr/ports/net/netpipes/pkg-plist netpipes/pkg-plist
>--- /usr/ports/net/netpipes/pkg-plist	2014-01-23 01:46:56.000000000 +1030
>+++ netpipes/pkg-plist	2014-05-11 13:13:34.492507751 +0930
>@@ -5,3 +5,11 @@
> bin/hose
> bin/sockdown
> bin/timelimit
>+man/man1/encapsulate.1.gz
>+man/man1/faucet.1.gz
>+man/man1/getpeername.1.gz
>+man/man1/hose.1.gz
>+man/man1/netpipes.1.gz
>+man/man1/sockdown.1.gz
>+man/man1/timelimit.1.gz
>+

Actions: View | Diff

Attachments on bug 189645: 143327