From 1e48ead47ee3aa052ea1d7d267223f0de6c02b2f Mon Sep 17 00:00:00 2001 From: Martin Wilke Date: Mon, 7 Aug 2006 07:58:28 +0000 Subject: - Respect DESTDIR for all my ports Reviewed by: gabor Approved by: krion (mentor) --- archivers/dact/Makefile | 8 ++++++-- devel/robodoc/Makefile | 4 ++-- graphics/springgraph/Makefile | 2 +- mail/qsf/Makefile | 2 +- misc/nut/Makefile | 2 +- net/icpld/Makefile | 10 +++++----- security/find-zlib/Makefile | 2 +- shells/osh/Makefile | 10 +++++----- shells/osh/pkg-plist | 4 ++-- 9 files changed, 24 insertions(+), 20 deletions(-) diff --git a/archivers/dact/Makefile b/archivers/dact/Makefile index 39d61dd298bf..96cad62206f0 100644 --- a/archivers/dact/Makefile +++ b/archivers/dact/Makefile @@ -8,7 +8,6 @@ PORTNAME= dact PORTVERSION= 0.8.41 -PORTREVISION= 0 CATEGORIES= archivers MASTER_SITES= http://www.rkeene.org/files/oss/dact/release/ @@ -31,12 +30,17 @@ MAKE_ARGS= CONF=${EXAMPLESDIR}/dact.conf \ MAN1= dact.1 INSTALLS_SHLIB= yes +post-patch: + @${REINPLACE_CMD} -e "s|prefix = @prefix@|prefix = ${TARGETDIR}|" \ + -e "s|libdir = @libdir@|libdir = ${TARGETDIR}/lib|" \ + ${WRKSRC}/Makefile.in + pre-install: @${MKDIR} ${EXAMPLESDIR} @${RM} -f ${WRKSRC}/libdact.a post-install: - @${CP} -n ${EXAMPLESDIR}/dact.conf ${PREFIX}/etc + @${CP} -n ${EXAMPLESDIR}/dact.conf ${TARGETDIR}/etc .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/Docs/dact.txt ${DOCSDIR} diff --git a/devel/robodoc/Makefile b/devel/robodoc/Makefile index 21a3c154d1eb..64fc1df17b00 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 ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/Source/robohdrs ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/Source/robodoc ${TARGETDIR}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/Source/robohdrs ${TARGETDIR}/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/graphics/springgraph/Makefile b/graphics/springgraph/Makefile index 77ad112f02e9..83826dc4a0ff 100644 --- a/graphics/springgraph/Makefile +++ b/graphics/springgraph/Makefile @@ -30,6 +30,6 @@ post-patch: @${PERL} -pi -e "s|/usr/bin/perl|${PERL}|g" ${WRKSRC}/springgraph.pl do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/springgraph.pl ${PREFIX}/bin/springgraph + ${INSTALL_SCRIPT} ${WRKSRC}/springgraph.pl ${TARGETDIR}/bin/springgraph .include diff --git a/mail/qsf/Makefile b/mail/qsf/Makefile index ccb02fabdfc6..868283fe3c43 100644 --- a/mail/qsf/Makefile +++ b/mail/qsf/Makefile @@ -54,7 +54,7 @@ post-patch: @${REINPLACE_CMD} -e 's|Linux|@VERSION@|g' ${WRKSRC}/doc/quickref.1.in do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/qsf ${PREFIX}/bin/qsf + ${INSTALL_PROGRAM} ${WRKSRC}/qsf ${TARGETDIR}/bin/qsf ${INSTALL_MAN} ${WRKSRC}/doc/quickref.1 ${MANPREFIX}/man/man1/qsf.1 .include diff --git a/misc/nut/Makefile b/misc/nut/Makefile index 417771c8b4d4..3fa4d2c527f5 100644 --- a/misc/nut/Makefile +++ b/misc/nut/Makefile @@ -33,7 +33,7 @@ post-patch: -e 's|^CFLAGS=|CFLAGS+=|g' ${WRKSRC}/Makefile do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/ + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${TARGETDIR}/bin/ ${INSTALL} -d ${DATADIR} ${INSTALL_DATA} ${RAW:S,^,${WRKSRC}/raw.data/,} ${DATADIR}/ ${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MAN1PREFIX}/man/man1/ diff --git a/net/icpld/Makefile b/net/icpld/Makefile index 9208fb152e58..10d7dfccadb7 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} ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${TARGETDIR}/bin ${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1 ${MANPREFIX}/man/man1 - @${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 + @${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 post-install: .if !defined(NOPORTDOCS) diff --git a/security/find-zlib/Makefile b/security/find-zlib/Makefile index acc5e86251b5..7741375c44a2 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} ${PREFIX}/bin + ${INSTALL_SCRIPT} ${DISTDIR}/${DISTNAME} ${TARGETDIR}/bin .include diff --git a/shells/osh/Makefile b/shells/osh/Makefile index f79daa1123c1..c4425cc18cde 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 post-install: - @${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 + @${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 .include diff --git a/shells/osh/pkg-plist b/shells/osh/pkg-plist index 9125442c7601..9dbc744d35e8 100644 --- a/shells/osh/pkg-plist +++ b/shells/osh/pkg-plist @@ -2,5 +2,5 @@ bin/fd2 bin/goto bin/if bin/osh -@exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells -@unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells +@exec echo "updating ${DESTDIR}/etc/shells"; cp ${DESTDIR}/etc/shells ${DESTDIR}/etc/shells.bak; (grep -v %D/%F ${DESTDIR}/etc/shells.bak; echo %D/%F) >${DESTDIR}/etc/shells +@unexec echo "updating ${DESTDIR}/etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells -- cgit v1.2.3