diff options
| author | Gabor Kovesdan <gabor@FreeBSD.org> | 2007-08-04 11:41:30 +0000 |
|---|---|---|
| committer | Gabor Kovesdan <gabor@FreeBSD.org> | 2007-08-04 11:41:30 +0000 |
| commit | 42542fb07642b8336e808272918f3ae46aa67e0b (patch) | |
| tree | 98ff235c33c6493aa26457284f122652c38935f7 | |
| parent | 4c9cd257fd4e6eca46807a43e128d298429ee3cd (diff) | |
| download | ports-42542fb07642b8336e808272918f3ae46aa67e0b.tar.gz ports-42542fb07642b8336e808272918f3ae46aa67e0b.zip | |
- Remove the DESTDIR modifications from individual ports as we have a new,
fully chrooted DESTDIR, which does not need such any more.
Sponsored by: Google Summer of Code 2007
Approved by: portmgr (pav)
Notes
Notes:
svn path=/head/; revision=197075
315 files changed, 721 insertions, 737 deletions
diff --git a/archivers/9e/Makefile b/archivers/9e/Makefile index a51a6ec839ba..ea81cddae274 100644 --- a/archivers/9e/Makefile +++ b/archivers/9e/Makefile @@ -18,6 +18,6 @@ PLIST_FILES= bin/9e MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" LIBS="" HDRS="" do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/9e ${TARGETDIR}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/9e ${PREFIX}/bin .include <bsd.port.mk> diff --git a/archivers/bzip/Makefile b/archivers/bzip/Makefile index 7d252fea13d2..116fd7bd7325 100644 --- a/archivers/bzip/Makefile +++ b/archivers/bzip/Makefile @@ -24,9 +24,9 @@ pre-install: @${CAT} ${FILESDIR}/COPYRIGHT do-install: - ${RM} -f ${PREFIX}/bin/bzip ${TARGETDIR}/bin/bunzip - ${INSTALL_PROGRAM} ${WRKSRC}/bzip ${TARGETDIR}/bin/bzip - ${LN} -fs ${TARGETDIR}/bin/bzip ${TARGETDIR}/bin/bunzip + ${RM} -f ${PREFIX}/bin/bzip ${PREFIX}/bin/bunzip + ${INSTALL_PROGRAM} ${WRKSRC}/bzip ${PREFIX}/bin/bzip + ${LN} -fs ${PREFIX}/bin/bzip ${PREFIX}/bin/bunzip ${INSTALL_MAN} ${WRKSRC}/bzip.1 ${MAN1PREFIX}/man/man1/bzip.1 ${INSTALL_MAN} ${WRKSRC}/bzip.1 ${MAN1PREFIX}/man/man1/bunzip.1 diff --git a/archivers/dact/Makefile b/archivers/dact/Makefile index 96cad62206f0..9f7fe10d4573 100644 --- a/archivers/dact/Makefile +++ b/archivers/dact/Makefile @@ -31,8 +31,8 @@ MAN1= dact.1 INSTALLS_SHLIB= yes post-patch: - @${REINPLACE_CMD} -e "s|prefix = @prefix@|prefix = ${TARGETDIR}|" \ - -e "s|libdir = @libdir@|libdir = ${TARGETDIR}/lib|" \ + @${REINPLACE_CMD} -e "s|prefix = @prefix@|prefix = ${PREFIX}|" \ + -e "s|libdir = @libdir@|libdir = ${PREFIX}/lib|" \ ${WRKSRC}/Makefile.in pre-install: @@ -40,7 +40,7 @@ pre-install: @${RM} -f ${WRKSRC}/libdact.a post-install: - @${CP} -n ${EXAMPLESDIR}/dact.conf ${TARGETDIR}/etc + @${CP} -n ${EXAMPLESDIR}/dact.conf ${PREFIX}/etc .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/Docs/dact.txt ${DOCSDIR} diff --git a/archivers/dpkg/Makefile b/archivers/dpkg/Makefile index b254469203fd..150e2786156e 100644 --- a/archivers/dpkg/Makefile +++ b/archivers/dpkg/Makefile @@ -24,7 +24,7 @@ USE_ICONV= yes USE_PERL5= yes WRKSRC= ${WRKDIR}/dpkg-${PORTVERSION} -DPKGDIR?= ${DESTDIR}/var/db/dpkg +DPKGDIR?= /var/db/dpkg PLIST_SUB+= DPKGDIR=${DPKGDIR:C,^/,,} SUB_FILES= pkg-install pkg-deinstall diff --git a/archivers/ecm/Makefile b/archivers/ecm/Makefile index bb440f9fb217..6302a84af232 100644 --- a/archivers/ecm/Makefile +++ b/archivers/ecm/Makefile @@ -19,7 +19,7 @@ PORTDOCS= format.txt do-install: .for f in ${PORTNAME} un${PORTNAME} - ${INSTALL_PROGRAM} ${WRKSRC}/${f} ${TARGETDIR}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/bin .endfor .if !defined(NOPORTDOCS) diff --git a/archivers/gzrecover/Makefile b/archivers/gzrecover/Makefile index c94ce75763a0..6680a519627a 100644 --- a/archivers/gzrecover/Makefile +++ b/archivers/gzrecover/Makefile @@ -25,7 +25,7 @@ do-build: ${CC} -o ${WRKSRC}/${PORTNAME} ${CFLAGS} ${WRKSRC}/${PORTNAME}.c do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${TARGETDIR}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} diff --git a/archivers/mar/Makefile b/archivers/mar/Makefile index 46599a325da1..3e1199196b76 100644 --- a/archivers/mar/Makefile +++ b/archivers/mar/Makefile @@ -26,7 +26,7 @@ post-patch: ${WRKSRC}/src/Makefile do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${TARGETDIR}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/man/man1/mar.1 ${MAN1PREFIX}/man/man1 .if !defined(NOPORTDOCS) diff --git a/archivers/mscompress/Makefile b/archivers/mscompress/Makefile index 05b59dbb94d8..fe5eef38c531 100644 --- a/archivers/mscompress/Makefile +++ b/archivers/mscompress/Makefile @@ -22,8 +22,8 @@ MAN1= mscompress.1 msexpand.1 PLIST_FILES= bin/mscompress bin/msexpand do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/mscompress ${TARGETDIR}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/msexpand ${TARGETDIR}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/mscompress ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/msexpand ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/mscompress.1 ${MAN1PREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/msexpand.1 ${MAN1PREFIX}/man/man1 diff --git a/archivers/mtf/Makefile b/archivers/mtf/Makefile index f3dc865762cc..bb785b9ea7d0 100644 --- a/archivers/mtf/Makefile +++ b/archivers/mtf/Makefile @@ -26,7 +26,7 @@ post-patch: ${WRKSRC}/Makefile do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/mtf ${TARGETDIR}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/mtf ${PREFIX}/bin .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} diff --git a/archivers/unace/Makefile b/archivers/unace/Makefile index c73bef4d2936..27f60e54fef0 100644 --- a/archivers/unace/Makefile +++ b/archivers/unace/Makefile @@ -29,6 +29,6 @@ post-patch: ${WRKSRC}/uac_crt.h do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/unace ${TARGETDIR}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/unace ${PREFIX}/bin .include <bsd.port.mk> diff --git a/archivers/unalz/Makefile b/archivers/unalz/Makefile index 35b80e385235..29473f7b1708 100644 --- a/archivers/unalz/Makefile +++ b/archivers/unalz/Makefile @@ -31,6 +31,6 @@ pre-patch: ${WRKSRC}/Makefile do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/unalz ${TARGETDIR}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/unalz ${PREFIX}/bin .include <bsd.port.mk> diff --git a/archivers/undms/Makefile b/archivers/undms/Makefile index 1c9759d04222..6d1bded84e72 100644 --- a/archivers/undms/Makefile +++ b/archivers/undms/Makefile @@ -27,6 +27,6 @@ do-build: cd ${WRKSRC} && ${CC} ${CFLAGS} -o undms undms-1.3.c do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/undms ${TARGETDIR}/bin/ + ${INSTALL_PROGRAM} ${WRKSRC}/undms ${PREFIX}/bin/ .include <bsd.port.mk> diff --git a/archivers/unlzx/Makefile b/archivers/unlzx/Makefile index 028e36aa8c02..2cfdd418d46a 100644 --- a/archivers/unlzx/Makefile +++ b/archivers/unlzx/Makefile @@ -26,6 +26,6 @@ do-build: ${CC} ${CFLAGS} -o ${WRKSRC}/${PORTNAME} ${WRKSRC}/${PORTNAME}.c do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${TARGETDIR}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin .include <bsd.port.mk> diff --git a/archivers/unmakeself/Makefile b/archivers/unmakeself/Makefile index e7d6b837c2e8..f596039587a7 100644 --- a/archivers/unmakeself/Makefile +++ b/archivers/unmakeself/Makefile @@ -40,6 +40,6 @@ do-build: ${FILESDIR}/unmakeself.c ${LDFLAGS} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/unmakeself ${TARGETDIR}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/unmakeself ${PREFIX}/bin .include <bsd.port.post.mk> diff --git a/archivers/untar/Makefile b/archivers/untar/Makefile index 09f6a473e54e..4050a3d3a6fd 100644 --- a/archivers/untar/Makefile +++ b/archivers/untar/Makefile @@ -29,6 +29,6 @@ pre-patch: @${CP} ${DISTDIR}/untar.c ${WRKSRC} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${TARGETDIR}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin .include <bsd.port.mk> diff --git a/archivers/unzoo/Makefile b/archivers/unzoo/Makefile index 8a2de1846d69..3024fbb94805 100644 --- a/archivers/unzoo/Makefile +++ b/archivers/unzoo/Makefile @@ -39,7 +39,7 @@ do-build: ${WRKSRC}/${PORTNAME}.c do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${TARGETDIR}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/debian/${PORTNAME}.1 ${MAN1PREFIX}/man/man1 .include <bsd.port.post.mk> diff --git a/astro/aa/Makefile b/astro/aa/Makefile index fe352e5f34ee..94828c18d240 100644 --- a/astro/aa/Makefile +++ b/astro/aa/Makefile @@ -31,8 +31,8 @@ post-patch: @${REINPLACE_CMD} 's|CFLAGS= -O2|CFLAGS+=|' ${WRKSRC}/makefile do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/aa ${TARGETDIR}/bin - @${INSTALL_DATA} ${WRKSRC}/aa.ini ${TARGETDIR}/etc/aa.ini.default + @${INSTALL_PROGRAM} ${WRKSRC}/aa ${PREFIX}/bin + @${INSTALL_DATA} ${WRKSRC}/aa.ini ${PREFIX}/etc/aa.ini.default post-install: .if !defined(NOPORTDOCS) diff --git a/astro/p5-Astro-Catalog/Makefile b/astro/p5-Astro-Catalog/Makefile index 2bab29aff640..d028ec281443 100644 --- a/astro/p5-Astro-Catalog/Makefile +++ b/astro/p5-Astro-Catalog/Makefile @@ -70,9 +70,9 @@ post-patch: post-install: .for f in ${CONFIG} - ${INSTALL_DATA} ${WRKSRC}/etc/${f} ${TARGETDIR}/etc/${f}.default -.if !exists(${TARGETDIR}/etc/${f}) - ${INSTALL_DATA} ${WRKSRC}/etc/${f} ${TARGETDIR}/etc/${f} + ${INSTALL_DATA} ${WRKSRC}/etc/${f} ${PREFIX}/etc/${f}.default +.if !exists(${PREFIX}/etc/${f}) + ${INSTALL_DATA} ${WRKSRC}/etc/${f} ${PREFIX}/etc/${f} .endif .endfor diff --git a/astro/weatherspect/Makefile b/astro/weatherspect/Makefile index 5d895ea132b6..4fdf5927696f 100644 --- a/astro/weatherspect/Makefile +++ b/astro/weatherspect/Makefile @@ -23,6 +23,6 @@ NO_BUILD= yes PLIST_FILES= bin/weatherspect do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${TARGETDIR}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin .include <bsd.port.mk> diff --git a/audio/cmus/Makefile b/audio/cmus/Makefile index 303b7fda3433..ac3dc1eded26 100644 --- a/audio/cmus/Makefile +++ b/audio/cmus/Makefile @@ -19,7 +19,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_ICONV= yes HAS_CONFIGURE= yes -CONFIGURE_ARGS+=prefix=${TARGETDIR} mandir=${MANPREFIX}/man \ +CONFIGURE_ARGS+=prefix=${PREFIX} mandir=${MANPREFIX}/man \ exampledir=${EXAMPLESDIR} CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/audio/fapg/Makefile b/audio/fapg/Makefile index 61a46b3c2364..fc29092ca690 100644 --- a/audio/fapg/Makefile +++ b/audio/fapg/Makefile @@ -22,7 +22,7 @@ do-build: @cd ${WRKSRC} && ${MAKE} ${PORTNAME} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${TARGETDIR}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/fapg.1 ${MAN1PREFIX}/man/man1 post-install: diff --git a/audio/libgpod/Makefile b/audio/libgpod/Makefile index ccc879924d67..1c12c592883f 100644 --- a/audio/libgpod/Makefile +++ b/audio/libgpod/Makefile @@ -25,7 +25,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ CONFIGURE_ARGS= --without-python .if !defined(NOPORTDOCS) -CONFIGURE_ARGS+= --with-html-dir="${TARGETDIR}/share/doc" +CONFIGURE_ARGS+= --with-html-dir="${PREFIX}/share/doc" .endif post-extract: .SILENT diff --git a/audio/muine/Makefile b/audio/muine/Makefile index 6451302004a9..c61b556ef7a3 100644 --- a/audio/muine/Makefile +++ b/audio/muine/Makefile @@ -29,7 +29,7 @@ INSTALLS_ICONS= yes CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ - GACUTIL_FLAGS="/package muine /gacdir $(DESTDIR)$(libdir) /root $(DESTDIR)$(libdir)" + GACUTIL_FLAGS="/package muine /gacdir $(libdir) /root $(libdir)" GCONF_SCHEMAS= muine.schemas diff --git a/audio/snack/Makefile b/audio/snack/Makefile index 696dad65907a..8739e202022c 100644 --- a/audio/snack/Makefile +++ b/audio/snack/Makefile @@ -26,7 +26,7 @@ GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-tcl=${LOCALBASE}/lib/tcl8.4 \ --with-tk=${LOCALBASE}/lib/tk8.4 -MAKE_ENV= prefix=${TARGETDIR} exec_prefix=${TARGETDIR} +MAKE_ENV= prefix=${PREFIX} exec_prefix=${PREFIX} CFLAGS+= -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4 \ -I${LOCALBASE}/include diff --git a/audio/yell/Makefile b/audio/yell/Makefile index 50325b295e8e..9185779bf719 100644 --- a/audio/yell/Makefile +++ b/audio/yell/Makefile @@ -33,9 +33,9 @@ do-build: do-install: .if defined(WITH_SUID) - ${INSTALL_PROGRAM} -m 4110 ${WRKSRC}/${PORTNAME} ${TARGETDIR}/bin + ${INSTALL_PROGRAM} -m 4110 ${WRKSRC}/${PORTNAME} ${PREFIX}/bin .else - ${INSTALL_PROGRAM} -m 0100 ${WRKSRC}/${PORTNAME} ${TARGETDIR}/bin + ${INSTALL_PROGRAM} -m 0100 ${WRKSRC}/${PORTNAME} ${PREFIX}/bin .endif .include <bsd.port.post.mk> diff --git a/benchmarks/bonnie/Makefile b/benchmarks/bonnie/Makefile index 8af2fd137ae4..fc48af66cd7e 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 ${TARGETDIR}/bin/bonnie - ${INSTALL_MAN} ${FILESDIR}/bonnie.1 ${TARGETDIR}/man/man1 + ${INSTALL_PROGRAM} ${WRKSRC}/Bonnie ${PREFIX}/bin/bonnie + ${INSTALL_MAN} ${FILESDIR}/bonnie.1 ${PREFIX}/man/man1 .include <bsd.port.mk> diff --git a/benchmarks/unixbench/Makefile b/benchmarks/unixbench/Makefile index ba72c0eb8d62..0e17f24fd242 100644 --- a/benchmarks/unixbench/Makefile +++ b/benchmarks/unixbench/Makefile @@ -21,34 +21,34 @@ post-extract: ${RM} -f ${WRKSRC}/pgms/select do-install: - ${INSTALL_SCRIPT} ${WRKDIR}/unixbench ${TARGETDIR}/bin/ - -${MKDIR} ${TARGETDIR}/lib/unixbench + ${INSTALL_SCRIPT} ${WRKDIR}/unixbench ${PREFIX}/bin/ + -${MKDIR} ${PREFIX}/lib/unixbench for f in Run ; do \ - ${INSTALL_SCRIPT} ${WRKSRC}/$${f} ${TARGETDIR}/lib/unixbench/ ; \ + ${INSTALL_SCRIPT} ${WRKSRC}/$${f} ${PREFIX}/lib/unixbench/ ; \ done for f in Makefile README ; do \ - ${INSTALL_DATA} ${WRKSRC}/$${f} ${TARGETDIR}/lib/unixbench/ ; \ + ${INSTALL_DATA} ${WRKSRC}/$${f} ${PREFIX}/lib/unixbench/ ; \ done - -${MKDIR} ${TARGETDIR}/lib/unixbench/pgms + -${MKDIR} ${PREFIX}/lib/unixbench/pgms for f in ${WRKSRC}/pgms/* ; do \ case $$f in \ *.awk|*.sh|*perlbench) \ - ${INSTALL_SCRIPT} $${f} ${TARGETDIR}/lib/unixbench/pgms/ ;; \ + ${INSTALL_SCRIPT} $${f} ${PREFIX}/lib/unixbench/pgms/ ;; \ *.logo|*.base) \ - ${INSTALL_SCRIPT} $${f} ${TARGETDIR}/lib/unixbench/pgms/ ;; \ + ${INSTALL_SCRIPT} $${f} ${PREFIX}/lib/unixbench/pgms/ ;; \ *.orig|*.rej|*~) \ ;;\ *) \ - ${INSTALL_PROGRAM} $${f} ${TARGETDIR}/lib/unixbench/pgms/ ;; \ + ${INSTALL_PROGRAM} $${f} ${PREFIX}/lib/unixbench/pgms/ ;; \ esac ; \ done - -${MKDIR} ${TARGETDIR}/lib/unixbench/results + -${MKDIR} ${PREFIX}/lib/unixbench/results # for f in ${WRKSRC}/results/* ; do \ -# ${INSTALL_DATA} $${f} ${TARGETDIR}/lib/unixbench/results/ ; \ +# ${INSTALL_DATA} $${f} ${PREFIX}/lib/unixbench/results/ ; \ # done - -${MKDIR} ${TARGETDIR}/lib/unixbench/testdir + -${MKDIR} ${PREFIX}/lib/unixbench/testdir for f in ${WRKSRC}/testdir/* ; do \ - ${INSTALL_DATA} $${f} ${TARGETDIR}/lib/unixbench/testdir/ ; \ + ${INSTALL_DATA} $${f} ${PREFIX}/lib/unixbench/testdir/ ; \ done .include <bsd.port.mk> diff --git a/chinese/BBMan/Makefile b/chinese/BBMan/Makefile index cdbbe03bd80f..e57e6389f409 100644 --- a/chinese/BBMan/Makefile +++ b/chinese/BBMan/Makefile @@ -37,6 +37,6 @@ do-build: cd ${WRKSRC} && ${CXX} main.cpp `${WX_CONFIG} --libs --cxxflags` -I${LOCALBASE}/include ${CFLAGS} -o BBMan do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/BBMan ${TARGETDIR}/bin/BBMan + ${INSTALL_PROGRAM} ${WRKSRC}/BBMan ${PREFIX}/bin/BBMan .include <bsd.port.post.mk> diff --git a/chinese/auto-tw-l10n/Makefile b/chinese/auto-tw-l10n/Makefile index e3bb7841df9d..157a0721609d 100644 --- a/chinese/auto-tw-l10n/Makefile +++ b/chinese/auto-tw-l10n/Makefile @@ -31,8 +31,8 @@ pre-install: @${FIND} ${WRKSRC} -name "*.in" -delete do-install: - ${MKDIR} ${TARGETDIR}/share/skel/zh_TW.Big5 - ${CP} ${WRKSRC}/* ${TARGETDIR}/share/skel/zh_TW.Big5 + ${MKDIR} ${PREFIX}/share/skel/zh_TW.Big5 + ${CP} ${WRKSRC}/* ${PREFIX}/share/skel/zh_TW.Big5 post-install: @${CAT} ${PKGMESSAGE} diff --git a/chinese/bg5pdf/Makefile b/chinese/bg5pdf/Makefile index b284e96d005b..9bac5b5480cf 100644 --- a/chinese/bg5pdf/Makefile +++ b/chinese/bg5pdf/Makefile @@ -30,8 +30,8 @@ do-build: do-install: @${MKDIR} ${EXAMPLESDIR} - ${INSTALL_SCRIPT} ${WRKSRC}/bg5pdf ${TARGETDIR}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/gbpdf ${TARGETDIR}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/bg5pdf ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/gbpdf ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/bg5pdflib.so ${PYTHON_SITELIBDIR} ${INSTALL_DATA} ${WRKSRC}/test.big5 ${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/test.big5.pdf ${EXAMPLESDIR} diff --git a/chinese/bg5ps/Makefile b/chinese/bg5ps/Makefile index 05527121dca2..36826771f77f 100644 --- a/chinese/bg5ps/Makefile +++ b/chinese/bg5ps/Makefile @@ -21,10 +21,10 @@ PKGMESSAGE= ${WRKDIR}/pkg-message SUB_FILES= pkg-message do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/bg5ps ${TARGETDIR}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/ttf2psm ${TARGETDIR}/bin - ${INSTALL_DATA} ${WRKSRC}/bg5ps.conf ${TARGETDIR}/etc/bg5ps.conf.sample - ${INSTALL_DATA} ${WRKSRC}/gb2312-bg5ps.conf ${TARGETDIR}/etc/gb2312-bg5ps.conf.sample + ${INSTALL_SCRIPT} ${WRKSRC}/bg5ps ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/ttf2psm ${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/bg5ps.conf ${PREFIX}/etc/bg5ps.conf.sample + ${INSTALL_DATA} ${WRKSRC}/gb2312-bg5ps.conf ${PREFIX}/etc/gb2312-bg5ps.conf.sample .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} ${CP} -R ${WRKSRC}/doc/* ${DOCSDIR} diff --git a/chinese/big5width/Makefile b/chinese/big5width/Makefile index 1a38b536a7e4..7de793bc2c24 100644 --- a/chinese/big5width/Makefile +++ b/chinese/big5width/Makefile @@ -14,7 +14,7 @@ DISTFILES= # none MAINTAINER= rafan@FreeBSD.org COMMENT= Unicode width dirty fix for Big5 font (${LANG} locale) -BASELOCALEDIR= ${DESTDIR}/usr/share/locale +BASELOCALEDIR= /usr/share/locale LOCALEDIR= ${PREFIX}/share/locale LANG= zh_TW.UTF-8 diff --git a/chinese/dictd-database/Makefile b/chinese/dictd-database/Makefile index 34ca0398b149..11859b9d6932 100644 --- a/chinese/dictd-database/Makefile +++ b/chinese/dictd-database/Makefile @@ -26,11 +26,11 @@ PKGMESSAGE= ${WRKSRC}/pkg-message DICTFILES= cedict pydict moecomp netterm do-install: - ${SED} 's|%%PREFIX%%|${TARGETDIR}|g' ${MSG_FILE} > ${PKGMESSAGE} - @${MKDIR} ${TARGETDIR}/lib/dict + ${SED} 's|%%PREFIX%%|${PREFIX}|g' ${MSG_FILE} > ${PKGMESSAGE} + @${MKDIR} ${PREFIX}/lib/dict for f in ${DICTFILES}; do \ - ${INSTALL_DATA} ${WRKSRC}/$${f}.dict.dz ${TARGETDIR}/lib/dict; \ - ${INSTALL_DATA} ${WRKSRC}/$${f}.index ${TARGETDIR}/lib/dict; \ + ${INSTALL_DATA} ${WRKSRC}/$${f}.dict.dz ${PREFIX}/lib/dict; \ + ${INSTALL_DATA} ${WRKSRC}/$${f}.index ${PREFIX}/lib/dict; \ done post-install: diff --git a/chinese/fortunetw/Makefile b/chinese/fortunetw/Makefile index 448e30835f35..a1ae595272d2 100644 --- a/chinese/fortunetw/Makefile +++ b/chinese/fortunetw/Makefile @@ -20,14 +20,14 @@ NO_BUILD= yes STRCMD= /usr/games/strfile do-install: - @${MKDIR} ${TARGETDIR}/share/games/fortune - @${INSTALL_DATA} ${WRKSRC}/bsdchat ${TARGETDIR}/share/games/fortune - @${INSTALL_DATA} ${WRKSRC}/folksong ${TARGETDIR}/share/games/fortune - @${INSTALL_DATA} ${WRKSRC}/liuyong ${TARGETDIR}/share/games/fortune - @${INSTALL_DATA} ${WRKSRC}/stephehchow ${TARGETDIR}/share/games/fortune - @${INSTALL_DATA} ${WRKSRC}/tangshi ${TARGETDIR}/share/games/fortune - @${INSTALL_DATA} ${WRKSRC}/xiaoxing ${TARGETDIR}/share/games/fortune - @${INSTALL_DATA} ${WRKSRC}/yijing ${TARGETDIR}/share/games/fortune + @${MKDIR} ${PREFIX}/share/games/fortune + @${INSTALL_DATA} ${WRKSRC}/bsdchat ${PREFIX}/share/games/fortune + @${INSTALL_DATA} ${WRKSRC}/folksong ${PREFIX}/share/games/fortune + @${INSTALL_DATA} ${WRKSRC}/liuyong ${PREFIX}/share/games/fortune + @${INSTALL_DATA} ${WRKSRC}/stephehchow ${PREFIX}/share/games/fortune + @${INSTALL_DATA} ${WRKSRC}/tangshi ${PREFIX}/share/games/fortune + @${INSTALL_DATA} ${WRKSRC}/xiaoxing ${PREFIX}/share/games/fortune + @${INSTALL_DATA} ${WRKSRC}/yijing ${PREFIX}/share/games/fortune pre-install: .if !exists(${STRCMD}) @@ -36,22 +36,22 @@ pre-install: .endif post-install: - @${STRCMD} ${TARGETDIR}/share/games/fortune/bsdchat - @${STRCMD} ${TARGETDIR}/share/games/fortune/folksong - @${STRCMD} ${TARGETDIR}/share/games/fortune/liuyong - @${STRCMD} ${TARGETDIR}/share/games/fortune/stephehchow - @${STRCMD} ${TARGETDIR}/share/games/fortune/tangshi - @${STRCMD} ${TARGETDIR}/share/games/fortune/xiaoxing - @${STRCMD} ${TARGETDIR}/share/games/fortune/yijing + @${STRCMD} ${PREFIX}/share/games/fortune/bsdchat + @${STRCMD} ${PREFIX}/share/games/fortune/folksong + @${STRCMD} ${PREFIX}/share/games/fortune/liuyong + @${STRCMD} ${PREFIX}/share/games/fortune/stephehchow + @${STRCMD} ${PREFIX}/share/games/fortune/tangshi + @${STRCMD} ${PREFIX}/share/games/fortune/xiaoxing + @${STRCMD} ${PREFIX}/share/games/fortune/yijing @${ECHO_MSG} "" @${ECHO_MSG} "Usage:" - @${ECHO_MSG} "${STRCMD} ${TARGETDIR}/share/games/fortune/bsdchat" - @${ECHO_MSG} "${STRCMD} ${TARGETDIR}/share/games/fortune/folksong" - @${ECHO_MSG} "${STRCMD} ${TARGETDIR}/share/games/fortune/liuyong" - @${ECHO_MSG} "${STRCMD} ${TARGETDIR}/share/games/fortune/stephehchow" - @${ECHO_MSG} "${STRCMD} ${TARGETDIR}/share/games/fortune/tangshi" - @${ECHO_MSG} "${STRCMD} ${TARGETDIR}/share/games/fortune/xiaoxing" - @${ECHO_MSG} "${STRCMD} ${TARGETDIR}/share/games/fortune/yijing" + @${ECHO_MSG} "${STRCMD} ${PREFIX}/share/games/fortune/bsdchat" + @${ECHO_MSG} "${STRCMD} ${PREFIX}/share/games/fortune/folksong" + @${ECHO_MSG} "${STRCMD} ${PREFIX}/share/games/fortune/liuyong" + @${ECHO_MSG} "${STRCMD} ${PREFIX}/share/games/fortune/stephehchow" + @${ECHO_MSG} "${STRCMD} ${PREFIX}/share/games/fortune/tangshi" + @${ECHO_MSG} "${STRCMD} ${PREFIX}/share/games/fortune/xiaoxing" + @${ECHO_MSG} "${STRCMD} ${PREFIX}/share/games/fortune/yijing" @${ECHO_MSG} "" .include <bsd.port.mk> diff --git a/chinese/libchewing/Makefile b/chinese/libchewing/Makefile index 4383213c5b91..64684ad5f808 100644 --- a/chinese/libchewing/Makefile +++ b/chinese/libchewing/Makefile @@ -19,6 +19,6 @@ USE_GCC= 3.2+ GNU_CONFIGURE= yes USE_LDCONFIG= yes -DATADIR= ${TARGETDIR}/share/chewing +DATADIR= ${PREFIX}/share/chewing .include <bsd.port.mk> diff --git a/chinese/oxim/Makefile b/chinese/oxim/Makefile index 33ce2f6f9f3f..5f23d26d3031 100644 --- a/chinese/oxim/Makefile +++ b/chinese/oxim/Makefile @@ -38,7 +38,7 @@ CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" \ LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS+=--disable-bimsphone-module \ --disable-static \ - --with-conf-dir=${TARGETDIR}/etc/${PORTNAME} + --with-conf-dir=${PREFIX}/etc/${PORTNAME} # oxim requires qinputcontextplugin.h which only exists in Debian package CONFIGURE_ARGS+=--disable-qt-immodule @@ -102,12 +102,12 @@ PLIST_SUB+= NLS="" #.endif post-patch: - ${REINPLACE_CMD} 's|%%PREFIX%%|${TARGETDIR}|' \ + ${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|' \ ${WRKSRC}/src/gtk-immodule/gtkintl.h post-install: .if !defined(WITHOUT_GTK2) - @gtk-query-immodules-2.0 > ${TARGETDIR}/etc/gtk-2.0/gtk.immodules + @gtk-query-immodules-2.0 > ${PREFIX}/etc/gtk-2.0/gtk.immodules .endif @${CAT} ${PKGMESSAGE} @${ECHO} To display this message again, type ${PKG_INFO} -D ${PKGNAME} diff --git a/chinese/telnet/Makefile b/chinese/telnet/Makefile index 21b9cf113a4f..c725d7a9704f 100644 --- a/chinese/telnet/Makefile +++ b/chinese/telnet/Makefile @@ -52,7 +52,7 @@ pre-build: @cd ${WRKSRC}/libtelnet && ${MAKE} do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/telnet ${TARGETDIR}/bin/zh-telnet + @${INSTALL_PROGRAM} ${WRKSRC}/telnet ${PREFIX}/bin/zh-telnet @${INSTALL_MAN} ${WRKSRC}/telnet.1 ${MAN1PREFIX}/man/man1/${MAN1} .include <bsd.port.post.mk> diff --git a/chinese/vflib/Makefile b/chinese/vflib/Makefile index b9a7f062da1a..8ca3658befda 100644 --- a/chinese/vflib/Makefile +++ b/chinese/vflib/Makefile @@ -27,7 +27,7 @@ BUILD_DEPENDS= xmkmf:${X_IMAKE_PORT} VFLIB_VERSION= 2.25.6 PLIST_SUB= VFLIB_VERSION=${VFLIB_VERSION} -DATADIR= ${TARGETDIR}/share/VFlib +DATADIR= ${PREFIX}/share/VFlib GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-freetype \ --with-freetype-includedir=${LOCALBASE}/include/freetype1/freetype \ @@ -49,11 +49,11 @@ post-patch: post-install: @(cd ${WRKSRC}/tools; \ - ${INSTALL_SCRIPT} fmtest disol kban vfperf vftest ${TARGETDIR}/bin) + ${INSTALL_SCRIPT} fmtest disol kban vfperf vftest ${PREFIX}/bin) @(cd ${WRKSRC}; \ ${MKDIR} ${DATADIR}/${VFLIB_VERSION} ;\ ${CP} COPYING COPYING.LIB README.txt.JP_EUC \ ${DATADIR}/${VFLIB_VERSION}) - ${MV} ${DATADIR}/${VFLIB_VERSION}/VF.h ${TARGETDIR}/include + ${MV} ${DATADIR}/${VFLIB_VERSION}/VF.h ${PREFIX}/include .include <bsd.port.post.mk> diff --git a/chinese/wenju/Makefile b/chinese/wenju/Makefile index e463d9647207..ddd49fb8710a 100644 --- a/chinese/wenju/Makefile +++ b/chinese/wenju/Makefile @@ -33,7 +33,7 @@ PLIST_SUB+= NLS="@comment " .endif post-install: - gtk-query-immodules-2.0 > ${TARGETDIR}/etc/gtk-2.0/gtk.immodules + gtk-query-immodules-2.0 > ${PREFIX}/etc/gtk-2.0/gtk.immodules .include <bsd.port.pre.mk> diff --git a/chinese/xemacs/Makefile b/chinese/xemacs/Makefile index 470c7a90876a..6d768ea0bb28 100644 --- a/chinese/xemacs/Makefile +++ b/chinese/xemacs/Makefile @@ -27,7 +27,7 @@ USE_XPM= yes STRIP= HAS_CONFIGURE= yes XEMACS_ARCH= ${MACHINE_ARCH}--freebsd -CONFIGURE_ARGS= ${XEMACS_ARCH} --prefix=${TARGETDIR} \ +CONFIGURE_ARGS= ${XEMACS_ARCH} --prefix=${PREFIX} \ --with-mule \ --with-xfs \ --with-clash-detection \ @@ -81,21 +81,21 @@ CONFIGURE_ARGS+= --with-xface=no --with-offix=no post-install: .for file in b2m ctags etags gnuclient ${DISTNAME} - strip ${TARGETDIR}/bin/${file} + strip ${PREFIX}/bin/${file} .endfor # ``make install'' does not set the permissions like pkg_add does. ${CHMOD} 1777 /var/run/emacs/lock - ${CHMOD} 755 ${TARGETDIR}/lib/xemacs/site-lisp - ${CHMOD} 755 ${TARGETDIR}/share/emacs/site-lisp - ${RM} -f ${TARGETDIR}/bin/send-pr - ${RM} -f ${TARGETDIR}/lib/xemacs-20.4/lisp/mule/mule-init.el.orig -# Install xemacs20.sh into ${TARGETDIR}/etc/rc.d - @if [ ! -d ${TARGETDIR}/etc/rc.d ]; then ${MKDIR} ${TARGETDIR}/etc/rc.d; fi - ${INSTALL_SCRIPT} ${FILESDIR}/xemacs20.sh ${TARGETDIR}/etc/rc.d + ${CHMOD} 755 ${PREFIX}/lib/xemacs/site-lisp + ${CHMOD} 755 ${PREFIX}/share/emacs/site-lisp + ${RM} -f ${PREFIX}/bin/send-pr + ${RM} -f ${PREFIX}/lib/xemacs-20.4/lisp/mule/mule-init.el.orig +# Install xemacs20.sh into ${PREFIX}/etc/rc.d + @if [ ! -d ${PREFIX}/etc/rc.d ]; then ${MKDIR} ${PREFIX}/etc/rc.d; fi + ${INSTALL_SCRIPT} ${FILESDIR}/xemacs20.sh ${PREFIX}/etc/rc.d # Install Chinese Big5 related files. - @${MKDIR} ${TARGETDIR}/lib/xemacs-20.4/etc/app-defaults/zh_TW.Big5 - @${INSTALL_DATA} ${FILESDIR}/Emacs ${TARGETDIR}/lib/xemacs-20.4/etc/app-defaults/zh_TW.Big5 - @${INSTALL_DATA} ${FILESDIR}/sample.emacs ${TARGETDIR}/lib/xemacs-20.4/etc/app-defaults/zh_TW.Big5 + @${MKDIR} ${PREFIX}/lib/xemacs-20.4/etc/app-defaults/zh_TW.Big5 + @${INSTALL_DATA} ${FILESDIR}/Emacs ${PREFIX}/lib/xemacs-20.4/etc/app-defaults/zh_TW.Big5 + @${INSTALL_DATA} ${FILESDIR}/sample.emacs ${PREFIX}/lib/xemacs-20.4/etc/app-defaults/zh_TW.Big5 # Display XIM usages. @${CAT} ${PKGMESSAGE} diff --git a/chinese/xpdf/Makefile b/chinese/xpdf/Makefile index d2e910636054..b3ad27d27ab0 100644 --- a/chinese/xpdf/Makefile +++ b/chinese/xpdf/Makefile @@ -45,6 +45,6 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/xpdf-chinese-traditional/${i} ${DATADIR}/chinese-traditional .endfor ${INSTALL_DATA} ${WRKSRC}/dot.xpdfrc ${DATADIR}/chinese-traditional - @${SETENV} PKG_PREFIX=${TARGETDIR} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> diff --git a/chinese/xsim/Makefile b/chinese/xsim/Makefile index da34e58bf618..ad3c5659b7db 100644 --- a/chinese/xsim/Makefile +++ b/chinese/xsim/Makefile @@ -40,7 +40,7 @@ post-patch: @${REINPLACE_CMD} "s/-O2/${CFLAGS}/g" ${WRKSRC}/configure post-install: - ${INSTALL_DATA} ${WRKDIR}/xsim.sh ${TARGETDIR}/bin/xsim + ${INSTALL_DATA} ${WRKDIR}/xsim.sh ${PREFIX}/bin/xsim @${MKDIR} ${DATADIR}/dat @${CP} -R ${WRKDIR}/usr/local/xsim/dat/* ${DATADIR}/dat @${CAT} ${PKGMESSAGE} diff --git a/chinese/zhcon/Makefile b/chinese/zhcon/Makefile index 1d79a1dd08a3..2a1139c9db14 100644 --- a/chinese/zhcon/Makefile +++ b/chinese/zhcon/Makefile @@ -30,14 +30,14 @@ SUB_FILES= pkg-message MAN1= zhcon.1 post-patch: - @${REINPLACE_CMD} -e 's,/etc,${TARGETDIR}/etc,' ${WRKSRC}/doc/zhcon.1.in + @${REINPLACE_CMD} -e 's,/etc,${PREFIX}/etc,' ${WRKSRC}/doc/zhcon.1.in @${REINPLACE_CMD} -Ee 's,/dev/vga,/dev/ttyv0,g' ${WRKSRC}/src/display/fbdev.cpp @${REINPLACE_CMD} -Ee 's,endian,sys/endian,g' ${WRKSRC}/src/display/fblinear4.cpp \ ${WRKSRC}/src/display/fblinear8.cpp ${WRKSRC}/src/display/fblinear16.cpp \ ${WRKSRC}/src/display/fblinear24.cpp - @${REINPLACE_CMD} -e '5 s,#,,; s,/usr/lib,${TARGETDIR}/lib,' ${WRKSRC}/src/zhcon.conf - @${REINPLACE_CMD} -e 's,"/etc,"${TARGETDIR}/etc,' ${WRKSRC}/src/zhcon.cpp - @${REINPLACE_CMD} -Ee 's,(\s*=\s*)("?)/usr/local([^"]*)("?),\1\2${TARGETDIR}\3\4,g' \ + @${REINPLACE_CMD} -e '5 s,#,,; s,/usr/lib,${PREFIX}/lib,' ${WRKSRC}/src/zhcon.conf + @${REINPLACE_CMD} -e 's,"/etc,"${PREFIX}/etc,' ${WRKSRC}/src/zhcon.cpp + @${REINPLACE_CMD} -Ee 's,(\s*=\s*)("?)/usr/local([^"]*)("?),\1\2${PREFIX}\3\4,g' \ -e '/_nl_expand_alias/s,\(0\),\(\),g' ${WRKSRC}/${CONFIGURE_SCRIPT} .if defined(WITH_BIG5) @${REINPLACE_CMD} -e '11 s,gb2312,big5,' ${WRKSRC}/src/zhcon.conf diff --git a/comms/ltmdm/Makefile b/comms/ltmdm/Makefile index 75002320b527..c1e87b3d874f 100644 --- a/comms/ltmdm/Makefile +++ b/comms/ltmdm/Makefile @@ -15,7 +15,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= osa@FreeBSD.org COMMENT= Driver for the Lucent LT Winmodem chipset -DEVDIR= ${DESTDIR}/dev +DEVDIR= /dev MODULES_WITH_WORLD?= yes ONLY_FOR_ARCHS= i386 BUILD_WRKSRC= ${WRKSRC}/sys/modules/ltmdm diff --git a/comms/yaps/Makefile b/comms/yaps/Makefile index 9a3fe932b08f..d99b984858ac 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 ${TARGETDIR}/etc/yaps.rc.sample - ${INSTALL_MAN} ${WRKSRC}/yaps.1 ${TARGETDIR}/man/man1 + ${INSTALL_DATA} ${WRKSRC}/yaps.rc ${PREFIX}/etc/yaps.rc.sample + ${INSTALL_MAN} ${WRKSRC}/yaps.1 ${PREFIX}/man/man1 .if !defined(NOPORTDOCS) - @${MKDIR} ${TARGETDIR}/share/doc/yaps - ${INSTALL_DATA} ${WRKSRC}/yaps.doc ${TARGETDIR}/share/doc/yaps - ${INSTALL_DATA} ${WRKSRC}/yaps.html ${TARGETDIR}/share/doc/yaps + @${MKDIR} ${PREFIX}/share/doc/yaps + ${INSTALL_DATA} ${WRKSRC}/yaps.doc ${PREFIX}/share/doc/yaps + ${INSTALL_DATA} ${WRKSRC}/yaps.html ${PREFIX}/share/doc/yaps .endif .include <bsd.port.mk> diff --git a/databases/p5-postgresql-plperl/Makefile b/databases/p5-postgresql-plperl/Makefile index f523742d0c2a..443e884d442c 100644 --- a/databases/p5-postgresql-plperl/Makefile +++ b/databases/p5-postgresql-plperl/Makefile @@ -21,7 +21,7 @@ DEFAULT_PGSQL_VER?=74 # can't include <bsd.port.pre.mk> in a slave port # so set these instead: -LOCALBASE?= ${DESTDIR}/usr/local +LOCALBASE?= /usr/local SED?= /usr/bin/sed # Setting/finding PostgreSQL version we want. diff --git a/databases/p5-sqlrelay/Makefile b/databases/p5-sqlrelay/Makefile index 23e9cbbd119d..787b37c0b0af 100644 --- a/databases/p5-sqlrelay/Makefile +++ b/databases/p5-sqlrelay/Makefile @@ -32,7 +32,7 @@ CONFIGURE_ARGS= ${SQLRELAY_CONFIGURE_ARGS} \ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ ${SQLRELAY_CONFIGURE_ENV} -MAN3PREFIX= ${TARGETDIR}/lib/perl5/${PERL_VERSION} +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} MAN3= DBD::SQLRelay.3 SQLRelay::Connection.3 SQLRelay::Cursor.3 .include "${.CURDIR}/../sqlrelay/Makefile.common" diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile index a326c57cd0a6..06625a470573 100644 --- a/databases/phpmyadmin/Makefile +++ b/databases/phpmyadmin/Makefile @@ -58,7 +58,7 @@ OPTIONS= BZ2 "bzip2 library support" on \ MCRYPT "MCrypt library support" on \ MBSTRING "Multi-byte character-set string support" on -PORT_DBDIR?= ${DESTDIR}/var/db/ports +PORT_DBDIR?= /var/db/ports LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX} OPTIONSFILE?= ${PORT_DBDIR}/${LATEST_LINK}/options @@ -137,7 +137,7 @@ do-install: install-app install-conf install-app: cd ${WRKSRC} ; \ for src in $$( ${FIND} . ! -name .cvsignore ) ; do \ - dst=${TARGETDIR}/${MYADMDIR}$${src#.} ; \ + dst=${PREFIX}/${MYADMDIR}$${src#.} ; \ if ${TEST} -d $$src ; then \ ${MKDIR} $$dst ; \ else \ @@ -146,7 +146,7 @@ install-app: done install-conf: install-app - cd ${TARGETDIR}/${MYADMDIR} ; \ + cd ${PREFIX}/${MYADMDIR} ; \ ${CHMOD} 0640 ${CFGFILE}.sample ; \ ${CHGRP} ${MYADMGRP} ${CFGFILE}.sample ; \ if ${TEST} ! -f ${CFGFILE} ; then \ diff --git a/databases/phpmyadmin211/Makefile b/databases/phpmyadmin211/Makefile index a326c57cd0a6..06625a470573 100644 --- a/databases/phpmyadmin211/Makefile +++ b/databases/phpmyadmin211/Makefile @@ -58,7 +58,7 @@ OPTIONS= BZ2 "bzip2 library support" on \ MCRYPT "MCrypt library support" on \ MBSTRING "Multi-byte character-set string support" on -PORT_DBDIR?= ${DESTDIR}/var/db/ports +PORT_DBDIR?= /var/db/ports LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX} OPTIONSFILE?= ${PORT_DBDIR}/${LATEST_LINK}/options @@ -137,7 +137,7 @@ do-install: install-app install-conf install-app: cd ${WRKSRC} ; \ for src in $$( ${FIND} . ! -name .cvsignore ) ; do \ - dst=${TARGETDIR}/${MYADMDIR}$${src#.} ; \ + dst=${PREFIX}/${MYADMDIR}$${src#.} ; \ if ${TEST} -d $$src ; then \ ${MKDIR} $$dst ; \ else \ @@ -146,7 +146,7 @@ install-app: done install-conf: install-app - cd ${TARGETDIR}/${MYADMDIR} ; \ + cd ${PREFIX}/${MYADMDIR} ; \ ${CHMOD} 0640 ${CFGFILE}.sample ; \ ${CHGRP} ${MYADMGRP} ${CFGFILE}.sample ; \ if ${TEST} ! -f ${CFGFILE} ; then \ diff --git a/databases/phppgadmin/Makefile b/databases/phppgadmin/Makefile index 97ee6c9b6e03..3baea33dbde3 100644 --- a/databases/phppgadmin/Makefile +++ b/databases/phppgadmin/Makefile @@ -41,8 +41,8 @@ do-install: ${MKDIR} ${PREFIX}/${PGADMDIR} ${RM} -f ${WRKSRC}/classes/database/Postgres81.php.orig ${CP} -Rp ${WRKSRC}/ ${PREFIX}/${PGADMDIR}/ -.if exists(${DESTDIR}${PREFIX}/${PGADMOLDDIR}/conf/config.inc.php) - ${CP} -np ${DESTDIR}${PREFIX}/${PGADMOLDDIR}/conf/config.inc.php \ +.if exists(${PREFIX}/${PGADMOLDDIR}/conf/config.inc.php) + ${CP} -np ${PREFIX}/${PGADMOLDDIR}/conf/config.inc.php \ ${PREFIX}/${PGADMDIR}/conf/config.inc.php .endif ${CP} -np ${PREFIX}/${PGADMDIR}/conf/config.inc.php-dist \ diff --git a/databases/postgresql-contrib/Makefile b/databases/postgresql-contrib/Makefile index 5332c8ddaf14..dad2ae019835 100644 --- a/databases/postgresql-contrib/Makefile +++ b/databases/postgresql-contrib/Makefile @@ -20,7 +20,7 @@ DEFAULT_PGSQL_VER?=81 # can't include <bsd.port.pre.mk> in a slave port # so set these instead: -LOCALBASE?= ${DESTDIR}/usr/local +LOCALBASE?= /usr/local SED?= /usr/bin/sed # Setting/finding PostgreSQL version we want. diff --git a/databases/postgresql-docs/Makefile b/databases/postgresql-docs/Makefile index a2ee5df8f225..3d62ba69f449 100644 --- a/databases/postgresql-docs/Makefile +++ b/databases/postgresql-docs/Makefile @@ -18,7 +18,7 @@ DEFAULT_PGSQL_VER?=74 # can't include <bsd.port.pre.mk> in a slave port # so set these instead: -LOCALBASE?= ${DESTDIR}/usr/local +LOCALBASE?= /usr/local SED?= /usr/bin/sed # Setting/finding PostgreSQL version we want. diff --git a/databases/postgresql-plpython/Makefile b/databases/postgresql-plpython/Makefile index 2521a1a804f4..073f5e56520a 100644 --- a/databases/postgresql-plpython/Makefile +++ b/databases/postgresql-plpython/Makefile @@ -21,7 +21,7 @@ DEFAULT_PGSQL_VER?=74 # can't include <bsd.port.pre.mk> in a slave port # so set these instead: -LOCALBASE?= ${DESTDIR}/usr/local +LOCALBASE?= /usr/local SED?= /usr/bin/sed # Setting/finding PostgreSQL version we want. diff --git a/databases/postgresql-pltcl/Makefile b/databases/postgresql-pltcl/Makefile index e2441f92e965..1584907a1b6d 100644 --- a/databases/postgresql-pltcl/Makefile +++ b/databases/postgresql-pltcl/Makefile @@ -22,7 +22,7 @@ DEFAULT_PGSQL_VER?=74 # can't include <bsd.port.pre.mk> in a slave port # so set these instead: -LOCALBASE?= ${DESTDIR}/usr/local +LOCALBASE?= /usr/local SED?= /usr/bin/sed # Setting/finding PostgreSQL version we want. diff --git a/databases/py-bsddb3/Makefile b/databases/py-bsddb3/Makefile index f1581acd3326..25a60ca43120 100644 --- a/databases/py-bsddb3/Makefile +++ b/databases/py-bsddb3/Makefile @@ -23,7 +23,7 @@ PYDISTUTILS_BUILDARGS= --libs="-l${BDB_LIB_NAME}" --berkeley-db=${LOCALBASE} PYDISTUTILS_INSTALLARGS=-c -O1 --prefix=${PREFIX} --berkeley-db=${LOCALBASE} PORTDOCS= * -DOCSDIR= ${TARGETDIR}/share/doc/py-${PORTNAME} +DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} post-patch: ${REINPLACE_CMD} 's,%%DBVERSION%%,${BDB_LIB_NAME},g' ${WRKSRC}/setup.py diff --git a/databases/py-dbutils/Makefile b/databases/py-dbutils/Makefile index 0c57f22d5156..f1a398f5fb37 100644 --- a/databases/py-dbutils/Makefile +++ b/databases/py-dbutils/Makefile @@ -20,7 +20,7 @@ USE_PYTHON= yes USE_PYDISTUTILS=yes PYDISTUTILS_PKGNAME= DBUtils -DOCSDIR= ${TARGETDIR}/share/doc/py-${PORTNAME} +DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} post-install: .if !defined(NOPORTDOCS) diff --git a/databases/py-psycopg2/Makefile b/databases/py-psycopg2/Makefile index e17ca858f5b7..3673d6271df1 100644 --- a/databases/py-psycopg2/Makefile +++ b/databases/py-psycopg2/Makefile @@ -30,8 +30,8 @@ do-build: do-install: @(cd ${WRKSRC}; ${PYTHON_CMD} setup.py install) -DOCSDIR= ${TARGETDIR}/share/doc/py-psycopg2 -EXAMPLESDIR= ${TARGETDIR}/share/examples/py-psycopg2 +DOCSDIR= ${PREFIX}/share/doc/py-psycopg2 +EXAMPLESDIR= ${PREFIX}/share/examples/py-psycopg2 EXAMPLES= binary.py cursor.py dt.py lastrowid.py notify.py threads.py \ whereareyou.jpg copy_from.py dialtone.py encoding.py \ diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile index 34065ee050ba..36e83e7ae55d 100644 --- a/databases/rrdtool/Makefile +++ b/databases/rrdtool/Makefile @@ -73,7 +73,7 @@ MAN1= bin_dec_hex.1 cdeftutorial.1 rpntutorial.1 rrd-beginners.1 \ .if !defined(WITHOUT_PERL_MODULE) MAN3= RRDp.3 RRDs.3 -MAN3PREFIX= ${TARGETDIR}/lib/perl5/${PERL_VERSION} +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} .endif post-extract: diff --git a/databases/rrdtool10/Makefile b/databases/rrdtool10/Makefile index 9b659fce79de..da30bc4b63a3 100644 --- a/databases/rrdtool10/Makefile +++ b/databases/rrdtool10/Makefile @@ -36,7 +36,7 @@ MAN1= RRDp.1 RRDs.1 bin_dec_hex.1 rrdcgi.1 rrdcreate.1 rrddump.1 \ cdeftutorial.1 rpntutorial.1 rrdinfo.1 rrdxport.1 rrd-beginners.1 \ rrdfirst.1 MAN3= RRDp.3 RRDs.3 -MAN3PREFIX= ${TARGETDIR}/lib/perl5/${PERL_VERSION} +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} OPTIONS= "ISO-8859-2 fonts support" off diff --git a/deskutils/todo/Makefile b/deskutils/todo/Makefile index 10b52d23089b..f7df4c31ed68 100644 --- a/deskutils/todo/Makefile +++ b/deskutils/todo/Makefile @@ -27,7 +27,7 @@ post-patch: @${REINPLACE_CMD} -e "s,/bin/sh,${LOCALBASE}/bin/bash," ${WRKSRC}/todo.sh do-install: - @${INSTALL_SCRIPT} ${WRKSRC}/todo.sh ${TARGETDIR}/bin/todo - @${INSTALL_DATA} ${WRKSRC}/.todo ${TARGETDIR}/etc/dot.todo + @${INSTALL_SCRIPT} ${WRKSRC}/todo.sh ${PREFIX}/bin/todo + @${INSTALL_DATA} ${WRKSRC}/.todo ${PREFIX}/etc/dot.todo .include <bsd.port.mk> diff --git a/devel/afay/Makefile b/devel/afay/Makefile index 5790cadbe92f..b4e594425fa2 100644 --- a/devel/afay/Makefile +++ b/devel/afay/Makefile @@ -27,32 +27,32 @@ do-build: @cd ${WRKSRC}/afay/ayacc/src/gnat_unix && ${SH} ./README do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/afay/aflex/src/aflex ${DESTDIR}${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/afay/ayacc/src/ayacc ${DESTDIR}${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/afay/aflex/doc/aflex.man ${DESTDIR}${PREFIX}/man/man1/aflex.1 - ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/doc/old_docs/ayacc.manpage ${DESTDIR}${PREFIX}/man/man1/ayacc.1 + ${INSTALL_PROGRAM} ${WRKSRC}/afay/aflex/src/aflex ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/afay/ayacc/src/ayacc ${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/afay/aflex/doc/aflex.man ${PREFIX}/man/man1/aflex.1 + ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/doc/old_docs/ayacc.manpage ${PREFIX}/man/man1/ayacc.1 .if !defined(NOPORTDOCS) ${MKDIR} ${DESTDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/afay/aflex/doc/READ_ME ${DESTDIR}${DOCSDIR}/READ_ME.aflex - ${INSTALL_DATA} ${WRKSRC}/afay/aflex/doc/aflex.html ${DESTDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/afay/aflex/doc/aflex_user_man.* ${DESTDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/doc/READ_ME ${DESTDIR}${DOCSDIR}/READ_ME.ayacc - ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/doc/ayacc.html ${DESTDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/doc/ayacc_user_man.tex ${DESTDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/afay/aflex/doc/READ_ME ${DOCSDIR}/READ_ME.aflex + ${INSTALL_DATA} ${WRKSRC}/afay/aflex/doc/aflex.html ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/afay/aflex/doc/aflex_user_man.* ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/doc/READ_ME ${DOCSDIR}/READ_ME.ayacc + ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/doc/ayacc.html ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/doc/ayacc_user_man.tex ${DOCSDIR} .endif - ${MKDIR} ${DESTDIR}${EXAMPLESDIR} - ${MKDIR} ${DESTDIR}${EXAMPLESDIR}/ada_parser - ${MKDIR} ${DESTDIR}${EXAMPLESDIR}/calc - ${INSTALL_DATA} ${WRKSRC}/afay/aflex/doc/example.l ${DESTDIR}${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/afay/aflex/doc/test95.l ${DESTDIR}${EXAMPLESDIR} - ${INSTALL_SCRIPT} ${WRKSRC}/afay/ayacc/examples/ada_parser/COMPILE ${DESTDIR}${EXAMPLESDIR}/ada_parser - ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/examples/ada_parser/READ.ME ${DESTDIR}${EXAMPLESDIR}/ada_parser - ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/examples/ada_parser/ada.y ${DESTDIR}${EXAMPLESDIR}/ada_parser - ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/examples/ada_parser/ada_lex.l ${DESTDIR}${EXAMPLESDIR}/ada_parser - ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/examples/ada_parser/driver.a ${DESTDIR}${EXAMPLESDIR}/ada_parser - ${INSTALL_SCRIPT} ${WRKSRC}/afay/ayacc/examples/calc/COMPILE ${DESTDIR}${EXAMPLESDIR}/calc - ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/examples/calc/READ.ME ${DESTDIR}${EXAMPLESDIR}/calc - ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/examples/calc/calc* ${DESTDIR}${EXAMPLESDIR}/calc - ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/examples/calc/driver.a ${DESTDIR}${EXAMPLESDIR}/calc + ${MKDIR} ${EXAMPLESDIR} + ${MKDIR} ${EXAMPLESDIR}/ada_parser + ${MKDIR} ${EXAMPLESDIR}/calc + ${INSTALL_DATA} ${WRKSRC}/afay/aflex/doc/example.l ${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/afay/aflex/doc/test95.l ${EXAMPLESDIR} + ${INSTALL_SCRIPT} ${WRKSRC}/afay/ayacc/examples/ada_parser/COMPILE ${EXAMPLESDIR}/ada_parser + ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/examples/ada_parser/READ.ME ${EXAMPLESDIR}/ada_parser + ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/examples/ada_parser/ada.y ${EXAMPLESDIR}/ada_parser + ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/examples/ada_parser/ada_lex.l ${EXAMPLESDIR}/ada_parser + ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/examples/ada_parser/driver.a ${EXAMPLESDIR}/ada_parser + ${INSTALL_SCRIPT} ${WRKSRC}/afay/ayacc/examples/calc/COMPILE ${EXAMPLESDIR}/calc + ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/examples/calc/READ.ME ${EXAMPLESDIR}/calc + ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/examples/calc/calc* ${EXAMPLESDIR}/calc + ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/examples/calc/driver.a ${EXAMPLESDIR}/calc .include <bsd.port.mk> diff --git a/devel/cbind/Makefile b/devel/cbind/Makefile index 552ad8c9d76c..9a60bfa4d1be 100644 --- a/devel/cbind/Makefile +++ b/devel/cbind/Makefile @@ -27,9 +27,9 @@ do-install: @${INSTALL_PROGRAM} ${WRKSRC}/cbpp ${PREFIX}/bin @${INSTALL_DATA} ${WRKSRC}/cbind.1 ${PREFIX}/man/man1 .if !defined(NOPORTDOCS) - @${MKDIR} ${DESTDIR}${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/DOCS ${DESTDIR}${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${DOCSDIR} + @${MKDIR} ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/DOCS ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} .endif .include <bsd.port.mk> diff --git a/devel/git/Makefile b/devel/git/Makefile index a5958047c03f..5924480d710f 100644 --- a/devel/git/Makefile +++ b/devel/git/Makefile @@ -156,7 +156,7 @@ MAN1= git-add.1 \ git-whatchanged.1 \ git-write-tree.1 \ gitk.1 -MAN3PREFIX= ${TARGETDIR}/lib/perl5/${PERL_VERSION} +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} MAN3= Git.3 MAN5= gitattributes.5 gitignore.5 MAN7= git.7 diff --git a/devel/ncurses-devel/Makefile b/devel/ncurses-devel/Makefile index cd508ce05a45..d5dda703b885 100644 --- a/devel/ncurses-devel/Makefile +++ b/devel/ncurses-devel/Makefile @@ -38,10 +38,10 @@ PATCHDATE= ${i} GNU_CONFIGURE= yes CONFIGURE_SCRIPT=../configure -CONFIGURE_ARGS= --datadir=${TARGETDIR}/share/misc --disable-overwrite \ +CONFIGURE_ARGS= --datadir=${PREFIX}/share/misc --disable-overwrite \ --enable-termcap --enable-bsdpad --enable-getcap \ --enable-colorfgbg --disable-home-terminfo \ - --includedir=${TARGETDIR}/include/ncurses \ + --includedir=${PREFIX}/include/ncurses \ --with-shared \ --without-curses-h --with-termlib --program-prefix= \ --enable-rpath --disable-root-environ \ @@ -67,8 +67,8 @@ BUILD_WRKSRC= ${NOWIDEC_WRKSRC} INSTALL_WRKSRC= ${NOWIDEC_WRKSRC} PLIST_SUB+= PORTVERSION=${RELEASE} \ - WIDEC_EXAMPLESDIR=${WIDEC_EXAMPLESDIR:S,${TARGETDIR}/,,} \ - NOWIDEC_EXAMPLESDIR=${NOWIDEC_EXAMPLESDIR:S,${TARGETDIR}/,,} + WIDEC_EXAMPLESDIR=${WIDEC_EXAMPLESDIR:S,${PREFIX}/,,} \ + NOWIDEC_EXAMPLESDIR=${NOWIDEC_EXAMPLESDIR:S,${PREFIX}/,,} PORTDOCS= * PORTEXAMPLES= * diff --git a/devel/ncurses/Makefile b/devel/ncurses/Makefile index 9bfb283903a5..2da7fce6bf0d 100644 --- a/devel/ncurses/Makefile +++ b/devel/ncurses/Makefile @@ -22,10 +22,10 @@ RELEASE= 5.6 GNU_CONFIGURE= yes CONFIGURE_SCRIPT=../configure -CONFIGURE_ARGS= --datadir=${TARGETDIR}/share/misc --disable-overwrite \ +CONFIGURE_ARGS= --datadir=${PREFIX}/share/misc --disable-overwrite \ --enable-termcap --enable-bsdpad --enable-getcap \ --enable-colorfgbg --disable-home-terminfo \ - --includedir=${TARGETDIR}/include/ncurses \ + --includedir=${PREFIX}/include/ncurses \ --with-shared \ --without-curses-h --with-termlib --program-prefix= \ --enable-rpath --disable-root-environ \ @@ -51,8 +51,8 @@ BUILD_WRKSRC= ${NOWIDEC_WRKSRC} INSTALL_WRKSRC= ${NOWIDEC_WRKSRC} PLIST_SUB+= PORTVERSION=${RELEASE} \ - WIDEC_EXAMPLESDIR=${WIDEC_EXAMPLESDIR:S,${TARGETDIR}/,,} \ - NOWIDEC_EXAMPLESDIR=${NOWIDEC_EXAMPLESDIR:S,${TARGETDIR}/,,} + WIDEC_EXAMPLESDIR=${WIDEC_EXAMPLESDIR:S,${PREFIX}/,,} \ + NOWIDEC_EXAMPLESDIR=${NOWIDEC_EXAMPLESDIR:S,${PREFIX}/,,} PORTDOCS= * diff --git a/devel/ocaml-cfg/Makefile b/devel/ocaml-cfg/Makefile index a1a55ca81290..194df680a6a0 100644 --- a/devel/ocaml-cfg/Makefile +++ b/devel/ocaml-cfg/Makefile @@ -23,8 +23,8 @@ USE_OCAML_FINDLIB=yes USE_OCAML_WASH= yes DOCS= README -DOCSDIR= ${TARGETDIR}/share/doc/ocaml/${PORTNAME} -EXAMPLESDIR= ${TARGETDIR}/share/examples/ocaml/${PORTNAME} +DOCSDIR= ${PREFIX}/share/doc/ocaml/${PORTNAME} +EXAMPLESDIR= ${PREFIX}/share/examples/ocaml/${PORTNAME} .include <bsd.port.pre.mk> @@ -36,20 +36,20 @@ post-extract: post-install: @${FIND} ${OCAMLFIND_DESTDIR}/${PORTNAME} -type f | \ - ${SED} "s,^${TARGETDIR}/,," >> ${TMPPLIST} + ${SED} "s,^${PREFIX}/,," >> ${TMPPLIST} .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/ @${MKDIR} ${EXAMPLESDIR} @(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}/) @${FIND} ${EXAMPLESDIR}/ ! -type d | \ - ${SED} 's,^${TARGETDIR}/,,' >> ${TMPPLIST} + ${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST} @${FIND} ${EXAMPLESDIR}/ -type d | ${SORT} -r | \ - ${SED} 's,^${TARGETDIR}/,@dirrm ,' >> ${TMPPLIST} + ${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST} @${FIND} ${DOCSDIR}/ ! -type d | \ - ${SED} 's,^${TARGETDIR}/,,' >> ${TMPPLIST} + ${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST} @${FIND} ${DOCSDIR}/ -type d | ${SORT} -r | \ - ${SED} 's,^${TARGETDIR}/,@dirrm ,' >> ${TMPPLIST} + ${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST} # XXX: temporary workaround for non-standard PREFIX @${ECHO_CMD} "@unexec rmdir %D/share/doc/ocaml 2>/dev/null || true" \ >> ${TMPPLIST} diff --git a/devel/ocaml-lacaml/Makefile b/devel/ocaml-lacaml/Makefile index 00e6b754d018..95ddb92c5497 100644 --- a/devel/ocaml-lacaml/Makefile +++ b/devel/ocaml-lacaml/Makefile @@ -30,8 +30,8 @@ CFLAGS+= -fPIC MAKE_ENV+= OCAMLMKLIB_FLAGS="-L${LOCALBASE}/lib" DOCS= README TODO -DOCSDIR= ${TARGETDIR}/share/doc/ocaml/${PORTNAME} -EXAMPLESDIR= ${TARGETDIR}/share/examples/ocaml/${PORTNAME} +DOCSDIR= ${PREFIX}/share/doc/ocaml/${PORTNAME} +EXAMPLESDIR= ${PREFIX}/share/examples/ocaml/${PORTNAME} .include <bsd.port.pre.mk> @@ -53,20 +53,20 @@ post-extract: post-install: @${FIND} ${OCAMLFIND_DESTDIR}/${PORTNAME} -type f | \ - ${SED} "s,^${TARGETDIR}/,," >> ${TMPPLIST} + ${SED} "s,^${PREFIX}/,," >> ${TMPPLIST} .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/ @${MKDIR} ${EXAMPLESDIR} @(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}/) @${FIND} ${EXAMPLESDIR}/ ! -type d | \ - ${SED} 's,^${TARGETDIR}/,,' >> ${TMPPLIST} + ${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST} @${FIND} ${EXAMPLESDIR}/ -type d | ${SORT} -r | \ - ${SED} 's,^${TARGETDIR}/,@dirrm ,' >> ${TMPPLIST} + ${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST} @${FIND} ${DOCSDIR}/ ! -type d | \ - ${SED} 's,^${TARGETDIR}/,,' >> ${TMPPLIST} + ${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST} @${FIND} ${DOCSDIR}/ -type d | ${SORT} -r | \ - ${SED} 's,^${TARGETDIR}/,@dirrm ,' >> ${TMPPLIST} + ${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST} # XXX: temporary workaround for non-standard PREFIX @${ECHO_CMD} "@unexec rmdir %D/share/doc/ocaml 2>/dev/null || true" \ >> ${TMPPLIST} diff --git a/devel/ocaml-pomap/Makefile b/devel/ocaml-pomap/Makefile index 8ba3bd1b51ac..6c759c78f898 100644 --- a/devel/ocaml-pomap/Makefile +++ b/devel/ocaml-pomap/Makefile @@ -23,8 +23,8 @@ USE_OCAML_FINDLIB=yes USE_OCAML_WASH= yes DOCS= README -DOCSDIR= ${TARGETDIR}/share/doc/ocaml/${PORTNAME} -EXAMPLESDIR= ${TARGETDIR}/share/examples/ocaml/${PORTNAME} +DOCSDIR= ${PREFIX}/share/doc/ocaml/${PORTNAME} +EXAMPLESDIR= ${PREFIX}/share/examples/ocaml/${PORTNAME} .include <bsd.port.pre.mk> @@ -36,20 +36,20 @@ post-extract: post-install: @${FIND} ${OCAMLFIND_DESTDIR}/${PORTNAME} -type f | \ - ${SED} "s,^${TARGETDIR}/,," >> ${TMPPLIST} + ${SED} "s,^${PREFIX}/,," >> ${TMPPLIST} .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/ @${MKDIR} ${EXAMPLESDIR} @(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}/) @${FIND} ${EXAMPLESDIR}/ ! -type d | \ - ${SED} 's,^${TARGETDIR}/,,' >> ${TMPPLIST} + ${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST} @${FIND} ${EXAMPLESDIR}/ -type d | ${SORT} -r | \ - ${SED} 's,^${TARGETDIR}/,@dirrm ,' >> ${TMPPLIST} + ${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST} @${FIND} ${DOCSDIR}/ ! -type d | \ - ${SED} 's,^${TARGETDIR}/,,' >> ${TMPPLIST} + ${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST} @${FIND} ${DOCSDIR}/ -type d | ${SORT} -r | \ - ${SED} 's,^${TARGETDIR}/,@dirrm ,' >> ${TMPPLIST} + ${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST} # XXX: temporary workaround for non-standard PREFIX @${ECHO_CMD} "@unexec rmdir %D/share/doc/ocaml 2>/dev/null || true" \ >> ${TMPPLIST} diff --git a/devel/ocaml-res/Makefile b/devel/ocaml-res/Makefile index 9c86eed97499..0fce2caad6f7 100644 --- a/devel/ocaml-res/Makefile +++ b/devel/ocaml-res/Makefile @@ -23,8 +23,8 @@ USE_OCAML_FINDLIB=yes USE_OCAML_WASH= yes DOCS= README -DOCSDIR= ${TARGETDIR}/share/doc/ocaml/${PORTNAME} -EXAMPLESDIR= ${TARGETDIR}/share/examples/ocaml/${PORTNAME} +DOCSDIR= ${PREFIX}/share/doc/ocaml/${PORTNAME} +EXAMPLESDIR= ${PREFIX}/share/examples/ocaml/${PORTNAME} .include <bsd.port.pre.mk> @@ -36,20 +36,20 @@ post-extract: post-install: @${FIND} ${OCAMLFIND_DESTDIR}/${PORTNAME} -type f | \ - ${SED} "s,^${TARGETDIR}/,," >> ${TMPPLIST} + ${SED} "s,^${PREFIX}/,," >> ${TMPPLIST} .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/ @${MKDIR} ${EXAMPLESDIR} @(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}/) @${FIND} ${EXAMPLESDIR}/ ! -type d | \ - ${SED} 's,^${TARGETDIR}/,,' >> ${TMPPLIST} + ${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST} @${FIND} ${EXAMPLESDIR}/ -type d | ${SORT} -r | \ - ${SED} 's,^${TARGETDIR}/,@dirrm ,' >> ${TMPPLIST} + ${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST} @${FIND} ${DOCSDIR}/ ! -type d | \ - ${SED} 's,^${TARGETDIR}/,,' >> ${TMPPLIST} + ${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST} @${FIND} ${DOCSDIR}/ -type d | ${SORT} -r | \ - ${SED} 's,^${TARGETDIR}/,@dirrm ,' >> ${TMPPLIST} + ${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST} # XXX: temporary workaround for non-standard PREFIX @${ECHO_CMD} "@unexec rmdir %D/share/doc/ocaml 2>/dev/null || true" \ >> ${TMPPLIST} diff --git a/devel/p5-Dir-Project/Makefile b/devel/p5-Dir-Project/Makefile index 846a71cd562e..8e474d944f30 100644 --- a/devel/p5-Dir-Project/Makefile +++ b/devel/p5-Dir-Project/Makefile @@ -16,7 +16,7 @@ MAINTAINER= perl@FreeBSD.org COMMENT= Project Environment determination PERL_CONFIGURE= yes -CONFIGURE_ENV+= DIRPROJECT_PREFIX=${TARGETDIR} +CONFIGURE_ENV+= DIRPROJECT_PREFIX=${PREFIX} MAN1= project_bin.1 project_dir.1 MAN3= Dir::Project.3 diff --git a/devel/p5-Glib2/Makefile b/devel/p5-Glib2/Makefile index 97063f403138..2d46d8f02493 100644 --- a/devel/p5-Glib2/Makefile +++ b/devel/p5-Glib2/Makefile @@ -30,6 +30,6 @@ IGNORE= requires perl 5.8.0 or later. Install lang/perl5.8 then try again post-install: @cd ${WRKSRC}/blib/man3 && ${FIND} * -name "*.3" | ${SED} \ - 's,^,${MAN3PREFIX:S,^${TARGETDIR}/,,}/man/man3/,' >> ${TMPPLIST} + 's,^,${MAN3PREFIX:S,^${PREFIX}/,,}/man/man3/,' >> ${TMPPLIST} .include <bsd.port.post.mk> diff --git a/devel/p5-SDL/Makefile b/devel/p5-SDL/Makefile index 3cac952fe441..fbad99527a64 100644 --- a/devel/p5-SDL/Makefile +++ b/devel/p5-SDL/Makefile @@ -54,7 +54,7 @@ USE_PERL5= yes INSTALLS_SHLIB= yes INSTALL_TARGET= pure_install -MAN3PREFIX= ${TARGETDIR}/lib/perl5/${PERL_VERSION} +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} MAN3= SDL.3 \ SDL::App.3 \ SDL::Cdrom.3 \ diff --git a/devel/pcre/Makefile b/devel/pcre/Makefile index 868fe9e424d1..a47de355bdb7 100644 --- a/devel/pcre/Makefile +++ b/devel/pcre/Makefile @@ -45,11 +45,11 @@ MAN3= pcre.3 pcre_compile.3 pcre_compile2.3 pcre_config.3 \ pcreperform.3 pcreposix.3 pcresample.3 pcrestack.3 post-install: - @${STRIP_CMD} ${DESTDIR}${PREFIX}/bin/pcregrep ${DESTDIR}${PREFIX}/bin/pcretest + @${STRIP_CMD} ${PREFIX}/bin/pcregrep ${PREFIX}/bin/pcretest .if !defined(NOPORTDOCS) - @${MKDIR} ${DESTDIR}${DOCSDIR} ${DESTDIR}${DOCSDIR}/html - @cd ${WRKSRC}; ${INSTALL_DATA} ChangeLog NEWS LICENCE doc/*.txt ${DESTDIR}${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/doc/html/*.html ${DESTDIR}${DOCSDIR}/html + @${MKDIR} ${DOCSDIR} ${DOCSDIR}/html + @cd ${WRKSRC}; ${INSTALL_DATA} ChangeLog NEWS LICENCE doc/*.txt ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/doc/html/*.html ${DOCSDIR}/html .endif .include <bsd.port.mk> diff --git a/devel/plan9port/Makefile b/devel/plan9port/Makefile index 2a22853f4ab3..ce9589496339 100644 --- a/devel/plan9port/Makefile +++ b/devel/plan9port/Makefile @@ -24,7 +24,7 @@ SUB_FILES= pkg-message REINPLACE_ARGS= -i "" ONLY_FOR_ARCHS= i386 -PLAN9= ${TARGETDIR}/plan9 +PLAN9= ${PREFIX}/plan9 MANPREFIX= ${PLAN9} MAN1= 9term.1 acmeevent.1 ascii.1 acme.1 9p.1 basename.1 cal.1 \ @@ -109,14 +109,14 @@ post-build: ${FIND} plan9 -type f \ -a ! -path "plan9/man/man[0-9]/*.[0-9]*"; \ for D in ${EMPTY_DIRS}; do \ - ${ECHO_CMD} "@exec ${MKDIR} ${TARGETDIR}/$${D}"; \ + ${ECHO_CMD} "@exec ${MKDIR} ${PREFIX}/$${D}"; \ done; \ ${FIND} plan9 -type d | ${SORT} -r \ | ${SED} -e 's|^|@dirrm |'; \ ) > ${PLIST} do-install: - ${CP} -rp ${WRKSRC} ${TARGETDIR} + ${CP} -rp ${WRKSRC} ${PREFIX} post-install: cd ${PLAN9} && \ diff --git a/devel/py-cheetah/Makefile b/devel/py-cheetah/Makefile index 49cacd104871..1ecbb8823274 100644 --- a/devel/py-cheetah/Makefile +++ b/devel/py-cheetah/Makefile @@ -37,6 +37,6 @@ PYCHEETAH_EGG= Cheetah-${CHEETAHVER}-py${PYTHON_VERSION:S/^python//}-${OSINFOS}. .include <bsd.port.pre.mk> -OSRELEASE!= ${DESTDIR}/usr/bin/uname -r +OSRELEASE!= /usr/bin/uname -r .include <bsd.port.post.mk> diff --git a/devel/py-gdata/Makefile b/devel/py-gdata/Makefile index e7c9fc4cfe10..6a8555533ace 100644 --- a/devel/py-gdata/Makefile +++ b/devel/py-gdata/Makefile @@ -19,7 +19,7 @@ USE_PYTHON= yes USE_PYDISTUTILS= yes PYDISTUTILS_PKGNAME= gdata.py -EXAMPLESDIR= ${TARGETDIR}/share/examples/py-${PORTNAME} +EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} .if !defined(NOPORTEXAMPLES) post-install: diff --git a/devel/py-lxml/Makefile b/devel/py-lxml/Makefile index 33e25370a071..07b840238191 100644 --- a/devel/py-lxml/Makefile +++ b/devel/py-lxml/Makefile @@ -54,6 +54,6 @@ post-install: .include <bsd.port.pre.mk> -OSRELEASE!= ${DESTDIR}/usr/bin/uname -r +OSRELEASE!= /usr/bin/uname -r .include <bsd.port.post.mk> diff --git a/devel/py-notifier/Makefile b/devel/py-notifier/Makefile index c7db4076e8c3..59f537dad12d 100644 --- a/devel/py-notifier/Makefile +++ b/devel/py-notifier/Makefile @@ -19,7 +19,7 @@ USE_PYTHON= yes USE_PYDISTUTILS= yes PYDISTUTILS_PKGNAME= pynotifier -EXAMPLESDIR= ${TARGETDIR}/share/examples/py-${PORTNAME} +EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} WRKSRC= ${WRKDIR}/py${PORTNAME}-${PORTVERSION} diff --git a/devel/py-pp/Makefile b/devel/py-pp/Makefile index 2d599e65401d..33b03d04ba64 100644 --- a/devel/py-pp/Makefile +++ b/devel/py-pp/Makefile @@ -21,6 +21,6 @@ post-patch: ${REINPLACE_CMD} -e 's,^#!/usr/bin/python,#!${PYTHON_CMD},' ${WRKSRC}/ppserver.py post-install: - ${INSTALL_SCRIPT} ${WRKSRC}/ppserver.py ${TARGETDIR}/bin/ + ${INSTALL_SCRIPT} ${WRKSRC}/ppserver.py ${PREFIX}/bin/ .include <bsd.port.mk> diff --git a/devel/py-protocols-devel/Makefile b/devel/py-protocols-devel/Makefile index 06e2672cf93c..24f0c521a82f 100644 --- a/devel/py-protocols-devel/Makefile +++ b/devel/py-protocols-devel/Makefile @@ -39,6 +39,6 @@ PYPROTOCOLS_VER?= 1.0a0 .include <bsd.port.pre.mk> -OSRELEASE!= ${DESTDIR}/usr/bin/uname -r +OSRELEASE!= /usr/bin/uname -r .include <bsd.port.post.mk> diff --git a/devel/py-pycallgraph/Makefile b/devel/py-pycallgraph/Makefile index 0e7d8262a299..8ed144a0f537 100644 --- a/devel/py-pycallgraph/Makefile +++ b/devel/py-pycallgraph/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS+= dot:${PORTSDIR}/graphics/graphviz USE_PYTHON= yes USE_PYDISTUTILS= yes -EXAMPLESDIR= ${TARGETDIR}/share/examples/py-${PORTNAME} +EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} .if !defined(NOPORTEXANPLES) post-install: diff --git a/devel/py-qt4-qct/Makefile b/devel/py-qt4-qct/Makefile index 230e17d06063..36a7f6f607af 100644 --- a/devel/py-qt4-qct/Makefile +++ b/devel/py-qt4-qct/Makefile @@ -22,7 +22,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4 USE_PYTHON= 2.4+ USE_PYDISTUTILS=yes -DOCSDIR= ${TARGETDIR}/share/doc/py-qt4-${PORTNAME} +DOCSDIR= ${PREFIX}/share/doc/py-qt4-${PORTNAME} post-install: .if !defined(NOPORTDOCS) diff --git a/devel/py-ruledispatch/Makefile b/devel/py-ruledispatch/Makefile index 502be1bcc257..1fa79bed9704 100644 --- a/devel/py-ruledispatch/Makefile +++ b/devel/py-ruledispatch/Makefile @@ -45,7 +45,7 @@ post-extract: .include <bsd.port.pre.mk> -OSRELEASE!= ${DESTDIR}/usr/bin/uname -r +OSRELEASE!= /usr/bin/uname -r PYPROTOCOLS_EGG!= ${MAKE} -f ${PORTSDIR}/devel/py-protocols-devel/Makefile -V PYPROTOCOLS_EGG .include <bsd.port.post.mk> diff --git a/devel/py-simplejson/Makefile b/devel/py-simplejson/Makefile index 6a364c894ffa..373caae5f56f 100644 --- a/devel/py-simplejson/Makefile +++ b/devel/py-simplejson/Makefile @@ -27,7 +27,7 @@ OSINFOS= ${OPSYS:L}-${OSRELEASE}-${ARCH} PLIST_SUB+= PYSIMPLEJSON_EGG=${PYSIMPLEJSON_EGG} .if !defined(NOPORTDOCS) -DOCSDIR= ${TARGETDIR}/share/doc/py-${PORTNAME} +DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} PORTDOCS= * .endif diff --git a/devel/py-simpy/Makefile b/devel/py-simpy/Makefile index f800e5fe8378..60cb9fef3ae5 100644 --- a/devel/py-simpy/Makefile +++ b/devel/py-simpy/Makefile @@ -25,9 +25,9 @@ OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options .if !defined(NOPORTDOCS) PORTDOCS= * -DOCSDIR= ${TARGETDIR}/share/doc/py-${PORTNAME} +DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} .endif -EXAMPLESDIR= ${TARGETDIR}/share/examples/py-${PORTNAME} +EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} .include <bsd.port.pre.mk> diff --git a/devel/py-zope.interface/Makefile b/devel/py-zope.interface/Makefile index 87f153e4defb..6b4c240d2b90 100644 --- a/devel/py-zope.interface/Makefile +++ b/devel/py-zope.interface/Makefile @@ -39,6 +39,6 @@ PLIST_SUB+= EASY_INSTALL_CMD=${EASY_INSTALL_CMD} \ .include <bsd.port.pre.mk> -OSRELEASE!= ${DESTDIR}/usr/bin/uname -r +OSRELEASE!= /usr/bin/uname -r .include <bsd.port.post.mk> diff --git a/devel/py-zopeInterface/Makefile b/devel/py-zopeInterface/Makefile index 87f153e4defb..6b4c240d2b90 100644 --- a/devel/py-zopeInterface/Makefile +++ b/devel/py-zopeInterface/Makefile @@ -39,6 +39,6 @@ PLIST_SUB+= EASY_INSTALL_CMD=${EASY_INSTALL_CMD} \ .include <bsd.port.pre.mk> -OSRELEASE!= ${DESTDIR}/usr/bin/uname -r +OSRELEASE!= /usr/bin/uname -r .include <bsd.port.post.mk> diff --git a/devel/pycount/Makefile b/devel/pycount/Makefile index 84f20ae806da..9189bd982f31 100644 --- a/devel/pycount/Makefile +++ b/devel/pycount/Makefile @@ -29,6 +29,6 @@ do-extract: @${CP} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} ${WRKDIR} do-install: - ${INSTALL_SCRIPT} ${WRKDIR}/${DISTFILES} ${TARGETDIR}/bin/${PORTNAME} + ${INSTALL_SCRIPT} ${WRKDIR}/${DISTFILES} ${PREFIX}/bin/${PORTNAME} .include <bsd.port.mk> diff --git a/devel/pythontidy/Makefile b/devel/pythontidy/Makefile index 921d9efe0b2e..bb855caf9015 100644 --- a/devel/pythontidy/Makefile +++ b/devel/pythontidy/Makefile @@ -30,6 +30,6 @@ do-patch: ${REINPLACE_CMD} -e s,/usr/bin/python,${PYTHON_CMD}, ${WRKDIR}/${DISTFILES} do-install: - ${INSTALL_SCRIPT} ${WRKDIR}/${DISTFILES} ${TARGETDIR}/bin/pythontidy + ${INSTALL_SCRIPT} ${WRKDIR}/${DISTFILES} ${PREFIX}/bin/pythontidy .include <bsd.port.mk> diff --git a/devel/qct/Makefile b/devel/qct/Makefile index 230e17d06063..36a7f6f607af 100644 --- a/devel/qct/Makefile +++ b/devel/qct/Makefile @@ -22,7 +22,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4 USE_PYTHON= 2.4+ USE_PYDISTUTILS=yes -DOCSDIR= ${TARGETDIR}/share/doc/py-qt4-${PORTNAME} +DOCSDIR= ${PREFIX}/share/doc/py-qt4-${PORTNAME} post-install: .if !defined(NOPORTDOCS) diff --git a/devel/robodoc/Makefile b/devel/robodoc/Makefile index 64fc1df17b00..21a3c154d1eb 100644 --- a/devel/robodoc/Makefile +++ b/devel/robodoc/Makefile @@ -20,8 +20,8 @@ MAKEFILE= makefile MAN1= robodoc.1 robohdrs.1 do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/Source/robodoc ${TARGETDIR}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/Source/robohdrs ${TARGETDIR}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/Source/robodoc ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/Source/robohdrs ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/Docs/robodoc.1 ${MANPREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/Docs/robohdrs.1 ${MANPREFIX}/man/man1 .if !defined(NOPORTDOCS) diff --git a/devel/ruby-jttui/Makefile b/devel/ruby-jttui/Makefile index 51137f14404d..60b9c44b01ca 100644 --- a/devel/ruby-jttui/Makefile +++ b/devel/ruby-jttui/Makefile @@ -26,12 +26,12 @@ INSTALL_TARGET= site-install .include <bsd.port.pre.mk> post-install: .if !defined(NOPORTDOCS) - ${MKDIR} ${DESTDIR}${RUBY_MODDOCDIR} + ${MKDIR} ${RUBY_MODDOCDIR} cd ${WRKSRC}/doc; \ - ${FIND} . | ${CPIO} -pdmv ${DESTDIR}${RUBY_MODDOCDIR} - ${CHMOD} -R ugo+rX,ugo-w ${DESTDIR}${RUBY_MODDOCDIR} - ${MKDIR} ${DESTDIR}${RUBY_MODEXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/examples/* ${DESTDIR}${RUBY_MODEXAMPLESDIR} - ${CHMOD} ugo+x ${DESTDIR}${RUBY_MODEXAMPLESDIR}/example-*.rb + ${FIND} . | ${CPIO} -pdmv ${RUBY_MODDOCDIR} + ${CHMOD} -R ugo+rX,ugo-w ${RUBY_MODDOCDIR} + ${MKDIR} ${RUBY_MODEXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/examples/* ${RUBY_MODEXAMPLESDIR} + ${CHMOD} ugo+x ${RUBY_MODEXAMPLESDIR}/example-*.rb .endif # !defined(NOPORTDOCS) .include <bsd.port.post.mk> diff --git a/devel/simian/Makefile b/devel/simian/Makefile index e7d3110e6813..102056d75751 100644 --- a/devel/simian/Makefile +++ b/devel/simian/Makefile @@ -82,19 +82,19 @@ pre-fetch: .endif do-install: - @${MKDIR} ${TARGETDIR}/share/xsl/${PORTNAME} - ${CP} ${WRKSRC}/simian.xsl ${TARGETDIR}/share/xsl/${PORTNAME} - @${MKDIR} ${TARGETDIR}/simian - @${MKDIR} ${TARGETDIR}/simian/bin + @${MKDIR} ${PREFIX}/share/xsl/${PORTNAME} + ${CP} ${WRKSRC}/simian.xsl ${PREFIX}/share/xsl/${PORTNAME} + @${MKDIR} ${PREFIX}/simian + @${MKDIR} ${PREFIX}/simian/bin .if !defined(WITHOUT_JAVA) - ${CP} ${WRKSRC}/bin/simian-${PORTVERSION}.jar ${TARGETDIR}/simian/bin + ${CP} ${WRKSRC}/bin/simian-${PORTVERSION}.jar ${PREFIX}/simian/bin .endif .if defined(WITH_MONO) - ${CP} ${WRKSRC}/bin/*.dll ${TARGETDIR}/simian/bin - ${CP} ${WRKSRC}/bin/simian-${PORTVERSION}.exe ${TARGETDIR}/simian/bin + ${CP} ${WRKSRC}/bin/*.dll ${PREFIX}/simian/bin + ${CP} ${WRKSRC}/bin/simian-${PORTVERSION}.exe ${PREFIX}/simian/bin .endif - ${CP} ${WRKSRC}/simian ${TARGETDIR}/bin/simian - ${CHMOD} a+x ${TARGETDIR}/bin/simian + ${CP} ${WRKSRC}/simian ${PREFIX}/bin/simian + ${CHMOD} a+x ${PREFIX}/bin/simian .if !defined(NOPORTDOCS) cd ${WRKSRC} \ && ${FIND} ${PORTDOCS} -type d -exec ${MKDIR} ${DOCSDIR}/\{} \; \ diff --git a/devel/subversion-devel/Makefile b/devel/subversion-devel/Makefile index 28bc24490608..5f4220d8c7b9 100644 --- a/devel/subversion-devel/Makefile +++ b/devel/subversion-devel/Makefile @@ -98,7 +98,7 @@ IGNORE= subversion\'s Perl bindings need perl 5.8.0 or greater. Upgrade your per SWIG_BINDINGS+= yes USE_PERL5= yes PLIST_SUB+= WITH_PERL="" -MAN3PREFIX= ${TARGETDIR}/lib/perl5/${PERL_VERSION} +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} MAN3= SVN::Base.3 \ SVN::Client.3 \ SVN::Core.3 \ diff --git a/devel/subversion-freebsd/Makefile b/devel/subversion-freebsd/Makefile index 28bc24490608..5f4220d8c7b9 100644 --- a/devel/subversion-freebsd/Makefile +++ b/devel/subversion-freebsd/Makefile @@ -98,7 +98,7 @@ IGNORE= subversion\'s Perl bindings need perl 5.8.0 or greater. Upgrade your per SWIG_BINDINGS+= yes USE_PERL5= yes PLIST_SUB+= WITH_PERL="" -MAN3PREFIX= ${TARGETDIR}/lib/perl5/${PERL_VERSION} +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} MAN3= SVN::Base.3 \ SVN::Client.3 \ SVN::Core.3 \ diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile index 28bc24490608..5f4220d8c7b9 100644 --- a/devel/subversion/Makefile +++ b/devel/subversion/Makefile @@ -98,7 +98,7 @@ IGNORE= subversion\'s Perl bindings need perl 5.8.0 or greater. Upgrade your per SWIG_BINDINGS+= yes USE_PERL5= yes PLIST_SUB+= WITH_PERL="" -MAN3PREFIX= ${TARGETDIR}/lib/perl5/${PERL_VERSION} +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} MAN3= SVN::Base.3 \ SVN::Client.3 \ SVN::Core.3 \ diff --git a/devel/subversion16/Makefile b/devel/subversion16/Makefile index 28bc24490608..5f4220d8c7b9 100644 --- a/devel/subversion16/Makefile +++ b/devel/subversion16/Makefile @@ -98,7 +98,7 @@ IGNORE= subversion\'s Perl bindings need perl 5.8.0 or greater. Upgrade your per SWIG_BINDINGS+= yes USE_PERL5= yes PLIST_SUB+= WITH_PERL="" -MAN3PREFIX= ${TARGETDIR}/lib/perl5/${PERL_VERSION} +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} MAN3= SVN::Base.3 \ SVN::Client.3 \ SVN::Core.3 \ diff --git a/devel/tclthread/Makefile b/devel/tclthread/Makefile index 358b94d5ff79..defe273b478a 100644 --- a/devel/tclthread/Makefile +++ b/devel/tclthread/Makefile @@ -19,7 +19,7 @@ COMMENT= Thread extension for Tcl USE_TCL= 84+ USE_TCL_THREADS= yes -DOCSDIR= ${TARGETDIR}/share/doc/${PKGNAMEPREFIX}${PORTNAME} +DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} GNU_CONFIGURE= yes USE_LDCONFIG= ${PREFIX}/lib/thread${PORTVERSION} diff --git a/dns/ez-ipupdate/Makefile b/dns/ez-ipupdate/Makefile index 7821f5463a72..05eb9753ad56 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} ${TARGETDIR}/share/examples/${PORTNAME} + ${MKDIR} ${PREFIX}/share/examples/${PORTNAME} for f in ${WRKSRC}/example-*.conf; \ do \ - ${INSTALL_DATA} $$f ${TARGETDIR}/share/examples/${PORTNAME}/; \ + ${INSTALL_DATA} $$f ${PREFIX}/share/examples/${PORTNAME}/; \ done ${INSTALL_DATA} ${WRKSRC}/example.conf \ - ${TARGETDIR}/etc/${PORTNAME}.conf.sample + ${PREFIX}/etc/${PORTNAME}.conf.sample .include <bsd.port.mk> diff --git a/dns/p5-Net-LibIDN/Makefile b/dns/p5-Net-LibIDN/Makefile index 2804c365f34f..a970ef6620d9 100644 --- a/dns/p5-Net-LibIDN/Makefile +++ b/dns/p5-Net-LibIDN/Makefile @@ -18,7 +18,7 @@ COMMENT= This module provides access to the libidn library LIB_DEPENDS= idn.16:${PORTSDIR}/dns/libidn PERL_CONFIGURE= yes -CONFIGURE_ARGS+= --with-libidn=${TARGETDIR}/lib --with-libidn-inc=${TARGETDIR}/include +CONFIGURE_ARGS+= --with-libidn=${PREFIX}/lib --with-libidn-inc=${PREFIX}/include MAN3= Net::LibIDN.3 diff --git a/finance/cbb/Makefile b/finance/cbb/Makefile index 7c88d72ccdce..abd330b2d043 100644 --- a/finance/cbb/Makefile +++ b/finance/cbb/Makefile @@ -26,8 +26,8 @@ post-patch: -e "s|WISH = /usr/bin/wish|WISH = ${LOCALBASE}/bin/wish8.2|" \ -e "s|DESTDIR =||" ${WRKSRC}/Makefile @${REINPLACE_CMD} "s|DESTDIR =||" ${WRKSRC}/Makefile - @${REINPLACE_CMD} -e 's|$$destdir/bin|$$destdir/$$prefix/bin|' \ - -e 's|$$destdir/lib/cbb|$$destdir/$$prefix/lib/cbb|' \ + @${REINPLACE_CMD} -e 's|$$destdir/bin|$$prefix/bin|' \ + -e 's|$$destdir/lib/cbb|$$prefix/lib/cbb|' \ ${WRKSRC}/install.pl @${REINPLACE_CMD} -e "s|=wish|=wish8.2|" -e 's|=""wish""|=""wish8.2""|' \ ${WRKSRC}/configure diff --git a/finance/sabernetdcs-client/Makefile b/finance/sabernetdcs-client/Makefile index d8e816bfbfc7..e781cededfb4 100644 --- a/finance/sabernetdcs-client/Makefile +++ b/finance/sabernetdcs-client/Makefile @@ -24,8 +24,8 @@ RUN_DEPENDS= pygtk-codegen-2.0:${PORTSDIR}/x11-toolkits/py-gtk2 \ USE_PYTHON= 2.4+ USE_PYDISTUTILS= yes USE_BZIP2= yes -DOCSDIR= ${TARGETDIR}/share/doc/sndcs -DATADIR= ${TARGETDIR}/share/sndcs +DOCSDIR= ${PREFIX}/share/doc/sndcs +DATADIR= ${PREFIX}/share/sndcs PYDISTUTILS_PKGNAME= sndcs diff --git a/ftp/frox/Makefile b/ftp/frox/Makefile index aa5ea8edfa1a..8673dfc53f3f 100644 --- a/ftp/frox/Makefile +++ b/ftp/frox/Makefile @@ -30,8 +30,8 @@ MAN5= frox.conf.5 PORTDOCS= SECURITY CREDITS ChangeLog FAQ.html FAQ-1.html FAQ-2.html \ FAQ-3.html FAQ-4.html FAQ-5.html FAQ-6.html FAQ-7.html \ FAQ-8.html -PLIST_FILES= sbin/frox ${EXAMPLESDIR:S,${TARGETDIR}/,,}/frox.conf -PLIST_DIRS= ${EXAMPLESDIR:S,${TARGETDIR}/,,} +PLIST_FILES= sbin/frox ${EXAMPLESDIR:S,${PREFIX}/,,}/frox.conf +PLIST_DIRS= ${EXAMPLESDIR:S,${PREFIX}/,,} PKGMESSAGE= ${WRKDIR}/pkg-message @@ -73,7 +73,7 @@ CONFIGURE_ARGS+= --enable-run-as-root .endif do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/frox ${TARGETDIR}/sbin + ${INSTALL_PROGRAM} ${WRKSRC}/src/frox ${PREFIX}/sbin ${MKDIR} ${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/src/frox.conf ${EXAMPLESDIR}/frox.conf ${INSTALL_MAN} ${WRKSRC}/doc/frox.man ${MANPREFIX}/man/man1/frox.1 @@ -86,7 +86,7 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR} .endfor .endif - @${STRIP_CMD} ${TARGETDIR}/sbin/frox; \ + @${STRIP_CMD} ${PREFIX}/sbin/frox; \ ${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/ftp/jftpgw/Makefile b/ftp/jftpgw/Makefile index 6d9190c46a69..2ba12ef352d8 100644 --- a/ftp/jftpgw/Makefile +++ b/ftp/jftpgw/Makefile @@ -26,15 +26,15 @@ MAN1= jftpgw.1 USE_RC_SUBR= jftpgw.sh do-install: - ${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' \ + ${INSTALL_PROGRAM} ${WRKSRC}/jftpgw ${PREFIX}/sbin/ + ${INSTALL_DATA} ${WRKSRC}/jftpgw.conf.sample ${PREFIX}/etc/ + ${INSTALL_MAN} ${WRKSRC}/jftpgw.1 ${PREFIX}/man/man1/ +# ${REINPLACE_CMD} -e 's:@PREFIX@:${PREFIX}:g' \ # ${FILESDIR}/jftpgw.sh.in > ${WRKDIR}/jftpgw.sh -# ${INSTALL_SCRIPT} ${WRKDIR}/jftpgw.sh ${TARGETDIR}/etc/rc.d +# ${INSTALL_SCRIPT} ${WRKDIR}/jftpgw.sh ${PREFIX}/etc/rc.d .if !defined(NOPORTDOCS) - ${MKDIR} ${TARGETDIR}/share/doc/jftpgw - ${INSTALL_DATA} ${WRKSRC}/doc/config.html ${TARGETDIR}/share/doc/jftpgw + ${MKDIR} ${PREFIX}/share/doc/jftpgw + ${INSTALL_DATA} ${WRKSRC}/doc/config.html ${PREFIX}/share/doc/jftpgw .endif .include <bsd.port.mk> diff --git a/ftp/p5-Net-FTPServer/Makefile b/ftp/p5-Net-FTPServer/Makefile index 89ef334c17e9..5f2355dc7b86 100644 --- a/ftp/p5-Net-FTPServer/Makefile +++ b/ftp/p5-Net-FTPServer/Makefile @@ -66,11 +66,11 @@ RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Di post-patch: @${REINPLACE_CMD} -e "s/root,root/root,wheel/" \ - -e "s,/usr/sbin,${TARGETDIR}/sbin," \ + -e "s,/usr/sbin,${PREFIX}/sbin," \ ${WRKSRC}/Net-FTPServer.spec.PL @${REINPLACE_CMD} -e "s/-g root/-g wheel/" \ - -e "s,$$.PREFIX./sbin,${TARGETDIR}/sbin," \ - -e "s,$$.SITEPREFIX./sbin,${TARGETDIR}/sbin," \ + -e "s,$$.PREFIX./sbin,${PREFIX}/sbin," \ + -e "s,$$.SITEPREFIX./sbin,${PREFIX}/sbin," \ ${WRKSRC}/Makefile.PL post-install: @@ -80,7 +80,7 @@ post-install: @${MKDIR} ${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR} .endif - @${PERL} -p -e 's,PREFIX,${TARGETDIR},g' ${PKGDIR}/pkg-message > ${PKGMESSAGE} + @${PERL} -p -e 's,PREFIX,${PREFIX},g' ${PKGDIR}/pkg-message > ${PKGMESSAGE} @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/ftp/py-curl/Makefile b/ftp/py-curl/Makefile index c91fc9fb146f..c7dfd5ebba00 100644 --- a/ftp/py-curl/Makefile +++ b/ftp/py-curl/Makefile @@ -23,8 +23,8 @@ USE_PYDISTUTILS= yes PYDISTUTILS_PKGNAME= pycurl USE_OPENSSL= yes -DOCSDIR= ${TARGETDIR}/share/doc/py-curl -EXAMPLESDIR= ${TARGETDIR}/share/examples/py-curl +DOCSDIR= ${PREFIX}/share/doc/py-curl +EXAMPLESDIR= ${PREFIX}/share/examples/py-curl post-patch: ${REINPLACE_CMD} \ diff --git a/ftp/py-pyftpdlib/Makefile b/ftp/py-pyftpdlib/Makefile index 59501fa75e1f..dc4ab78933d2 100644 --- a/ftp/py-pyftpdlib/Makefile +++ b/ftp/py-pyftpdlib/Makefile @@ -18,8 +18,8 @@ COMMENT= Python FTP server library USE_PYTHON= yes USE_PYDISTUTILS= yes -DOCSDIR= ${TARGETDIR}/share/doc/py-${PORTNAME} -EXAMPLESDIR= ${TARGETDIR}/share/examples/py-${PORTNAME} +DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} +EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} post-install: .if !defined(NOPORTDOCS) diff --git a/games/asc/Makefile b/games/asc/Makefile index 11b5714b7186..0f8a74d4d17b 100644 --- a/games/asc/Makefile +++ b/games/asc/Makefile @@ -33,7 +33,7 @@ CONFIGURE_ENV= CPPFLAGS="`${SDL_CONFIG} --cflags`" \ LIBS="`${SDL_CONFIG} --libs` -lm" CONFIGURE_ARGS= --disable-paraguitest \ - --prefix=${TARGETDIR} + --prefix=${PREFIX} OPTIONS= MUSIC "Install extra music files" off diff --git a/games/rocksndiamonds/Makefile b/games/rocksndiamonds/Makefile index d8c2b73d8b99..6201bc54290d 100644 --- a/games/rocksndiamonds/Makefile +++ b/games/rocksndiamonds/Makefile @@ -36,7 +36,7 @@ post-patch: 's:sdl-config:$${SDL_CONFIG}:g' ${WRKSRC}/src/Makefile do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/rocksndiamonds ${TARGETDIR}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/rocksndiamonds ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/rocksndiamonds.1 ${MANPREFIX}/man/man1 @${MKDIR} ${DATADIR} ${TAR} -C ${WRKSRC} -cf - graphics levels music scores sounds | \ diff --git a/games/rt2-demo/Makefile b/games/rt2-demo/Makefile index 9a1b51b0fc46..0f0b3534709f 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 ${TARGETDIR} ${DISTDIR} + @${SH} ${FILESDIR}/do-install ${PREFIX} ${DISTDIR} .include <bsd.port.mk> diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index 0104d95edb81..060223c40ef6 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -78,7 +78,7 @@ IGNORE= requires newer version of ghostscript CONFIGURE_ARGS+= --with-perl=${PERL5} PLIST_SUB+= WITH_PERL='' MAN3= Image::Magick.3 -MAN3PREFIX= ${TARGETDIR}/lib/perl5/${PERL_VERSION} +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} .else CONFIGURE_ARGS+= --without-perl PLIST_SUB+= WITH_PERL='@comment ' diff --git a/graphics/jave6/Makefile b/graphics/jave6/Makefile index 06c12922a2e0..2f3121e4db94 100644 --- a/graphics/jave6/Makefile +++ b/graphics/jave6/Makefile @@ -21,7 +21,7 @@ USE_ZIP= YES JAVA_VERSION= 1.3+ NO_BUILD= YES DATADIR= ${JAVASHAREDIR}/${PORTNAME} -LNKTARGET= ${TARGETDIR}/bin/jave6 +LNKTARGET= ${PREFIX}/bin/jave6 HLPSKRIPT= jave6 PLIST_SUB+=DATADIR=%%JAVASHAREDIR%%/${PORTNAME} diff --git a/graphics/p5-PGPLOT/Makefile b/graphics/p5-PGPLOT/Makefile index da2ba2371dac..fcd3a9612114 100644 --- a/graphics/p5-PGPLOT/Makefile +++ b/graphics/p5-PGPLOT/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= pgplot.5:${PORTSDIR}/graphics/pgplot BUILD_DEPENDS= ${SITE_PERL}/ExtUtils/F77.pm:${PORTSDIR}/lang/p5-F77 MAN3= PGPLOT.3 -MAN3PREFIX= ${TARGETDIR}/lib/perl5/${PERL_VERSION} +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} WANT_FORTRAN= yes USE_PERL5= yes diff --git a/graphics/pgperl/Makefile b/graphics/pgperl/Makefile index da2ba2371dac..fcd3a9612114 100644 --- a/graphics/pgperl/Makefile +++ b/graphics/pgperl/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= pgplot.5:${PORTSDIR}/graphics/pgplot BUILD_DEPENDS= ${SITE_PERL}/ExtUtils/F77.pm:${PORTSDIR}/lang/p5-F77 MAN3= PGPLOT.3 -MAN3PREFIX= ${TARGETDIR}/lib/perl5/${PERL_VERSION} +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} WANT_FORTRAN= yes USE_PERL5= yes diff --git a/graphics/py-imaging/Makefile b/graphics/py-imaging/Makefile index 1d5e52d4e6b1..44527a078350 100644 --- a/graphics/py-imaging/Makefile +++ b/graphics/py-imaging/Makefile @@ -30,8 +30,8 @@ PYDISTUTILS_EGGINFODIR= ${PYTHON_SITELIBDIR}/PIL PORTDOCS= * -DOCSDIR= ${TARGETDIR}/share/doc/py-${PORTNAME} -EXAMPLESDIR= ${TARGETDIR}/share/examples/py-${PORTNAME} +DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} +EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} OPTIONS= TKINTER "Build with tkinter for X support" on diff --git a/graphics/springgraph/Makefile b/graphics/springgraph/Makefile index 29e72415f08f..28da15d4fbc7 100644 --- a/graphics/springgraph/Makefile +++ b/graphics/springgraph/Makefile @@ -31,6 +31,6 @@ post-patch: @${PERL} -pi -e "s|/usr/bin/perl|${PERL}|g" ${WRKSRC}/springgraph.pl do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/springgraph.pl ${TARGETDIR}/bin/springgraph + ${INSTALL_SCRIPT} ${WRKSRC}/springgraph.pl ${PREFIX}/bin/springgraph .include <bsd.port.mk> diff --git a/graphics/tcm/Makefile b/graphics/tcm/Makefile index 42376a6004db..a96bed015481 100644 --- a/graphics/tcm/Makefile +++ b/graphics/tcm/Makefile @@ -29,7 +29,7 @@ USE_MOTIF= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} SUB_FILES+= pkg-message -MANPREFIX= ${TARGETDIR}/tcm +MANPREFIX= ${PREFIX}/tcm MAN1= psf.1 tatd.1 tcbd.1 tcm.1 tcmd.1 tcmdv.1 tcmt.1 tcpd.1 tcrd.1 \ tdfd.1 tdpd.1 tefd.1 terd.1 tesd.1 text2ps.1 tfet.1 tfrt.1 \ tgd.1 tgt.1 tgtt.1 tpsd.1 trpg.1 tscd.1 tsnd.1 tssd.1 tstd.1 \ diff --git a/graphics/xfig/files/patch-Imakefile b/graphics/xfig/files/patch-Imakefile index 8b4cd3539985..ac0d2078f502 100644 --- a/graphics/xfig/files/patch-Imakefile +++ b/graphics/xfig/files/patch-Imakefile @@ -5,7 +5,7 @@ XCOMM for it relative to the BINDIR variable. XCOMM -BINDIR = /usr/bin -+BINDIR = $(TARGETDIR)/bin ++BINDIR = $(PREFIX)/bin XCOMM MKDIRHIER = /bin/sh /usr/bin/X11/mkdirhier -p -MKDIRHIER = mkdirhier +MKDIRHIER = ${X11BASE}/bin/mkdirhier diff --git a/irc/ircd-rusnet/Makefile b/irc/ircd-rusnet/Makefile index 5364893d75a3..e07bf5974ea8 100644 --- a/irc/ircd-rusnet/Makefile +++ b/irc/ircd-rusnet/Makefile @@ -26,7 +26,7 @@ USER= ircd GROUP= ${USER} NETWORK= RusNet -VARDIR?= ${DESTDIR}/var +VARDIR?= /var IRCD_CONFDIR?= ${PREFIX}/etc/ircd-rusnet IRCD_CODEPAGES?= ${IRCD_CONFDIR}/codepages IRCD_MOTD?= ${IRCD_CONFDIR}/ircd.motd diff --git a/irc/tr-ircd/Makefile b/irc/tr-ircd/Makefile index 54c2faacdda1..7665a86bcd81 100644 --- a/irc/tr-ircd/Makefile +++ b/irc/tr-ircd/Makefile @@ -24,11 +24,11 @@ TRIRCD_USER?= trircd TRIRCD_GROUP?= trircd TRIRCD_RUNDIR?= /var/run/tr-ircd TRIRCD_LOGDIR?= /var/log/tr-ircd -TRIRCD_CONFDIR?= ${TARGETDIR}/etc/tr-ircd -TRIRCD_LIBDIR= ${TARGETDIR}/lib/tr-ircd -TRIRCD_INCLUDEDIR= ${TARGETDIR}/include/tr-ircd +TRIRCD_CONFDIR?= ${PREFIX}/etc/tr-ircd +TRIRCD_LIBDIR= ${PREFIX}/lib/tr-ircd +TRIRCD_INCLUDEDIR= ${PREFIX}/include/tr-ircd -CONFIGURE_ARGS= --prefix=${TARGETDIR} \ +CONFIGURE_ARGS= --prefix=${PREFIX} \ --localstatedir=${TRIRCD_RUNDIR} \ --sysconfdir=${TRIRCD_CONFDIR} \ --libdir=${TRIRCD_LIBDIR} \ diff --git a/japanese/mecab/Makefile b/japanese/mecab/Makefile index bb79f7c0a271..19896c6fc9a6 100644 --- a/japanese/mecab/Makefile +++ b/japanese/mecab/Makefile @@ -48,8 +48,8 @@ post-configure: ${CP} ${WRKSRC}/mecabrc ${WRKSRC}/mecabrc.dist post-install: - @if [ ! -f ${TARGETDIR}/etc/mecabrc ]; then \ - ${INSTALL_DATA} ${TARGETDIR}/etc/mecabrc.dist ${TARGETDIR}/etc/mecabrc; \ + @if [ ! -f ${PREFIX}/etc/mecabrc ]; then \ + ${INSTALL_DATA} ${PREFIX}/etc/mecabrc.dist ${PREFIX}/etc/mecabrc; \ fi .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} diff --git a/japanese/p5-manual/Makefile b/japanese/p5-manual/Makefile index a809302b2cfe..5dc8961d316b 100644 --- a/japanese/p5-manual/Makefile +++ b/japanese/p5-manual/Makefile @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Perl5 japanese manual NO_BUILD= yes -MANPREFIX= ${TARGETDIR}/man/ja +MANPREFIX= ${PREFIX}/man/ja CAT1= a2p.1 perl.1 perlapi.1 perlbook.1 perlbot.1 perlcall.1 \ perldata.1 perldebug.1 perldiag.1 perlembed.1 perlform.1 \ diff --git a/japanese/perl5/Makefile b/japanese/perl5/Makefile index 4ed86535e938..b3ca7655bcb0 100644 --- a/japanese/perl5/Makefile +++ b/japanese/perl5/Makefile @@ -44,7 +44,7 @@ COMMENT= Pattern Extraction and Recognition Language + Japanese patches HAS_CONFIGURE= yes CONFIGURE_SCRIPT= Configure -CONFIGURE_ARGS= -sde -Dprefix=${TARGETDIR} -Duseshrplib \ +CONFIGURE_ARGS= -sde -Dprefix=${PREFIX} -Duseshrplib \ -Dlibperl=libperl.so.${PERL_SHLIBVER} JPERL_VER= 5.005 @@ -110,7 +110,7 @@ MAN3= AnyDBM_File.3 AutoLoader.3 AutoSplit.3 B.3 B::Asmdata.3 \ strict.3 subs.3 vars.3 \ I18N::Japanese.3 -MAN3PREFIX= ${TARGETDIR}/lib/perl5/${JPERL_VERSION}/ +MAN3PREFIX= ${PREFIX}/lib/perl5/${JPERL_VERSION}/ test: @(cd ${WRKSRC}; make test) @@ -121,16 +121,16 @@ post-patch: .endfor post-install: - @strip ${TARGETDIR}/bin/perl${JPERL_VERSION} - @strip ${TARGETDIR}/bin/sperl${JPERL_VERSION} - @${RM} ${TARGETDIR}/bin/perl ${TARGETDIR}/bin/suidperl - @${LN} -sf ${TARGETDIR}/bin/perl${JPERL_VERSION} ${TARGETDIR}/bin/perl - @${LN} -sf ${TARGETDIR}/bin/perl${JPERL_VERSION} ${TARGETDIR}/bin/perl5 - @${LN} -fs ${TARGETDIR}/bin/perl${JPERL_VERSION} ${TARGETDIR}/bin/jperl5 - @${LN} -fs ${TARGETDIR}/bin/perl${JPERL_VERSION} ${TARGETDIR}/bin/jperl${JPERL_VERSION} - @${LN} -fs ${TARGETDIR}/bin/sperl${JPERL_VERSION} ${TARGETDIR}/bin/suidperl - @${LN} -fs ${TARGETDIR}/bin/sperl${JPERL_VERSION} ${TARGETDIR}/bin/jsuidperl - @${LN} -fs ${TARGETDIR}/lib/perl5/${JPERL_VERSION}/${MACHINE_ARCH}-freebsd/CORE/libperl.so.${PERL_SHLIBVER} ${TARGETDIR}/lib/perl5/${JPERL_VERSION}/${MACHINE_ARCH}-freebsd/CORE/libperl.so - @PKG_PREFIX=${TARGETDIR} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + @strip ${PREFIX}/bin/perl${JPERL_VERSION} + @strip ${PREFIX}/bin/sperl${JPERL_VERSION} + @${RM} ${PREFIX}/bin/perl ${PREFIX}/bin/suidperl + @${LN} -sf ${PREFIX}/bin/perl${JPERL_VERSION} ${PREFIX}/bin/perl + @${LN} -sf ${PREFIX}/bin/perl${JPERL_VERSION} ${PREFIX}/bin/perl5 + @${LN} -fs ${PREFIX}/bin/perl${JPERL_VERSION} ${PREFIX}/bin/jperl5 + @${LN} -fs ${PREFIX}/bin/perl${JPERL_VERSION} ${PREFIX}/bin/jperl${JPERL_VERSION} + @${LN} -fs ${PREFIX}/bin/sperl${JPERL_VERSION} ${PREFIX}/bin/suidperl + @${LN} -fs ${PREFIX}/bin/sperl${JPERL_VERSION} ${PREFIX}/bin/jsuidperl + @${LN} -fs ${PREFIX}/lib/perl5/${JPERL_VERSION}/${MACHINE_ARCH}-freebsd/CORE/libperl.so.${PERL_SHLIBVER} ${PREFIX}/lib/perl5/${JPERL_VERSION}/${MACHINE_ARCH}-freebsd/CORE/libperl.so + @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.post.mk> diff --git a/java/berkeley-db/Makefile b/java/berkeley-db/Makefile index b8e079182c58..9478abf41c72 100644 --- a/java/berkeley-db/Makefile +++ b/java/berkeley-db/Makefile @@ -68,7 +68,7 @@ post-build: post-patch: - @${REINPLACE_CMD} "s,/usr/local,${TARGETDIR}," ${WRKSRC}/build.xml + @${REINPLACE_CMD} "s,/usr/local,${PREFIX}," ${WRKSRC}/build.xml do-install: @${INSTALL_DATA} ${WRKSRC}/build/lib/je.jar ${JAVAJARDIR} diff --git a/java/veditor/Makefile b/java/veditor/Makefile index 077e92f75fd8..bf8d3625c36a 100644 --- a/java/veditor/Makefile +++ b/java/veditor/Makefile @@ -34,7 +34,7 @@ NO_BUILD= yes USE_ZIP= yes NO_WRKSUBDIR= yes -ECLIPSE= ${TARGETDIR}/eclipse +ECLIPSE= ${PREFIX}/eclipse PLUGINS= plugins do-install: diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile index a504e0f01e14..8863af4f8b03 100644 --- a/lang/erlang/Makefile +++ b/lang/erlang/Makefile @@ -93,10 +93,10 @@ PLIST_SUB+= ERTS_VSN=${ERTS_VSN} TOOLS_VSN=${TOOLS_VSN} NOMANCOMPRESS= yes -MAN1PREFIX= ${TARGETDIR}/lib/erlang -MAN3PREFIX= ${TARGETDIR}/lib/erlang -MAN4PREFIX= ${TARGETDIR}/lib/erlang -MAN6PREFIX= ${TARGETDIR}/lib/erlang +MAN1PREFIX= ${PREFIX}/lib/erlang +MAN3PREFIX= ${PREFIX}/lib/erlang +MAN4PREFIX= ${PREFIX}/lib/erlang +MAN6PREFIX= ${PREFIX}/lib/erlang pre-configure: # Check if ${JAVAC} exists. diff --git a/lang/erlang14/Makefile b/lang/erlang14/Makefile index a504e0f01e14..8863af4f8b03 100644 --- a/lang/erlang14/Makefile +++ b/lang/erlang14/Makefile @@ -93,10 +93,10 @@ PLIST_SUB+= ERTS_VSN=${ERTS_VSN} TOOLS_VSN=${TOOLS_VSN} NOMANCOMPRESS= yes -MAN1PREFIX= ${TARGETDIR}/lib/erlang -MAN3PREFIX= ${TARGETDIR}/lib/erlang -MAN4PREFIX= ${TARGETDIR}/lib/erlang -MAN6PREFIX= ${TARGETDIR}/lib/erlang +MAN1PREFIX= ${PREFIX}/lib/erlang +MAN3PREFIX= ${PREFIX}/lib/erlang +MAN4PREFIX= ${PREFIX}/lib/erlang +MAN6PREFIX= ${PREFIX}/lib/erlang pre-configure: # Check if ${JAVAC} exists. diff --git a/lang/icc/Makefile b/lang/icc/Makefile index e1808efd21c9..df123e737017 100644 --- a/lang/icc/Makefile +++ b/lang/icc/Makefile @@ -39,7 +39,7 @@ PATCH_WRKSRC= ${WRKSRC}/opt/${COMPILERDIR} MAN1= icc.1 MLINKS= icc.1 icpc.1 -MANPREFIX= ${TARGETDIR}/${COMPILERDIR} +MANPREFIX= ${PREFIX}/${COMPILERDIR} ICC_SITE= http://www.intel.com/software/products/compilers/ diff --git a/lang/icc7/Makefile b/lang/icc7/Makefile index 1032c82e7db1..20eb41a54707 100644 --- a/lang/icc7/Makefile +++ b/lang/icc7/Makefile @@ -31,7 +31,7 @@ PLIST_SUB= COMPILERDIR=${COMPILERDIR} PATCH_WRKSRC= ${WRKSRC}/opt/intel/${COMPILERDIR} MAN1= icc.1 -MANPREFIX= ${TARGETDIR}/intel/${COMPILERDIR}/ +MANPREFIX= ${PREFIX}/intel/${COMPILERDIR}/ ICC_SITE= http://www.intel.com/software/products/compilers/ diff --git a/lang/ifc/Makefile b/lang/ifc/Makefile index 049ee88a495b..bee8787e9df9 100644 --- a/lang/ifc/Makefile +++ b/lang/ifc/Makefile @@ -35,7 +35,7 @@ PLIST_SUB= COMPILERDIR=${COMPILERDIR} PATCH_WRKSRC= ${WRKSRC}/opt/${COMPILERDIR} MAN1= ifort.1 -MANPREFIX= ${TARGETDIR}/${COMPILERDIR}/ +MANPREFIX= ${PREFIX}/${COMPILERDIR}/ IFC_SITE= http://www.intel.com/software/products/compilers/ diff --git a/lang/ifc7/Makefile b/lang/ifc7/Makefile index 8bcba1dbe24d..378f7597a6c8 100644 --- a/lang/ifc7/Makefile +++ b/lang/ifc7/Makefile @@ -30,7 +30,7 @@ PLIST_SUB= COMPILERDIR=${COMPILERDIR} PATCH_WRKSRC= ${WRKSRC}/opt/intel/${COMPILERDIR} MAN1= ifc.1 -MANPREFIX= ${TARGETDIR}/intel/${COMPILERDIR}/ +MANPREFIX= ${PREFIX}/intel/${COMPILERDIR}/ IFC_SITE= http://www.intel.com/software/products/compilers/ diff --git a/lang/imp-interpreter/Makefile b/lang/imp-interpreter/Makefile index 4dffb07aba81..340d565e3e09 100644 --- a/lang/imp-interpreter/Makefile +++ b/lang/imp-interpreter/Makefile @@ -32,7 +32,7 @@ PORTDOCS= README .include <bsd.port.pre.mk> do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/main ${TARGETDIR}/bin/IMP + ${INSTALL_PROGRAM} ${WRKSRC}/main ${PREFIX}/bin/IMP post-install: .if !defined(NOPORTDOCS) diff --git a/lang/metaocaml/Makefile b/lang/metaocaml/Makefile index 3d68be9cb557..eb91c60647d2 100644 --- a/lang/metaocaml/Makefile +++ b/lang/metaocaml/Makefile @@ -72,7 +72,7 @@ PLISTDIR= ${PREFIX}/lib/metaocaml \ .include <bsd.port.pre.mk> # Have to set this here and can't use ${DATADIR} or MLINKS get screwed up -MANPREFIX= ${TARGETDIR}/share/metaocaml +MANPREFIX= ${PREFIX}/share/metaocaml .if defined(WITH_X11) USE_XLIB= yes diff --git a/lang/perl5.10/Makefile b/lang/perl5.10/Makefile index 46c7d47d3b4e..725f1b4d0b44 100644 --- a/lang/perl5.10/Makefile +++ b/lang/perl5.10/Makefile @@ -119,7 +119,7 @@ PLIST_SUB+= NEED_USE_PERL="@comment " .if defined(WITH_GDBM) MAN3+= GDBM_File.3 .endif -MAN3PREFIX= ${TARGETDIR}/lib/perl5/${PERL_VER}/perl +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VER}/perl test: @(cd ${WRKSRC}; make test) diff --git a/lang/perl5.12/Makefile b/lang/perl5.12/Makefile index 46c7d47d3b4e..725f1b4d0b44 100644 --- a/lang/perl5.12/Makefile +++ b/lang/perl5.12/Makefile @@ -119,7 +119,7 @@ PLIST_SUB+= NEED_USE_PERL="@comment " .if defined(WITH_GDBM) MAN3+= GDBM_File.3 .endif -MAN3PREFIX= ${TARGETDIR}/lib/perl5/${PERL_VER}/perl +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VER}/perl test: @(cd ${WRKSRC}; make test) diff --git a/lang/perl5.14/Makefile b/lang/perl5.14/Makefile index 46c7d47d3b4e..725f1b4d0b44 100644 --- a/lang/perl5.14/Makefile +++ b/lang/perl5.14/Makefile @@ -119,7 +119,7 @@ PLIST_SUB+= NEED_USE_PERL="@comment " .if defined(WITH_GDBM) MAN3+= GDBM_File.3 .endif -MAN3PREFIX= ${TARGETDIR}/lib/perl5/${PERL_VER}/perl +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VER}/perl test: @(cd ${WRKSRC}; make test) diff --git a/lang/perl5.16/Makefile b/lang/perl5.16/Makefile index 46c7d47d3b4e..725f1b4d0b44 100644 --- a/lang/perl5.16/Makefile +++ b/lang/perl5.16/Makefile @@ -119,7 +119,7 @@ PLIST_SUB+= NEED_USE_PERL="@comment " .if defined(WITH_GDBM) MAN3+= GDBM_File.3 .endif -MAN3PREFIX= ${TARGETDIR}/lib/perl5/${PERL_VER}/perl +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VER}/perl test: @(cd ${WRKSRC}; make test) diff --git a/lang/perl5.6/Makefile b/lang/perl5.6/Makefile index fe5fdb148699..8e48d5aec941 100644 --- a/lang/perl5.6/Makefile +++ b/lang/perl5.6/Makefile @@ -97,7 +97,7 @@ PLIST_SUB+= NEED_USE_PERL="" .if defined(WITH_GDBM) MAN3+= GDBM_File.3 .endif -MAN3PREFIX= ${TARGETDIR}/lib/perl5/${PERL_VER}/perl +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VER}/perl test: @(cd ${WRKSRC}; make test) diff --git a/lang/perl5.8/Makefile b/lang/perl5.8/Makefile index 46c7d47d3b4e..725f1b4d0b44 100644 --- a/lang/perl5.8/Makefile +++ b/lang/perl5.8/Makefile @@ -119,7 +119,7 @@ PLIST_SUB+= NEED_USE_PERL="@comment " .if defined(WITH_GDBM) MAN3+= GDBM_File.3 .endif -MAN3PREFIX= ${TARGETDIR}/lib/perl5/${PERL_VER}/perl +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VER}/perl test: @(cd ${WRKSRC}; make test) diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile index fe5fdb148699..8e48d5aec941 100644 --- a/lang/perl5/Makefile +++ b/lang/perl5/Makefile @@ -97,7 +97,7 @@ PLIST_SUB+= NEED_USE_PERL="" .if defined(WITH_GDBM) MAN3+= GDBM_File.3 .endif -MAN3PREFIX= ${TARGETDIR}/lib/perl5/${PERL_VER}/perl +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VER}/perl test: @(cd ${WRKSRC}; make test) diff --git a/lang/pike72/Makefile b/lang/pike72/Makefile index c611eb4e5511..66b196ac91be 100644 --- a/lang/pike72/Makefile +++ b/lang/pike72/Makefile @@ -178,7 +178,7 @@ CONFIGURE_ARGS+= --without-libpdf USE_GMAKE= yes MAN1= hilfe.1 pike.1 -MAN1PREFIX= ${TARGETDIR}/pike/${PORTVERSION} +MAN1PREFIX= ${PREFIX}/pike/${PORTVERSION} pre-everything:: .if !defined(WITH_OPTIMIZED_CFLAGS) diff --git a/lang/pugs/Makefile b/lang/pugs/Makefile index 484bcd49b9a3..ee7a36021a76 100644 --- a/lang/pugs/Makefile +++ b/lang/pugs/Makefile @@ -35,7 +35,7 @@ MAN3= Perl6::Pugs.3 \ Inline::Pugs.3 SITE_PERL6_REL= lib/perl6 -PERL6_MANPREFIX= ${TARGETDIR}/${SITE_PERL6_REL}/site_perl/auto/pugs/perl5 +PERL6_MANPREFIX= ${PREFIX}/${SITE_PERL6_REL}/site_perl/auto/pugs/perl5 SITE_PERL6_MAN3= Class::Rebless.3 \ PIL2JS::JSPM.3 \ Pugs::Compiler::Perl6.3 \ @@ -57,8 +57,8 @@ PLIST_SUB= SITE_PERL6_REL=${SITE_PERL6_REL} .include <bsd.port.pre.mk> post-configure: - @${REINPLACE_CMD} -e '/^INSTALLPRIVLIB/s,${PREFIX}/lib,${TARGETDIR}/lib/perl6,;' \ - -e '/^INSTALLARCHLIB/s,${PREFIX}/lib,${TARGETDIR}/lib/perl6/mach,' \ + @${REINPLACE_CMD} -e '/^INSTALLPRIVLIB/s,${PREFIX}/lib,${PREFIX}/lib/perl6,;' \ + -e '/^INSTALLARCHLIB/s,${PREFIX}/lib,${PREFIX}/lib/perl6/mach,' \ ${WRKSRC}/Makefile .if !defined(NOPORTDOCS) @@ -67,9 +67,9 @@ post-install: @${MKDIR} ${EXAMPLESDIR} @${CP} -R ${EXDIR}/ ${EXAMPLESDIR} @${FIND} -s ${EXAMPLESDIR} -type f | \ - ${SED} -e 's|^${TARGETDIR}/||' >> ${TMPPLIST} + ${SED} -e 's|^${PREFIX}/||' >> ${TMPPLIST} @${FIND} -d ${EXAMPLESDIR} -type d | \ - ${SED} -e 's|^${TARGETDIR}/|@dirrm |' >> ${TMPPLIST} + ${SED} -e 's|^${PREFIX}/|@dirrm |' >> ${TMPPLIST} .endif .include <bsd.port.post.mk> diff --git a/mail/exim/Makefile b/mail/exim/Makefile index 608c583dd5b5..3411d69ebafc 100644 --- a/mail/exim/Makefile +++ b/mail/exim/Makefile @@ -629,45 +629,45 @@ pre-install: if ! /usr/sbin/pw groupshow ${EXIM_GROUP}; then /usr/sbin/pw groupadd ${EXIM_GROUP} -g 125; fi if ! /usr/sbin/pw usershow ${EXIM_USER}; then /usr/sbin/pw useradd ${EXIM_USER} -g ${EXIM_GROUP} -u 125 \ -h - -d /var/spool/exim -s /nonexistent -c "Exim User"; fi - @[ -d "${DESTDIR}/etc" ] || ${MKDIR} "${DESTDIR}/etc" - @${SETENV} PKG_PREFIX="${PREFIX}" PKG_DESTDIR="${DESTDIR}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL + @[ -d "/etc" ] || ${MKDIR} "/etc" + @${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: .if !defined(WITHOUT_DAEMON) - @${MKDIR} ${DESTDIR}${PREFIX}/etc/periodic/daily + @${MKDIR} ${PREFIX}/etc/periodic/daily .for script in ${DAILY_SCRIPTS} - @${INSTALL_SCRIPT} ${WRKDIR}/${script}.sh ${DESTDIR}${PREFIX}/etc/periodic/daily/${script} + @${INSTALL_SCRIPT} ${WRKDIR}/${script}.sh ${PREFIX}/etc/periodic/daily/${script} .endfor .endif - @[ -f ${DESTDIR}${PREFIX}/etc/exim/configure ] || \ - ${CP} ${DESTDIR}${PREFIX}/etc/exim/configure.default ${DESTDIR}${PREFIX}/etc/exim/configure + @[ -f ${PREFIX}/etc/exim/configure ] || \ + ${CP} ${PREFIX}/etc/exim/configure.default ${PREFIX}/etc/exim/configure .for manfile in ${MAN8} - @${INSTALL_MAN} ${WRKSRC}/doc/${manfile} ${DESTDIR}${MAN8PREFIX}/man/man8 + @${INSTALL_MAN} ${WRKSRC}/doc/${manfile} ${MAN8PREFIX}/man/man8 .endfor .if !defined(NOPORTDOCS) - @${MKDIR} ${DESTDIR}${DOCSDIR} - @${INSTALL_DATA} ${WRKDIR}/POST-INSTALL-NOTES ${DESTDIR}${DOCSDIR} - @${INSTALL_DATA} ${WRKDIR}/POST-INSTALL-NOTES.clamd ${DESTDIR}${DOCSDIR} + @${MKDIR} ${DOCSDIR} + @${INSTALL_DATA} ${WRKDIR}/POST-INSTALL-NOTES ${DOCSDIR} + @${INSTALL_DATA} ${WRKDIR}/POST-INSTALL-NOTES.clamd ${DOCSDIR} .for docfile in ${PORTDOC_BASE} - @${INSTALL_DATA} ${WRKSRC}/${docfile} ${DESTDIR}${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/${docfile} ${DOCSDIR} .endfor .for docfile in ${PORTDOC_FILES} - @${INSTALL_DATA} ${WRKSRC}/doc/${docfile} ${DESTDIR}${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/doc/${docfile} ${DOCSDIR} .endfor - @${MKDIR} ${DESTDIR}${EXAMPLESDIR} + @${MKDIR} ${EXAMPLESDIR} .for example in ${PORT_EXAMPLES} - @${INSTALL_SCRIPT} ${WRKSRC}/build-${OPSYS}-${ARCH}/${example} ${DESTDIR}${EXAMPLESDIR} + @${INSTALL_SCRIPT} ${WRKSRC}/build-${OPSYS}-${ARCH}/${example} ${EXAMPLESDIR} .endfor .endif .if defined(WITH_SA_EXIM) @${INSTALL_DATA} ${WRKDIR}/sa-exim-${SA_EXIM_VERSION}/sa-exim.conf \ - ${DESTDIR}${PREFIX}/etc/exim/sa-exim.conf.default - @[ -f ${DESTDIR}${PREFIX}/etc/exim/sa-exim.conf ] || \ - ${CP} ${DESTDIR}${PREFIX}/etc/exim/sa-exim.conf.default \ - ${DESTDIR}${PREFIX}/etc/exim/sa-exim.conf + ${PREFIX}/etc/exim/sa-exim.conf.default + @[ -f ${PREFIX}/etc/exim/sa-exim.conf ] || \ + ${CP} ${PREFIX}/etc/exim/sa-exim.conf.default \ + ${PREFIX}/etc/exim/sa-exim.conf .endif @${CAT} ${PKGMESSAGE} - @${SETENV} PKG_PREFIX="${PREFIX}" PKG_DESTDIR="${DESTDIR}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + @${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .else diff --git a/mail/exim/pkg-install b/mail/exim/pkg-install index ee9dbcead7f6..616ff41effd5 100644 --- a/mail/exim/pkg-install +++ b/mail/exim/pkg-install @@ -12,11 +12,10 @@ # PKG_PREFIX=${PKG_PREFIX:=%%PREFIX%%} -PKG_DESTDIR=${PKG_DESTDIR:=} user=%%EXIM_USER%% group=%%EXIM_GROUP%% -logdir=$PKG_DESTDIR%%LOGDIR%% +logdir=%%LOGDIR%% if [ "$2" = "PRE-INSTALL" ]; then if ! /usr/bin/id ${user} > /dev/null; then @@ -31,7 +30,7 @@ if [ "$2" = "PRE-INSTALL" ]; then fi if [ "$2" = "POST-INSTALL" ]; then - cf=$PKG_DESTDIR$PKG_PREFIX/etc/exim/configure + cf=$PKG_PREFIX/etc/exim/configure if [ -e $cf ]; then if /usr/bin/grep -q '^[^#]*hostlist.*relay_from_hosts.*=.*127.0.0.1' $cf then @@ -49,7 +48,7 @@ if [ "$2" = "POST-INSTALL" ]; then echo "============================================================" fi fi - if ! /usr/bin/grep -qs "^exim_enable" $PKG_DESTDIR/etc/rc.conf + if ! /usr/bin/grep -qs "^exim_enable" /etc/rc.conf then echo echo "Don't forget to add 'exim_enable=\"YES\"' to rc.conf(5)" diff --git a/mail/exipick/Makefile b/mail/exipick/Makefile index 542ead87a7b6..fc9af7ee6469 100644 --- a/mail/exipick/Makefile +++ b/mail/exipick/Makefile @@ -29,8 +29,7 @@ do-build: ${WRKSRC}/${DISTNAME} > ${WRKSRC}/${PORTNAME}.pl do-install: - @${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl \ - ${DESTDIR}${PREFIX}/bin/${PORTNAME} + @${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl ${PREFIX}/bin/${PORTNAME} @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/mail/mailgraph/Makefile b/mail/mailgraph/Makefile index bdec0d4c40d4..554a0afb56b1 100644 --- a/mail/mailgraph/Makefile +++ b/mail/mailgraph/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= ${SITE_PERL}/RRDp.pm:${PORTSDIR}/databases/rrdtool \ NO_BUILD= yes -DATADIR?= ${DESTDIR}/var/db/mailgraph +DATADIR?= /var/db/mailgraph MAILGRAPH_USER?= ${WWWOWN} MAILGRAPH_GROUP?= ${WWWGRP} @@ -48,11 +48,11 @@ post-patch: @${SED} 's|%%DATADIR%%|${DATADIR}|g' ${MSG_FILE} > ${PKGMESSAGE} do-install: - ${MKDIR} ${TARGETDIR}/www/cgi-bin + ${MKDIR} ${PREFIX}/www/cgi-bin ${MKDIR} ${DATADIR} @${CHOWN} -R ${MAILGRAPH_USER}:${MAILGRAPH_GROUP} ${DATADIR} - @${INSTALL_SCRIPT} ${WRKSRC}/mailgraph.pl ${TARGETDIR}/sbin - @${INSTALL_SCRIPT} ${WRKSRC}/mailgraph.cgi ${TARGETDIR}/www/cgi-bin + @${INSTALL_SCRIPT} ${WRKSRC}/mailgraph.pl ${PREFIX}/sbin + @${INSTALL_SCRIPT} ${WRKSRC}/mailgraph.cgi ${PREFIX}/www/cgi-bin .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} for f in ${DOCS}; do \ diff --git a/mail/mboxstats/Makefile b/mail/mboxstats/Makefile index 6b06e355dec6..e091d5a7f317 100644 --- a/mail/mboxstats/Makefile +++ b/mail/mboxstats/Makefile @@ -28,6 +28,6 @@ post-patch: @${REINPLACE_CMD} -Ee 's,(stat|mmap|lseek|off)64,\1,g' ${WRKSRC}/br.h ${WRKSRC}/br.cpp do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/mboxstats ${TARGETDIR}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/mboxstats ${PREFIX}/bin .include <bsd.port.post.mk> diff --git a/mail/nullpop/Makefile b/mail/nullpop/Makefile index aefa3dafdce3..6189a46c44f8 100644 --- a/mail/nullpop/Makefile +++ b/mail/nullpop/Makefile @@ -14,7 +14,7 @@ MAINTAINER= pankov_p@mail.ru COMMENT= A POP3 server that allows logins, but never returns any email GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--libexecdir="${TARGETDIR}/bin" +CONFIGURE_ARGS+=--libexecdir="${PREFIX}/bin" PLIST_FILES= bin/nullpop MAN8= nullpop.8 diff --git a/mail/pflogsumm/Makefile b/mail/pflogsumm/Makefile index 5f050e6c6fdb..4f6c6595872e 100644 --- a/mail/pflogsumm/Makefile +++ b/mail/pflogsumm/Makefile @@ -28,7 +28,7 @@ MAN1= pflogsumm.1 do-install: ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl \ - ${TARGETDIR}/bin/${PORTNAME} + ${PREFIX}/bin/${PORTNAME} ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MAN1PREFIX}/man/man1 .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} diff --git a/mail/qmailanalog/Makefile b/mail/qmailanalog/Makefile index 18c943a095e8..9109f76c21cd 100644 --- a/mail/qmailanalog/Makefile +++ b/mail/qmailanalog/Makefile @@ -33,7 +33,7 @@ MYSUBDIR?= .endif PREFIX?= ${QMAIL_PREFIX} -QMPREFIX?= ${TARGETDIR}/${MYSUBDIR} +QMPREFIX?= ${PREFIX}/${MYSUBDIR} NO_MTREE= yes diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile index 474b1efb5c09..843f613c6882 100644 --- a/mail/sendmail/Makefile +++ b/mail/sendmail/Makefile @@ -123,7 +123,7 @@ CONFLICTS2!= ${MAKE_PKGNAMES} | grep -v "${PORTNAME}${PKGNAMESUFFIX}-8." CONFLICTS+= ${CONFLICTS2} # Build site.config.m4 -.if exists(${DESTDIR}/etc/mail/mailer.conf) +.if exists(/etc/mail/mailer.conf) SITE+= ${FILESDIR}/site.config.m4 .endif .if !defined(SENDMAIL_WITHOUT_IPV6) @@ -143,9 +143,9 @@ USE_OPENSSL= yes .endif # install directly if no mailwrapper support -.if ! exists(${DESTDIR}/etc/mail/mailer.conf) -PREFIX?= ${DESTDIR}/usr -MANPREFIX?= ${DESTDIR}/usr/share +.if ! exists(/etc/mail/mailer.conf) +PREFIX?= /usr +MANPREFIX?= /usr/share PLIST_SUB+= ETCPORT="@comment " .else PLIST_SUB+= ETCPORT="" @@ -290,7 +290,7 @@ post-install: ${LN} -sf libmilter.so.${MILTER_SOVER} ${PREFIX}/lib/libmilter.so .endif .endif -.if exists(${DESTDIR}/etc/mail/mailer.conf) +.if exists(/etc/mail/mailer.conf) ${INSTALL_SCRIPT} ${WRKSRC}/sm-client.sh \ ${LOCALBASE}/etc/rc.d/sm-client.sh.sample ${INSTALL_SCRIPT} ${WRKSRC}/sendmail.sh \ @@ -332,7 +332,7 @@ post-install: ${INSTALL_DATA} ${FILESDIR}/CYRUS_LOOKUP ${DOCSDIR}/CYRUS_LOOKUP .endif .endif -.if exists(${DESTDIR}/etc/mail/mailer.conf) +.if exists(/etc/mail/mailer.conf) @${CAT} ${PKGMESSAGE} mailer.base: @@ -343,9 +343,9 @@ mailer.base: -e "s=^newaliases[ ]*/.*$$=newaliases ${BASEMAIL}=" \ -e "s=^hoststat[ ]*/.*$$=hoststat ${BASEMAIL}=" \ -e "s=^purgestat[ ]*/.*$$=purgestat ${BASEMAIL}=" \ - ${DESTDIR}/etc/mail/mailer.conf > ${DESTDIR}/etc/mail/mailer.conf.new - ${MV} ${DESTDIR}/etc/mail/mailer.conf.new \ - ${DESTDIR}/etc/mail/mailer.conf + /etc/mail/mailer.conf > /etc/mail/mailer.conf.new + ${MV} /etc/mail/mailer.conf.new \ + /etc/mail/mailer.conf mailer.conf: @${SED} \ @@ -355,21 +355,21 @@ mailer.conf: -e "s=^newaliases[ ]*/.*$$=newaliases ${SENDMAIL}=" \ -e "s=^hoststat[ ]*/.*$$=hoststat ${SENDMAIL}=" \ -e "s=^purgestat[ ]*/.*$$=purgestat ${SENDMAIL}=" \ - ${DESTDIR}/etc/mail/mailer.conf > ${DESTDIR}/etc/mail/mailer.conf.new - ${MV} ${DESTDIR}/etc/mail/mailer.conf.new \ - ${DESTDIR}/etc/mail/mailer.conf + /etc/mail/mailer.conf > /etc/mail/mailer.conf.new + ${MV} /etc/mail/mailer.conf.new \ + /etc/mail/mailer.conf .endif # create sumbit.cf on older systems # -submit.cf: ${DESTDIR}/etc/mail/submit.cf +submit.cf: /etc/mail/submit.cf -${DESTDIR}/etc/mail/submit.mc: +/etc/mail/submit.mc: ${INSTALL_DATA} ${PREFIX}/share/sendmail/cf/cf/submit.mc \ - ${DESTDIR}/etc/mail/submit.mc + /etc/mail/submit.mc -${DESTDIR}/etc/mail/submit.cf: ${DESTDIR}/etc/mail/submit.mc - @( cd ${DESTDIR}/etc/mail && ${MAKE} \ +/etc/mail/submit.cf: /etc/mail/submit.mc + @( cd /etc/mail && ${MAKE} \ SENDMAIL_CF_DIR=${PREFIX}/share/sendmail/cf \ SENDMAIL_MC=submit ) @@ -394,7 +394,7 @@ tls-install: help: @${ECHO_CMD} "# additional targets:" @${ECHO_CMD} "#" - @${ECHO_CMD} "# configure ${DESTDIR}/etc/mail/mailer.conf" + @${ECHO_CMD} "# configure /etc/mail/mailer.conf" @${ECHO_CMD} "# for sendmail from ports" @${ECHO_CMD} "make mailer.conf" @${ECHO_CMD} "# for sendmail in the base" @@ -420,7 +420,7 @@ SITE+= ${FILESDIR}/site.config.m4.tls SITE+= ${FILESDIR}/site.config.m4.local .endif -.if exists(${DESTDIR}/etc/mail/mailer.conf) && ${PREFIX} == "/usr" +.if exists(/etc/mail/mailer.conf) && ${PREFIX} == "/usr" pre-everything:: @${ECHO_CMD} "#" @${ECHO_CMD} "# You can't override the base sendmail this way." diff --git a/mail/swaks/Makefile b/mail/swaks/Makefile index 8c4418d731a1..6357ac47b181 100644 --- a/mail/swaks/Makefile +++ b/mail/swaks/Makefile @@ -47,8 +47,7 @@ do-build: ${WRKSRC}/${DISTNAME} > ${WRKSRC}/${PORTNAME}.pl do-install: - @${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl \ - ${DESTDIR}${PREFIX}/bin/${PORTNAME} + @${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl ${PREFIX}/bin/${PORTNAME} @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/mail/zmailer/Makefile b/mail/zmailer/Makefile index 65f048d161b3..f64ec22a2542 100644 --- a/mail/zmailer/Makefile +++ b/mail/zmailer/Makefile @@ -49,7 +49,7 @@ CONFIGURE_ARGS+=--prefix=${PREFIX}/ \ MAN1= rmail.1zm vacation.1zm zmailer.1zm zmsh.1zm mboxpath.1zm mailq.1zm \ mailrm.1zm newaliases.1zm -MAN3PREFIX= ${TARGETDIR}/lib/perl5/${PERL_VERSION} +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} MAN3= ZMailer::mailq.3 MAN5= aliases.5zm mailq-m.5zm zdbases.conf.5zm zmailer.conf.5zm MAN8= hold.8zm router.8zm scheduler.8zm sendmail.8zm sm.8zm smtp.8zm \ diff --git a/math/PDL/Makefile b/math/PDL/Makefile index f555d742edaa..b400740f679f 100644 --- a/math/PDL/Makefile +++ b/math/PDL/Makefile @@ -75,17 +75,17 @@ test: # autogen plist post-install: @(cd ${WRKSRC}/blib/man3 ; \ - ${FIND} *.3 | ${SED} "s,^,${MAN3PREFIX:S,^${TARGETDIR}/,,}/man/man3/," \ + ${FIND} *.3 | ${SED} "s,^,${MAN3PREFIX:S,^${PREFIX}/,,}/man/man3/," \ >> ${TMPPLIST} ; \ cd ${WRKSRC}/blib/man1 ; \ ${FIND} *.1 | ${SED} "s,^,man/man1/," >> ${TMPPLIST}) @(${FIND} ${SITE_PERL}/${PERL_ARCH}/PDL* -type f | \ - ${SED} "s,^${TARGETDIR}/,," >> ${TMPPLIST} ; \ + ${SED} "s,^${PREFIX}/,," >> ${TMPPLIST} ; \ ${FIND} ${SITE_PERL}/${PERL_ARCH}/PDL* -type d | ${SORT} -r | \ - ${SED} "s,^${TARGETDIR}/,@dirrm ," >> ${TMPPLIST} ; \ + ${SED} "s,^${PREFIX}/,@dirrm ," >> ${TMPPLIST} ; \ ${FIND} ${SITE_PERL}/${PERL_ARCH}/auto/PDL -type f | \ - ${SED} "s,^${TARGETDIR}/,," >> ${TMPPLIST} ; \ + ${SED} "s,^${PREFIX}/,," >> ${TMPPLIST} ; \ ${FIND} ${SITE_PERL}/${PERL_ARCH}/auto/PDL -type d | ${SORT} -r | \ - ${SED} "s,^${TARGETDIR}/,@dirrm ," >> ${TMPPLIST}) + ${SED} "s,^${PREFIX}/,@dirrm ," >> ${TMPPLIST}) .include <bsd.port.post.mk> diff --git a/math/blas/files/makefile.lib b/math/blas/files/makefile.lib index 99a484141cfc..f12ef652709d 100644 --- a/math/blas/files/makefile.lib +++ b/math/blas/files/makefile.lib @@ -1,7 +1,7 @@ # @(#)Makefile 5.7 (Berkeley) 6/27/91 FFLAGS= @FFLAGS@ -LIBDIR= ${TARGETDIR}/lib +LIBDIR= ${PREFIX}/lib .if (${OSVERSION} > 600007) NO_PROFILE= no .else diff --git a/math/ltl/Makefile b/math/ltl/Makefile index 4d7922c2318e..029142c5c4c7 100644 --- a/math/ltl/Makefile +++ b/math/ltl/Makefile @@ -20,7 +20,7 @@ GNU_CONFIGURE= yes USE_AUTOTOOLS= libtool:15 CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-cxx=gcc --disable-doxygen --prefix=${PREFIX} --includedir=${PREFIX}/include/LTL -MAKE_ENV= prefix=${TARGETDIR} exec_prefix=${TARGETDIR} +MAKE_ENV= prefix=${PREFIX} exec_prefix=${PREFIX} MAKE_ARGS+= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ AUTOHEADER="${TRUE}" INSTALL_TARGET= install install-data check distdir diff --git a/math/py-matplotlib/Makefile b/math/py-matplotlib/Makefile index 6f7e5732f424..63d6316762ad 100644 --- a/math/py-matplotlib/Makefile +++ b/math/py-matplotlib/Makefile @@ -37,7 +37,7 @@ USE_TCL_RUN= yes USE_TK_RUN= yes CFLAGS+= -I${X11BASE}/include -EXAMPLESDIR= ${TARGETDIR}/share/examples/py-${PORTNAME} +EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} post-patch: @${GREP} -lR "share/matplotlib" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \ diff --git a/misc/nut/Makefile b/misc/nut/Makefile index 1e67689e91fe..c03a0310c194 100644 --- a/misc/nut/Makefile +++ b/misc/nut/Makefile @@ -30,7 +30,7 @@ post-patch: -e 's|^CFLAGS=|CFLAGS+=|g;s|-Os||;s|gcc|$${CC}|' ${WRKSRC}/Makefile do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${TARGETDIR}/bin/ + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/ ${INSTALL} -d ${DATADIR} ${INSTALL_DATA} ${RAW:S,^,${WRKSRC}/raw.data/,} ${DATADIR}/ ${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MAN1PREFIX}/man/man1/ diff --git a/misc/ossp-uuid/Makefile b/misc/ossp-uuid/Makefile index aa32d638fc0d..6e7557a5cee7 100644 --- a/misc/ossp-uuid/Makefile +++ b/misc/ossp-uuid/Makefile @@ -32,7 +32,7 @@ CONFIGURE_ENV+= PERL=${PERL5} CONFIGURE_ARGS+= --with-perl PLIST_SUB+= WITH_PERL='' MAN3= OSSP::uuid.3 -MAN3PREFIX= ${TARGETDIR}/lib/perl5/${PERL_VERSION} +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} .else PLIST_SUB+= WITH_PERL='@comment ' .endif diff --git a/misc/py-yolk/Makefile b/misc/py-yolk/Makefile index fe0b10764aa3..39cba03c817a 100644 --- a/misc/py-yolk/Makefile +++ b/misc/py-yolk/Makefile @@ -45,7 +45,7 @@ RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/elementtree/__init__.py:${PORTSDIR}/devel/py- .endif .if !defined (NOPORTEXAMPLES) -EXAMPLESDIR= ${TARGETDIR}/share/examples/py-${PORTNAME} +EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} .endif .include <bsd.port.post.mk> diff --git a/misc/table.el/Makefile b/misc/table.el/Makefile index 775c9e80851a..13fe2c789479 100644 --- a/misc/table.el/Makefile +++ b/misc/table.el/Makefile @@ -19,8 +19,8 @@ COMMENT= Create and edit WYSIWYG text based embedded tables in Emacs NO_BUILD= yes NO_WRKSUBDIR= yes -EMACSLISPDIR= ${TARGETDIR}/share/emacs/site-lisp -XEMACSLISPDIR= ${TARGETDIR}/lib/xemacs/site-lisp +EMACSLISPDIR= ${PREFIX}/share/emacs/site-lisp +XEMACSLISPDIR= ${PREFIX}/lib/xemacs/site-lisp do-extract: ${MKDIR} ${WRKDIR} diff --git a/misc/ttyrec/Makefile b/misc/ttyrec/Makefile index 7219089552af..ed35941f44f6 100644 --- a/misc/ttyrec/Makefile +++ b/misc/ttyrec/Makefile @@ -24,7 +24,7 @@ post-patch: do-install: .for file in ttyrec ttyplay ttytime - ${INSTALL_PROGRAM} ${WRKSRC}/${file} ${TARGETDIR}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${file} ${PREFIX}/bin .endfor .for file in ${MAN1} ${INSTALL_MAN} ${WRKSRC}/${file} ${MAN1PREFIX}/man/man1 diff --git a/misc/utf8locale/Makefile b/misc/utf8locale/Makefile index cd1cfdd7e59a..1be0e52324a3 100644 --- a/misc/utf8locale/Makefile +++ b/misc/utf8locale/Makefile @@ -21,14 +21,14 @@ LANGS= af_ZA be_BY bg_BG ca_ES cs_CZ da_DK de_AT de_CH de_DE el_GR \ fr_CA fr_CH fr_FR hr_HR hu_HU hy_AM is_IS it_CH it_IT ja_JP \ kk_KZ ko_KR lt_LT nl_BE nl_NL no_NO pl_PL pt_BR pt_PT ro_RO \ ru_RU sk_SK sl_SI sr_YU sv_SE tr_TR uk_UA zh_CN zh_HK zh_TW -BASELOCALEDIR= ${DESTDIR}/usr/share/locale +BASELOCALEDIR= /usr/share/locale PLIST_SUB= BASELOCALEDIR=${BASELOCALEDIR} \ LANGS="${LANGS}" PLIST= ${WRKDIR}/pkg-plist .include <bsd.port.pre.mk> -_HAVE_SWIDTH!= ${GREP} _CTYPE_SW ${DESTDIR}/usr/include/ctype.h 2>/dev/null \ +_HAVE_SWIDTH!= ${GREP} _CTYPE_SW /usr/include/ctype.h 2>/dev/null \ || ${TRUE} .if empty(_HAVE_SWIDTH) PKGNAMESUFFIX= -without-swidth diff --git a/multimedia/dvbcut/Makefile b/multimedia/dvbcut/Makefile index 1f33453c3f82..394ad010ab62 100644 --- a/multimedia/dvbcut/Makefile +++ b/multimedia/dvbcut/Makefile @@ -35,7 +35,7 @@ MAN1= dvbcut.1 PLIST_FILES= bin/dvbcut do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/bin/dvbcut ${TARGETDIR}/bin/ - ${INSTALL_MAN} ${WRKSRC}/dvbcut.1 ${TARGETDIR}/man/man1/ + ${INSTALL_PROGRAM} ${WRKSRC}/bin/dvbcut ${PREFIX}/bin/ + ${INSTALL_MAN} ${WRKSRC}/dvbcut.1 ${PREFIX}/man/man1/ .include <bsd.port.mk> diff --git a/multimedia/dvdrip/Makefile b/multimedia/dvdrip/Makefile index 38c71a6530d5..a2b2a872be72 100644 --- a/multimedia/dvdrip/Makefile +++ b/multimedia/dvdrip/Makefile @@ -80,6 +80,6 @@ post-patch: post-install: @cd ${WRKSRC}/blib/man3 && ${FIND} * -name "*.3" | ${SED} \ - 's,^,${MAN3PREFIX:S,^${TARGETDIR}/,,}/man/man3/,' >> ${TMPPLIST} + 's,^,${MAN3PREFIX:S,^${PREFIX}/,,}/man/man3/,' >> ${TMPPLIST} .include <bsd.port.post.mk> diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile index 31c711df79ce..0f9755a1a993 100644 --- a/multimedia/libxine/Makefile +++ b/multimedia/libxine/Makefile @@ -68,7 +68,7 @@ OPTIONS= ARTS "Enable aRts support" off \ MAN1= xine-config.1 MAN5= xine.5 -DOCSDIR= ${TARGETDIR}/share/doc/xine-lib +DOCSDIR= ${PREFIX}/share/doc/xine-lib PLIST_SUB= PLUGINSDIR="lib/xine/plugins/${PORTVERSION}" .include <bsd.port.pre.mk> diff --git a/net-im/jabber-conference/Makefile b/net-im/jabber-conference/Makefile index 49cf297864bc..f1821de7640d 100644 --- a/net-im/jabber-conference/Makefile +++ b/net-im/jabber-conference/Makefile @@ -30,7 +30,7 @@ MAKE_ARGS+= MCFLAGS="-shared" \ LDFLAGS="-L${LOCALBASE}/lib/pth -L${LOCALBASE}/lib/jabber" SUB_FILES+= pkg-message README.jabberd14 -DOCSDIR= ${TARGETDIR}/share/examples/${PKGNAMEPREFIX}${PORTNAME} +DOCSDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME} .if !defined(NOPORTDOCS) PKGMESSAGE= ${WRKDIR}/pkg-message @@ -43,7 +43,7 @@ CFLAGS+= -fPIC .endif do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/conference.so ${TARGETDIR}/lib/jabber/ + ${INSTALL_PROGRAM} ${WRKSRC}/conference.so ${PREFIX}/lib/jabber/ post-install: .if !defined(NOPORTDOCS) diff --git a/net-im/jabber-jud/Makefile b/net-im/jabber-jud/Makefile index 42ec78c794f5..25a610820477 100644 --- a/net-im/jabber-jud/Makefile +++ b/net-im/jabber-jud/Makefile @@ -33,7 +33,7 @@ MAKE_ARGS+= MCFLAGS="-shared" \ LDFLAGS="-L${LOCALBASE}/lib/pth -L${LOCALBASE}/lib/jabber" SUB_FILES+= pkg-message README.jabberd14 -DOCSDIR= ${TARGETDIR}/share/doc/${PKGNAMEPREFIX}${PORTNAME} +DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} .if !defined(NOPORTDOCS) PKGMESSAGE= ${WRKDIR}/pkg-message @@ -46,7 +46,7 @@ CFLAGS+= -fPIC .endif do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/jud.so ${TARGETDIR}/lib/jabber/ + ${INSTALL_PROGRAM} ${WRKSRC}/jud.so ${PREFIX}/lib/jabber/ post-install: .if !defined(NOPORTDOCS) diff --git a/net-im/jabber-yahoo/Makefile b/net-im/jabber-yahoo/Makefile index c74c9b767ff8..1737d29efec8 100644 --- a/net-im/jabber-yahoo/Makefile +++ b/net-im/jabber-yahoo/Makefile @@ -28,7 +28,7 @@ USE_ICONV= yes WRKSRC= ${WRKDIR}/yahoo-transport-${PORTVERSION} -DOCSDIR= ${TARGETDIR}/share/doc/${PKGNAMEPREFIX}${PORTNAME} +DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} SUB_FILES+= README.jabberd14 pkg-message diff --git a/net-im/jabber/Makefile b/net-im/jabber/Makefile index a8234322feb5..326e76853179 100644 --- a/net-im/jabber/Makefile +++ b/net-im/jabber/Makefile @@ -33,7 +33,7 @@ USE_ICONV= yes USE_GMAKE= yes USE_GETTEXT= yes USE_AUTOTOOLS= libtool:15 -USE_LDCONFIG= ${TARGETDIR}/lib/jabber +USE_LDCONFIG= ${PREFIX}/lib/jabber .if !defined(NO_INSTALL_MANPAGES) MAN5= jabber.xml.5 @@ -44,7 +44,7 @@ JABBER_USER= jabber JABBER_UID= 93 JABBER_GROUP= ${JABBER_USER} JABBER_GID= ${JABBER_UID} -JABBER_ETCDIR= "${TARGETDIR}/etc" +JABBER_ETCDIR= "${PREFIX}/etc" JABBER_RUNDIR= "/var/run/jabberd" JABBER_SPOOLDIR="/var/spool/jabberd" JABBER_LOGDIR= "/var/log/jabberd" @@ -52,8 +52,8 @@ JABBER_LOGDIR= "/var/log/jabberd" CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --localstatedir=/var \ --sysconfdir=${JABBER_ETCDIR} \ - --includedir=${TARGETDIR}/include/jabber \ - --libdir=${TARGETDIR}/lib/jabber + --includedir=${PREFIX}/include/jabber \ + --libdir=${PREFIX}/lib/jabber CPPFLAGS+= -I${LOCALBASE}/include/pth -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib/pth -L${LOCALBASE}/lib @@ -101,8 +101,8 @@ post-patch: @${LN} -s ${WRKSRC}/man/jabberd.8.in ${WRKSRC}/man/jabberd14.8.in post-install: - @${TOUCH} ${TARGETDIR}/include/jabber/platform-settings - @${INSTALL_DATA} ${WRKSRC}/jabber.xml.dist ${TARGETDIR}/etc/jabber.xml.sample + @${TOUCH} ${PREFIX}/include/jabber/platform-settings + @${INSTALL_DATA} ${WRKSRC}/jabber.xml.dist ${PREFIX}/etc/jabber.xml.sample .if !defined(NO_INSTALL_MANPAGES) @cd ${WRKSRC}/man && make install-man .endif diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile index 353d9676124a..75703608dd55 100644 --- a/net-im/libpurple/Makefile +++ b/net-im/libpurple/Makefile @@ -182,7 +182,7 @@ USE_PERL5= yes CONFIGURE_ARGS+= --with-perl-lib=site PLIST_SUB+= PERL:="" .if !defined(PIDGIN_SLAVE) -MAN3PREFIX= ${TARGETDIR}/lib/perl5/${PERL_VERSION} +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} MAN3+= Purple.3 .endif .else diff --git a/net-mgmt/argus-clients/Makefile b/net-mgmt/argus-clients/Makefile index eaf3b84572ce..89d0c775f3df 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?= ${TARGETDIR}/share/doc/argus-2.0 -EXAMPLESDIR?= ${TARGETDIR}/share/examples/argus-2.0 +DOCSDIR?= ${PREFIX}/share/doc/argus-2.0 +EXAMPLESDIR?= ${PREFIX}/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 ${TARGETDIR}/bin/$i + ${INSTALL_PROGRAM} ${WRKSRC}/bin/$i ${PREFIX}/bin/$i .endfor .for i in argusbug ragraph - ${INSTALL_SCRIPT} ${WRKSRC}/bin/$i ${TARGETDIR}/bin/$i + ${INSTALL_SCRIPT} ${WRKSRC}/bin/$i ${PREFIX}/bin/$i .endfor .for i in argus_client.a argus_common.a argus_parse.a - ${INSTALL_DATA} ${WRKSRC}/lib/$i ${TARGETDIR}/lib/$i + ${INSTALL_DATA} ${WRKSRC}/lib/$i ${PREFIX}/lib/$i .endfor - ${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} ${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} ${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 ${TARGETDIR}/man/man1 + ${INSTALL_DATA} ${WRKSRC}/man/man1/$i ${PREFIX}/man/man1 .endfor .for i in ${MAN5} - ${INSTALL_DATA} ${WRKSRC}/man/man5/$i ${TARGETDIR}/man/man5 + ${INSTALL_DATA} ${WRKSRC}/man/man5/$i ${PREFIX}/man/man5 .endfor .endif diff --git a/net-mgmt/argus/Makefile b/net-mgmt/argus/Makefile index f71910be0aeb..adba7210193a 100644 --- a/net-mgmt/argus/Makefile +++ b/net-mgmt/argus/Makefile @@ -26,14 +26,14 @@ CONFIGURE_ARGS= --exec-prefix=${PREFIX} CONFIGURE_ARGS+= --with-sasl=${PREFIX} .endif -DOCSDIR?= ${TARGETDIR}/share/doc/argus-2.0 +DOCSDIR?= ${PREFIX}/share/doc/argus-2.0 MAN5= argus.5 argus.conf.5 MAN8= argus.8 do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/bin/argus_bpf ${TARGETDIR}/sbin/argus - ${MKDIR} ${TARGETDIR}/argus/archive + ${INSTALL_PROGRAM} ${WRKSRC}/bin/argus_bpf ${PREFIX}/sbin/argus + ${MKDIR} ${PREFIX}/argus/archive .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR}/html/man .for i in doc/html/man/*.html @@ -42,10 +42,10 @@ do-install: .endif .if !defined(NOMAN) .for i in ${MAN5} - ${INSTALL_DATA} ${WRKSRC}/man/man5/$i ${TARGETDIR}/man/man5 + ${INSTALL_DATA} ${WRKSRC}/man/man5/$i ${PREFIX}/man/man5 .endfor .for i in ${MAN8} - ${INSTALL_DATA} ${WRKSRC}/man/man8/$i ${TARGETDIR}/man/man8 + ${INSTALL_DATA} ${WRKSRC}/man/man8/$i ${PREFIX}/man/man8 .endfor .endif diff --git a/net-mgmt/flow-tools/Makefile b/net-mgmt/flow-tools/Makefile index 89719fcd7a59..7b3b49618d02 100644 --- a/net-mgmt/flow-tools/Makefile +++ b/net-mgmt/flow-tools/Makefile @@ -35,7 +35,7 @@ SUB_LIST= FLOW_CAPTURE_SPOOL="${FLOW_CAPTURE_SPOOL}" \ FLOW_CAPTURE_PIDDIR="${FLOW_CAPTURE_PIDDIR}" USE_RC_SUBR= flow_capture flow_fanout -VARDIR?= ${DESTDIR}/var +VARDIR?= /var FLOW_CAPTURE_SPOOL= ${VARDIR}/db/flows FLOW_CAPTURE_USER= flowtools FLOW_CAPTURE_GROUP= flowtools diff --git a/net-mgmt/flowd/Makefile b/net-mgmt/flowd/Makefile index 0ee415824a1f..a636d9880773 100644 --- a/net-mgmt/flowd/Makefile +++ b/net-mgmt/flowd/Makefile @@ -24,7 +24,7 @@ FLOWD_USER?= _flowd .if defined(WITH_PERL) USE_PERL5= yes PLIST_SUB+= WITH_PERL="" -#MAN3PREFIX= ${TARGETDIR}/lib/perl5/${PERL_VERSION} +#MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} #MAN3= Flowd.3 .else PLIST_SUB+= WITH_PERL="@comment " diff --git a/net-mgmt/nedi/Makefile b/net-mgmt/nedi/Makefile index 42990d355d3b..1fc8c7413099 100644 --- a/net-mgmt/nedi/Makefile +++ b/net-mgmt/nedi/Makefile @@ -29,7 +29,7 @@ NO_BUILD= yes # after pre.mk. The solution is to set them by ourselves. OPTIONS= GD "Use GD" OFF -PORT_DBDIR?= ${DESTDIR}/var/db/ports +PORT_DBDIR?= /var/db/ports LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX} OPTIONSFILE?= ${PORT_DBDIR}/${LATEST_LINK}/options diff --git a/net-mgmt/net-snmp-devel/Makefile b/net-mgmt/net-snmp-devel/Makefile index 1dedd9da65e9..663eb9417205 100644 --- a/net-mgmt/net-snmp-devel/Makefile +++ b/net-mgmt/net-snmp-devel/Makefile @@ -155,7 +155,7 @@ MAN3PERL= NetSNMP::ASN.3 NetSNMP::OID.3 NetSNMP::agent.3 \ NetSNMP::agent::default_store.3 \ NetSNMP::default_store.3 \ NetSNMP::netsnmp_request_infoPtr.3 SNMP.3 -MAN3PERLPREFIX= ${TARGETDIR}/lib/perl5/${PERL_VERSION} +MAN3PERLPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} _MANPAGES+= ${MAN3PERL:S%^%${MAN3PERLPREFIX}/man/man3/%} .endif diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile index 1dedd9da65e9..663eb9417205 100644 --- a/net-mgmt/net-snmp/Makefile +++ b/net-mgmt/net-snmp/Makefile @@ -155,7 +155,7 @@ MAN3PERL= NetSNMP::ASN.3 NetSNMP::OID.3 NetSNMP::agent.3 \ NetSNMP::agent::default_store.3 \ NetSNMP::default_store.3 \ NetSNMP::netsnmp_request_infoPtr.3 SNMP.3 -MAN3PERLPREFIX= ${TARGETDIR}/lib/perl5/${PERL_VERSION} +MAN3PERLPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} _MANPAGES+= ${MAN3PERL:S%^%${MAN3PERLPREFIX}/man/man3/%} .endif diff --git a/net-mgmt/net-snmp53/Makefile b/net-mgmt/net-snmp53/Makefile index 1dedd9da65e9..663eb9417205 100644 --- a/net-mgmt/net-snmp53/Makefile +++ b/net-mgmt/net-snmp53/Makefile @@ -155,7 +155,7 @@ MAN3PERL= NetSNMP::ASN.3 NetSNMP::OID.3 NetSNMP::agent.3 \ NetSNMP::agent::default_store.3 \ NetSNMP::default_store.3 \ NetSNMP::netsnmp_request_infoPtr.3 SNMP.3 -MAN3PERLPREFIX= ${TARGETDIR}/lib/perl5/${PERL_VERSION} +MAN3PERLPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} _MANPAGES+= ${MAN3PERL:S%^%${MAN3PERLPREFIX}/man/man3/%} .endif diff --git a/net-mgmt/nocol/Makefile b/net-mgmt/nocol/Makefile index ecf2412eac32..7fada71630e5 100644 --- a/net-mgmt/nocol/Makefile +++ b/net-mgmt/nocol/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= http://www.netplex-tech.com/software/downloads/nocol/ MAINTAINER= nivo+kw+ports.bfa274@is-root.com COMMENT= Network/Service monitoring software -MANPREFIX= ${TARGETDIR}/nocol/ +MANPREFIX= ${PREFIX}/nocol/ MAN1= netconsole.1 MAN3= nocol-prog.3 perlnocol.3 MAN8= etherload.8 eventselect.8 genmon.8 multiping.8 noclogd.8 \ diff --git a/net-p2p/torrentflux/Makefile b/net-p2p/torrentflux/Makefile index d64ad3be029d..dae8702a492c 100644 --- a/net-p2p/torrentflux/Makefile +++ b/net-p2p/torrentflux/Makefile @@ -87,7 +87,7 @@ post-install: -type f -print -o -type d -exec echo "@dirrm {}" \; \ >>${TMPPLIST} @if [ -f "${PKGINSTALL}" ]; then \ - ${SETENV} PKG_PREFIX="${PREFIX}" PKG_DESTDIR="${DESTDIR}" \ + ${SETENV} PKG_PREFIX="${PREFIX}" \ ${SH} "${PKGINSTALL}" ${PKGNAME} POST-INSTALL; \ fi @if [ -f "${PKGMESSAGE}" ]; then \ diff --git a/net/freebsd-uucp/Makefile b/net/freebsd-uucp/Makefile index ca02c3807ce6..fbd9adb96c82 100644 --- a/net/freebsd-uucp/Makefile +++ b/net/freebsd-uucp/Makefile @@ -81,16 +81,16 @@ do-configure: ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} configure) post-install: - -${MKDIR} ${DESTDIR}${PREFIX}/info - ${INSTALL_DATA} ${WRKSRC}/uucp/doc/uucp.info ${DESTDIR}${PREFIX}/info/ + -${MKDIR} ${PREFIX}/info + ${INSTALL_DATA} ${WRKSRC}/uucp/doc/uucp.info ${PREFIX}/info/ @${CHOWN} uucp:uucp ${PREFIX}/etc/uucp @${CHMOD} 750 ${PREFIX}/etc/uucp - @${ECHO_CMD} "updating ${DESTDIR}/etc/services" - @${CP} ${DESTDIR}/etc/services ${DESTDIR}/etc/services.bak - @(grep -v ^suucp ${DESTDIR}/etc/services.bak; \ + @${ECHO_CMD} "updating /etc/services" + @${CP} /etc/services /etc/services.bak + @(grep -v ^suucp /etc/services.bak; \ ${ECHO_CMD} "suucp 4031/tcp #UUCP over SSL"; \ ${ECHO_CMD} "suucp 4031/udp #UUCP over SSL" ) \ - > ${DESTDIR}/etc/services + > /etc/services .if !defined(BATCH) @if test "$$(pw usershow uucp)" != "uucp:*:66:66::0:0:UUCP pseudo-user:/var/spool/uucppublic:${PREFIX}/libexec/uucp/uucico"; then \ pw usermod uucp -s ${PREFIX}/libexec/uucp/uucico; fi diff --git a/net/globus4/Makefile b/net/globus4/Makefile index 5e5a06e0fe69..0fb980bf1c93 100644 --- a/net/globus4/Makefile +++ b/net/globus4/Makefile @@ -40,7 +40,7 @@ USE_PERL5= yes USE_LDCONFIG= ${GLOBUS_LOCATION}/lib GLOBUS_BASE?= globus -GLOBUS_LOCATION=${TARGETDIR}/${GLOBUS_BASE} +GLOBUS_LOCATION=${PREFIX}/${GLOBUS_BASE} TMP_GLOBUS_LOCATION= ${WRKDIR}/globus TMP_GLOBUS_ENV= GLOBUS_LOCATION=${TMP_GLOBUS_LOCATION} \ GPT_LOCATION=${TMP_GLOBUS_LOCATION} \ diff --git a/net/icpld/Makefile b/net/icpld/Makefile index 10d7dfccadb7..9208fb152e58 100644 --- a/net/icpld/Makefile +++ b/net/icpld/Makefile @@ -34,12 +34,12 @@ CONFIGURE_ARGS+= --disable-ipv6 .endif do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${TARGETDIR}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1 ${MANPREFIX}/man/man1 - @${ECHO_MSG} '===> Installing ${TARGETDIR}/etc/icpld.conf.sample file.' - ${INSTALL_DATA} ${WRKSRC}/icpld.conf.sample ${TARGETDIR}/etc - @${ECHO_MSG} '===> Installing ${TARGETDIR}/etc/rc.d/icpld.sh.sample' - ${INSTALL_SCRIPT} ${WRKSRC}/contrib/icpld.sh.sample ${TARGETDIR}/etc/rc.d + @${ECHO_MSG} '===> Installing ${PREFIX}/etc/icpld.conf.sample file.' + ${INSTALL_DATA} ${WRKSRC}/icpld.conf.sample ${PREFIX}/etc + @${ECHO_MSG} '===> Installing ${PREFIX}/etc/rc.d/icpld.sh.sample' + ${INSTALL_SCRIPT} ${WRKSRC}/contrib/icpld.sh.sample ${PREFIX}/etc/rc.d post-install: .if !defined(NOPORTDOCS) diff --git a/net/libpcap/Makefile b/net/libpcap/Makefile index 987f4760f386..6c54631d97ce 100644 --- a/net/libpcap/Makefile +++ b/net/libpcap/Makefile @@ -26,7 +26,7 @@ USE_LDCONFIG= yes .if defined(LIBPCAP_OVERWRITE_BASE) PREFIX= /usr PKGNAMESUFFIX= -overwrite-base -MANPREFIX= ${TARGETDIR}/share +MANPREFIX= ${PREFIX}/share PLIST_SUB+= NOTBASE="@comment " PLIST_SUB+= BASE="" EXTRA_PATCHES+= ${FILESDIR}/patchbase-Makefile.in diff --git a/net/micro_inetd/Makefile b/net/micro_inetd/Makefile index e2a6460b305e..2560638bae6b 100644 --- a/net/micro_inetd/Makefile +++ b/net/micro_inetd/Makefile @@ -19,7 +19,7 @@ PLIST_FILES= bin/micro_inetd MAN1= micro_inetd.1 do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/micro_inetd ${TARGETDIR}/bin/micro_inetd + ${INSTALL_PROGRAM} ${WRKSRC}/micro_inetd ${PREFIX}/bin/micro_inetd ${INSTALL_MAN} ${WRKSRC}/micro_inetd.1 ${MAN1PREFIX}/man/man1/micro_inetd.1 .include <bsd.port.mk> diff --git a/net/mpd4/Makefile b/net/mpd4/Makefile index 41b9fa8fe217..641f24d09d76 100644 --- a/net/mpd4/Makefile +++ b/net/mpd4/Makefile @@ -36,7 +36,7 @@ MANCOMPRESSED= maybe USE_RC_SUBR= mpd4.sh HTMLNUM!= jot 67 1 CONFSUF= conf links secret script -DOCSDIR= ${TARGETDIR}/share/doc/mpd4 +DOCSDIR= ${PREFIX}/share/doc/mpd4 PORTDOCS= ${HTMLNUM:S/^/mpd/:S/$/.html/} mpd.html mpd.ps README \ mpd_toc.html PLIST_DIRS= etc/mpd4 diff --git a/net/mpd5/Makefile b/net/mpd5/Makefile index 41b9fa8fe217..641f24d09d76 100644 --- a/net/mpd5/Makefile +++ b/net/mpd5/Makefile @@ -36,7 +36,7 @@ MANCOMPRESSED= maybe USE_RC_SUBR= mpd4.sh HTMLNUM!= jot 67 1 CONFSUF= conf links secret script -DOCSDIR= ${TARGETDIR}/share/doc/mpd4 +DOCSDIR= ${PREFIX}/share/doc/mpd4 PORTDOCS= ${HTMLNUM:S/^/mpd/:S/$/.html/} mpd.html mpd.ps README \ mpd_toc.html PLIST_DIRS= etc/mpd4 diff --git a/net/mpich/Makefile b/net/mpich/Makefile index ce6e6f0e0ae1..4b451c55cb03 100644 --- a/net/mpich/Makefile +++ b/net/mpich/Makefile @@ -71,7 +71,7 @@ PLIST_SUB+= JAVA="" ALL_TARGET= -MANPREFIX= ${TARGETDIR}/mpich +MANPREFIX= ${PREFIX}/mpich MAN1= MPI.1 cleanipcs.1 mpiCC.1 mpicc.1 mpif77.1 mpif90.1 mpiman.1 \ mpireconfig.1 mpirun.1 Jumpshots.1 chp4_servs.1 tstmachines.1 diff --git a/net/omnitty/Makefile b/net/omnitty/Makefile index e484131aca4f..8d479b67e3af 100644 --- a/net/omnitty/Makefile +++ b/net/omnitty/Makefile @@ -36,7 +36,7 @@ post-patch: ${WRKSRC}/machmgr.c do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${TARGETDIR}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MAN1PREFIX}/man/man1 .include <bsd.port.post.mk> diff --git a/net/openldap23-server/Makefile b/net/openldap23-server/Makefile index af99310c33a8..496ad2ef0414 100644 --- a/net/openldap23-server/Makefile +++ b/net/openldap23-server/Makefile @@ -415,24 +415,24 @@ test: build pre-su-install: @if [ -f ${PKGINSTALL} ]; then \ - ${SETENV} PKG_PREFIX="${PREFIX}" PKG_DESTDIR="${DESTDIR}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL; \ + ${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL; \ fi .if defined(WITH_MODULES) || !defined(WITHOUT_DYNAMIC_BACKENDS) || defined(WITH_SLAPI) - @${MKDIR} ${DESTDIR}${PREFIX}/libexec/openldap + @${MKDIR} ${PREFIX}/libexec/openldap .endif post-install: .if defined(CLIENT_ONLY) .if !defined(NOPORTDOCS) - @${MKDIR} ${DESTDIR}${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/CHANGES ${DESTDIR}${DOCSDIR} + @${MKDIR} ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/CHANGES ${DOCSDIR} @for dir in drafts rfc; do \ - ${MKDIR} ${DESTDIR}${DOCSDIR}/$${dir}; \ - ${INSTALL_DATA} ${WRKSRC}/doc/$${dir}/* ${DESTDIR}${DOCSDIR}/$${dir}; \ + ${MKDIR} ${DOCSDIR}/$${dir}; \ + ${INSTALL_DATA} ${WRKSRC}/doc/$${dir}/* ${DOCSDIR}/$${dir}; \ done .endif .else - @${MKDIR} ${DESTDIR}${LDAP_RUN_DIR} + @${MKDIR} ${LDAP_RUN_DIR} @for schema in ${SCHEMATA}; do \ ${ECHO_CMD} "@unexec if cmp -s %D/etc/openldap/schema/$${schema}.schema" \ "%D/etc/openldap/schema/$${schema}.schema.default; then" \ diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile index fd92db0bd80f..4311dfb13f80 100644 --- a/net/openldap24-server/Makefile +++ b/net/openldap24-server/Makefile @@ -454,24 +454,24 @@ test: build pre-su-install: @if [ -f ${PKGINSTALL} ]; then \ - ${SETENV} PKG_PREFIX="${PREFIX}" PKG_DESTDIR="${DESTDIR}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL; \ + ${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL; \ fi .if defined(WITH_MODULES) || !defined(WITHOUT_DYNAMIC_BACKENDS) || defined(WITH_SLAPI) - @${MKDIR} ${DESTDIR}${PREFIX}/libexec/openldap + @${MKDIR} ${PREFIX}/libexec/openldap .endif post-install: .if defined(CLIENT_ONLY) .if !defined(NOPORTDOCS) - @${MKDIR} ${DESTDIR}${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/CHANGES ${DESTDIR}${DOCSDIR} + @${MKDIR} ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/CHANGES ${DOCSDIR} @for dir in drafts rfc; do \ - ${MKDIR} ${DESTDIR}${DOCSDIR}/$${dir}; \ - ${INSTALL_DATA} ${WRKSRC}/doc/$${dir}/* ${DESTDIR}${DOCSDIR}/$${dir}; \ + ${MKDIR} ${DOCSDIR}/$${dir}; \ + ${INSTALL_DATA} ${WRKSRC}/doc/$${dir}/* ${DOCSDIR}/$${dir}; \ done .endif .else - @${MKDIR} ${DESTDIR}${LDAP_RUN_DIR} + @${MKDIR} ${LDAP_RUN_DIR} @for schema in ${SCHEMATA}; do \ ${ECHO_CMD} "@unexec if cmp -s %D/etc/openldap/schema/$${schema}.schema" \ "%D/etc/openldap/schema/$${schema}.schema.default; then" \ diff --git a/net/openmpi/Makefile b/net/openmpi/Makefile index 3c60414b8b2f..759ab3f36d35 100644 --- a/net/openmpi/Makefile +++ b/net/openmpi/Makefile @@ -34,7 +34,7 @@ CONFIGURE_ARGS+= --prefix=${PREFIX}/${MPIDIR} ${CONFIGURE_TARGET} USE_LDCONFIG= ${PREFIX}/${MPIDIR}/lib \ ${PREFIX}/${MPIDIR}/lib/openmpi -MANPREFIX= ${TARGETDIR}/${MPIDIR} +MANPREFIX= ${PREFIX}/${MPIDIR} .include "${.CURDIR}/Makefile.man" .include <bsd.port.pre.mk> diff --git a/net/radiusd-cistron/Makefile b/net/radiusd-cistron/Makefile index bae157ee24f8..0b9e1bf0a4c7 100644 --- a/net/radiusd-cistron/Makefile +++ b/net/radiusd-cistron/Makefile @@ -53,7 +53,7 @@ do-install: .endfor .endif -.if exists(${DESTDIR}/etc/pam.d) +.if exists(/etc/pam.d) PLIST_SUB+= WITH_PAMD="" .else PLIST_SUB+= WITH_PAMD="@comment " diff --git a/net/ris/Makefile b/net/ris/Makefile index b4c3533a3bb6..0496d6567ace 100644 --- a/net/ris/Makefile +++ b/net/ris/Makefile @@ -21,7 +21,7 @@ USE_RC_SUBR= binlsrv.sh USE_PYTHON= yes NO_BUILD= yes -VARDIR= ${DESTDIR}/var +VARDIR= /var PID_FILE?= ${VARDIR}/run/binlsrv.pid DEVLIST_CACHE?= ${VARDIR}/db/devlist.cache diff --git a/net/rrdtool10/Makefile b/net/rrdtool10/Makefile index 9b659fce79de..da30bc4b63a3 100644 --- a/net/rrdtool10/Makefile +++ b/net/rrdtool10/Makefile @@ -36,7 +36,7 @@ MAN1= RRDp.1 RRDs.1 bin_dec_hex.1 rrdcgi.1 rrdcreate.1 rrddump.1 \ cdeftutorial.1 rpntutorial.1 rrdinfo.1 rrdxport.1 rrd-beginners.1 \ rrdfirst.1 MAN3= RRDp.3 RRDs.3 -MAN3PREFIX= ${TARGETDIR}/lib/perl5/${PERL_VERSION} +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} OPTIONS= "ISO-8859-2 fonts support" off diff --git a/net/rsync/Makefile b/net/rsync/Makefile index 60c49cb58afd..4f51c77b747b 100644 --- a/net/rsync/Makefile +++ b/net/rsync/Makefile @@ -83,14 +83,14 @@ pre-configure: ${WRKSRC}/rsync.h ${WRKSRC}/zlib/zutil.h post-install: - @${STRIP_CMD} ${DESTDIR}${PREFIX}/bin/rsync - @${INSTALL_DATA} ${FILESDIR}/rsyncd.conf.sample ${DESTDIR}${PREFIX}/etc/ - @[ -f ${DESTDIR}${PREFIX}/etc/rsyncd.conf ] || \ - ${CP} ${DESTDIR}${PREFIX}/etc/rsyncd.conf.sample \ - ${DESTDIR}${PREFIX}/etc/rsyncd.conf + @${STRIP_CMD} ${PREFIX}/bin/rsync + @${INSTALL_DATA} ${FILESDIR}/rsyncd.conf.sample ${PREFIX}/etc/ + @[ -f ${PREFIX}/etc/rsyncd.conf ] || \ + ${CP} ${PREFIX}/etc/rsyncd.conf.sample \ + ${PREFIX}/etc/rsyncd.conf .if !defined(NOPORTDOCS) - @${MKDIR} ${DESTDIR}${DOCSDIR} - @${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DESTDIR}${DOCSDIR} + @${MKDIR} ${DOCSDIR} + @${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR} .endif test: build diff --git a/net/samba3/Makefile b/net/samba3/Makefile index ca0d09883578..ef0021ee576c 100644 --- a/net/samba3/Makefile +++ b/net/samba3/Makefile @@ -29,7 +29,7 @@ LATEST_LINK?= ${PKGNAMEPREFIX}${PORTNAME}3${PKGNAMESUFFIX} EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} WRKSRC= ${WRKDIR}/${DISTNAME}/source # directories -VARDIR?= ${DESTDIR}/var +VARDIR?= /var SAMBA_SPOOL= ${VARDIR}/spool/samba SAMBA_LOGDIR= ${VARDIR}/log/samba SAMBA_RUNDIR= ${VARDIR}/run @@ -271,8 +271,8 @@ CONFIGURE_ARGS+= --without-ads CONFIGURE_ARGS+= --with-krb5="${KRB5_HOME}" .elif defined(HEIMDAL_HOME) && exists(${HEIMDAL_HOME}/lib/libgssapi.so) CONFIGURE_ARGS+= --with-krb5="${HEIMDAL_HOME}" -.elif exists(${DESTDIR}/usr/lib/libkrb5.so) && exists(${DESTDIR}/usr/bin/krb5-config) -CONFIGURE_ARGS+= --with-krb5="${DESTDIR}/usr" +.elif exists(/usr/lib/libkrb5.so) && exists(/usr/bin/krb5-config) +CONFIGURE_ARGS+= --with-krb5="/usr" .else LIB_DEPENDS+= krb5:${PORTSDIR}/security/heimdal CONFIGURE_ARGS+= --with-krb5="${LOCALBASE}" diff --git a/net/samba4wins/Makefile b/net/samba4wins/Makefile index 0a91eeb01f52..0358ce25dfe1 100644 --- a/net/samba4wins/Makefile +++ b/net/samba4wins/Makefile @@ -24,7 +24,7 @@ USE_AUTOTOOLS= autoconf:259 autoheader:259 WRKSRC= ${WRKDIR}/${PORTNAME}/source # directories -VARDIR?= ${DESTDIR}/var +VARDIR?= /var S4W_DATADIR= ${PREFIX}/share/${PORTNAME} S4W_LOGDIR= ${VARDIR}/log/${PORTNAME} S4W_RUNDIR= ${VARDIR}/run @@ -46,7 +46,7 @@ CONFIGURE_ARGS+= --exec-prefix=${PREFIX} \ --with-logfilebase=${S4W_LOGDIR} CONFIGURE_ARGS+= --disable-reg-gconf --disable-socket-wrapper \ - --with-readline=${DESTDIR}/usr --with-included-popt \ + --with-readline=/usr --with-included-popt \ --with-libiconv=${LOCALBASE} --without-sqlite3 \ --without-pthreads --without-python diff --git a/net/sipxcalllib/Makefile b/net/sipxcalllib/Makefile index 4dfce646e812..4c33a4ff0834 100644 --- a/net/sipxcalllib/Makefile +++ b/net/sipxcalllib/Makefile @@ -27,7 +27,7 @@ USE_GMAKE= yes USE_AUTOTOOLS= autoconf:259:env automake:19:env GNU_CONFIGURE= yes USE_LDCONFIG= yes -LOCALSTATEDIR=${DESTDIR}/var +LOCALSTATEDIR= /var CONFIGURE_ENV+= wwwdir=${PREFIX}/www/sipX \ INSTALL=`which ginstall` CONFIGURE_ARGS+= --enable-sip-tls \ diff --git a/net/sipxcommserverlib/Makefile b/net/sipxcommserverlib/Makefile index 7e8f2fd48f7b..5c73efaee9dc 100644 --- a/net/sipxcommserverlib/Makefile +++ b/net/sipxcommserverlib/Makefile @@ -32,7 +32,7 @@ USE_AUTOTOOLS= autoconf:259:env automake:19:env GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_PERL5_RUN= yes -LOCALSTATEDIR=${DESTDIR}/var +LOCALSTATEDIR= /var CONFIGURE_ENV+= wwwdir=${PREFIX}/www/sipX \ INSTALL=`which ginstall` CONFIGURE_ARGS+= --enable-sip-tls \ diff --git a/net/sipxconfig/Makefile b/net/sipxconfig/Makefile index f53565444744..5bf6c71e7867 100644 --- a/net/sipxconfig/Makefile +++ b/net/sipxconfig/Makefile @@ -34,7 +34,7 @@ USE_JAVA= 1.4+ USE_APACHE= 2.0+ USE_RUBY= yes GNU_CONFIGURE= yes -LOCALSTATEDIR=${DESTDIR}/var +LOCALSTATEDIR= /var CONFIGURE_ENV+= JAVA_HOME=${JAVA_HOME} \ wwwdir=${PREFIX}/www/sipX \ INSTALL=`which ginstall` diff --git a/net/sipxmediaadapterlib/Makefile b/net/sipxmediaadapterlib/Makefile index 5aec1d41af59..d42145ac63bb 100644 --- a/net/sipxmediaadapterlib/Makefile +++ b/net/sipxmediaadapterlib/Makefile @@ -26,7 +26,7 @@ USE_GMAKE= yes USE_AUTOTOOLS= autoconf:259:env automake:19:env GNU_CONFIGURE= yes USE_LDCONFIG= yes -LOCALSTATEDIR=${DESTDIR}/var +LOCALSTATEDIR= /var CONFIGURE_ENV+= wwwdir=${PREFIX}/www/sipX \ INSTALL=`which ginstall` CONFIGURE_ARGS+= --enable-sip-tls \ diff --git a/net/sipxmedialib/Makefile b/net/sipxmedialib/Makefile index 1560354656a7..2eb9795298c3 100644 --- a/net/sipxmedialib/Makefile +++ b/net/sipxmedialib/Makefile @@ -25,7 +25,7 @@ USE_GMAKE= yes USE_AUTOTOOLS= autoconf:259:env automake:19:env GNU_CONFIGURE= yes USE_LDCONFIG= yes -LOCALSTATEDIR=${DESTDIR}/var +LOCALSTATEDIR= /var CONFIGURE_ENV+= wwwdir=${PREFIX}/www/sipX \ INSTALL=`which ginstall` CONFIGURE_ARGS+= --enable-sip-tls \ diff --git a/net/sipxpbx/Makefile b/net/sipxpbx/Makefile index 61d127f836e8..3ecc1ecca39e 100644 --- a/net/sipxpbx/Makefile +++ b/net/sipxpbx/Makefile @@ -40,7 +40,7 @@ USE_APACHE= 2.0+ USE_PERL5_RUN= yes USE_RC_SUBR= sipxpbx GNU_CONFIGURE= yes -LOCALSTATEDIR=${DESTDIR}/var +LOCALSTATEDIR= /var .include <bsd.port.pre.mk> CONFIGURE_ENV+= wwwdir=${PREFIX}/www/sipX \ @@ -64,7 +64,6 @@ CONFIGURE_ARGS+= --enable-sip-tls \ --with-mod_cplusplus=${PREFIX}/${APACHEINCLUDEDIR} SUB_LIST= LOCALSTATEDIR=${LOCALSTATEDIR} \ PREFIX=${PREFIX} \ - DESTDIR=${DESTDIR} \ APACHEMODDIR=${APACHEMODDIR} \ APACHE_VERSION=${APACHE_VERSION} diff --git a/net/sipxportlib/Makefile b/net/sipxportlib/Makefile index 04c707add298..3b2c4b3751a1 100644 --- a/net/sipxportlib/Makefile +++ b/net/sipxportlib/Makefile @@ -24,7 +24,7 @@ USE_AUTOTOOLS= autoconf:259:env automake:19:env GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_PERL5_RUN= yes -LOCALSTATEDIR=${DESTDIR}/var +LOCALSTATEDIR= /var CONFIGURE_ENV+= wwwdir=${PREFIX}/www/sipX \ INSTALL=`which ginstall` CONFIGURE_ARGS+= --enable-sip-tls \ diff --git a/net/sipxproxy/Makefile b/net/sipxproxy/Makefile index 31d8ad751394..585adfcfc2be 100644 --- a/net/sipxproxy/Makefile +++ b/net/sipxproxy/Makefile @@ -31,7 +31,7 @@ USE_GMAKE= yes USE_RUBY= yes USE_AUTOTOOLS= autoconf:259:env automake:19:env GNU_CONFIGURE= yes -LOCALSTATEDIR=${DESTDIR}/var +LOCALSTATEDIR= /var CONFIGURE_ENV+= wwwdir=${PREFIX}/www/sipX \ INSTALL=`which ginstall` CONFIGURE_ARGS+= --enable-sip-tls \ diff --git a/net/sipxpublisher/Makefile b/net/sipxpublisher/Makefile index ac44b31d39e5..d97efb25d635 100644 --- a/net/sipxpublisher/Makefile +++ b/net/sipxpublisher/Makefile @@ -25,7 +25,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_AUTOTOOLS= autoconf:259:env automake:19:env GNU_CONFIGURE= yes -LOCALSTATEDIR=${DESTDIR}/var +LOCALSTATEDIR= /var CONFIGURE_ENV+= wwwdir=${PREFIX}/www/sipX \ INSTALL=`which ginstall` CONFIGURE_ARGS+= --enable-sip-tls \ diff --git a/net/sipxregistry/Makefile b/net/sipxregistry/Makefile index ae736e79109c..4af3e8f28027 100644 --- a/net/sipxregistry/Makefile +++ b/net/sipxregistry/Makefile @@ -27,7 +27,7 @@ USE_GMAKE= yes USE_AUTOTOOLS= autoconf:259:env automake:19:env GNU_CONFIGURE= yes USE_LDCONFIG= yes -LOCALSTATEDIR=${DESTDIR}/var +LOCALSTATEDIR= /var CONFIGURE_ENV+= wwwdir=${PREFIX}/www/sipX \ INSTALL=`which ginstall` CONFIGURE_ARGS+= --enable-sip-tls \ diff --git a/net/sipxtacklib/Makefile b/net/sipxtacklib/Makefile index 36fa9b495e2a..def59eedb650 100644 --- a/net/sipxtacklib/Makefile +++ b/net/sipxtacklib/Makefile @@ -29,7 +29,7 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_PERL5_RUN= yes USE_JAVA= 1.4+ -LOCALSTATEDIR=${DESTDIR}/var +LOCALSTATEDIR= /var CONFIGURE_ENV+= JAVA_HOME=${JAVA_HOME} \ wwwdir=${PREFIX}/www/sipX \ INSTALL=`which ginstall` diff --git a/net/sipxvxml/Makefile b/net/sipxvxml/Makefile index 703d57ccb56f..dbae84cea019 100644 --- a/net/sipxvxml/Makefile +++ b/net/sipxvxml/Makefile @@ -29,7 +29,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_AUTOTOOLS= autoconf:259:env automake:19:env GNU_CONFIGURE= yes -LOCALSTATEDIR=${DESTDIR}/var +LOCALSTATEDIR= /var CONFIGURE_ENV+= wwwdir=${PREFIX}/www/sipX \ INSTALL=`which ginstall` CONFIGURE_ARGS+= --enable-sip-tls \ diff --git a/net/spread/Makefile b/net/spread/Makefile index 29dc8264d73b..eaf30700a61a 100644 --- a/net/spread/Makefile +++ b/net/spread/Makefile @@ -40,7 +40,7 @@ MAN3= libsp.3 SP_connect.3 SP_disconnect.3 SP_equal_group_ids.3 \ PERL_CONFIGURE_ARGS= CC="${CC}" CCFLAGS="${CFLAGS}" PREFIX="${PREFIX}" \ INSTALLPRIVLIB="${PREFIX}/lib" INSTALLARCHLIB="${PREFIX}/lib" -_MANPAGES+= ${TARGETDIR}/lib/perl5/${PERL_VERSION}/man/man3/Spread.3 +_MANPAGES+= ${PREFIX}/lib/perl5/${PERL_VERSION}/man/man3/Spread.3 post-configure: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ diff --git a/net/spread4/Makefile b/net/spread4/Makefile index 29dc8264d73b..eaf30700a61a 100644 --- a/net/spread4/Makefile +++ b/net/spread4/Makefile @@ -40,7 +40,7 @@ MAN3= libsp.3 SP_connect.3 SP_disconnect.3 SP_equal_group_ids.3 \ PERL_CONFIGURE_ARGS= CC="${CC}" CCFLAGS="${CFLAGS}" PREFIX="${PREFIX}" \ INSTALLPRIVLIB="${PREFIX}/lib" INSTALLARCHLIB="${PREFIX}/lib" -_MANPAGES+= ${TARGETDIR}/lib/perl5/${PERL_VERSION}/man/man3/Spread.3 +_MANPAGES+= ${PREFIX}/lib/perl5/${PERL_VERSION}/man/man3/Spread.3 post-configure: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ diff --git a/net/tcpdump/Makefile b/net/tcpdump/Makefile index bf0d90caa3ea..eafb1c8d5eb7 100644 --- a/net/tcpdump/Makefile +++ b/net/tcpdump/Makefile @@ -31,7 +31,7 @@ GNU_CONFIGURE= yes .if defined(TCPDUMP_OVERWRITE_BASE) PREFIX= /usr PKGNAMESUFFIX= -overwrite-base -MANPREFIX= ${TARGETDIR}/share +MANPREFIX= ${PREFIX}/share PLIST_SUB+= NOTBASE="@comment " PLIST_SUB+= BASE="" PKGMESSAGE= ${FILESDIR}/pkg-message-base diff --git a/net/vserver/files/pkg-install.in b/net/vserver/files/pkg-install.in index e677774c5ee9..b13f0f092cde 100644 --- a/net/vserver/files/pkg-install.in +++ b/net/vserver/files/pkg-install.in @@ -6,23 +6,10 @@ VCHATUSER=%%VCHATUSER%% VCHATGROUP=%%VCHATGROUP%% UID=128 GID=128 - -if [ -n "%%DESTDIR%%" ]; then - - PW="/usr/sbin/chroot %%DESTDIR%% pw" - CHOWN="/usr/sbin/chroot %%DESTDIR%% chown" - CHMOD="/usr/sbin/chroot %%DESTDIR%% chmod" - MKDIR="/usr/sbin/chroot %%DESTDIR%% mkdir -p" - -else - - PW="pw" - CHOWN="chown" - CHMOD="chmod" - MKDIR="mkdir" - - -fi +PW="pw" +CHOWN="chown" +CHMOD="chmod" +MKDIR="mkdir" if [ "$2" = "PRE-INSTALL" ]; then diff --git a/net/yaz/Makefile b/net/yaz/Makefile index cf39bb6d83af..38e61a9767d8 100644 --- a/net/yaz/Makefile +++ b/net/yaz/Makefile @@ -31,10 +31,10 @@ MAN8= yaz-config.8 yaz-ztest.8 pre-install: cd ${WRKSRC}/doc && \ - ${REINPLACE_CMD} -e 's,[$$]{datarootdir}/man,${TARGETDIR}/man,' \ + ${REINPLACE_CMD} -e 's,[$$]{datarootdir}/man,${PREFIX}/man,' \ Makefile cd ${WRKSRC}/ziffy && \ - ${REINPLACE_CMD} -e 's,[$$]{datarootdir}/man,${TARGETDIR}/man,' \ + ${REINPLACE_CMD} -e 's,[$$]{datarootdir}/man,${PREFIX}/man,' \ Makefile .include <bsd.port.mk> diff --git a/news/ifmail/Makefile b/news/ifmail/Makefile index 79fabf97c369..fe0c4d31f724 100644 --- a/news/ifmail/Makefile +++ b/news/ifmail/Makefile @@ -39,11 +39,11 @@ post-install: .for i in ${MAN3} ${INSTALL_MAN} ${WRKSRC}/iflib/${i} ${PREFIX}/man/man3 .endfor - @${ECHO_CMD} "updating ${DESTDIR}/etc/services" - @${CP} ${DESTDIR}/etc/services ${DESTDIR}/etc/services.bak - @(grep -v ^ifcico ${DESTDIR}/etc/services.bak; \ + @${ECHO_CMD} "updating /etc/services" + @${CP} /etc/services /etc/services.bak + @(grep -v ^ifcico /etc/services.bak; \ ${ECHO_CMD} "ifcico 60179/tcp #ifcico server (ifmail)") \ - > ${DESTDIR}/etc/services + > /etc/services .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/ diff --git a/palm/prc-tools/Makefile b/palm/prc-tools/Makefile index 4ced1d8f696e..36128c1c3a9c 100644 --- a/palm/prc-tools/Makefile +++ b/palm/prc-tools/Makefile @@ -41,7 +41,7 @@ CONFIGURE_ARGS= --enable-targets=m68k-palmos,arm-palmos \ CONFIGURE_ENV= PATH=${PATH}:${PREFIX}/pilot/bin MAKE_ENV= PATH=${PATH}:${PREFIX}/pilot/bin -MANPREFIX= ${TARGETDIR}/pilot +MANPREFIX= ${PREFIX}/pilot MAN1= cccp.1 m68k-palmos-g++.1 m68k-palmos-gcc.1 \ m68k-palmos-addr2line.1 m68k-palmos-ar.1 \ m68k-palmos-as.1 m68k-palmos-c++filt.1 \ diff --git a/ports-mgmt/barry/Makefile b/ports-mgmt/barry/Makefile index a3beb54c1894..d5477fd78ac6 100644 --- a/ports-mgmt/barry/Makefile +++ b/ports-mgmt/barry/Makefile @@ -36,6 +36,6 @@ post-patch: @${REINPLACE_CMD} "s,-lpthread,${PTHREAD_LIBS},g" ${WRKSRC}/configure pre-install: - @${MKDIR} ${DESTDIR}${PREFIX}/share/applnk/Utilities + @${MKDIR} ${PREFIX}/share/applnk/Utilities .include <bsd.port.post.mk> diff --git a/ports-mgmt/p5-FreeBSD-Portindex/Makefile b/ports-mgmt/p5-FreeBSD-Portindex/Makefile index c89d8e638151..c74706b1aa24 100644 --- a/ports-mgmt/p5-FreeBSD-Portindex/Makefile +++ b/ports-mgmt/p5-FreeBSD-Portindex/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= ${BUILD_DEPENDS} USE_BZIP2= yes PERL_CONFIGURE= yes -CACHE_DIR?= ${DESTDIR}/var/db/portindex +CACHE_DIR?= /var/db/portindex CACHE_OWNER?= root CACHE_GROUP?= operator CACHE_MODE?= 0775 @@ -45,8 +45,8 @@ post-install: install-conf install-cache install-conf: cd ${WRKSRC} ; \ - ${INSTALL_DATA} ${CFG_FILE}.sample ${TARGETDIR}/etc/${CFG_FILE}.sample - cd ${TARGETDIR}/etc ; \ + ${INSTALL_DATA} ${CFG_FILE}.sample ${PREFIX}/etc/${CFG_FILE}.sample + cd ${PREFIX}/etc ; \ if ${TEST} ! -f ${CFG_FILE} ; then \ ${CP} -p ${CFG_FILE}.sample ${CFG_FILE} ; \ fi diff --git a/ports-mgmt/portlint/Makefile b/ports-mgmt/portlint/Makefile index 62ade39428d1..02524b760ec0 100644 --- a/ports-mgmt/portlint/Makefile +++ b/ports-mgmt/portlint/Makefile @@ -36,7 +36,7 @@ post-patch: ${WRKSRC}/portlintgrep.pl do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/portlint.pl ${TARGETDIR}/bin/portlint + ${INSTALL_SCRIPT} ${WRKSRC}/portlint.pl ${PREFIX}/bin/portlint ${INSTALL_MAN} ${WRKSRC}/portlint.1 ${MAN1PREFIX}/man/man1 ${MKDIR} ${EXAMPLESDIR} ${INSTALL_SCRIPT} ${WRKSRC}/portlintgrep.pl ${EXAMPLESDIR}/portlintgrep diff --git a/print/cjk-lyx/Makefile b/print/cjk-lyx/Makefile index 9cac6d84fe38..d1b7f591331d 100644 --- a/print/cjk-lyx/Makefile +++ b/print/cjk-lyx/Makefile @@ -59,7 +59,7 @@ MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ AUTOHEADER="${TRUE}" MAN1= ${PKGNAMEPREFIX}lyx.1 ${PKGNAMEPREFIX}tex2lyx.1 ${PKGNAMEPREFIX}lyxclient.1 -DATADIR= ${TARGETDIR}/share/${PKGNAMEPREFIX}${PORTNAME} +DATADIR= ${PREFIX}/share/${PKGNAMEPREFIX}${PORTNAME} # Make uic stay off the lawn MAKE_ENV= TMPDIR=/tmp diff --git a/print/cups-pstoraster/Makefile b/print/cups-pstoraster/Makefile index b774487f7d04..82e6343f8bf6 100644 --- a/print/cups-pstoraster/Makefile +++ b/print/cups-pstoraster/Makefile @@ -30,7 +30,7 @@ GS_VERSION= 8.15 WRKSRC= ${WRKDIR}/espgs-${PORTVERSION} -DATADIR= ${TARGETDIR}/share/espgs +DATADIR= ${PREFIX}/share/espgs USE_BZIP2= yes USE_GMAKE= yes diff --git a/print/cups-samba/Makefile b/print/cups-samba/Makefile index 0b77c51cc7ff..be7bcd587faa 100644 --- a/print/cups-samba/Makefile +++ b/print/cups-samba/Makefile @@ -23,7 +23,7 @@ RUN_DEPENDS= smbspool:${PORTSDIR}/net/samba3 \ NO_BUILD= yes NO_WRKSUBDIR= yes -DATADIR= ${TARGETDIR}/share/cups +DATADIR= ${PREFIX}/share/cups DRIVER_FILES= cups6.inf cups6.ini cupsps6.dll cupsui6.dll SUB_FILES= pkg-message diff --git a/print/freetype-tools/Makefile b/print/freetype-tools/Makefile index 48a46771bd15..89ad884fb2b9 100644 --- a/print/freetype-tools/Makefile +++ b/print/freetype-tools/Makefile @@ -30,7 +30,7 @@ USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS= --disable-nls --enable-static --enable-shared -TEXMFMAIN= ${TARGETDIR}/share/texmf +TEXMFMAIN= ${PREFIX}/share/texmf MAN1= ttf2bdf.1 ttf2tfm.1 ttf2pk.1 @@ -46,10 +46,10 @@ post-patch: ${WRKSRC}/contrib/ttf2pfb/Makefile.in post-build: - @cd ${WRKSRC}/contrib/ttf2bdf && ./configure --prefix=${TARGETDIR} && ${GMAKE} - @cd ${WRKSRC}/contrib/ttf2pfb && ./configure --prefix=${TARGETDIR} && ${GMAKE} - @cd ${WRKSRC}/contrib/ttf2pk && ./configure --prefix=${TARGETDIR} --with-kpathsea-dir=${LOCALBASE} && ${GMAKE} - @cd ${WRKSRC}/contrib/ttfbanner && ./configure --prefix=${TARGETDIR} && ${GMAKE} + @cd ${WRKSRC}/contrib/ttf2bdf && ./configure --prefix=${PREFIX} && ${GMAKE} + @cd ${WRKSRC}/contrib/ttf2pfb && ./configure --prefix=${PREFIX} && ${GMAKE} + @cd ${WRKSRC}/contrib/ttf2pk && ./configure --prefix=${PREFIX} --with-kpathsea-dir=${LOCALBASE} && ${GMAKE} + @cd ${WRKSRC}/contrib/ttfbanner && ./configure --prefix=${PREFIX} && ${GMAKE} do-install: @cd ${WRKSRC}/contrib/ttf2bdf && ${GMAKE} install diff --git a/print/perlftlib/Makefile b/print/perlftlib/Makefile index d027492b504b..89c247024135 100644 --- a/print/perlftlib/Makefile +++ b/print/perlftlib/Makefile @@ -22,7 +22,7 @@ USE_PERL5= yes NOMANCOMPRESS= yes MAN1= mkttfdir.1 ftinfo.1 MAN3= FreeType.3 -MAN3PREFIX= ${TARGETDIR}/lib/perl5/${PERL_VERSION} +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} MAKE_ENV= PERL_VER=${PERL_VER} PERL5=${PERL5} diff --git a/russian/xcode/Makefile b/russian/xcode/Makefile index 17a1a0d26c5b..27ac950fbc51 100644 --- a/russian/xcode/Makefile +++ b/russian/xcode/Makefile @@ -23,6 +23,6 @@ ALL_TARGET= xcode CFLAGS+= -DD_KOI do-install: - @ ${INSTALL_PROGRAM} ${WRKSRC}/xcode ${TARGETDIR}/bin + @ ${INSTALL_PROGRAM} ${WRKSRC}/xcode ${PREFIX}/bin .include <bsd.port.mk> diff --git a/science/libsvm/Makefile b/science/libsvm/Makefile index 9a22e274e34f..f39caaa94e37 100644 --- a/science/libsvm/Makefile +++ b/science/libsvm/Makefile @@ -69,9 +69,9 @@ do-install: .else do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/svm-train ${TARGETDIR}/bin/ - ${INSTALL_PROGRAM} ${WRKSRC}/svm-predict ${TARGETDIR}/bin/ - ${INSTALL_PROGRAM} ${WRKSRC}/svm-scale ${TARGETDIR}/bin/ + ${INSTALL_PROGRAM} ${WRKSRC}/svm-train ${PREFIX}/bin/ + ${INSTALL_PROGRAM} ${WRKSRC}/svm-predict ${PREFIX}/bin/ + ${INSTALL_PROGRAM} ${WRKSRC}/svm-scale ${PREFIX}/bin/ ${MKDIR} ${DATADIR} for f in ${TOOLS}; do \ ${INSTALL_DATA} ${WRKSRC}/$$f ${DATADIR}; \ diff --git a/security/aafid2/Makefile b/security/aafid2/Makefile index 675ca56bf303..aa61d4871140 100644 --- a/security/aafid2/Makefile +++ b/security/aafid2/Makefile @@ -21,7 +21,7 @@ NO_WRKSUBDIR= yes NO_BUILD= yes do-install: - tar -C ${TARGETDIR}/lib -xzf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} - ${SH} ${FILESDIR}/post-install ${TARGETDIR} + tar -C ${PREFIX}/lib -xzf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} + ${SH} ${FILESDIR}/post-install ${PREFIX} .include <bsd.port.mk> diff --git a/security/botan/Makefile b/security/botan/Makefile index 51a8207da172..550756bcdde3 100644 --- a/security/botan/Makefile +++ b/security/botan/Makefile @@ -29,7 +29,7 @@ USE_LDCONFIG= yes PLIST_SUB= PORTVERSION=${PORTVERSION} .if !defined(NOPORTDOCS) -DOCSDIR= ${TARGETDIR}/share/doc/Botan-${PORTVERSION} +DOCSDIR= ${PREFIX}/share/doc/Botan-${PORTVERSION} PORTDOCS= * .endif diff --git a/security/clamsmtp/Makefile b/security/clamsmtp/Makefile index 67d3a0f5af8d..979959d51470 100644 --- a/security/clamsmtp/Makefile +++ b/security/clamsmtp/Makefile @@ -57,7 +57,7 @@ post-patch: @${REINPLACE_CMD} -e "s,%%PTHREAD_LIBS%%,${PTHREAD_LIBS}," ${WRKSRC}/configure post-install: - @${INSTALL_DATA} ${WRKSRC}/doc/clamsmtpd.conf ${TARGETDIR}/etc/clamsmtpd.conf-sample + @${INSTALL_DATA} ${WRKSRC}/doc/clamsmtpd.conf ${PREFIX}/etc/clamsmtpd.conf-sample .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} diff --git a/security/find-zlib/Makefile b/security/find-zlib/Makefile index 7741375c44a2..acc5e86251b5 100644 --- a/security/find-zlib/Makefile +++ b/security/find-zlib/Makefile @@ -21,6 +21,6 @@ NO_BUILD= none USE_PERL5_RUN= yes do-install: - ${INSTALL_SCRIPT} ${DISTDIR}/${DISTNAME} ${TARGETDIR}/bin + ${INSTALL_SCRIPT} ${DISTDIR}/${DISTNAME} ${PREFIX}/bin .include <bsd.port.mk> diff --git a/security/ipsec-tools/Makefile b/security/ipsec-tools/Makefile index 767cf78d44f6..0fed3ecbf534 100644 --- a/security/ipsec-tools/Makefile +++ b/security/ipsec-tools/Makefile @@ -31,7 +31,7 @@ CONFIGURE_ARGS= --enable-shared --sysconfdir=${PREFIX}/etc/racoon \ --localstatedir=${STATEDIR:S/\/racoon//} \ --with-pkgversion=freebsd-${PORTVERSION} -STATEDIR= ${DESTDIR}/var/db/racoon +STATEDIR= /var/db/racoon SUB_LIST+= STATEDIR=${STATEDIR} PLIST_SUB+= STATEDIR=${STATEDIR} diff --git a/security/nikto/Makefile b/security/nikto/Makefile index 709ab065f94e..2c2fb72aaafe 100644 --- a/security/nikto/Makefile +++ b/security/nikto/Makefile @@ -40,7 +40,7 @@ RUN_DEPENEDS+= nmap:${PORTSDIR}/security/nmap post-patch: @${REINPLACE_CMD} -e "s|/usr/local/bin/perl|${PERL}|" ${WRKSRC}/nikto.pl - @${REINPLACE_CMD} -Ee "s,(config.txt),${TARGETDIR}/etc/nikto.conf," ${WRKSRC}/nikto.pl + @${REINPLACE_CMD} -Ee "s,(config.txt),${PREFIX}/etc/nikto.conf," ${WRKSRC}/nikto.pl @${REINPLACE_CMD} -Ee "s|/usr/bin/nmap|${LOCALBASE}/bin/nmap|g" \ -e "s|# (PLUGINDIR=)/usr/local/nikto/plugins|\1${DATADIR}|g" \ ${WRKSRC}/config.txt @@ -51,10 +51,10 @@ post-patch: @${MV} ${WRKSRC}/docs/${PORTNAME}-${PORTVERSION}.man ${WRKSRC}/docs/${PORTNAME}.1 do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/nikto.pl ${TARGETDIR}/bin/nikto - ${INSTALL_DATA} ${WRKSRC}/config.txt ${TARGETDIR}/etc/nikto.conf.sample + ${INSTALL_SCRIPT} ${WRKSRC}/nikto.pl ${PREFIX}/bin/nikto + ${INSTALL_DATA} ${WRKSRC}/config.txt ${PREFIX}/etc/nikto.conf.sample [ -f ${PREFIX}/etc/nikto.conf ] || \ - ${INSTALL_DATA} ${WRKSRC}/config.txt ${TARGETDIR}/etc/nikto.conf + ${INSTALL_DATA} ${WRKSRC}/config.txt ${PREFIX}/etc/nikto.conf @${MKDIR} ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/plugins/LW.pm ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/plugins/*.db ${DATADIR} diff --git a/security/nmap-i18n-man/Makefile b/security/nmap-i18n-man/Makefile index 73da3c42c87e..a4c6d1a17351 100644 --- a/security/nmap-i18n-man/Makefile +++ b/security/nmap-i18n-man/Makefile @@ -88,10 +88,10 @@ do-install: lang="`expr $${token} : '\([^=]*\)'`"; \ locale="`expr $${token} : '.*=\([^=]*\)'`"; \ charset="`expr $${locale} : '[^.]*\.\([^.]*\)'`"; \ - ${MKDIR} ${DESTDIR}${MAN1PREFIX}/man/$${locale}/man1; \ + ${MKDIR} ${MAN1PREFIX}/man/$${locale}/man1; \ ${ECHO_CMD} Installing man/$${locale}/man1/nmap.1; \ ${INSTALL_MAN} ${WRKSRC}/nmap-$${lang}.1.$${charset} \ - ${DESTDIR}${MAN1PREFIX}/man/$${locale}/man1/nmap.1; \ + ${MAN1PREFIX}/man/$${locale}/man1/nmap.1; \ done .include <bsd.port.post.mk> diff --git a/security/nmap/Makefile b/security/nmap/Makefile index f89b0b3fb57d..34b6a211312b 100644 --- a/security/nmap/Makefile +++ b/security/nmap/Makefile @@ -53,9 +53,9 @@ post-configure: post-install: .ifndef NOPORTDOCS - @${MKDIR} ${DESTDIR}${DOCSDIR} + @${MKDIR} ${DOCSDIR} @for doc in CHANGELOG HACKING docs/nmap.dtd; do \ - ${INSTALL_DATA} ${WRKSRC}/$${doc} ${DESTDIR}${DOCSDIR}; \ + ${INSTALL_DATA} ${WRKSRC}/$${doc} ${DOCSDIR}; \ done .endif diff --git a/security/openssl/Makefile b/security/openssl/Makefile index 1c5c9a106cd9..b75435afcf13 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -886,7 +886,7 @@ MLINKS+= \ .include <bsd.port.pre.mk> -OPENSSL_BASE_SONAME!= readlink ${DESTDIR}/usr/lib/libcrypto.so || true +OPENSSL_BASE_SONAME!= readlink /usr/lib/libcrypto.so || true OPENSSL_SHLIBVER_BASE= ${OPENSSL_BASE_SONAME:E} OPENSSL_BASE_SOPATH= ${OPENSSL_BASE_SONAME:H} @@ -937,7 +937,7 @@ pre-everything:: @${FALSE} .endif -.if exists(${DESTDIR}/usr/lib/libcrypto.so.3) && ${OPENSSL_SHLIBVER} != 3 +.if exists(/usr/lib/libcrypto.so.3) && ${OPENSSL_SHLIBVER} != 3 pre-everything:: @${ECHO_CMD} "#" @${ECHO_CMD} "# this ports conflicts with your base system" @@ -950,7 +950,7 @@ pre-everything:: BASE_SUFFIX= -overwrite-base PREFIX= /usr OPENSSLDIR= /etc/ssl -MANPREFIX= ${TARGETDIR}/openssl +MANPREFIX= ${PREFIX}/openssl PLIST_SUB+= MANDIR="" PLIST_SUB+= NOBASE="@comment " .else @@ -965,7 +965,7 @@ pre-everything:: .endif OPENSSLDIR= ${PREFIX}/openssl -MANPREFIX= ${TARGETDIR} +MANPREFIX= ${PREFIX} PLIST_SUB+= MANDIR="@comment " PLIST_SUB+= NOBASE="" .endif diff --git a/security/pam_krb5/Makefile b/security/pam_krb5/Makefile index 682f89ac4b6c..6af133b03531 100644 --- a/security/pam_krb5/Makefile +++ b/security/pam_krb5/Makefile @@ -48,7 +48,7 @@ IGNORE= FreeBSD 5.x already ships with its own version of pam_krb5 .endif MANDIR= ${MANPREFIX}/man PREFIX= /usr -MANPREFIX= ${TARGETDIR}/usr/share +MANPREFIX= /usr/share MANDIR= ${PREFIX}/share/man KRB5_DIR?= ${LOCALBASE} CONFIGURE_ENV= CFLAGS="${CFLAGS}" diff --git a/security/py-gnutls/Makefile b/security/py-gnutls/Makefile index e12be8c48367..31ba54b5a7af 100644 --- a/security/py-gnutls/Makefile +++ b/security/py-gnutls/Makefile @@ -22,7 +22,7 @@ USE_PYTHON= yes USE_PYDISTUTILS= yes PYDISTUTILS_PKGNAME= python_gnutls -EXAMPLESDIR= ${TARGETDIR}/share/examples/py-${PORTNAME} +EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} post-patch: ${REINPLACE_CMD} -e "s|include_dirs=\[\]|include_dirs=\['${LOCALBASE}/include'\]|" ${WRKSRC}/setup.py diff --git a/security/snort/Makefile b/security/snort/Makefile index 920e2c581257..0068477b142d 100644 --- a/security/snort/Makefile +++ b/security/snort/Makefile @@ -36,7 +36,7 @@ CONFIG_DIR?= ${PREFIX}/etc/snort CONFIG_FILES= classification.config gen-msg.map generators reference.config \ sid sid-msg.map snort.conf threshold.conf unicode.map RULES_DIR= ${PREFIX}/etc/snort/rules -LOGS_DIR= ${DESTDIR}/var/log/snort +LOGS_DIR= /var/log/snort MAN8= snort.8 DOCS= RELEASE.NOTES doc/AUTHORS doc/BUGS doc/CREDITS \ diff --git a/security/vnccrack/Makefile b/security/vnccrack/Makefile index dea019ab37b1..49cedd62d272 100644 --- a/security/vnccrack/Makefile +++ b/security/vnccrack/Makefile @@ -22,7 +22,7 @@ USE_OPENSSL= yes SUB_FILES+= pkg-message do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/vnccrack ${TARGETDIR}/bin/vnccrack + @${INSTALL_PROGRAM} ${WRKSRC}/vnccrack ${PREFIX}/bin/vnccrack post-install: .if !defined(NOPORTDOCS) diff --git a/shells/bash/Makefile b/shells/bash/Makefile index 8fa0d105e064..08764fbb96aa 100644 --- a/shells/bash/Makefile +++ b/shells/bash/Makefile @@ -107,22 +107,22 @@ pre-build: @${ECHO_CMD} $$((${PORTREVISION}-1)) > ${WRKSRC}/.build pre-install: - @${SETENV} PKG_PREFIX="${PREFIX}" PKG_DESTDIR="${DESTDIR}" \ + @${SETENV} PKG_PREFIX="${PREFIX}" \ ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: @cd ${PREFIX}/bin ; ${LN} -sf bash rbash .if !defined(NOPORTDOCS) - @${MKDIR} ${DESTDIR}${DOCSDIR} + @${MKDIR} ${DOCSDIR} .if !defined(WITH_INCLUDED_FAQ) @${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/FAQ \ - ${WRKSRC}/doc/INTRO ${DESTDIR}${DOCSDIR} + ${WRKSRC}/doc/INTRO ${DOCSDIR} .else @${INSTALL_DATA} ${WRKSRC}/doc/FAQ \ - ${WRKSRC}/doc/INTRO ${DESTDIR}${DOCSDIR} + ${WRKSRC}/doc/INTRO ${DOCSDIR} .endif @for d in ${PORTDOCS:NFAQ:NINTRO}; do \ - ${INSTALL_DATA} ${WRKSRC}/$${d} ${DESTDIR}${DOCSDIR}; \ + ${INSTALL_DATA} ${WRKSRC}/$${d} ${DOCSDIR}; \ done .endif @${SETENV} PKG_PREFIX="${PREFIX}" PKG_DESTDIR="${DESTDIR}" \ diff --git a/shells/bash/pkg-install b/shells/bash/pkg-install index 37a63a755364..99417b66ba6e 100644 --- a/shells/bash/pkg-install +++ b/shells/bash/pkg-install @@ -5,7 +5,7 @@ BASH="$(echo ${PKG_PREFIX-/usr/local}/bin/bash | /usr/bin/sed -e 's|//|/|g')" RBASH="$(echo ${PKG_PREFIX-/usr/local}/bin/rbash | /usr/bin/sed -e 's|//|/|g')" -SHELLS="${PKG_DESTDIR-}/etc/shells" +SHELLS="/etc/shells" case $2 in POST-INSTALL) diff --git a/shells/mksh/Makefile b/shells/mksh/Makefile index e875aa47ed21..9ada3f03b8e1 100644 --- a/shells/mksh/Makefile +++ b/shells/mksh/Makefile @@ -47,11 +47,11 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/mksh.1 ${MANPREFIX}/man/man1 pre-install: - @${SETENV} PKG_PREFIX="${PREFIX}" PKG_DESTDIR="${DESTDIR}" \ + @${SETENV} PKG_PREFIX="${PREFIX}" \ ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: - @${SETENV} PKG_PREFIX="${PREFIX}" PKG_DESTDIR="${DESTDIR}" \ + @${SETENV} PKG_PREFIX="${PREFIX}" \ ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.post.mk> diff --git a/shells/mksh/pkg-install b/shells/mksh/pkg-install index dea9b5231c91..87dea009ba0a 100644 --- a/shells/mksh/pkg-install +++ b/shells/mksh/pkg-install @@ -4,7 +4,7 @@ # MKSH="${PKG_PREFIX-/usr/local}/bin/mksh" -SHELLS="${PKG_DESTDIR-}/etc/shells" +SHELLS="/etc/shells" case $2 in POST-INSTALL) diff --git a/shells/osh/Makefile b/shells/osh/Makefile index 92db7c3e63a6..7345dec3754e 100644 --- a/shells/osh/Makefile +++ b/shells/osh/Makefile @@ -16,10 +16,10 @@ COMMENT= An implementation of the UNIX 6th Edition shell MAN1= fd2.1 goto.1 if.1 osh.1 sh6.1 glob6.1 post-install: - @${ECHO_MSG} "updating ${DESTDIR}/etc/shells" - @${CP} ${DESTDIR}/etc/shells ${DESTDIR}/etc/shells.bak - @(${GREP} -v ${PREFIX}/bin/osh ${DESTDIR}/etc/shells.bak; \ - ${ECHO_CMD} ${PREFIX}/bin/osh) > ${DESTDIR}/etc/shells - @${RM} ${DESTDIR}/etc/shells.bak + @${ECHO_MSG} "updating /etc/shells" + @${CP} /etc/shells /etc/shells.bak + @(${GREP} -v ${PREFIX}/bin/osh /etc/shells.bak; \ + ${ECHO_CMD} ${PREFIX}/bin/osh) > /etc/shells + @${RM} /etc/shells.bak .include <bsd.port.mk> diff --git a/sysutils/apt/Makefile b/sysutils/apt/Makefile index 20d847cc6d7b..fdd44c9043a1 100644 --- a/sysutils/apt/Makefile +++ b/sysutils/apt/Makefile @@ -35,8 +35,8 @@ MAN1= apt-extracttemplates.1 apt-ftparchive.1 apt-sortpkgs.1 MAN5= apt.conf.5 apt_preferences.5 sources.list.5 MAN8= apt-cache.8 apt-cdrom.8 apt-config.8 apt-get.8 apt-key.8 apt-secure.8 -DPKGDIR?= ${DESTDIR}/var/db/dpkg -APTDIR?= ${DESTDIR}/var/db/apt +DPKGDIR?= /var/db/dpkg +APTDIR?= /var/db/apt PLIST_SUB+= APTDIR=${APTDIR:C,^/,,} post-patch: diff --git a/sysutils/bksh/files/patch-Makefile b/sysutils/bksh/files/patch-Makefile index 3b9c899c32e2..e06cf3338507 100644 --- a/sysutils/bksh/files/patch-Makefile +++ b/sysutils/bksh/files/patch-Makefile @@ -1,8 +1,9 @@ ---- Makefile.orig Sat Aug 5 11:56:42 2006 -+++ Makefile Sat Aug 5 11:56:58 2006 -@@ -1,5 +1,7 @@ +--- Makefile.orig Mon Jun 23 03:11:57 2003 ++++ Makefile Sat Aug 4 00:32:00 2007 +@@ -1,5 +1,8 @@ .include "local.mk" ++DESTDIR= +BINDIR= ${PREFIX}/bin + # Stolen from bsd.port.mk diff --git a/sysutils/freeipmi/Makefile b/sysutils/freeipmi/Makefile index 42dbe75504ed..04f4ee7bfaae 100644 --- a/sysutils/freeipmi/Makefile +++ b/sysutils/freeipmi/Makefile @@ -64,7 +64,7 @@ STRIP= # empty .endif post-install: - @${CHMOD} 0700 ${DESTDIR}${PREFIX}/var/log/freeipmi \ - ${DESTDIR}${PREFIX}/var/lib/freeipmi + @${CHMOD} 0700 ${PREFIX}/var/log/freeipmi \ + ${PREFIX}/var/lib/freeipmi .include <bsd.port.post.mk> diff --git a/sysutils/fusefs-httpfs/Makefile b/sysutils/fusefs-httpfs/Makefile index 63bf1aa28de2..b05e7a1bf7a9 100644 --- a/sysutils/fusefs-httpfs/Makefile +++ b/sysutils/fusefs-httpfs/Makefile @@ -30,7 +30,7 @@ do-build: -o httpfs httpfs.c -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lfuse) do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/httpfs ${TARGETDIR}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/httpfs ${PREFIX}/bin .include <bsd.port.pre.mk> diff --git a/sysutils/fusefs-unionfs/Makefile b/sysutils/fusefs-unionfs/Makefile index 2d8e6a7bec0c..dadbb199cd20 100644 --- a/sysutils/fusefs-unionfs/Makefile +++ b/sysutils/fusefs-unionfs/Makefile @@ -29,7 +29,7 @@ do-build: -o unionfs *.c -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lfuse) do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/unionfs ${TARGETDIR}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/unionfs ${PREFIX}/bin .include <bsd.port.pre.mk> diff --git a/sysutils/heirloom/Makefile b/sysutils/heirloom/Makefile index c7ae7bb927cb..39727ab996ef 100644 --- a/sysutils/heirloom/Makefile +++ b/sysutils/heirloom/Makefile @@ -22,7 +22,7 @@ USE_GMAKE= yes MAKE_ARGS= CC=${CC} MAKEFILE= makefile ALL_TARGET= -DATADIR= ${TARGETDIR}/${PORTNAME} +DATADIR= ${PREFIX}/${PORTNAME} REINPLACE_SUB= DATADIR="${DATADIR}" _MANPREFIX= ${DATADIR}/usr/share/man/5man diff --git a/sysutils/ipmi-kmod/Makefile b/sysutils/ipmi-kmod/Makefile index f85ed2f5a7a8..ba4a259af92d 100644 --- a/sysutils/ipmi-kmod/Makefile +++ b/sysutils/ipmi-kmod/Makefile @@ -51,7 +51,7 @@ CFLAGS+= -I@/contrib/dev/acpica do-install: @${MKDIR} ${PREFIX}/include/sys ${INSTALL_DATA} ${WRKSRC}/sys/ipmi.h ${PREFIX}/include/sys - ${INSTALL_PROGRAM} ${WRKSRC}/ipmi.ko ${DESTDIR}${KMODDIR} + ${INSTALL_PROGRAM} ${WRKSRC}/ipmi.ko ${KMODDIR} post-install: @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL diff --git a/sysutils/isomaster/Makefile b/sysutils/isomaster/Makefile index 4d56d58f9fca..fea0c7d3ba48 100644 --- a/sysutils/isomaster/Makefile +++ b/sysutils/isomaster/Makefile @@ -30,7 +30,7 @@ PLIST_SUB+= NLS="" .else PLIST_SUB+= NLS="@comment " .endif -PLIST_SUB+= DESKTOPDIR="${DESKTOPDIR:S,^${TARGETDIR}/,,}" +PLIST_SUB+= DESKTOPDIR="${DESKTOPDIR:S,^${PREFIX}/,,}" MAN1= isomaster.1 diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile index 5b844e639101..ec0c486bbd16 100644 --- a/sysutils/nut/Makefile +++ b/sysutils/nut/Makefile @@ -34,7 +34,7 @@ CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/nut \ --with-user=${NUT_USER} NUT_USER?= uucp -STATEDIR= ${DESTDIR}/var/db/nut +STATEDIR= /var/db/nut .include <bsd.port.pre.mk> diff --git a/sysutils/nut22/Makefile b/sysutils/nut22/Makefile index 5b844e639101..ec0c486bbd16 100644 --- a/sysutils/nut22/Makefile +++ b/sysutils/nut22/Makefile @@ -34,7 +34,7 @@ CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/nut \ --with-user=${NUT_USER} NUT_USER?= uucp -STATEDIR= ${DESTDIR}/var/db/nut +STATEDIR= /var/db/nut .include <bsd.port.pre.mk> diff --git a/sysutils/pflogx/Makefile b/sysutils/pflogx/Makefile index f3d514c88e84..9a028f930c38 100644 --- a/sysutils/pflogx/Makefile +++ b/sysutils/pflogx/Makefile @@ -33,7 +33,7 @@ MAKE_ARGS+= -DWITH_EXPAT \ .endif do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/pflogx ${TARGETDIR}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/src/pflogx ${PREFIX}/bin .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} diff --git a/sysutils/sge/Makefile b/sysutils/sge/Makefile index 84dd64829791..142424781237 100644 --- a/sysutils/sge/Makefile +++ b/sysutils/sge/Makefile @@ -43,7 +43,7 @@ USE_OPENSSL= yes USE_LDCONFIG= ${SGE_ROOT}/lib/${SGE_ARCH} SGE_BASE?= sge -SGE_ROOT= ${TARGETDIR}/${SGE_BASE} +SGE_ROOT= ${PREFIX}/${SGE_BASE} SGE_ARCH= fbsd-${ARCH} SGE_BUILD_ARCH= FREEBSD_${ARCH:U} SGE_VERSION= 6.0.10 diff --git a/sysutils/sge60/Makefile b/sysutils/sge60/Makefile index 84dd64829791..142424781237 100644 --- a/sysutils/sge60/Makefile +++ b/sysutils/sge60/Makefile @@ -43,7 +43,7 @@ USE_OPENSSL= yes USE_LDCONFIG= ${SGE_ROOT}/lib/${SGE_ARCH} SGE_BASE?= sge -SGE_ROOT= ${TARGETDIR}/${SGE_BASE} +SGE_ROOT= ${PREFIX}/${SGE_BASE} SGE_ARCH= fbsd-${ARCH} SGE_BUILD_ARCH= FREEBSD_${ARCH:U} SGE_VERSION= 6.0.10 diff --git a/sysutils/sge61/Makefile b/sysutils/sge61/Makefile index 84dd64829791..142424781237 100644 --- a/sysutils/sge61/Makefile +++ b/sysutils/sge61/Makefile @@ -43,7 +43,7 @@ USE_OPENSSL= yes USE_LDCONFIG= ${SGE_ROOT}/lib/${SGE_ARCH} SGE_BASE?= sge -SGE_ROOT= ${TARGETDIR}/${SGE_BASE} +SGE_ROOT= ${PREFIX}/${SGE_BASE} SGE_ARCH= fbsd-${ARCH} SGE_BUILD_ARCH= FREEBSD_${ARCH:U} SGE_VERSION= 6.0.10 diff --git a/sysutils/sge62/Makefile b/sysutils/sge62/Makefile index 84dd64829791..142424781237 100644 --- a/sysutils/sge62/Makefile +++ b/sysutils/sge62/Makefile @@ -43,7 +43,7 @@ USE_OPENSSL= yes USE_LDCONFIG= ${SGE_ROOT}/lib/${SGE_ARCH} SGE_BASE?= sge -SGE_ROOT= ${TARGETDIR}/${SGE_BASE} +SGE_ROOT= ${PREFIX}/${SGE_BASE} SGE_ARCH= fbsd-${ARCH} SGE_BUILD_ARCH= FREEBSD_${ARCH:U} SGE_VERSION= 6.0.10 diff --git a/sysutils/tenshi/Makefile b/sysutils/tenshi/Makefile index bdfa2ccf5753..275620aa4fe7 100644 --- a/sysutils/tenshi/Makefile +++ b/sysutils/tenshi/Makefile @@ -46,13 +46,13 @@ post-patch: ' ${WRKSRC}/tenshi do-install: - @${INSTALL_SCRIPT} ${WRKSRC}/tenshi ${DESTDIR}${PREFIX}/bin - @${INSTALL_DATA} ${WRKSRC}/tenshi.conf ${DESTDIR}${PREFIX}/etc/tenshi.conf.sample - @${INSTALL_MAN} ${WRKSRC}/tenshi.8 ${DESTDIR}${MAN8PREFIX}/man/man8 + @${INSTALL_SCRIPT} ${WRKSRC}/tenshi ${PREFIX}/bin + @${INSTALL_DATA} ${WRKSRC}/tenshi.conf ${PREFIX}/etc/tenshi.conf.sample + @${INSTALL_MAN} ${WRKSRC}/tenshi.8 ${MAN8PREFIX}/man/man8 .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} @for doc in ${PORTDOCS}; do \ - ${INSTALL_DATA} ${WRKSRC}/$$doc ${DESTDIR}${DOCSDIR}; \ + ${INSTALL_DATA} ${WRKSRC}/$$doc ${DOCSDIR}; \ done .endif diff --git a/sysutils/tw_cli/Makefile b/sysutils/tw_cli/Makefile index 5f6ac8458dba..6c39c73d3abf 100644 --- a/sysutils/tw_cli/Makefile +++ b/sysutils/tw_cli/Makefile @@ -42,13 +42,13 @@ do-configure: ${REINPLACE_CMD} 's!/usr/bin/perl!${PERL}!g' ${WRKSRC}/tw_sched do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/tw_cli ${DESTDIR}${PREFIX}/sbin/ - ${INSTALL_SCRIPT} ${WRKSRC}/tw_sched ${DESTDIR}${PREFIX}/sbin/ + ${INSTALL_PROGRAM} ${WRKSRC}/tw_cli ${PREFIX}/sbin/ + ${INSTALL_SCRIPT} ${WRKSRC}/tw_sched ${PREFIX}/sbin/ ${INSTALL_MAN} ${WRKSRC}/tw_cli.8.nroff ${MANPREFIX}/man/man8/tw_cli.8 ${INSTALL_MAN} ${WRKSRC}/tw_sched.8.nroff ${MANPREFIX}/man/man8/tw_sched.8 - @${MKDIR} ${DESTDIR}${PREFIX}/etc/periodic/daily + @${MKDIR} ${PREFIX}/etc/periodic/daily ${INSTALL_SCRIPT} ${WRKDIR}/407.status-3ware-raid \ - ${DESTDIR}${PREFIX}/etc/periodic/daily/ + ${PREFIX}/etc/periodic/daily/ post-install: .if !defined(NOPORTDOCS) diff --git a/sysutils/x86info/Makefile b/sysutils/x86info/Makefile index 28e9d8494753..f0c552d75b84 100644 --- a/sysutils/x86info/Makefile +++ b/sysutils/x86info/Makefile @@ -21,6 +21,6 @@ PLIST_FILES= bin/x86info MAKE_ARGS= CFLAGS="${CFLAGS}" do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/x86info ${TARGETDIR}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/x86info ${PREFIX}/bin .include <bsd.port.mk> diff --git a/textproc/bib2html/Makefile b/textproc/bib2html/Makefile index 7bdff9999b63..5f904fabecc3 100644 --- a/textproc/bib2html/Makefile +++ b/textproc/bib2html/Makefile @@ -23,26 +23,26 @@ NO_BUILD= yes post-patch: @${SED} -e \ - 's:= "$$0";:= "${TARGETDIR}/${SITE_PERL_REL}/Bib2HTML";:g' \ + 's:= "$$0";:= "${PREFIX}/${SITE_PERL_REL}/Bib2HTML";:g' \ < ${WRKSRC}/bib2html.pl > ${WRKSRC}/bib2html @${SED} -e \ - 's:= "$$0";:= "${TARGETDIR}/${SITE_PERL_REL}/Bib2HTML";:g' \ + 's:= "$$0";:= "${PREFIX}/${SITE_PERL_REL}/Bib2HTML";:g' \ < ${WRKSRC}/bib2xml.pl > ${WRKSRC}/bib2xml do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/bib2html ${TARGETDIR}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/bib2xml ${TARGETDIR}/bin - @${MKDIR} ${TARGETDIR}/${SITE_PERL_REL}/Bib2HTML + ${INSTALL_SCRIPT} ${WRKSRC}/bib2html ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/bib2xml ${PREFIX}/bin + @${MKDIR} ${PREFIX}/${SITE_PERL_REL}/Bib2HTML @cd ${WRKSRC}/Bib2HTML && ${FIND} . | \ ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} \ - ${TARGETDIR}/${SITE_PERL_REL}/Bib2HTML - ${FIND} ${TARGETDIR}/${SITE_PERL_REL}/Bib2HTML -type f | \ + ${PREFIX}/${SITE_PERL_REL}/Bib2HTML + ${FIND} ${PREFIX}/${SITE_PERL_REL}/Bib2HTML -type f | \ ${XARGS} ${CHMOD} ${LIBMODE} - ${FIND} ${TARGETDIR}/${SITE_PERL_REL}/Bib2HTML -type d | \ + ${FIND} ${PREFIX}/${SITE_PERL_REL}/Bib2HTML -type d | \ ${XARGS} ${CHMOD} a+rx - @${FIND} ${TARGETDIR}/${SITE_PERL_REL}/Bib2HTML -type f | \ - ${SED} "s,^${TARGETDIR}/,," >> ${TMPPLIST} - @${FIND} ${TARGETDIR}/${SITE_PERL_REL}/Bib2HTML -type d | ${SORT} -r | \ - ${SED} "s,^${TARGETDIR}/,@dirrm ," >> ${TMPPLIST} + @${FIND} ${PREFIX}/${SITE_PERL_REL}/Bib2HTML -type f | \ + ${SED} "s,^${PREFIX}/,," >> ${TMPPLIST} + @${FIND} ${PREFIX}/${SITE_PERL_REL}/Bib2HTML -type d | ${SORT} -r | \ + ${SED} "s,^${PREFIX}/,@dirrm ," >> ${TMPPLIST} .include <bsd.port.mk> diff --git a/textproc/csvdiff/Makefile b/textproc/csvdiff/Makefile index 1ccfcae9c117..eaa6d762567f 100644 --- a/textproc/csvdiff/Makefile +++ b/textproc/csvdiff/Makefile @@ -25,7 +25,7 @@ PORTDOCS= CHANGES README TODO do-install: ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl \ - ${TARGETDIR}/bin/${PORTNAME} + ${PREFIX}/bin/${PORTNAME} .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} .for i in ${PORTDOCS} diff --git a/textproc/dbacl/Makefile b/textproc/dbacl/Makefile index 43abfe077eac..f8aff1087e05 100644 --- a/textproc/dbacl/Makefile +++ b/textproc/dbacl/Makefile @@ -35,8 +35,8 @@ pre-install: do-install: @${MKDIR} ${EXAMPLESDIR} cd ${WRKSRC}/src && \ - ${INSTALL_PROGRAM} ${PROGRAMS} ${TARGETDIR}/bin && \ - ${INSTALL_SCRIPT} ${SCRIPTS} ${TARGETDIR}/bin + ${INSTALL_PROGRAM} ${PROGRAMS} ${PREFIX}/bin && \ + ${INSTALL_SCRIPT} ${SCRIPTS} ${PREFIX}/bin cd ${WRKSRC}/man && \ ${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/man1 && \ cd ${WRKSRC}/doc && \ diff --git a/textproc/diffstat/Makefile b/textproc/diffstat/Makefile index e5807aaf2859..e2fa5c33fe84 100644 --- a/textproc/diffstat/Makefile +++ b/textproc/diffstat/Makefile @@ -21,7 +21,7 @@ MAN1= diffstat.1 PLIST_FILES= bin/diffstat do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/diffstat ${TARGETDIR}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/diffstat ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MAN1PREFIX}/man/man1 .include <bsd.port.mk> diff --git a/textproc/lemmatizer2/Makefile b/textproc/lemmatizer2/Makefile index 8a7c5b2ba003..930da8175981 100644 --- a/textproc/lemmatizer2/Makefile +++ b/textproc/lemmatizer2/Makefile @@ -21,7 +21,7 @@ COMMENT= Russian / German / English lemmatizer library BUILD_DEPENDS= cmake:${PORTSDIR}/devel/cmake LIB_DEPENDS= pcre:${PORTSDIR}/devel/pcre -DB_DIR?= ${DESTDIR}/var/db/lemmatizer +DB_DIR?= /var/db/lemmatizer DIST_SUBDIR= ${PORTNAME} @@ -32,7 +32,7 @@ pre-fetch: @${ECHO} "You may use the following build options:" @${ECHO} "" @${ECHO} " DB_DIR=directory Set alternate directory for database files" - @${ECHO} " (default is ${DESTDIR}/var/db/lemmatizer)" + @${ECHO} " (default is /var/db/lemmatizer)" @${ECHO} "" do-configure: diff --git a/textproc/metaf2xml/Makefile b/textproc/metaf2xml/Makefile index 2278aa0ffa49..89677054b0a8 100644 --- a/textproc/metaf2xml/Makefile +++ b/textproc/metaf2xml/Makefile @@ -15,17 +15,17 @@ EXTRACT_SUFX= .tgz MAINTAINER= clsung@FreeBSD.org COMMENT= Parses METAR, TAF, and SYNOP messages and stores the components in XML -MAKE_ARGS= CGI_BIN_DIR=${TARGETDIR}/www/metaf2xml/cgi-bin \ - HTDOCS_DIR=${TARGETDIR}/www/metaf2xml/htdocs \ - METAF2XML=${TARGETDIR} \ - METAF2XML_LIB=${TARGETDIR}/${SITE_PERL_REL} \ +MAKE_ARGS= CGI_BIN_DIR=${PREFIX}/www/metaf2xml/cgi-bin \ + HTDOCS_DIR=${PREFIX}/www/metaf2xml/htdocs \ + METAF2XML=${PREFIX} \ + METAF2XML_LIB=${PREFIX}/${SITE_PERL_REL} \ METAF2XML_XSL=${DATADIR} NO_BUILD= yes USE_PERL5_RUN= yes pre-install: - ${MKDIR} ${TARGETDIR}/www/metaf2xml/cgi-bin \ - ${TARGETDIR}/www/metaf2xml/htdocs + ${MKDIR} ${PREFIX}/www/metaf2xml/cgi-bin \ + ${PREFIX}/www/metaf2xml/htdocs do-install: cd ${WRKSRC}; ${MAKE} ${MAKE_ARGS} install-all diff --git a/textproc/nltk/Makefile b/textproc/nltk/Makefile index 722c6683d50f..0fe692b8beab 100644 --- a/textproc/nltk/Makefile +++ b/textproc/nltk/Makefile @@ -27,8 +27,8 @@ BROKEN= Coredump during build on alpha 4.x post-install: @${FIND} ${PYTHON_SITELIBDIR}/nltk ! -type d | \ - ${SED} 's,^${TARGETDIR}/,,' >> ${TMPPLIST} + ${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST} @${FIND} ${PYTHON_SITELIBDIR}/nltk -type d | ${SORT} -r | \ - ${SED} 's,^${TARGETDIR}/,@dirrm ,' >> ${TMPPLIST} + ${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST} .include <bsd.port.post.mk> diff --git a/textproc/nltk_lite/Makefile b/textproc/nltk_lite/Makefile index 79d80debe25d..c0f3498543b9 100644 --- a/textproc/nltk_lite/Makefile +++ b/textproc/nltk_lite/Makefile @@ -31,8 +31,8 @@ PLIST_SUB+= EGG_INFO_FILE="" post-install: @${FIND} ${PYTHON_SITELIBDIR}/nltk_lite ! -type d | \ - ${SED} 's,^${TARGETDIR}/,,' >> ${TMPPLIST} + ${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST} @${FIND} ${PYTHON_SITELIBDIR}/nltk_lite -type d | ${SORT} -r | \ - ${SED} 's,^${TARGETDIR}/,@dirrm ,' >> ${TMPPLIST} + ${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST} .include <bsd.port.post.mk> diff --git a/textproc/po4a/Makefile b/textproc/po4a/Makefile index 8d96efcaaf69..92a72d7fb2b3 100644 --- a/textproc/po4a/Makefile +++ b/textproc/po4a/Makefile @@ -26,7 +26,7 @@ USE_PERL5= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -MAN3PREFIX= ${TARGETDIR}/lib/perl5/${PERL_VERSION} +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} MAN3= Locale::Po4a::TransTractor.3 \ Locale::Po4a::LaTeX.3 \ Locale::Po4a::Pod.3 \ diff --git a/textproc/py-pygments/Makefile b/textproc/py-pygments/Makefile index 8313612697cd..8d07d4b10005 100644 --- a/textproc/py-pygments/Makefile +++ b/textproc/py-pygments/Makefile @@ -21,7 +21,7 @@ USE_PYDISTUTILS= easy_install PYDISTUTILS_PKGNAME= Pygments .if !defined(NOPORTDOCS) -DOCSDIR= ${TARGETDIR}/share/doc/py-${PORTNAME} +DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} FIND_DOCS= . -type f MAN1= pygmentize.1 MANCOMPRESSED= no diff --git a/textproc/rst.el/Makefile b/textproc/rst.el/Makefile index 692fc9f81e34..2efac8962558 100644 --- a/textproc/rst.el/Makefile +++ b/textproc/rst.el/Makefile @@ -24,7 +24,7 @@ EXTRACT_CMD= ${CP} EXTRACT_BEFORE_ARGS= # empty EXTRACT_AFTER_ARGS= ${WRKSRC}/rst.el -ELISPDIR= ${TARGETDIR}/${EMACS_SITE_LISPDIR} +ELISPDIR= ${PREFIX}/${EMACS_SITE_LISPDIR} .include <bsd.port.pre.mk> diff --git a/textproc/ruby-sary/Makefile b/textproc/ruby-sary/Makefile index 06dce5aaff3a..1d4a7ffa2631 100644 --- a/textproc/ruby-sary/Makefile +++ b/textproc/ruby-sary/Makefile @@ -32,7 +32,7 @@ DOCS_JA= ${RUBY_RD_FILES:M*.ja.rd} \ ${RUBY_RD_HTML_FILES:M*.ja.html} post-install: doc-install - ${INSTALL_SCRIPT} ${WRKSRC}/rsary.rb ${TARGETDIR}/bin/ + ${INSTALL_SCRIPT} ${WRKSRC}/rsary.rb ${PREFIX}/bin/ doc-install: .if !defined(NOPORTDOCS) diff --git a/textproc/srilm/Makefile b/textproc/srilm/Makefile index 6c15f20b2263..3027c4b0cbfa 100644 --- a/textproc/srilm/Makefile +++ b/textproc/srilm/Makefile @@ -87,7 +87,7 @@ post-patch: do-install: @${MKDIR} ${EXAMPLESDIR} cd ${WRKSRC}/bin/freebsd && \ - ${INSTALL_PROGRAM} ${PROGRAMS} ${TARGETDIR}/bin && \ + ${INSTALL_PROGRAM} ${PROGRAMS} ${PREFIX}/bin && \ ${INSTALL_SCRIPT} ${GAWK_SCRIPTS} ${EXAMPLESDIR} && \ cd ${WRKSRC}/man/man1 && \ ${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/man1 && \ diff --git a/textproc/xxdiff/Makefile b/textproc/xxdiff/Makefile index f5643ca1ab29..acce20f0bbc5 100644 --- a/textproc/xxdiff/Makefile +++ b/textproc/xxdiff/Makefile @@ -46,7 +46,7 @@ pre-build: @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} QMAKESPEC=${SPEC} ${MAKE} -f Makefile.bootstrap ${MAKE_ARGS} Makefile) do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/bin/xxdiff ${TARGETDIR}/bin/ + ${INSTALL_PROGRAM} ${WRKSRC}/bin/xxdiff ${PREFIX}/bin/ .if !defined(NOPORTDOCS) @${INSTALL} -d ${DOCSDIR} ${SSDIR} ${INSTALL_DATA} ${DOCFILES:S,^,${WRKSRC}/doc/,} ${DOCSDIR}/ diff --git a/www/aolserver/Makefile b/www/aolserver/Makefile index faaf20789746..9ba71c6f290e 100644 --- a/www/aolserver/Makefile +++ b/www/aolserver/Makefile @@ -23,7 +23,7 @@ AOLSERVERBASE?= ${PORTNAME} AOLSERVERUSER?= nobody AOLSERVERGROUP?= nogroup -MANPREFIX= ${TARGETDIR}/${AOLSERVERBASE} +MANPREFIX= ${PREFIX}/${AOLSERVERBASE} USE_GMAKE= yes HAS_CONFIGURE= yes diff --git a/www/apache13-modperl/Makefile b/www/apache13-modperl/Makefile index 2d2650afe04e..7d1f72585b4a 100644 --- a/www/apache13-modperl/Makefile +++ b/www/apache13-modperl/Makefile @@ -39,7 +39,7 @@ DEFAULT_PATH= /bin:/usr/bin:${PREFIX}/bin RC_SCRIPTS_SUB=PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} # Perl man pages go into section 3 -MAN3PREFIX= ${TARGETDIR}/lib/perl5/${PERL_VERSION} +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} .include <bsd.port.pre.mk> diff --git a/www/apache20/Makefile b/www/apache20/Makefile index fba6ddb7feef..7c21ddfd1874 100644 --- a/www/apache20/Makefile +++ b/www/apache20/Makefile @@ -73,7 +73,7 @@ CONFIGURE_ENV= CC="${CC}" CPPFLAGS="${CPPFLAGS}" \ PREFIX_RELDEST= ${PREFIX:S,^${DESTDIR},,} RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} -MAKE_ENV+= DESTDIR=${DESTDIR} EXPR_COMPAT=yes +MAKE_ENV+= EXPR_COMPAT=yes WITH_MPM?= prefork # or worker, perchild, threadpool diff --git a/www/apache21/Makefile b/www/apache21/Makefile index eb795d852771..40227bf9c692 100644 --- a/www/apache21/Makefile +++ b/www/apache21/Makefile @@ -66,7 +66,7 @@ CONFIGURE_ENV= CC="${CC}" CPPFLAGS="${CPPFLAGS}" \ PREFIX_RELDEST= ${PREFIX:S,^${DESTDIR},,} RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} -MAKE_ENV+= DESTDIR=${DESTDIR} EXPR_COMPAT=yes +MAKE_ENV+= EXPR_COMPAT=yes WITH_MPM?= prefork # or worker, perchild, threadpool, event diff --git a/www/apache22/Makefile b/www/apache22/Makefile index 6f959f91f82e..d1e617163c55 100644 --- a/www/apache22/Makefile +++ b/www/apache22/Makefile @@ -73,7 +73,7 @@ CONFIGURE_ENV= CC="${CC}" CPPFLAGS="${CPPFLAGS}" \ PREFIX_RELDEST= ${PREFIX:S,^${DESTDIR},,} -MAKE_ENV+= DESTDIR=${DESTDIR} EXPR_COMPAT=yes +MAKE_ENV+= EXPR_COMPAT=yes WITH_MPM?= prefork # or worker, perchild, event, itk diff --git a/www/b2evolution/Makefile b/www/b2evolution/Makefile index 49d7f89c5b33..2b6d285ba6dd 100644 --- a/www/b2evolution/Makefile +++ b/www/b2evolution/Makefile @@ -42,14 +42,14 @@ pre-install: && ${ECHO_CMD} @dirrm ${B2EVO_DIR} >> ${PLIST} do-install: - ${MKDIR} ${TARGETDIR}/${B2EVO_DIR} - @${CHMOD} 755 ${TARGETDIR}/${B2EVO_DIR} - @${CP} -R ${WRKSRC}/ ${TARGETDIR}/${B2EVO_DIR} - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${TARGETDIR}/${B2EVO_DIR} - @${CHMOD} 665 ${TARGETDIR}/${B2EVO_DIR}/blogs/conf/_config.php + ${MKDIR} ${PREFIX}/${B2EVO_DIR} + @${CHMOD} 755 ${PREFIX}/${B2EVO_DIR} + @${CP} -R ${WRKSRC}/ ${PREFIX}/${B2EVO_DIR} + @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${B2EVO_DIR} + @${CHMOD} 665 ${PREFIX}/${B2EVO_DIR}/blogs/conf/_config.php post-install: - @${SED} -e 's|%%TARGETDIR%%|${TARGETDIR}|' \ + @${SED} -e 's|%%PREFIX%%|${PREFIX}|' \ -e 's|%%B2EVO_DIR%%|${B2EVO_DIR}|; s|%%B2EVO_URL%%|${B2EVO_URL}|' \ ${PKGMESSAGE} diff --git a/www/b2evolution/pkg-message b/www/b2evolution/pkg-message index dae6c6d547e7..3d89792294d8 100644 --- a/www/b2evolution/pkg-message +++ b/www/b2evolution/pkg-message @@ -19,7 +19,7 @@ you may need to perform the following steps. [1;32m# # Directives to allow use of b2evolution # - Alias /%%B2EVO_URL%% "%%TARGETDIR%%/%%B2EVO_DIR%%/"[m + Alias /%%B2EVO_URL%% "%%PREFIX%%/%%B2EVO_DIR%%/"[m 4.Open b2evo installation page in your web browser and login with b2evouser/b2evopassword diff --git a/www/libapreq2/Makefile b/www/libapreq2/Makefile index 3c8821da2c4a..40ab063b29ca 100644 --- a/www/libapreq2/Makefile +++ b/www/libapreq2/Makefile @@ -33,7 +33,7 @@ RUN_DEPENDS+= ${P5_APREQ_DEPENDS} USE_PERL5= yes CONFIGURE_ARGS+= --enable-perl-glue --with-perl=${PERL5} -MAN3PREFIX= ${TARGETDIR}/lib/perl5/${PERL_VERSION} +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} MAN3= APR::Request.3 \ APR::Request::Apache2.3 \ APR::Request::CGI.3 \ diff --git a/www/lifetype/Makefile b/www/lifetype/Makefile index cdba78fe79c6..8305f8ddd3f3 100644 --- a/www/lifetype/Makefile +++ b/www/lifetype/Makefile @@ -72,9 +72,9 @@ pre-install: && ${ECHO_CMD} @dirrm ${PLOGDIR} >> ${PLIST} do-install: - @${MKDIR} ${TARGETDIR}/${PLOGDIR} - @${CP} -R ${WRKSRC}/ ${TARGETDIR}/${PLOGDIR} - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${TARGETDIR}/${PLOGDIR} + @${MKDIR} ${PREFIX}/${PLOGDIR} + @${CP} -R ${WRKSRC}/ ${PREFIX}/${PLOGDIR} + @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${PLOGDIR} post-install: @${SED} -e 's|%%PLOGURL%%|${PLOGURL}|' pkg-message > ${PKGMESSAGE} diff --git a/www/lilurl/Makefile b/www/lilurl/Makefile index 47d3152e7961..625a4a852b81 100644 --- a/www/lilurl/Makefile +++ b/www/lilurl/Makefile @@ -37,12 +37,12 @@ pre-install: && ${ECHO_CMD} @dirrm ${LILURL_DIR} >> ${PLIST} do-install: - ${MKDIR} ${TARGETDIR}/${LILURL_DIR} - @${CP} -R ${WRKSRC}/ ${TARGETDIR}/${LILURL_DIR} - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${TARGETDIR}/${LILURL_DIR} + ${MKDIR} ${PREFIX}/${LILURL_DIR} + @${CP} -R ${WRKSRC}/ ${PREFIX}/${LILURL_DIR} + @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${LILURL_DIR} post-install: - @${SED} -e 's,%%TARGETDIR%%,${TARGETDIR},; s,%%LILURL_DIR%%,${LILURL_DIR},g' \ + @${SED} -e 's,%%PREFIX%%,${PREFIX},; s,%%LILURL_DIR%%,${LILURL_DIR},g' \ ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/www/lilurl/files/pkg-message.in b/www/lilurl/files/pkg-message.in index f55728eb858d..9da019a2de48 100644 --- a/www/lilurl/files/pkg-message.in +++ b/www/lilurl/files/pkg-message.in @@ -10,12 +10,12 @@ you may have to follow this steps to make it work correctly: # echo "GRANT ALL ON lilurl.* TO lilurluser@localhost IDENTIFIED BY 'lilurluser'; FLUSH PRIVILEGES;" | mysql 3. Import the default lilurl database: -# mysql lilurl < %%TARGETDIR%%/%%LILURL_DIR%%/lilurl.sql +# mysql lilurl < %%PREFIX%%/%%LILURL_DIR%%/lilurl.sql -4. Copy %%TARGETDIR%%/%%LILURL_DIR%%/includes/conf.php.sample to %%TARGETDIR%%/%%LILURL_DIR%%/includes/conf.php - Edit %%TARGETDIR%%/%%LILURL_DIR%%/includes/conf.php +4. Copy %%PREFIX%%/%%LILURL_DIR%%/includes/conf.php.sample to %%PREFIX%%/%%LILURL_DIR%%/includes/conf.php + Edit %%PREFIX%%/%%LILURL_DIR%%/includes/conf.php 5. Add alias in apache config for the lilurl dir: -Alias /lilurl "%%TARGETDIR%%/%%LILURL_DIR%%/" +Alias /lilurl "%%PREFIX%%/%%LILURL_DIR%%/" ======================================================================= diff --git a/www/mini_httpd/Makefile b/www/mini_httpd/Makefile index ca915520c8ef..1b7e27da2009 100644 --- a/www/mini_httpd/Makefile +++ b/www/mini_httpd/Makefile @@ -24,14 +24,14 @@ post-build: -${MV} ${WRKSRC}/htpasswd.1 ${WRKSRC}/htpasswd.8 do-install: - ${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/ + ${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/ @for file in ${MAN8}; \ do \ - ${INSTALL_MAN} ${WRKSRC}/$$file ${TARGETDIR}/man/man8/; \ + ${INSTALL_MAN} ${WRKSRC}/$$file ${PREFIX}/man/man8/; \ done - ${INSTALL_DATA} ${WRKSRC}/mini_httpd.cnf ${TARGETDIR}/etc/mini_httpd.cnf.sample + ${INSTALL_DATA} ${WRKSRC}/mini_httpd.cnf ${PREFIX}/etc/mini_httpd.cnf.sample .include <bsd.port.mk> diff --git a/www/mod_security2/Makefile b/www/mod_security2/Makefile index d27d995ed7e3..5bee20024478 100644 --- a/www/mod_security2/Makefile +++ b/www/mod_security2/Makefile @@ -23,7 +23,7 @@ WRKSRC= ${WRKSRCTOP}/apache2 SRC_FILE= *.c PORTDOCS= * DOCS= CHANGES LICENSE README.TXT modsecurity.conf-minimal doc rules -DOCSDIR= ${TARGETDIR}/share/doc/${MODULENAME} +DOCSDIR= ${PREFIX}/share/doc/${MODULENAME} SUB_FILES+= mod_security2.conf SUB_LIST+= APACHEETCDIR="${APACHEETCDIR}" diff --git a/www/mod_security21/Makefile b/www/mod_security21/Makefile index d27d995ed7e3..5bee20024478 100644 --- a/www/mod_security21/Makefile +++ b/www/mod_security21/Makefile @@ -23,7 +23,7 @@ WRKSRC= ${WRKSRCTOP}/apache2 SRC_FILE= *.c PORTDOCS= * DOCS= CHANGES LICENSE README.TXT modsecurity.conf-minimal doc rules -DOCSDIR= ${TARGETDIR}/share/doc/${MODULENAME} +DOCSDIR= ${PREFIX}/share/doc/${MODULENAME} SUB_FILES+= mod_security2.conf SUB_LIST+= APACHEETCDIR="${APACHEETCDIR}" diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index 293f61a74086..cfd52d5ca87c 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -16,7 +16,7 @@ PKGNAMESUFFIX= -devel MAINTAINER= osa@FreeBSD.org COMMENT= Robust and small WWW server -NGINX_VARDIR?= ${DESTDIR}/var +NGINX_VARDIR?= /var NGINX_LOGDIR?= ${NGINX_VARDIR}/log NGINX_RUNDIR?= ${NGINX_VARDIR}/run NGINX_TMPDIR?= ${NGINX_VARDIR}/tmp/nginx diff --git a/www/nginx/Makefile b/www/nginx/Makefile index 83ecadfae54a..ad7b62420650 100644 --- a/www/nginx/Makefile +++ b/www/nginx/Makefile @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= osa MAINTAINER= osa@FreeBSD.org COMMENT= Robust and small WWW server -NGINX_VARDIR?= ${DESTDIR}/var +NGINX_VARDIR?= /var NGINX_LOGDIR?= ${NGINX_VARDIR}/log NGINX_RUNDIR?= ${NGINX_VARDIR}/run NGINX_TMPDIR?= ${NGINX_VARDIR}/tmp/nginx diff --git a/www/openacs-dotlrn/Makefile b/www/openacs-dotlrn/Makefile index 0d0de1ec1147..8b19d4d917fc 100644 --- a/www/openacs-dotlrn/Makefile +++ b/www/openacs-dotlrn/Makefile @@ -18,7 +18,7 @@ OPENACS_USER?= dotlrn OPENACS_DB?= dotlrn OPENACS_GROUP?= www -OPENACSBASE= ${TARGETDIR}/dotlrn +OPENACSBASE= ${PREFIX}/dotlrn OPENACSNAME= .LRN BASE_INSTALL= bin content-repository-content-files log packages tcl www install.xml diff --git a/www/openacs/Makefile b/www/openacs/Makefile index dc44c0a1f655..25bd6b5d28b4 100644 --- a/www/openacs/Makefile +++ b/www/openacs/Makefile @@ -31,7 +31,7 @@ OPENACS_USER?= ${PORTNAME} OPENACS_DB?= ${PORTNAME} OPENACS_GROUP?= www PGUSER?= pgsql -OPENACSBASE?= ${TARGETDIR}/openacs +OPENACSBASE?= ${PREFIX}/openacs OPENACSNAME?= OpenACS SU?= /usr/bin/su PGREP?= /usr/bin/pgrep @@ -80,12 +80,12 @@ pre-install: @ ${FIND} ${WRKSRC} ! -type d ! -path '${WRKSRC}/etc*' \ ! -path '${WRKSRC}/readme.txt' ! -path '${WRKSRC}/license.txt' \ ! -path '${WRKSRC}/ChangeLog' | \ - ${SED} 's|${WRKSRC}|${OPENACSBASE:S/${TARGETDIR}\///}|' > ${PLIST} - @ ${ECHO} ${OPENACSBASE:S/${TARGETDIR}\///}/etc/${PORTNAME}-config.tcl >> ${PLIST} - @ ${ECHO} @dirrm ${OPENACSBASE:S/${TARGETDIR}\///}/etc >> ${PLIST} + ${SED} 's|${WRKSRC}|${OPENACSBASE:S/${PREFIX}\///}|' > ${PLIST} + @ ${ECHO} ${OPENACSBASE:S/${PREFIX}\///}/etc/${PORTNAME}-config.tcl >> ${PLIST} + @ ${ECHO} @dirrm ${OPENACSBASE:S/${PREFIX}\///}/etc >> ${PLIST} @ ${FIND} ${WRKSRC} -type d ! -path '${WRKSRC}/etc*' | \ ${SORT} -r | \ - ${SED} 's|${WRKSRC}|@dirrmtry ${OPENACSBASE:S/${TARGETDIR}\///}|' >> ${PLIST} + ${SED} 's|${WRKSRC}|@dirrmtry ${OPENACSBASE:S/${PREFIX}\///}|' >> ${PLIST} .if defined(WITH_EXAMPLES) @ ${FIND} ${WRKSRC}/etc ! -type d | \ ${SED} 's|${WRKSRC}/etc|%%EXAMPLESDIR%%|' >> ${PLIST} diff --git a/www/p5-Template-Toolkit/Makefile b/www/p5-Template-Toolkit/Makefile index 35eb6d990013..da121c76f621 100644 --- a/www/p5-Template-Toolkit/Makefile +++ b/www/p5-Template-Toolkit/Makefile @@ -56,7 +56,7 @@ CONFIGURE_ENV= | .include "Makefile.man" post-patch: - ${PERL} -pi -e 's,/usr/local/tt2,${TARGETDIR}/share/tt2,g' \ + ${PERL} -pi -e 's,/usr/local/tt2,${PREFIX}/share/tt2,g' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} .include <bsd.port.post.mk> diff --git a/www/polipo/Makefile b/www/polipo/Makefile index e3616867e541..8b7a1eebeaba 100644 --- a/www/polipo/Makefile +++ b/www/polipo/Makefile @@ -53,22 +53,22 @@ pre-install: apply-slist @PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/polipo ${DESTDIR}${PREFIX}/bin/ - ${MKDIR} ${DESTDIR}${PREFIX}/etc/periodic/daily/ - ${INSTALL_SCRIPT} ${WRKDIR}/400.polipo ${DESTDIR}${PREFIX}/etc/periodic/daily/ - ${INSTALL_MAN} ${WRKSRC}/polipo.man ${DESTDIR}${PREFIX}/man/man1/polipo.1 - ${MKDIR} ${DESTDIR}${PCONFIGDIR} - ${INSTALL_DATA} ${WRKSRC}/config.sample ${DESTDIR}${PCONFIGDIR} - ${INSTALL_DATA} ${WRKSRC}/forbidden.sample ${DESTDIR}${PCONFIGDIR} - ${CHGRP} -R ${PGRP} ${DESTDIR}${PCONFIGDIR} + ${INSTALL_PROGRAM} ${WRKSRC}/polipo ${PREFIX}/bin/ + ${MKDIR} ${PREFIX}/etc/periodic/daily/ + ${INSTALL_SCRIPT} ${WRKDIR}/400.polipo ${PREFIX}/etc/periodic/daily/ + ${INSTALL_MAN} ${WRKSRC}/polipo.man ${PREFIX}/man/man1/polipo.1 + ${MKDIR} ${PCONFIGDIR} + ${INSTALL_DATA} ${WRKSRC}/config.sample ${PCONFIGDIR} + ${INSTALL_DATA} ${WRKSRC}/forbidden.sample ${PCONFIGDIR} + ${CHGRP} -R ${PGRP} ${PCONFIGDIR} .if !defined(NO_PTEXINFO) - ${INSTALL_DATA} ${WRKSRC}/polipo.info ${DESTDIR}${PREFIX}/info/ + ${INSTALL_DATA} ${WRKSRC}/polipo.info ${PREFIX}/info/ .endif .if !defined(NOPORTDOCS) - ${MKDIR} ${DESTDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/html/* ${DESTDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/localindex.html ${DESTDIR}${DATADIR}/www/index.html - ${CHGRP} -R ${PGRP} ${DESTDIR}${DATADIR} + ${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/html/* ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/localindex.html ${DATADIR}/www/index.html + ${CHGRP} -R ${PGRP} ${DATADIR} .endif post-install: diff --git a/www/punbb/Makefile b/www/punbb/Makefile index f25548159384..c9e3e05e7926 100644 --- a/www/punbb/Makefile +++ b/www/punbb/Makefile @@ -23,7 +23,7 @@ COMMENT= A fast and lightweight PHP-powered discussion board BUILD_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip NO_BUILD= yes -PUNBBDIR?= ${TARGETDIR}/www/punbb +PUNBBDIR?= ${PREFIX}/www/punbb USE_PHP= yes USE_ZIP= yes diff --git a/www/py-funkload/Makefile b/www/py-funkload/Makefile index 4ba6c354999d..961916ad461c 100644 --- a/www/py-funkload/Makefile +++ b/www/py-funkload/Makefile @@ -25,8 +25,8 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/docutils/__init__.py:${PORTSDIR}/textproc/py-d USE_PYTHON= 2.4+ USE_PYDISTUTILS= easy_install -DOCSDIR= ${TARGETDIR}/share/doc/py-${PORTNAME} -EXAMPLESDIR= ${TARGETDIR}/share/examples/py-${PORTNAME} +DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} +EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} post-install: .if !defined(NOPORTDOCS) diff --git a/www/py-pylons/Makefile b/www/py-pylons/Makefile index ba77cee79871..8a7f6c8fa914 100644 --- a/www/py-pylons/Makefile +++ b/www/py-pylons/Makefile @@ -41,7 +41,7 @@ PLIST_SUB= EASY_INSTALL_CMD=${EASY_INSTALL_CMD} \ EASY_INSTALL_CMD?= easy_install-${PYTHON_VER} -DOCSDIR= ${TARGETDIR}/share/doc/py-${PORTNAME} +DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} post-install: ${FIND} ${PYTHON_SITELIBDIR}/${PYPYLONS_EGG} \ diff --git a/www/py-pysearch/Makefile b/www/py-pysearch/Makefile index ba84f91401f8..0a17a4db418d 100644 --- a/www/py-pysearch/Makefile +++ b/www/py-pysearch/Makefile @@ -19,8 +19,8 @@ USE_PYTHON= yes USE_PYDISTUTILS= yes PYDISTUTILS_PKGNAME= pYsearch -DOCSDIR= ${TARGETDIR}/share/doc/py-${PORTNAME} -EXAMPLESDIR= ${TARGETDIR}/share/examples/py-${PORTNAME} +DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} +EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} post-install: .if !defined(NOPORTDOCS) diff --git a/www/py-turbogears/Makefile b/www/py-turbogears/Makefile index f2b4f7d6715a..062d586f2908 100644 --- a/www/py-turbogears/Makefile +++ b/www/py-turbogears/Makefile @@ -69,7 +69,7 @@ PYTURBOGEARS_EGG= ${PORTNAME}-${PORTVERSION}-py${PYTHON_VER}.egg # www/py-cheerypy # When it happens, we shall remove the respective entry from TGDEPEGGS, # REG_TGDEPEGGS, distinfo, and add the dependent port to RUN_DEPENDS -OSRELEASE!= ${DESTDIR}/usr/bin/uname -r +OSRELEASE!= /usr/bin/uname -r ENVINFO= py${PYTHON_VER}-${OPSYS:L}-${OSRELEASE}-${ARCH}.egg TGDEPEGGS= CherryPy-2.2.1-py2.4.egg cElementTree-1.0.5-20051216.tar.gz \ diff --git a/www/py-turbogears2/Makefile b/www/py-turbogears2/Makefile index f2b4f7d6715a..062d586f2908 100644 --- a/www/py-turbogears2/Makefile +++ b/www/py-turbogears2/Makefile @@ -69,7 +69,7 @@ PYTURBOGEARS_EGG= ${PORTNAME}-${PORTVERSION}-py${PYTHON_VER}.egg # www/py-cheerypy # When it happens, we shall remove the respective entry from TGDEPEGGS, # REG_TGDEPEGGS, distinfo, and add the dependent port to RUN_DEPENDS -OSRELEASE!= ${DESTDIR}/usr/bin/uname -r +OSRELEASE!= /usr/bin/uname -r ENVINFO= py${PYTHON_VER}-${OPSYS:L}-${OSRELEASE}-${ARCH}.egg TGDEPEGGS= CherryPy-2.2.1-py2.4.egg cElementTree-1.0.5-20051216.tar.gz \ diff --git a/www/py-webunit/Makefile b/www/py-webunit/Makefile index 395719f5805b..bc9caaede41c 100644 --- a/www/py-webunit/Makefile +++ b/www/py-webunit/Makefile @@ -18,7 +18,7 @@ COMMENT= Unit test your websites with code that acts like a web browser USE_PYTHON= yes USE_PYDISTUTILS= yes -EXAMPLESDIR= ${TARGETDIR}/share/examples/py-${PORTNAME} +EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} .if !defined(NOPORTEXAMPLES) post-install: diff --git a/www/rt2/Makefile b/www/rt2/Makefile index 0472f3193f45..52c787be6b25 100644 --- a/www/rt2/Makefile +++ b/www/rt2/Makefile @@ -83,7 +83,7 @@ BUILD_DEPENDS+= ${LOCALBASE}/bin/safe_mysqld:${PORTSDIR}/databases/mysql323-serv RUN_DEPENDS+= ${BUILD_DEPENDS} -MAN3PREFIX= ${TARGETDIR}/lib/perl5/${PERL_VERSION} +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} MAKE_ENV= MAN3PREFIX=${MAN3PREFIX} .if defined(INSTALL_NEW) diff --git a/www/serendipity-devel/Makefile b/www/serendipity-devel/Makefile index d2de5052d110..eb92db7dc0f5 100644 --- a/www/serendipity-devel/Makefile +++ b/www/serendipity-devel/Makefile @@ -52,10 +52,10 @@ RUN_DEPENDS+= convert:${PORTSDIR}/graphics/ImageMagick .endif do-install: - @-${MKDIR} ${TARGETDIR}/${SERENDIPITY} - @${CHMOD} 755 ${TARGETDIR}/${SERENDIPITY} - @(cd ${WRKSRC} && ${CP} -R * ${TARGETDIR}/${SERENDIPITY}/ ) - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${TARGETDIR}/${SERENDIPITY} + @-${MKDIR} ${PREFIX}/${SERENDIPITY} + @${CHMOD} 755 ${PREFIX}/${SERENDIPITY} + @(cd ${WRKSRC} && ${CP} -R * ${PREFIX}/${SERENDIPITY}/ ) + @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${SERENDIPITY} post-install: @${CAT} ${PKGMESSAGE} diff --git a/www/slash/Makefile b/www/slash/Makefile index 11345077573d..38743933bc93 100644 --- a/www/slash/Makefile +++ b/www/slash/Makefile @@ -28,7 +28,7 @@ DOCS= README INSTALL CONFLICTS= metalist -MAN3PREFIX= ${TARGETDIR}/lib/perl5/${PERL_VERSION} +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} MAN3= FZ.3 Slash.3 Slash::Apache.3 Slash::Apache::Banlist.3 \ Slash::Apache::Log.3 Slash::Apache::User.3 \ Slash::Custom::Bulkmail.3 Slash::DB.3 Slash::DB::MySQL.3 \ diff --git a/www/snownews/Makefile b/www/snownews/Makefile index 62cfcc7b6605..bd7459149f49 100644 --- a/www/snownews/Makefile +++ b/www/snownews/Makefile @@ -44,7 +44,7 @@ PLIST_SUB+= OPML="@comment " RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML PLIST_SUB+= OPML="" # opml2snow only have "" manpage -_MANPAGES+= ${TARGETDIR}/man/man1/opml2snow.1 +_MANPAGES+= ${PREFIX}/man/man1/opml2snow.1 .endif MAN1= snownews.1 diff --git a/www/visitors/Makefile b/www/visitors/Makefile index 9808aab4c629..76c342ae8274 100644 --- a/www/visitors/Makefile +++ b/www/visitors/Makefile @@ -21,7 +21,7 @@ PLIST_FILES= bin/visitors PORTDOCS= doc.html do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/visitors ${TARGETDIR}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/visitors ${PREFIX}/bin .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${DOCSDIR} diff --git a/www/youtube_dl/Makefile b/www/youtube_dl/Makefile index 81efc9199132..4124b671246c 100644 --- a/www/youtube_dl/Makefile +++ b/www/youtube_dl/Makefile @@ -39,6 +39,6 @@ post-patch: @${REINPLACE_CMD} -e 's|%%PYTHON_CMD%%|${PYTHON_CMD}|g' ${WRKSRC}/youtube-dl do-install: - @${INSTALL_SCRIPT} ${WRKSRC}/youtube-dl ${TARGETDIR}/bin/youtube-dl + @${INSTALL_SCRIPT} ${WRKSRC}/youtube-dl ${PREFIX}/bin/youtube-dl .include <bsd.port.post.mk> diff --git a/www/ziproxy/Makefile b/www/ziproxy/Makefile index a953ba558b3f..3b3614ad0814 100644 --- a/www/ziproxy/Makefile +++ b/www/ziproxy/Makefile @@ -69,7 +69,7 @@ post-install: @${INSTALL_DATA} ${WRKSRC}/var/ziproxy/error/${FILE} ${DATADIR}/error/${FILE} .endfor - @${INSTALL_SCRIPT} ${WRKSRC}/src/tools/ziproxy_genhtml_stats.sh ${TARGETDIR}/bin + @${INSTALL_SCRIPT} ${WRKSRC}/src/tools/ziproxy_genhtml_stats.sh ${PREFIX}/bin @${CAT} ${PKGMESSAGE} diff --git a/x11-toolkits/p5-Gtk2/Makefile b/x11-toolkits/p5-Gtk2/Makefile index 16d798b4cf76..66f6e5e24830 100644 --- a/x11-toolkits/p5-Gtk2/Makefile +++ b/x11-toolkits/p5-Gtk2/Makefile @@ -34,6 +34,6 @@ IGNORE= requires perl 5.8.0 or later. Install lang/perl5.8 then try again post-install: @cd ${WRKSRC}/blib/man3 && ${FIND} * -name "*.3" | ${SED} \ - 's,^,${MAN3PREFIX:S,^${TARGETDIR}/,,}/man/man3/,' >> ${TMPPLIST} + 's,^,${MAN3PREFIX:S,^${PREFIX}/,,}/man/man3/,' >> ${TMPPLIST} .include <bsd.port.post.mk> diff --git a/x11-toolkits/p5-qt/Makefile b/x11-toolkits/p5-qt/Makefile index 38e2bdb30c21..0551caa282fa 100644 --- a/x11-toolkits/p5-qt/Makefile +++ b/x11-toolkits/p5-qt/Makefile @@ -35,7 +35,7 @@ PLIST_FILES= bin/pqtapi bin/pqtsh bin/puic include/smoke.h \ lib/libsmokeqt.a MAN1= puic.1 -MAN3PREFIX= ${TARGETDIR}/lib/perl5/${PERL_VERSION} +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} MAN3= Qt.3 .include <bsd.port.pre.mk> diff --git a/x11-wm/jwm/Makefile b/x11-wm/jwm/Makefile index c41deb285706..c154011665eb 100644 --- a/x11-wm/jwm/Makefile +++ b/x11-wm/jwm/Makefile @@ -36,10 +36,10 @@ post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/example.jwmrc do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/jwm ${TARGETDIR}/bin - ${INSTALL_DATA} ${WRKSRC}/example.jwmrc ${TARGETDIR}/etc/system.jwmrc.sample - if ! [ -f ${TARGETDIR}/etc/system.jwmrc ]; then \ - ${INSTALL_DATA} ${WRKSRC}/example.jwmrc ${TARGETDIR}/etc/system.jwmrc; \ + ${INSTALL_PROGRAM} ${WRKSRC}/src/jwm ${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/example.jwmrc ${PREFIX}/etc/system.jwmrc.sample + if ! [ -f ${PREFIX}/etc/system.jwmrc ]; then \ + ${INSTALL_DATA} ${WRKSRC}/example.jwmrc ${PREFIX}/etc/system.jwmrc; \ fi ${INSTALL_MAN} ${WRKSRC}/jwm.1 ${MANPREFIX}/man/man1/ |