[pkgsrc/trunk]: pkgsrc/www/trac Split options into options.mk

[gdt <gdt%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0b6267e259a7
branches:  trunk
changeset: 352248:0b6267e259a7
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Sun Sep 11 15:43:01 2016 +0000

description:
Split options into options.mk

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

diffstat:

 www/trac/Makefile   |  23 +++--------------------
 www/trac/options.mk |  19 +++++++++++++++++++
 2 files changed, 22 insertions(+), 20 deletions(-)

diffs (66 lines):

diff -r c600ceb6719f -r 0b6267e259a7 www/trac/Makefile
--- a/www/trac/Makefile Sun Sep 11 15:31:27 2016 +0000
+++ b/www/trac/Makefile Sun Sep 11 15:43:01 2016 +0000
@@ -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 @@
 
 .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 @@
        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 -r c600ceb6719f -r 0b6267e259a7 www/trac/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/trac/options.mk       Sun Sep 11 15:43:01 2016 +0000
@@ -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.