- Stagify.

5 files changed, 22 insertions, 23 deletions

diff --git a/databases/pglesslog/Makefile b/databases/pglesslog/Makefile
index 9d7c3bf72ab3..243b037d3850 100644
--- a/databases/pglesslog/Makefile
+++ b/databases/pglesslog/Makefile
@@ -17,7 +17,6 @@ WRKSRC=		${WRKDIR}/pg_lesslog_${PORTVERSION}_pg84
 PGSQL_PORT=	databases/postgresql${PGSQL_VER}
 PGSQL_SRCDIR=	`cd ${PORTSDIR}/${PGSQL_PORT}-server; ${MAKE} -VWRKSRC`
 
-NO_STAGE=	yes
 pre-build:
 	${REINPLACE_CMD} "s|top_builddir = ../..|top_builddir = ${PGSQL_SRCDIR}|" ${WRKSRC}/Makefile.*
 
diff --git a/databases/pgpool-II-30/Makefile b/databases/pgpool-II-30/Makefile
index 436794d12210..0d66eae126d9 100644
--- a/databases/pgpool-II-30/Makefile
+++ b/databases/pgpool-II-30/Makefile
@@ -25,9 +25,6 @@ PORTDOCS+=	TODO
 PORTDOCShtml=	pgpool-en.html pgpool-ja.html pgpool.css
 PORTDOCShtml+=	tutorial-en.html tutorial-ja.html
 
-MAN8=		pgpool.8
-
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \
 	${WRKSRC}/configure
@@ -38,20 +35,23 @@ post-build:
 	@cd ${WRKSRC}/sql/pgpool-recovery && ${GMAKE}
 
 post-install:
-	@cd ${WRKSRC}/sql/pgpool-recovery && ${GMAKE} ${INSTALL_TARGET}
-	${INSTALL_DATA} ${WRKSRC}/sample/dist_def_pgbench.sql ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/sample/replicate_def_pgbench.sql ${DATADIR}
-	${MKDIR} ${DATADIR} ${EXAMPLESDIR}
+	echo "--- ==="
+	-cat `pg_config --pgxs`
+	echo "--- ==="
+	@cd ${WRKSRC}/sql/pgpool-recovery && ${GMAKE} DESTDIR=${STAGEDIR} ${INSTALL_TARGET}
+	${INSTALL_DATA} ${WRKSRC}/sample/dist_def_pgbench.sql ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/sample/replicate_def_pgbench.sql ${STAGEDIR}${DATADIR}
+	${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${EXAMPLESDIR}
 .for f in pgpool_recovery pgpool_recovery_pitr pgpool_remote_start
-	${INSTALL_SCRIPT} ${WRKSRC}/sample/${f} ${EXAMPLESDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/sample/${f}  ${STAGEDIR}${EXAMPLESDIR}
 .endfor
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR}  ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
-	${INSTALL_MAN} ${WRKSRC}/$f ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/$f  ${STAGEDIR}${DOCSDIR}
 .endfor
 .for f in ${PORTDOCShtml}
-	${INSTALL_MAN} ${WRKSRC}/doc/$f ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/doc/$f  ${STAGEDIR}${DOCSDIR}
 .endfor
 PORTDOCS+=	${PORTDOCShtml}
 .endif
diff --git a/databases/pgpool-II-30/pkg-plist b/databases/pgpool-II-30/pkg-plist
index fa9009c66180..06205ae13402 100644
--- a/databases/pgpool-II-30/pkg-plist
+++ b/databases/pgpool-II-30/pkg-plist
@@ -21,6 +21,8 @@ lib/libpcp.a
 lib/libpcp.la
 lib/libpcp.so
 lib/libpcp.so.0
+lib/postgresql/pgpool-recovery.so
+man/man8/pgpool.8.gz
 %%DATADIR%%/dist_def_pgbench.sql
 %%DATADIR%%/pgpool.pam
 %%DATADIR%%/replicate_def_pgbench.sql
diff --git a/databases/pgpool-II/Makefile b/databases/pgpool-II/Makefile
index adda78dca50e..80b3143c683c 100644
--- a/databases/pgpool-II/Makefile
+++ b/databases/pgpool-II/Makefile
@@ -27,12 +27,9 @@ PORTDOCS+=	TODO
 PORTDOCShtml=	pgpool-en.html pgpool-ja.html pgpool.css
 PORTDOCShtml+=	tutorial-en.html tutorial-ja.html
 
-MAN8=		pgpool.8
-
 OPTIONS_DEFINE+=	DOCS SSL
 SSL_DESC=	Build with OpenSSL support
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSSL}
@@ -61,21 +58,21 @@ post-build:
 
 post-install:
 .for f in ${FUNCTIONS}
-	@cd ${WRKSRC}/sql/${f} && ${GMAKE} ${INSTALL_TARGET}
+	@cd ${WRKSRC}/sql/${f} && ${GMAKE} DESTDIR=${STAGEDIR}  ${INSTALL_TARGET}
 .endfor
-	${INSTALL_DATA} ${WRKSRC}/sample/dist_def_pgbench.sql ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/sample/replicate_def_pgbench.sql ${DATADIR}
-	${MKDIR} ${DATADIR} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/sample/dist_def_pgbench.sql ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/sample/replicate_def_pgbench.sql ${STAGEDIR}${DATADIR}
+	${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${EXAMPLESDIR}
 .for f in pgpool_recovery pgpool_recovery_pitr pgpool_remote_start
-	${INSTALL_SCRIPT} ${WRKSRC}/sample/${f} ${EXAMPLESDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/sample/${f} ${STAGEDIR}${EXAMPLESDIR}
 .endfor
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
-	${INSTALL_MAN} ${WRKSRC}/$f ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/$f ${STAGEDIR}${DOCSDIR}
 .endfor
 .for f in ${PORTDOCShtml}
-	${INSTALL_MAN} ${WRKSRC}/doc/$f ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/doc/$f ${STAGEDIR}${DOCSDIR}
 .endfor
 PORTDOCS+=	${PORTDOCShtml}
 .endif
diff --git a/databases/pgpool-II/pkg-plist b/databases/pgpool-II/pkg-plist
index d7cde28fde0a..a4509adc7b13 100644
--- a/databases/pgpool-II/pkg-plist
+++ b/databases/pgpool-II/pkg-plist
@@ -25,6 +25,7 @@ lib/libpcp.a
 lib/libpcp.la
 lib/libpcp.so
 lib/libpcp.so.0
+man/man8/pgpool.8.gz
 %%DATADIR%%/dist_def_pgbench.sql
 %%DATADIR%%/insert_lock.sql
 %%DATADIR%%/pgpool.pam