Rototill comments and rearrange option lines

This commit has no functional changes.

Drop comments about wip/trac, www/ja-trac and eventual merging,
because that's happened.  Adjust explanation of why there is no svn or
git dependency.

Move option declaration near option use, in preparation for
options.mk.

1 files changed, 15 insertions, 26 deletions

diff --git a/www/trac/Makefile b/www/trac/Makefile
index fcfe3fa9893..1fff5665cf3 100644
--- a/www/trac/Makefile
+++ b/www/trac/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.77 2016/09/11 15:17:44 gdt Exp $
+# $NetBSD: Makefile,v 1.78 2016/09/11 15:29:31 gdt Exp $
 
 DISTNAME=	Trac-1.0.13
 PKGNAME=	${DISTNAME:tl}
@@ -11,37 +11,18 @@ HOMEPAGE=	http://trac.edgewall.org/
 COMMENT=	Repository browser, wiki, and issue tracking system
 LICENSE=	modified-bsd
 
-# Maintainer notes:
+# Updates to micro-releases along stable branches are commited without
+# testing.
 #
-# This package is similar to wip/trac, which in turn structurally
-# matches www/ja-trac.  Ideally, www/trac and ja-trac would converge.
-# This note outlines the known differences and proposed resolution.
-# Besides bringing the packages closer, a goal is to avoid breaking
-# existing trac installations that blindly upgrade, to the extent that
-# this is reasonable.
-#
-# www/trac options are not in options.mk (to be fixed).
-#
-# This package supports sqlite3 or postgresql.
-# ja-trac supports sqlite3, postgresql, and mysql.
-# ja-trac uses py-sqlite2 (separate Python DB API 2.0 support for sqlite3)
-# while this package uses py-sqlite3 (bundled support for sqlite3).
+# Trac supports svn and git in the base, plus others via plugins,
+# using them at runtime if configured.  Therefore this package does
+# not depend on svn or git to avoid installing them for trac installs
+# that use the other.
 
 DEPENDS+=	${PYPKGPREFIX}-genshi>=0.6:../../www/py-genshi
-# Arguably there should be a trac-svn package that depends on
-# subversion and trac.  This line is residual from when trac always
-# included subversion support.
-#DEPENDS+=	${PYPKGPREFIX}-subversion>=1.6:../../devel/py-subversion
 
 USE_TOOLS+=	pax
 
-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"
-
 PYDISTUTILSPKG=	YES
 PY_PATCHPLIST=	YES
 REPLACE_PYTHON=	contrib/cgi-bin/trac.* contrib/*.py contrib/*-hook
@@ -50,6 +31,14 @@ 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