pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Pull out some definitions common to the graphite packages into Makefile.common.
Module Name: pkgsrc-wip
Committed By: Jeff Rizzo <riz%tastylime.net@localhost>
Pushed By: riz
Date: Mon Dec 7 14:47:08 2015 -0800
Changeset: 2365a52395863181772e679a00ae8cd0f4b25c3b
Modified Files:
py-carbon/Makefile
Added Files:
py-carbon/Makefile.common
Log Message:
Pull out some definitions common to the graphite packages
into Makefile.common.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2365a52395863181772e679a00ae8cd0f4b25c3b
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
py-carbon/Makefile | 10 +---------
py-carbon/Makefile.common | 11 +++++++++++
2 files changed, 12 insertions(+), 9 deletions(-)
diffs:
diff --git a/py-carbon/Makefile b/py-carbon/Makefile
index 4cbc0f8..9f1846a 100644
--- a/py-carbon/Makefile
+++ b/py-carbon/Makefile
@@ -22,15 +22,6 @@ PYTHON_VERSIONS_INCOMPATIBLE= 33 34 35 # py-twisted
BUILD_DEFS+= VARBASE GRAPHITE_USER GRAPHITE_GROUP GRAPHITE_DIR
-GRAPHITE_USER?= graphite
-GRAPHITE_GROUP?= graphite
-GRAPHITE_DIR?= ${VARBASE}/graphite
-GRAPHITE_EGDIR?= share/examples/graphite
-
-PKG_GROUPS+= ${GRAPHITE_GROUP}
-PKG_USERS+= ${GRAPHITE_USER}:${GRAPHITE_GROUP}
-PKG_GECOS.${GRAPHITE_USER}= Graphite Carbon user
-
RCD_SCRIPTS= carbon-aggregator carbon-cache carbon-relay
FILES_SUBST+= GRAPHITE_USER=${GRAPHITE_USER} GRAPHITE_GROUP=${GRAPHITE_GROUP} \
GRAPHITE_DIR=${GRAPHITE_DIR}
@@ -81,5 +72,6 @@ PYSETUPINSTALLARGS= --prefix=${PREFIX} \
INSTALLATION_DIRS+= share/examples/graphite
+.include "../../wip/py-carbon/Makefile.common"
.include "../../lang/python/distutils.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-carbon/Makefile.common b/py-carbon/Makefile.common
new file mode 100644
index 0000000..081da19
--- /dev/null
+++ b/py-carbon/Makefile.common
@@ -0,0 +1,11 @@
+# $NetBSD$
+
+GRAPHITE_USER?= graphite
+GRAPHITE_GROUP?= graphite
+GRAPHITE_DIR?= ${VARBASE}/graphite
+GRAPHITE_EGDIR?= share/examples/graphite
+GRAPHITE_LOG_DIR?= ${VARBASE}/log/graphite
+
+PKG_GROUPS+= ${GRAPHITE_GROUP}
+PKG_USERS+= ${GRAPHITE_USER}:${GRAPHITE_GROUP}
+PKG_GECOS.${GRAPHITE_USER}= Graphite Carbon user
Home |
Main Index |
Thread Index |
Old Index