Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_150637919685600"
MIME-Version: 1.0
Date: Mon, 25 Sep 2017 22:39:56 +0000
From: "Johnny C. Lam" <jlam@netbsd.org>
Subject: CVS commit: pkgsrc/www/siege
To: pkgsrc-changes@NetBSD.org
Reply-To: jlam@netbsd.org
Message-Id: <20170925223956.7CA91FA9C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_150637919685600
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	jlam
Date:		Mon Sep 25 22:39:56 UTC 2017

Modified Files:
	pkgsrc/www/siege: Makefile

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/siege/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_150637919685600
Content-Disposition: inline
Content-Length: 1505
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/www/siege/Makefile
diff -u pkgsrc/www/siege/Makefile:1.3 pkgsrc/www/siege/Makefile:1.4
--- pkgsrc/www/siege/Makefile:1.3	Sat Mar  5 11:29:39 2016
+++ pkgsrc/www/siege/Makefile	Mon Sep 25 22:39:56 2017
@@ -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


--_----------=_150637919685600--