View | Details | Raw Unified | Return to bug 189645
Collapse All | Expand All

(-)netpipes/Makefile (-3 / +3 lines)
Lines 14-21 Link Here
14
CONFLICTS=	timelimit-[0-9]*
14
CONFLICTS=	timelimit-[0-9]*
15
15
16
NO_WRKSUBDIR=	yes
16
NO_WRKSUBDIR=	yes
17
MAN1=		faucet.1 hose.1 sockdown.1 getpeername.1 encapsulate.1 \
18
		timelimit.1 netpipes.1
19
17
20
NO_STAGE=	yes
18
do-install:
19
	${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKDIR} STAGEDIR=${STAGEDIR} install
20
21
.include <bsd.port.mk>
21
.include <bsd.port.mk>
(-)netpipes/files/patch-Makefile (+67 lines)
Line 0 Link Here
1
--- Makefile.orig	1998-10-29 07:00:03.000000000 +1030
2
+++ Makefile	2014-05-11 13:28:21.742500328 +0930
3
@@ -17,7 +17,7 @@
4
 
5
 # You probably want to change this:
6
 #INSTROOT = ${HOME}
7
-INSTROOT = /depot/collections0/netpipes4.1
8
+INSTROOT = ${STAGEDIR}/${PREFIX}
9
 #INSTROOT = /usr/local
10
 INSTBIN = ${INSTROOT}/bin
11
 INSTMAN = ${INSTROOT}/man
12
@@ -59,7 +59,7 @@
13
 #CFLAGS = -DPOSIX_SIG -DHAVE_INET_ATON $(CDEBUGFLAGS)
14
 
15
 # Linux (developed with RedHat 4.2, libc5)
16
-CFLAGS = -DUSE_IOCTL -DPOSIX_SIG -DHAVE_INET_ATON $(CDEBUGFLAGS)
17
+#CFLAGS = -DUSE_IOCTL -DPOSIX_SIG -DHAVE_INET_ATON $(CDEBUGFLAGS)
18
 
19
 # SGI
20
 #CFLAGS = -DSYSV $(CDEBUGFLAGS)
21
@@ -71,7 +71,7 @@
22
 #CFLAGS = -DPOSIX_SIG $(CDEBUGFLAGS)
23
 
24
 # FreeBSD
25
-#CFLAGS = -DPOSIX_SIG $(CDEBUGFLAGS)
26
+CFLAGS += -DPOSIX_SIG $(CDEBUGFLAGS)
27
 
28
 # AIX 4.1.4 and 3.2.5
29
 #CFLAGS = -DPOSIX_SIG -DAIX $(CDEBUGFLAGS)
30
@@ -86,7 +86,7 @@
31
 
32
 # gcc can handle both -O and -g at once
33
 #CDEBUGFLAGS = -g # -Wall -DDEBUG
34
-CDEBUGFLAGS = -O
35
+#CDEBUGFLAGS = -O
36
 
37
 ######################################################################
38
 
39
@@ -104,8 +104,7 @@
40
 SSLLIB = -L../SSLeay-0.8.1 -lssl -lcrypto
41
 
42
 MANPAGES = netpipes.1 faucet.1 hose.1 \
43
-	sockdown.1 getpeername.1 timelimit.1 encapsulate.1 \
44
-	ssl-auth.1
45
+	sockdown.1 getpeername.1 timelimit.1 encapsulate.1
46
 PROGRAMS = faucet hose sockdown getpeername timelimit encapsulate
47
 
48
 all	: ${PROGRAMS}
49
@@ -138,15 +137,9 @@
50
 	${CC} ${CFLAGS} ${SSLINC} -c $<
51
 
52
 install : all
53
-	test -d ${INSTROOT}  || mkdir ${INSTROOT}
54
-	test -d ${INSTBIN}  || mkdir ${INSTBIN}
55
-	cp ${PROGRAMS} ${INSTBIN}/
56
-	- rm -f ${INSTBIN}/getsockname
57
-	ln -s getpeername ${INSTBIN}/getsockname
58
-	- [ -x ssl-auth ] && cp ssl-auth ${INSTBIN}/
59
-	test -d ${INSTMAN}  || mkdir ${INSTMAN}
60
-	test -d ${INSTMAN}/man1  || mkdir ${INSTMAN}/man1
61
-	cp ${MANPAGES} ${INSTMAN}/man1/
62
+	${BSD_INSTALL_MAN} ${MANPAGES} ${INSTMAN}/man1/
63
+	${BSD_INSTALL_PROGRAM} ${PROGRAMS} ${INSTBIN}/
64
+	ln -f -s getpeername ${INSTBIN}/getsockname
65
 
