pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/net/Radicale Add default-off git option which adds py-...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/13bad7b6e453
branches:  trunk
changeset: 645414:13bad7b6e453
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Jan 28 07:22:51 2015 +0000

description:
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:

 net/Radicale/Makefile   |  12 ++++++------
 net/Radicale/options.mk |  10 ++++++++++
 2 files changed, 16 insertions(+), 6 deletions(-)

diffs (53 lines):

diff -r 2bbeeddb6750 -r 13bad7b6e453 net/Radicale/Makefile
--- a/net/Radicale/Makefile     Wed Jan 28 07:14:24 2015 +0000
+++ b/net/Radicale/Makefile     Wed Jan 28 07:22:51 2015 +0000
@@ -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 @@
 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-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 -r 2bbeeddb6750 -r 13bad7b6e453 net/Radicale/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/Radicale/options.mk   Wed Jan 28 07:22:51 2015 +0000
@@ -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



Home | Main Index | Thread Index | Old Index