- Stagify.

7 files changed, 63 insertions, 10 deletions

diff --git a/net-p2p/libpdtp/Makefile b/net-p2p/libpdtp/Makefile
index 94bfa602d940..5979a63585b7 100644
--- a/net-p2p/libpdtp/Makefile
+++ b/net-p2p/libpdtp/Makefile
@@ -14,9 +14,8 @@ HAS_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CFLAGS+=	-fpic
 
-NO_STAGE=	yes
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/pdtp ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/libpdtp.* ${PREFIX}/lib
+	${INSTALL_PROGRAM} ${WRKSRC}/pdtp ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/libpdtp.* ${STAGEDIR}${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/net-p2p/libpdtp/files/patch-make-buildlib.sh b/net-p2p/libpdtp/files/patch-make-buildlib.sh
new file mode 100644
index 000000000000..e2200d8d288e
--- /dev/null
+++ b/net-p2p/libpdtp/files/patch-make-buildlib.sh
@@ -0,0 +1,11 @@
+--- ./make-buildlib.sh.orig	2014-06-11 23:58:17.022462223 +0900
++++ ./make-buildlib.sh	2014-06-11 23:58:26.037461106 +0900
+@@ -10,7 +10,7 @@
+ 	BUILDLIBFLAGS="-lpthread -shared"
+ ;;
+ FreeBSD|OpenBSD|NetBSD)
+-	BUILDLIB=gcc
++	BUILDLIB=${CC}
+ 	BUILDLIBFLAGS="-pthread -shared"
+ ;;	
+ SunOS)
diff --git a/net-p2p/libpdtp/files/patch-make-compile.sh b/net-p2p/libpdtp/files/patch-make-compile.sh
new file mode 100644
index 000000000000..66f06a3a4b27
--- /dev/null
+++ b/net-p2p/libpdtp/files/patch-make-compile.sh
@@ -0,0 +1,11 @@
+--- ./make-compile.sh.orig	2014-06-11 23:56:44.234462034 +0900
++++ ./make-compile.sh	2014-06-11 23:56:59.164462439 +0900
+@@ -11,7 +11,7 @@
+ 	CFLAGS="-ansi -pedantic -fpic -g -Wall -D_GNU_SOURCE"
+ ;;
+ FreeBSD|OpenBSD|NetBSD)
+-	CC=gcc
++	CC=${CC}
+ 	CFLAGS="-ansi -pedantic -fpic -g -Wall"
+ ;;
+ SunOS)
diff --git a/net-p2p/libpdtp/files/patch-make-link.sh b/net-p2p/libpdtp/files/patch-make-link.sh
new file mode 100644
index 000000000000..77d28a5a2cf1
--- /dev/null
+++ b/net-p2p/libpdtp/files/patch-make-link.sh
@@ -0,0 +1,11 @@
+--- ./make-link.sh.orig	2014-06-11 23:57:05.342462423 +0900
++++ ./make-link.sh	2014-06-11 23:57:14.220461623 +0900
+@@ -6,7 +6,7 @@
+ 	LDFLAGS="-lpthread"
+ ;;
+ FreeBSD|OpenBSD|NetBSD)
+-	LD=gcc
++	LD=${CC}
+ 	LDFLAGS="-pthread"
+ ;;	
+ SunOS)
diff --git a/net-p2p/squall/Makefile b/net-p2p/squall/Makefile
index b9223e294205..93c5b96bc954 100644
--- a/net-p2p/squall/Makefile
+++ b/net-p2p/squall/Makefile
@@ -13,13 +13,12 @@ HAS_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 STRIP=		# Keep empty for debugging.
 
-NO_STAGE=	yes
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/squall/squall ${PREFIX}/sbin
-	${INSTALL_PROGRAM} ${WRKSRC}/squallhub/squallhub ${PREFIX}/sbin
-	${INSTALL_PROGRAM} ${WRKSRC}/squallproxy/squallproxy ${PREFIX}/sbin
-	${INSTALL_PROGRAM} ${WRKSRC}/squirt/squirt ${PREFIX}/sbin
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${DOCSDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/squall/squall ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/squallhub/squallhub ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/squallproxy/squallproxy ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/squirt/squirt ${STAGEDIR}${PREFIX}/sbin
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/net-p2p/squall/files/patch-make-compile.sh b/net-p2p/squall/files/patch-make-compile.sh
new file mode 100644
index 000000000000..2e20e290c921
--- /dev/null
+++ b/net-p2p/squall/files/patch-make-compile.sh
@@ -0,0 +1,11 @@
+--- make-compile.sh.orig	2014-06-11 23:42:34.333462233 +0900
++++ make-compile.sh	2014-06-11 23:42:45.001462051 +0900
+@@ -8,7 +8,7 @@
+ 	CFLAGS="-D_REENTRANT -D_THREAD_SAFE -g -O3 -Wall"
+ ;;
+ FreeBSD|OpenBSD|NetBSD)
+-        CC=gcc
++        CC=${CC}
+         CFLAGS="-D_REENTRANT -D_THREAD_SAFE -ansi -pedantic -g -O3 -Wall"
+ ;;
+ Linux)
diff --git a/net-p2p/squall/files/patch-make-link.sh b/net-p2p/squall/files/patch-make-link.sh
new file mode 100644
index 000000000000..64bd0abe229b
--- /dev/null
+++ b/net-p2p/squall/files/patch-make-link.sh
@@ -0,0 +1,11 @@
+--- make-link.sh.orig	2014-06-11 23:44:37.727462291 +0900
++++ make-link.sh	2014-06-11 23:47:07.004461915 +0900
+@@ -6,7 +6,7 @@
+ 	LDFLAGS=-lpthread
+ ;;
+ FreeBSD|OpenBSD|NetBSD)
+-	LD=gcc
++	LD=${CC}
+ 	LDFLAGS=-pthread
+ ;;	
+ SunOS)