CVS commit: pkgsrc/www/trac

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Sun Sep 11 15:43:01 UTC 2016

Modified Files:
        pkgsrc/www/trac: Makefile
Added Files:
        pkgsrc/www/trac: options.mk

Log Message:
Split options into options.mk

(No functional change - this is just moving option lines to options.mk
and .including them.)


To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 pkgsrc/www/trac/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/www/trac/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/trac/Makefile
diff -u pkgsrc/www/trac/Makefile:1.78 pkgsrc/www/trac/Makefile:1.79
--- pkgsrc/www/trac/Makefile:1.78       Sun Sep 11 15:29:31 2016
+++ pkgsrc/www/trac/Makefile    Sun Sep 11 15:43:01 2016
@@ -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 # no
 
 .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"

Added files:

Index: pkgsrc/www/trac/options.mk
diff -u /dev/null pkgsrc/www/trac/options.mk:1.1
--- /dev/null   Sun Sep 11 15:43:02 2016
+++ pkgsrc/www/trac/options.mk  Sun Sep 11 15:43:01 2016
@@ -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.