diff options
Diffstat (limited to 'net')
35 files changed, 69 insertions, 83 deletions
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> |