diff options
Diffstat (limited to 'sysutils')
-rw-r--r-- | sysutils/apt/Makefile | 4 | ||||
-rw-r--r-- | sysutils/bksh/files/patch-Makefile | 7 | ||||
-rw-r--r-- | sysutils/freeipmi/Makefile | 4 | ||||
-rw-r--r-- | sysutils/fusefs-httpfs/Makefile | 2 | ||||
-rw-r--r-- | sysutils/fusefs-unionfs/Makefile | 2 | ||||
-rw-r--r-- | sysutils/heirloom/Makefile | 2 | ||||
-rw-r--r-- | sysutils/ipmi-kmod/Makefile | 2 | ||||
-rw-r--r-- | sysutils/isomaster/Makefile | 2 | ||||
-rw-r--r-- | sysutils/nut/Makefile | 2 | ||||
-rw-r--r-- | sysutils/nut22/Makefile | 2 | ||||
-rw-r--r-- | sysutils/pflogx/Makefile | 2 | ||||
-rw-r--r-- | sysutils/sge/Makefile | 2 | ||||
-rw-r--r-- | sysutils/sge60/Makefile | 2 | ||||
-rw-r--r-- | sysutils/sge61/Makefile | 2 | ||||
-rw-r--r-- | sysutils/sge62/Makefile | 2 | ||||
-rw-r--r-- | sysutils/tenshi/Makefile | 8 | ||||
-rw-r--r-- | sysutils/tw_cli/Makefile | 8 | ||||
-rw-r--r-- | sysutils/x86info/Makefile | 2 |
18 files changed, 29 insertions, 28 deletions
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> |