[pkgsrc/trunk]: pkgsrc/sysutils Merge the common bits of net/ups-nut/Makefile...

[ghen <ghen%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/79a25e2dd736
branches:  trunk
changeset: 517603:79a25e2dd736
user:      ghen <ghen%pkgsrc.org@localhost>
date:      Wed Aug 16 13:15:54 2006 +0000

description:
Merge the common bits of net/ups-nut/Makefile and net/ups-nut-cgi/Makefile
into net/ups-nut/Makefile.common.  No functional changes.

diffstat:

 sysutils/ups-nut-cgi/Makefile    |  31 ++++++-------------------------
 sysutils/ups-nut/Makefile        |  34 ++++++++--------------------------
 sysutils/ups-nut/Makefile.common |  28 ++++++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 51 deletions(-)

diffs (123 lines):

diff -r 188f5964aad0 -r 79a25e2dd736 sysutils/ups-nut-cgi/Makefile
--- a/sysutils/ups-nut-cgi/Makefile     Wed Aug 16 12:28:11 2006 +0000
+++ b/sysutils/ups-nut-cgi/Makefile     Wed Aug 16 13:15:54 2006 +0000
@@ -1,36 +1,17 @@
-# $NetBSD: Makefile,v 1.44 2006/08/16 12:27:35 ghen Exp $
-
-DISTNAME=              nut-2.0.4
-PKGNAME=               ${DISTNAME:S/nut/ups-nut-cgi/}
-CATEGORIES=            sysutils
-MASTER_SITES=          http://random.networkupstools.org/source/2.0/
+# $NetBSD: Makefile,v 1.45 2006/08/16 13:15:54 ghen Exp $
 
-MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=              http://www.networkupstools.org/
+.include "../../sysutils/ups-nut/Makefile.common"
+
+PKGNAME=               ${DISTNAME:S/nut/ups-nut-cgi/}
 COMMENT=               Network UPS Tools CGI scripts
 
-DISTINFO_FILE=         ${.CURDIR}/../../sysutils/ups-nut/distinfo
-PATCHDIR=              ${.CURDIR}/../../sysutils/ups-nut/patches
-
 DEPENDS+=              ups-nut-2.*:../../sysutils/ups-nut
 
 BUILD_TARGET=          cgi
 INSTALL_TARGET=                install-cgi
 
-GNU_CONFIGURE=         yes
-CONFIGURE_ARGS+=       --sysconfdir=${NUT_CONFDIR:Q}                   \
-                       --datadir=${NUT_DATADIR:Q}                      \
-                       --localstatedir=${NUT_STATEDIR:Q}               \
-                       --with-statepath=${NUT_STATEDIR:Q}              \
-                       --with-cgi                                      \
-                       --with-cgipath=${NUT_CGIDIR:Q}
-
-PKG_SYSCONFSUBDIR?=    nut
-NUT_CONFDIR=           ${PKG_SYSCONFDIR}
-NUT_DATADIR=           ${PREFIX}/share/nut
-NUT_EGDIR=             ${PREFIX}/share/examples/nut
-NUT_STATEDIR?=         ${VARBASE}/db/nut
-NUT_CGIDIR=            ${PREFIX}/libexec/cgi-bin
+CONFIGURE_ARGS+=       --with-cgi
+CONFIGURE_ARGS+=       --with-cgipath=${NUT_CGIDIR:Q}
 
 BUILD_DEFS+=           NUT_STATEDIR
 
diff -r 188f5964aad0 -r 79a25e2dd736 sysutils/ups-nut/Makefile
--- a/sysutils/ups-nut/Makefile Wed Aug 16 12:28:11 2006 +0000
+++ b/sysutils/ups-nut/Makefile Wed Aug 16 13:15:54 2006 +0000
@@ -1,33 +1,15 @@
-# $NetBSD: Makefile,v 1.46 2006/08/15 12:26:07 ghen Exp $
-#
+# $NetBSD: Makefile,v 1.47 2006/08/16 13:15:54 ghen Exp $
 
-DISTNAME=              nut-2.0.4
+.include "Makefile.common"
+
 PKGNAME=               ups-${DISTNAME}
-CATEGORIES=            sysutils
-MASTER_SITES=          http://random.networkupstools.org/source/2.0/
-
-MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=              http://www.networkupstools.org/
 COMMENT=               Network UPS Tools
 
-GNU_CONFIGURE=         yes
-CONFIGURE_ARGS+=       --sysconfdir=${NUT_CONFDIR:Q}                   \
-                       --datadir=${NUT_DATADIR:Q}                      \
-                       --localstatedir=${NUT_STATEDIR:Q}               \
-                       --with-user=${NUT_USER:Q}                       \
-                       --with-group=${NUT_GROUP:Q}                     \
-                       --with-statepath=${NUT_STATEDIR:Q}              \
-                       --with-drvpath=${NUT_DRVDIR:Q}                  \
-                       --with-altpidpath=${NUT_STATEDIR:Q}             \
-                       --with-pidpath=${NUT_STATEDIR:Q}
-
-PKG_SYSCONFSUBDIR?=    nut
-NUT_CONFDIR=           ${PKG_SYSCONFDIR}
-NUT_DATADIR=           ${PREFIX}/share/nut
-NUT_DOCDIR=            ${PREFIX}/share/doc/nut
-NUT_DRVDIR=            ${PREFIX}/libexec/nut
-NUT_EGDIR=             ${PREFIX}/share/examples/nut
-NUT_STATEDIR?=         ${VARBASE}/db/nut
+CONFIGURE_ARGS+=       --with-user=${NUT_USER:Q}
+CONFIGURE_ARGS+=       --with-group=${NUT_GROUP:Q}
+CONFIGURE_ARGS+=       --with-drvpath=${NUT_DRVDIR:Q}
+CONFIGURE_ARGS+=       --with-altpidpath=${NUT_STATEDIR:Q}
+CONFIGURE_ARGS+=       --with-pidpath=${NUT_STATEDIR:Q}
 
 NUT_USER?=             nut
 NUT_GROUP?=            nut
diff -r 188f5964aad0 -r 79a25e2dd736 sysutils/ups-nut/Makefile.common
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/ups-nut/Makefile.common  Wed Aug 16 13:15:54 2006 +0000
@@ -0,0 +1,28 @@
+# $NetBSD: Makefile.common,v 1.1 2006/08/16 13:15:54 ghen Exp $
+
+DISTNAME=              nut-2.0.4
+CATEGORIES=            sysutils
+MASTER_SITES=          http://random.networkupstools.org/source/2.0/
+
+MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=              http://www.networkupstools.org/
+
+DISTINFO_FILE=         ${.CURDIR}/../../sysutils/ups-nut/distinfo
+PATCHDIR=              ${.CURDIR}/../../sysutils/ups-nut/patches
+
+GNU_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --sysconfdir=${NUT_CONFDIR:Q}
+CONFIGURE_ARGS+=       --datadir=${NUT_DATADIR:Q}
+CONFIGURE_ARGS+=       --localstatedir=${NUT_STATEDIR:Q}
+CONFIGURE_ARGS+=       --with-statepath=${NUT_STATEDIR:Q}
+
+.include "../../mk/bsd.prefs.mk"
+
+PKG_SYSCONFSUBDIR?=    nut
+NUT_CONFDIR=           ${PKG_SYSCONFDIR}
+NUT_DATADIR=           ${PREFIX}/share/nut
+NUT_DOCDIR=            ${PREFIX}/share/doc/nut
+NUT_DRVDIR=            ${PREFIX}/libexec/nut
+NUT_EGDIR=             ${PREFIX}/share/examples/nut
+NUT_STATEDIR?=         ${VARBASE}/db/nut
+NUT_CGIDIR=            ${PREFIX}/libexec/cgi-bin