diff options
-rw-r--r-- | benchmarks/bonnie/Makefile | 4 | ||||
-rw-r--r-- | benchmarks/unixbench/Makefile | 24 | ||||
-rw-r--r-- | comms/yaps/Makefile | 10 | ||||
-rw-r--r-- | dns/ez-ipupdate/Makefile | 6 | ||||
-rw-r--r-- | ftp/jftpgw/Makefile | 15 | ||||
-rw-r--r-- | games/rt2-demo/Makefile | 2 | ||||
-rw-r--r-- | multimedia/dvbcut/Makefile | 4 | ||||
-rw-r--r-- | net-mgmt/argus-clients/Makefile | 26 | ||||
-rw-r--r-- | net-mgmt/argus/Makefile | 12 | ||||
-rw-r--r-- | security/aafid2/Makefile | 4 | ||||
-rw-r--r-- | security/yersinia/Makefile | 4 | ||||
-rw-r--r-- | www/mini_httpd/Makefile | 14 |
12 files changed, 65 insertions, 60 deletions
diff --git a/benchmarks/bonnie/Makefile b/benchmarks/bonnie/Makefile index fc48af66cd7e..8af2fd137ae4 100644 --- a/benchmarks/bonnie/Makefile +++ b/benchmarks/bonnie/Makefile @@ -23,7 +23,7 @@ MAN1= bonnie.1 PLIST_FILES= bin/bonnie do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/Bonnie ${PREFIX}/bin/bonnie - ${INSTALL_MAN} ${FILESDIR}/bonnie.1 ${PREFIX}/man/man1 + ${INSTALL_PROGRAM} ${WRKSRC}/Bonnie ${TARGETDIR}/bin/bonnie + ${INSTALL_MAN} ${FILESDIR}/bonnie.1 ${TARGETDIR}/man/man1 .include <bsd.port.mk> diff --git a/benchmarks/unixbench/Makefile b/benchmarks/unixbench/Makefile index 1ec1d523027c..45899ab1ee95 100644 --- a/benchmarks/unixbench/Makefile +++ b/benchmarks/unixbench/Makefile @@ -20,34 +20,34 @@ post-extract: ${RM} -f ${WRKSRC}/pgms/select do-install: - ${INSTALL_SCRIPT} ${WRKDIR}/unixbench ${PREFIX}/bin/ - -${MKDIR} ${PREFIX}/lib/unixbench + ${INSTALL_SCRIPT} ${WRKDIR}/unixbench ${TARGETDIR}/bin/ + -${MKDIR} ${TARGETDIR}/lib/unixbench for f in Run ; do \ - ${INSTALL_SCRIPT} ${WRKSRC}/$${f} ${PREFIX}/lib/unixbench/ ; \ + ${INSTALL_SCRIPT} ${WRKSRC}/$${f} ${TARGETDIR}/lib/unixbench/ ; \ done for f in Makefile README ; do \ - ${INSTALL_DATA} ${WRKSRC}/$${f} ${PREFIX}/lib/unixbench/ ; \ + ${INSTALL_DATA} ${WRKSRC}/$${f} ${TARGETDIR}/lib/unixbench/ ; \ done - -${MKDIR} ${PREFIX}/lib/unixbench/pgms + -${MKDIR} ${TARGETDIR}/lib/unixbench/pgms for f in ${WRKSRC}/pgms/* ; do \ case $$f in \ *.awk|*.sh|*perlbench) \ - ${INSTALL_SCRIPT} $${f} ${PREFIX}/lib/unixbench/pgms/ ;; \ + ${INSTALL_SCRIPT} $${f} ${TARGETDIR}/lib/unixbench/pgms/ ;; \ *.logo|*.base) \ - ${INSTALL_SCRIPT} $${f} ${PREFIX}/lib/unixbench/pgms/ ;; \ + ${INSTALL_SCRIPT} $${f} ${TARGETDIR}/lib/unixbench/pgms/ ;; \ *.orig|*.rej|*~) \ ;;\ *) \ - ${INSTALL_PROGRAM} $${f} ${PREFIX}/lib/unixbench/pgms/ ;; \ + ${INSTALL_PROGRAM} $${f} ${TARGETDIR}/lib/unixbench/pgms/ ;; \ esac ; \ done - -${MKDIR} ${PREFIX}/lib/unixbench/results + -${MKDIR} ${TARGETDIR}/lib/unixbench/results # for f in ${WRKSRC}/results/* ; do \ -# ${INSTALL_DATA} $${f} ${PREFIX}/lib/unixbench/results/ ; \ +# ${INSTALL_DATA} $${f} ${TARGETDIR}/lib/unixbench/results/ ; \ # done - -${MKDIR} ${PREFIX}/lib/unixbench/testdir + -${MKDIR} ${TARGETDIR}/lib/unixbench/testdir for f in ${WRKSRC}/testdir/* ; do \ - ${INSTALL_DATA} $${f} ${PREFIX}/lib/unixbench/testdir/ ; \ + ${INSTALL_DATA} $${f} ${TARGETDIR}/lib/unixbench/testdir/ ; \ done .include <bsd.port.mk> diff --git a/comms/yaps/Makefile b/comms/yaps/Makefile index d99b984858ac..9a3fe932b08f 100644 --- a/comms/yaps/Makefile +++ b/comms/yaps/Makefile @@ -20,12 +20,12 @@ USE_GMAKE= true MAN1= yaps.1 post-install: - ${INSTALL_DATA} ${WRKSRC}/yaps.rc ${PREFIX}/etc/yaps.rc.sample - ${INSTALL_MAN} ${WRKSRC}/yaps.1 ${PREFIX}/man/man1 + ${INSTALL_DATA} ${WRKSRC}/yaps.rc ${TARGETDIR}/etc/yaps.rc.sample + ${INSTALL_MAN} ${WRKSRC}/yaps.1 ${TARGETDIR}/man/man1 .if !defined(NOPORTDOCS) - @${MKDIR} ${PREFIX}/share/doc/yaps - ${INSTALL_DATA} ${WRKSRC}/yaps.doc ${PREFIX}/share/doc/yaps - ${INSTALL_DATA} ${WRKSRC}/yaps.html ${PREFIX}/share/doc/yaps + @${MKDIR} ${TARGETDIR}/share/doc/yaps + ${INSTALL_DATA} ${WRKSRC}/yaps.doc ${TARGETDIR}/share/doc/yaps + ${INSTALL_DATA} ${WRKSRC}/yaps.html ${TARGETDIR}/share/doc/yaps .endif .include <bsd.port.mk> diff --git a/dns/ez-ipupdate/Makefile b/dns/ez-ipupdate/Makefile index 05eb9753ad56..7821f5463a72 100644 --- a/dns/ez-ipupdate/Makefile +++ b/dns/ez-ipupdate/Makefile @@ -20,12 +20,12 @@ USE_RC_SUBR= ez-ipupdate.sh GNU_CONFIGURE= yes post-install: - ${MKDIR} ${PREFIX}/share/examples/${PORTNAME} + ${MKDIR} ${TARGETDIR}/share/examples/${PORTNAME} for f in ${WRKSRC}/example-*.conf; \ do \ - ${INSTALL_DATA} $$f ${PREFIX}/share/examples/${PORTNAME}/; \ + ${INSTALL_DATA} $$f ${TARGETDIR}/share/examples/${PORTNAME}/; \ done ${INSTALL_DATA} ${WRKSRC}/example.conf \ - ${PREFIX}/etc/${PORTNAME}.conf.sample + ${TARGETDIR}/etc/${PORTNAME}.conf.sample .include <bsd.port.mk> diff --git a/ftp/jftpgw/Makefile b/ftp/jftpgw/Makefile index 81936f7073b7..6d9190c46a69 100644 --- a/ftp/jftpgw/Makefile +++ b/ftp/jftpgw/Makefile @@ -19,17 +19,22 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-logpath=/var/log \ --enable-crypt \ --enable-sftp +#USE_RC_SUBR= yes +#USE_REINPLACE= yes MAN1= jftpgw.1 USE_RC_SUBR= jftpgw.sh do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/jftpgw ${PREFIX}/sbin/ - ${INSTALL_DATA} ${WRKSRC}/jftpgw.conf.sample ${PREFIX}/etc/ - ${INSTALL_MAN} ${WRKSRC}/jftpgw.1 ${PREFIX}/man/man1/ + ${INSTALL_PROGRAM} ${WRKSRC}/jftpgw ${TARGETDIR}/sbin/ + ${INSTALL_DATA} ${WRKSRC}/jftpgw.conf.sample ${TARGETDIR}/etc/ + ${INSTALL_MAN} ${WRKSRC}/jftpgw.1 ${TARGETDIR}/man/man1/ +# ${REINPLACE_CMD} -e 's:@PREFIX@:${TARGETDIR}:g' \ +# ${FILESDIR}/jftpgw.sh.in > ${WRKDIR}/jftpgw.sh +# ${INSTALL_SCRIPT} ${WRKDIR}/jftpgw.sh ${TARGETDIR}/etc/rc.d .if !defined(NOPORTDOCS) - ${MKDIR} ${PREFIX}/share/doc/jftpgw - ${INSTALL_DATA} ${WRKSRC}/doc/config.html ${PREFIX}/share/doc/jftpgw + ${MKDIR} ${TARGETDIR}/share/doc/jftpgw + ${INSTALL_DATA} ${WRKSRC}/doc/config.html ${TARGETDIR}/share/doc/jftpgw .endif .include <bsd.port.mk> diff --git a/games/rt2-demo/Makefile b/games/rt2-demo/Makefile index 0f0b3534709f..9a1b51b0fc46 100644 --- a/games/rt2-demo/Makefile +++ b/games/rt2-demo/Makefile @@ -22,6 +22,6 @@ NO_BUILD= yes USE_LINUX= yes do-install: - @${SH} ${FILESDIR}/do-install ${PREFIX} ${DISTDIR} + @${SH} ${FILESDIR}/do-install ${TARGETDIR} ${DISTDIR} .include <bsd.port.mk> diff --git a/multimedia/dvbcut/Makefile b/multimedia/dvbcut/Makefile index 5d41223c5b9e..bc49c9ebdf23 100644 --- a/multimedia/dvbcut/Makefile +++ b/multimedia/dvbcut/Makefile @@ -34,7 +34,7 @@ MAN1= dvbcut.1 PLIST_FILES= bin/dvbcut do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/bin/dvbcut ${PREFIX}/bin/ - ${INSTALL_MAN} ${WRKSRC}/dvbcut.1 ${PREFIX}/man/man1/ + ${INSTALL_PROGRAM} ${WRKSRC}/bin/dvbcut ${TARGETDIR}/bin/ + ${INSTALL_MAN} ${WRKSRC}/dvbcut.1 ${TARGETDIR}/man/man1/ .include <bsd.port.mk> diff --git a/net-mgmt/argus-clients/Makefile b/net-mgmt/argus-clients/Makefile index 89d0c775f3df..eaf3b84572ce 100644 --- a/net-mgmt/argus-clients/Makefile +++ b/net-mgmt/argus-clients/Makefile @@ -26,8 +26,8 @@ CONFIGURE_ARGS+= --with-sasl=${PREFIX} CFLAGS+= -I${PREFIX}/include/sasl .endif -DOCSDIR?= ${PREFIX}/share/doc/argus-2.0 -EXAMPLESDIR?= ${PREFIX}/share/examples/argus-2.0 +DOCSDIR?= ${TARGETDIR}/share/doc/argus-2.0 +EXAMPLESDIR?= ${TARGETDIR}/share/examples/argus-2.0 MAN1= ra.1 racount.1 ragator.1 rahosts.1 ramon.1 ranonymize.1 rapolicy.1 \ rasort.1 rastrip.1 raxml.1 @@ -37,20 +37,20 @@ do-install: .for i in ra racount ragator ragrep rahistogram rahosts \ ramon ranonymize rapath rapolicy rarpwatch raseq \ rasort rasrvstats rastrip ratop raxml - ${INSTALL_PROGRAM} ${WRKSRC}/bin/$i ${PREFIX}/bin/$i + ${INSTALL_PROGRAM} ${WRKSRC}/bin/$i ${TARGETDIR}/bin/$i .endfor .for i in argusbug ragraph - ${INSTALL_SCRIPT} ${WRKSRC}/bin/$i ${PREFIX}/bin/$i + ${INSTALL_SCRIPT} ${WRKSRC}/bin/$i ${TARGETDIR}/bin/$i .endfor .for i in argus_client.a argus_common.a argus_parse.a - ${INSTALL_DATA} ${WRKSRC}/lib/$i ${PREFIX}/lib/$i + ${INSTALL_DATA} ${WRKSRC}/lib/$i ${TARGETDIR}/lib/$i .endfor - ${MKDIR} ${PREFIX}/argus/archive - ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/argus - ${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/argus - ${MKDIR} ${PREFIX}/include - ${INSTALL_DATA} ${WRKSRC}/include/cons_def.h ${PREFIX}/include - ${INSTALL_DATA} ${WRKSRC}/include/cons_out.h ${PREFIX}/include + ${MKDIR} ${TARGETDIR}/argus/archive + ${INSTALL_DATA} ${WRKSRC}/README ${TARGETDIR}/argus + ${INSTALL_DATA} ${WRKSRC}/COPYING ${TARGETDIR}/argus + ${MKDIR} ${TARGETDIR}/include + ${INSTALL_DATA} ${WRKSRC}/include/cons_def.h ${TARGETDIR}/include + ${INSTALL_DATA} ${WRKSRC}/include/cons_out.h ${TARGETDIR}/include ${MKDIR} ${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/support/README ${EXAMPLESDIR} .for i in Archive Config System Tools Xml @@ -70,10 +70,10 @@ do-install: .endif .if !defined(NOMAN) .for i in ${MAN1} - ${INSTALL_DATA} ${WRKSRC}/man/man1/$i ${PREFIX}/man/man1 + ${INSTALL_DATA} ${WRKSRC}/man/man1/$i ${TARGETDIR}/man/man1 .endfor .for i in ${MAN5} - ${INSTALL_DATA} ${WRKSRC}/man/man5/$i ${PREFIX}/man/man5 + ${INSTALL_DATA} ${WRKSRC}/man/man5/$i ${TARGETDIR}/man/man5 .endfor .endif diff --git a/net-mgmt/argus/Makefile b/net-mgmt/argus/Makefile index adba7210193a..39e92f06cea9 100644 --- a/net-mgmt/argus/Makefile +++ b/net-mgmt/argus/Makefile @@ -26,26 +26,26 @@ CONFIGURE_ARGS= --exec-prefix=${PREFIX} CONFIGURE_ARGS+= --with-sasl=${PREFIX} .endif -DOCSDIR?= ${PREFIX}/share/doc/argus-2.0 +DOCSDIR?= ${TARGETDIR}/share/doc/argus-2.0 MAN5= argus.5 argus.conf.5 MAN8= argus.8 do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/bin/argus_bpf ${PREFIX}/sbin/argus - ${MKDIR} ${PREFIX}/argus/archive + ${INSTALL_PROGRAM} ${WRKSRC}/bin/argus_bpf ${TARGETDIR}/sbin/argus + ${MKDIR} ${TARGETDIR}/argus/archive .if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR}/html/man + ${MKDIR} ${DOCSDIR}/html/man .for i in doc/html/man/*.html ${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR}/html/man .endfor .endif .if !defined(NOMAN) .for i in ${MAN5} - ${INSTALL_DATA} ${WRKSRC}/man/man5/$i ${PREFIX}/man/man5 + ${INSTALL_DATA} ${WRKSRC}/man/man5/$i ${TARGETDIR}/man/man5 .endfor .for i in ${MAN8} - ${INSTALL_DATA} ${WRKSRC}/man/man8/$i ${PREFIX}/man/man8 + ${INSTALL_DATA} ${WRKSRC}/man/man8/$i ${TARGETDIR}/man/man8 .endfor .endif diff --git a/security/aafid2/Makefile b/security/aafid2/Makefile index e53d7a55b13e..e0092a8937d8 100644 --- a/security/aafid2/Makefile +++ b/security/aafid2/Makefile @@ -20,7 +20,7 @@ NO_WRKSUBDIR= yes NO_BUILD= yes do-install: - tar -C ${PREFIX}/lib -xzf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} - ${SH} ${FILESDIR}/post-install ${PREFIX} + tar -C ${TARGETDIR}/lib -xzf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} + ${SH} ${FILESDIR}/post-install ${TARGETDIR} .include <bsd.port.mk> diff --git a/security/yersinia/Makefile b/security/yersinia/Makefile index df5a5e2c5d8b..ba90dfc188a4 100644 --- a/security/yersinia/Makefile +++ b/security/yersinia/Makefile @@ -41,7 +41,7 @@ MAN8= yersinia.8 PLIST_FILES= sbin/yersinia do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/yersinia ${PREFIX}/sbin/ - ${INSTALL_MAN} ${WRKSRC}/yersinia.8 ${PREFIX}/man/man8/ + ${INSTALL_PROGRAM} ${WRKSRC}/src/yersinia ${TARGETDIR}/sbin/ + ${INSTALL_MAN} ${WRKSRC}/yersinia.8 ${TARGETDIR}/man/man8/ .include <bsd.port.post.mk> diff --git a/www/mini_httpd/Makefile b/www/mini_httpd/Makefile index a47369cb4066..d37ea0f87028 100644 --- a/www/mini_httpd/Makefile +++ b/www/mini_httpd/Makefile @@ -21,17 +21,17 @@ USE_OPENSSL= YES MAN8= mini_httpd.8 htpasswd.8 post-build: - -${MV} ${WRKSRC}/htpasswd.1 ${WRKSRC}/htpasswd.8 + -${MV} ${WRKSRC}/htpasswd.1 ${WRKSRC}/htpasswd.8 do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/mini_httpd ${PREFIX}/sbin/ - ${INSTALL_PROGRAM} ${WRKSRC}/htpasswd ${PREFIX}/sbin/ - ${INSTALL_SCRIPT} ${WRKSRC}/scripts/mini_httpd_wrapper ${PREFIX}/sbin/ - ${INSTALL_SCRIPT} ${WRKSRC}/scripts/mini_httpd.sh ${PREFIX}/etc/rc.d/ + ${INSTALL_PROGRAM} ${WRKSRC}/mini_httpd ${TARGETDIR}/sbin/ + ${INSTALL_PROGRAM} ${WRKSRC}/htpasswd ${TARGETDIR}/sbin/ + ${INSTALL_SCRIPT} ${WRKSRC}/scripts/mini_httpd_wrapper ${TARGETDIR}/sbin/ + ${INSTALL_SCRIPT} ${WRKSRC}/scripts/mini_httpd.sh ${TARGETDIR}/etc/rc.d/ @for file in ${MAN8}; \ do \ - ${INSTALL_MAN} ${WRKSRC}/$$file ${MAN8PREFIX}/man/man8/; \ + ${INSTALL_MAN} ${WRKSRC}/$$file ${TARGETDIR}/man/man8/; \ done - ${INSTALL_DATA} ${WRKSRC}/mini_httpd.cnf ${PREFIX}/etc/mini_httpd.cnf.sample + ${INSTALL_DATA} ${WRKSRC}/mini_httpd.cnf ${TARGETDIR}/etc/mini_httpd.cnf.sample .include <bsd.port.mk> |