summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorgdt <gdt>2016-09-11 15:43:01 +0000
committergdt <gdt>2016-09-11 15:43:01 +0000
commit12f7d87b2ff7a63948395b09d48ee3cfde5faed2 (patch)
tree0c0160b4beac53103dc0cb6fc3e57548340a5fd3 /www
parent7818f2b57a53c0c5dc1e6d184bae779d3da6f223 (diff)
downloadpkgsrc-12f7d87b2ff7a63948395b09d48ee3cfde5faed2.tar.gz
Split options into options.mk
(No functional change - this is just moving option lines to options.mk and .including them.)
Diffstat (limited to 'www')
-rw-r--r--www/trac/Makefile23
-rw-r--r--www/trac/options.mk19
2 files changed, 22 insertions, 20 deletions
diff --git a/www/trac/Makefile b/www/trac/Makefile
index 1fff5665cf3..16d44b87a34 100644
--- a/www/trac/Makefile
+++ b/www/trac/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.78 2016/09/11 15:29:31 gdt Exp $
+# $NetBSD: Makefile,v 1.79 2016/09/11 15:43:01 gdt Exp $
DISTNAME= Trac-1.0.13
PKGNAME= ${DISTNAME:tl}
@@ -31,25 +31,6 @@ PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # not yet ported as of 1.0
.include "../../lang/python/application.mk"
-# TODO: move to options.mk
-PKG_OPTIONS_VAR= PKG_OPTIONS.trac
-PKG_OPTIONS_REQUIRED_GROUPS= db
-PKG_OPTIONS_GROUP.db= sqlite psycopg2
-PKG_SUGGESTED_OPTIONS= sqlite
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Msqlite)
-DEPENDS+= ${PYPKGPREFIX}-sqlite3>=0:../../databases/py-sqlite3
-.endif
-# trac 0.12 dropped support for py-PgSQL. Switching to py-psycopg2 with
-# an existing database that used to be accessed by py-PgSQL worked.
-.if !empty(PKG_OPTIONS:Mpsycopg2)
-DEPENDS+= ${PYPKGPREFIX}-psycopg2>=2:../../databases/py-psycopg2
-.endif
-# MySQL is sort of supported but not recommended by upstream and hence
-# omitted.
-
EGDIR= ${PREFIX}/share/examples/trac
CGIBINDIR= ${PREFIX}/libexec/trac
@@ -60,5 +41,7 @@ post-install:
cd ${WRKSRC}/contrib && pax -rwppm -s ',./rpm/.*$$,,' -s ',./rpm$$,,' \
. ${DESTDIR}${EGDIR}
+.include "options.mk"
+
.include "../../lang/python/egg.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/trac/options.mk b/www/trac/options.mk
new file mode 100644
index 00000000000..77fda04395b
--- /dev/null
+++ b/www/trac/options.mk
@@ -0,0 +1,19 @@
+# $NetBSD: options.mk,v 1.1 2016/09/11 15:43:01 gdt Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.trac
+PKG_OPTIONS_REQUIRED_GROUPS= db
+PKG_OPTIONS_GROUP.db= sqlite psycopg2
+PKG_SUGGESTED_OPTIONS= sqlite
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Msqlite)
+DEPENDS+= ${PYPKGPREFIX}-sqlite3>=0:../../databases/py-sqlite3
+.endif
+# trac 0.12 dropped support for py-PgSQL. Switching to py-psycopg2 with
+# an existing database that used to be accessed by py-PgSQL worked.
+.if !empty(PKG_OPTIONS:Mpsycopg2)
+DEPENDS+= ${PYPKGPREFIX}-psycopg2>=2:../../databases/py-psycopg2
+.endif
+# MySQL is sort of supported but not recommended by upstream and hence
+# omitted.