summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorwiz <wiz>2015-01-28 07:22:51 +0000
committerwiz <wiz>2015-01-28 07:22:51 +0000
commit3c1ad832a9494d2c0edee34fce842976d77c65fc (patch)
tree94a7949489b9d6290341083ef9e73ff2316a5694 /net
parent4c939f68c1089be7508e336e779fbe8c03c1b8ea (diff)
downloadpkgsrc-3c1ad832a9494d2c0edee34fce842976d77c65fc.tar.gz
Add default-off git option which adds py-dulwich dependency.
Replace /etc with PKG_SYSCONFDIR in more places, to avoid mismatches between configuration examples and default values. Some cleanup. Bump PKGREVISION.
Diffstat (limited to 'net')
-rw-r--r--net/Radicale/Makefile12
-rw-r--r--net/Radicale/options.mk10
2 files changed, 16 insertions, 6 deletions
diff --git a/net/Radicale/Makefile b/net/Radicale/Makefile
index aebb01a1909..2efdccd612d 100644
--- a/net/Radicale/Makefile
+++ b/net/Radicale/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2015/01/16 11:28:08 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2015/01/28 07:22:51 wiz Exp $
DISTNAME= Radicale-0.10
+PKGREVISION= 1
CATEGORIES= net time www
MASTER_SITES= http://pypi.python.org/packages/source/R/Radicale/
@@ -15,14 +16,14 @@ INSTALLATION_DIRS= ${EGDIR}
OWN_DIRS= ${PKG_SYSCONFDIR}/radicale
CONF_FILES+= ${EGDIR}/config ${PKG_SYSCONFDIR}/radicale/config
-#PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-
SUBST_CLASSES+= config
-SUBST_SED.config+= -e 's,/etc/radicale/config,${PKG_SYSCONFDIR}/radicale/config,'
-SUBST_FILES.config+= radicale/config.py
+SUBST_SED.config+= -e 's,/etc,${PKG_SYSCONFDIR},'
+SUBST_FILES.config+= radicale/config.py config logging
SUBST_STAGE.config= pre-configure
SUBST_MESSAGE.config= Fixing path to configuration file.
+.include "options.mk"
+
post-build:
${SED} -e "s#/etc#${PKG_SYSCONFDIR}#" -e "s#apache2/#httpd/#" \
${WRKSRC}/config >${WRKSRC}/config.pkgsrc
@@ -30,7 +31,6 @@ post-build:
post-install:
${INSTALL_DATA} ${WRKSRC}/config.pkgsrc \
${DESTDIR}${PREFIX}/${EGDIR}/config
-# ${MV} ${DESTDIR}${PREFIX}/bin/radicale ${DESTDIR}${PREFIX}/bin/radicale-${PYVERSSUFFIX}
.include "../../lang/python/distutils.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/Radicale/options.mk b/net/Radicale/options.mk
new file mode 100644
index 00000000000..775401662cd
--- /dev/null
+++ b/net/Radicale/options.mk
@@ -0,0 +1,10 @@
+# $NetBSD: options.mk,v 1.1 2015/01/28 07:22:51 wiz Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.Radicale
+PKG_SUPPORTED_OPTIONS= git
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mgit)
+DEPENDS+= ${PYPKGPREFIX}-dulwich-[0-9]*:../../devel/py-dulwich
+.endif