diff options
| author | jlam <jlam@pkgsrc.org> | 2017-09-25 22:39:56 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2017-09-25 22:39:56 +0000 |
| commit | 2ef9656f546b8aac383ad7179048df9062cb49b5 (patch) | |
| tree | 2ba91d1349893f2dfc736a3e25dd49efb2be2daa | |
| parent | b8f7ef993fec46d8990078c2012e4df745ae1608 (diff) | |
| download | pkgsrc-2ef9656f546b8aac383ad7179048df9062cb49b5.tar.gz | |
www/siege: Fix installation if ${PKG_SYSCONFBASE} != ${PREFIX}/etc.
The software Makefiles try to install example configuration files
directly into $(sysconfdir), which is set during the configure
stage to ${PKG_SYSCONFDIR} == ${PREFIX}/etc/siege. However, pkgsrc
standards require that the example configuration files be installed
into ${PREFIX}/share/examples/siege ( ${EGDIR} ).
Pass sysconfdir=${EGDIR} to the bmake(1) process during the install
stage so that the Makefile recipe will install the example files
into the correct location.
Remove the "install" substitution class that was trying to do the
same thing but which fails if ${PKG_SYSCONFBASE} != ${PREFIX}/etc.
Bump the PKGREVISION due to changes in the installed files if the
package is built with default settings. Fix discussed with nils@
in private correspondence.
| -rw-r--r-- | www/siege/Makefile | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/www/siege/Makefile b/www/siege/Makefile index f016ad25c63..16968dfd703 100644 --- a/www/siege/Makefile +++ b/www/siege/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.3 2016/03/05 11:29:39 jperkin Exp $ +# $NetBSD: Makefile,v 1.4 2017/09/25 22:39:56 jlam Exp $ # DISTNAME= siege-3.1.3 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= www MASTER_SITES= http://download.joedog.org/siege/ @@ -29,25 +29,18 @@ SUBST_STAGE.siege= post-patch SUBST_FILES.siege= doc/Makefile.am doc/Makefile.in SUBST_SED.siege+= -e "s|@EGDIR@|${EGDIR}|g" -SUBST_CLASSES+= install -SUBST_STAGE.install= pre-install -SUBST_MESSAGE.install= correcting installation path -SUBST_FILES.install= ${WRKSRC}/doc/Makefile -SUBST_SED.install= -e 's,${PREFIX}/etc,${EGDIR},g' - CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --localstatedir=${VARBASE}/log/ CONFIGURE_ENV+= PERL=${PERL5:Q} INSTALLATION_DIRS+= ${EGDIR} ${DOCDIR} +INSTALL_MAKE_FLAGS+= sysconfdir=${EGDIR:Q} NOT_FOR_PLATFORM+= SunOS-*-* pre-configure: cd ${WRKSRC} && autoconf post-install: - ${INSTALL_DATA} ${WRKSRC}/doc/urls.txt ${DESTDIR}${EGDIR}/urls.txt - ${INSTALL_DATA} ${WRKSRC}/doc/siegerc ${DESTDIR}${EGDIR}/siegerc ${INSTALL_DATA} ${WRKSRC}/AUTHORS ${DESTDIR}${DOCDIR}/AUTHORS ${INSTALL_DATA} ${WRKSRC}/COPYING ${DESTDIR}${DOCDIR}/COPYING ${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DESTDIR}${DOCDIR}/ChangeLog |