From 10ff1c87b74d2c4ba869cc0ceb00a962a51c5f28 Mon Sep 17 00:00:00 2001 From: Jun Kuriyama Date: Sat, 14 Jun 2014 08:38:25 +0000 Subject: - Stagify. --- databases/pglesslog/Makefile | 1 - databases/pgpool-II-30/Makefile | 22 +++++++++++----------- databases/pgpool-II-30/pkg-plist | 2 ++ databases/pgpool-II/Makefile | 19 ++++++++----------- databases/pgpool-II/pkg-plist | 1 + japanese/ajaxzip2-core/Makefile | 7 +++---- japanese/another-htmllint/Makefile | 5 ++--- japanese/man-doc/Makefile | 3 +-- japanese/mg/Makefile | 3 +-- japanese/ming/Makefile | 11 +++++------ misc/amanda-perl-wrapper/Makefile | 3 +-- misc/elscreen/Makefile | 7 +++---- 12 files changed, 38 insertions(+), 46 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 .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 diff --git a/japanese/ajaxzip2-core/Makefile b/japanese/ajaxzip2-core/Makefile index 2e12d6d2a62b..1af1eabb2219 100644 --- a/japanese/ajaxzip2-core/Makefile +++ b/japanese/ajaxzip2-core/Makefile @@ -17,10 +17,9 @@ WRKSRC= ${WRKDIR}/${PORTNAME} NO_BUILD= YES SHEBANG_FILES= work/csv2jsonzip.pl -NO_STAGE= yes do-install: - ${MKDIR} ${WWWDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/ajaxzip2.js ${WWWDIR}/ - ${INSTALL_SCRIPT} ${WRKSRC}/work/csv2jsonzip.pl ${DATADIR}/ + ${MKDIR} ${STAGEDIR}${WWWDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/ajaxzip2.js ${STAGEDIR}${WWWDIR}/ + ${INSTALL_SCRIPT} ${WRKSRC}/work/csv2jsonzip.pl ${STAGEDIR}${DATADIR}/ .include diff --git a/japanese/another-htmllint/Makefile b/japanese/another-htmllint/Makefile index 30cb6c8bc7e3..c9b525c43dca 100644 --- a/japanese/another-htmllint/Makefile +++ b/japanese/another-htmllint/Makefile @@ -15,7 +15,7 @@ USES= dos2unix perl5 zip WRKSRC= ${WRKDIR} DOS2UNIX_FILES= readme.txt -DIR= ${PREFIX}/share/htmllint +DIR= ${STAGEDIR}${PREFIX}/share/htmllint PM= htmllint.pm RFC2396.pm htmllint.env RULE= *.rul HTML= *.cgi *.html *.gif *.css @@ -24,7 +24,6 @@ SEDSUB= ${SED} -e 's@%PREFIX%@${PREFIX}@' # Please set this! HTMLLINT_ADMIN?= kuriyama@FreeBSD.org -NO_STAGE= yes do-build: @${SEDSUB} ${FILESDIR}/htmllint > ${WRKSRC}/htmllint @${SEDSUB} ${WRKSRC}/htmllintenv > ${WRKSRC}/htmllint.env @@ -38,7 +37,7 @@ do-build: do-install: ${MKDIR} ${DIR}/rule ${DIR}/html - cd ${WRKSRC} && ${INSTALL_SCRIPT} htmllint ${PREFIX}/bin + cd ${WRKSRC} && ${INSTALL_SCRIPT} htmllint ${STAGEDIR}${PREFIX}/bin cd ${WRKSRC} && ${INSTALL_SCRIPT} ${HTML} ${DIR}/html cd ${WRKSRC} && ${INSTALL_DATA} ${PM} ${DIR} cd ${WRKSRC} && ${INSTALL_DATA} ${RULE} ${DIR}/rule diff --git a/japanese/man-doc/Makefile b/japanese/man-doc/Makefile index 9256f68fb651..0ee26f0e6c5a 100644 --- a/japanese/man-doc/Makefile +++ b/japanese/man-doc/Makefile @@ -18,7 +18,6 @@ COMMENT= Japanese translation of FreeBSD manual pages RUN_DEPENDS= jman:${PORTSDIR}/japanese/man NO_MTREE= yes -NO_STAGE= yes WRKSRC= ${WRKDIR}/${DISTNAME} PLIST= ${WRKDIR}/pkg-plist MAKE_ENV= MANDIR=${MANDIR} @@ -64,7 +63,7 @@ pre-su-install: SECNUM=$${SEC%%/*}; \ cd ${WRKSRC}/$${SEC} && \ SUBDIR=`${MAKE} -VMANSUBDIR` && \ - ${MKDIR} ${PREFIX}/man/ja/$${SECNUM}$${SUBDIR}; \ + ${MKDIR} ${STAGEDIR}${PREFIX}/man/ja/$${SECNUM}$${SUBDIR}; \ done post-install: diff --git a/japanese/mg/Makefile b/japanese/mg/Makefile index 6e8d25043c56..ba4580e7218d 100644 --- a/japanese/mg/Makefile +++ b/japanese/mg/Makefile @@ -15,12 +15,11 @@ USES= perl5 USE_PERL5= run CONFLICTS= mg-200* -NO_STAGE= yes do-build: ${SED} -e "s|/usr/local|${PREFIX}|g" \ ${DISTDIR}/${DISTFILES} > ${WRKDIR}/${PORTNAME} do-install: - ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin/${PORTNAME} + ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} .include diff --git a/japanese/ming/Makefile b/japanese/ming/Makefile index ed7419383d2c..cdd230811df6 100644 --- a/japanese/ming/Makefile +++ b/japanese/ming/Makefile @@ -37,7 +37,6 @@ DOCS= CHANGES \ DOCS_UTIL= README \ TODO -NO_STAGE= yes post-extract: ${SED} -e 's:"\.\./\.\./ming\.h"::g' \ ${WRKSRC}/ming.h > ${WRKSRC}/mingpp.h @@ -69,19 +68,19 @@ post-build: ${CC} ${CFLAGS} -L${PREFIX}/lib -o swftophp swftophp.o blocktypes.o decompile.o read.o -lm pre-install: - ${MKDIR} ${PREFIX}/include/ming/blocks + ${MKDIR} ${STAGEDIR}${PREFIX}/include/ming/blocks post-install: .for f in ${UTILS} - ${INSTALL_PROGRAM} ${WRKSRC}/../util/${f} ${PREFIX}/bin/ + ${INSTALL_PROGRAM} ${WRKSRC}/../util/${f} ${STAGEDIR}${PREFIX}/bin/ .endfor .if !defined(NOPORTDOCS) - ${MKDIR} ${PREFIX}/share/doc/ming/utils + ${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/ming/utils .for f in ${DOCS} - ${INSTALL_DATA} ${WRKSRC}/../${f} ${PREFIX}/share/doc/ming/ + ${INSTALL_DATA} ${WRKSRC}/../${f} ${STAGEDIR}${PREFIX}/share/doc/ming/ .endfor .for f in ${DOCS_UTIL} - ${INSTALL_DATA} ${WRKSRC}/../util/${f} ${PREFIX}/share/doc/ming/utils/ + ${INSTALL_DATA} ${WRKSRC}/../util/${f} ${STAGEDIR}${PREFIX}/share/doc/ming/utils/ .endfor .endif diff --git a/misc/amanda-perl-wrapper/Makefile b/misc/amanda-perl-wrapper/Makefile index 7653a8bd7f0a..3f700ffaeacf 100644 --- a/misc/amanda-perl-wrapper/Makefile +++ b/misc/amanda-perl-wrapper/Makefile @@ -16,7 +16,6 @@ SUB_LIST= PREFIX=${LOCALBASE} PLIST_FILES= bin/perl-amanda WRKSRC= ${WRKDIR} -NO_STAGE= yes do-fetch: @${DO_NADA} @@ -26,7 +25,7 @@ do-build: cd ${WRKSRC} && ${CC} -o perl-amanda perl-amanda.c do-install: - ${INSTALL_PROGRAM} ${WRKDIR}/perl-amanda ${PREFIX}/bin/ + ${INSTALL_PROGRAM} ${WRKDIR}/perl-amanda ${STAGEDIR}${PREFIX}/bin/ .include diff --git a/misc/elscreen/Makefile b/misc/elscreen/Makefile index adb755af65e0..ee31af8f99b4 100644 --- a/misc/elscreen/Makefile +++ b/misc/elscreen/Makefile @@ -12,7 +12,6 @@ MAINTAINER= kuriyama@FreeBSD.org COMMENT= GNU screen like utility on Emacsen USE_EMACS= yes -NO_STAGE= yes .include .if (${EMACS_PORT_NAME} == "emacs20") DEPPORT_SUFFIX= -${EMACS_PORT_NAME} @@ -26,11 +25,11 @@ EMACS_NO_BUILD_DEPENDS= YES NO_BUILD= YES do-install: - ${INSTALL_DATA} ${WRKSRC}/elscreen.el ${PREFIX}/${EMACS_SITE_LISPDIR} + ${INSTALL_DATA} ${WRKSRC}/elscreen.el ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR} .if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ChangeLog README - ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor .endif .include -- cgit v1.2.3