66
 #
67
 
(-)netpipes/files/patch-aa (-67 lines)
Lines 1-67 Link Here
1
--- Makefile.orig	Wed Oct 28 12:30:03 1998
2
+++ Makefile	Fri Jun  7 00:23:28 2002
3
@@ -17,7 +17,7 @@
4
 
5
 # You probably want to change this:
6
 #INSTROOT = ${HOME}
7
-INSTROOT = /depot/collections0/netpipes4.1
8
+INSTROOT = ${PREFIX}
9
 #INSTROOT = /usr/local
10
 INSTBIN = ${INSTROOT}/bin
11
 INSTMAN = ${INSTROOT}/man
12
@@ -59,7 +59,7 @@
13
 #CFLAGS = -DPOSIX_SIG -DHAVE_INET_ATON $(CDEBUGFLAGS)
14
 
15
 # Linux (developed with RedHat 4.2, libc5)
16
-CFLAGS = -DUSE_IOCTL -DPOSIX_SIG -DHAVE_INET_ATON $(CDEBUGFLAGS)
17
+#CFLAGS = -DUSE_IOCTL -DPOSIX_SIG -DHAVE_INET_ATON $(CDEBUGFLAGS)
18
 
19
 # SGI
20
 #CFLAGS = -DSYSV $(CDEBUGFLAGS)
21
@@ -71,7 +71,7 @@
22
 #CFLAGS = -DPOSIX_SIG $(CDEBUGFLAGS)
23
 
24
 # FreeBSD
25
-#CFLAGS = -DPOSIX_SIG $(CDEBUGFLAGS)
26
+CFLAGS += -DPOSIX_SIG $(CDEBUGFLAGS)
27
 
28
 # AIX 4.1.4 and 3.2.5
29
 #CFLAGS = -DPOSIX_SIG -DAIX $(CDEBUGFLAGS)
30
@@ -86,7 +86,7 @@
31
 
32
 # gcc can handle both -O and -g at once
33
 #CDEBUGFLAGS = -g # -Wall -DDEBUG
34
-CDEBUGFLAGS = -O
35
+#CDEBUGFLAGS = -O
36
 
37
 ######################################################################
38
 
39
@@ -104,8 +104,7 @@
40
 SSLLIB = -L../SSLeay-0.8.1 -lssl -lcrypto
41
 
42
 MANPAGES = netpipes.1 faucet.1 hose.1 \
43
-	sockdown.1 getpeername.1 timelimit.1 encapsulate.1 \
44
-	ssl-auth.1
45
+	sockdown.1 getpeername.1 timelimit.1 encapsulate.1
46
 PROGRAMS = faucet hose sockdown getpeername timelimit encapsulate
47
 
48
 all	: ${PROGRAMS}
49
@@ -138,15 +137,9 @@
50
 	${CC} ${CFLAGS} ${SSLINC} -c $<
51
 
52
 install : all
53
-	test -d ${INSTROOT}  || mkdir ${INSTROOT}
54
-	test -d ${INSTBIN}  || mkdir ${INSTBIN}
55
-	cp ${PROGRAMS} ${INSTBIN}/
56
-	- rm -f ${INSTBIN}/getsockname
57
-	ln -s getpeername ${INSTBIN}/getsockname
58
-	- [ -x ssl-auth ] && cp ssl-auth ${INSTBIN}/
59
-	test -d ${INSTMAN}  || mkdir ${INSTMAN}
60
-	test -d ${INSTMAN}/man1  || mkdir ${INSTMAN}/man1
61
-	cp ${MANPAGES} ${INSTMAN}/man1/
62
+	${BSD_INSTALL_MAN} ${MANPAGES} ${INSTMAN}/man1/
63
+	${BSD_INSTALL_PROGRAM} ${PROGRAMS} ${INSTBIN}/
64
+	ln -f -s ${INSTBIN}/getpeername ${INSTBIN}/getsockname
65
 
66
 #
67
 
(-)netpipes/pkg-plist (+8 lines)
Lines 5-7 Link Here
5
bin/hose
5
bin/hose
6
bin/sockdown
6
bin/sockdown
7
bin/timelimit
7
bin/timelimit
8
man/man1/encapsulate.1.gz
9
man/man1/faucet.1.gz
10
man/man1/getpeername.1.gz
11
man/man1/hose.1.gz
12
man/man1/netpipes.1.gz
13
man/man1/sockdown.1.gz
14
man/man1/timelimit.1.gz
15

Return to bug 189645