svn commit: r364226 - head/devel/viewvc

[Olli Hauer]

Author: ohauer
Date: Wed Aug  6 22:08:13 2014
New Revision: 364226
URL: http://svnweb.freebsd.org/changeset/ports/364226
QAT: https://qat.redports.org/buildarchive/r364226/

Log:
  - LICENSE s/BSD/BSD2CLAUSE/
  - add CPE information
  - rename .dist files to .sample files an use @sample macro in pkg-plist
  - sort pkg-plist
  - bump PORTREVISION

Modified:
  head/devel/viewvc/Makefile
  head/devel/viewvc/pkg-plist

Modified: head/devel/viewvc/Makefile
==============================================================================
--- head/devel/viewvc/Makefile	Wed Aug  6 21:56:36 2014	(r364225)
+++ head/devel/viewvc/Makefile	Wed Aug  6 22:08:13 2014	(r364226)
@@ -3,6 +3,7 @@
 
 PORTNAME=	viewvc
 PORTVERSION=	1.1.22
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	http://www.viewvc.org/ \
 		LOCAL/ohauer
@@ -10,7 +11,7 @@ MASTER_SITES=	http://www.viewvc.org/ \
 MAINTAINER=	ohauer at FreeBSD.org
 COMMENT=	Web-based Version Control Repository Browsing
 
-LICENSE=	BSD
+LICENSE=	BSD2CLAUSE
 
 NO_OPTIONS_SORT=	yes
 OPTIONS_DEFINE=		WEBSRV APMOD SVN MYSQL
@@ -38,6 +39,9 @@ MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFI
 
 .include <bsd.port.options.mk>
 
+USES=		cpe
+CPE_VENDOR=	viewvc
+CPE_PRODUCT=	viewvc
 NO_BUILD=	yes
 USE_RC_SUBR=	viewvc
 USE_PYTHON=	2
@@ -53,6 +57,15 @@ pre-everything::
 IGNORE=	apache module needs Apache server, please re-run 'make config' then choose WEBSRV and APACHE
 .endif
 
+post-patch:
+.for i in cvsgraph.conf mimetypes.conf viewvc.conf
+	${MV} ${WRKSRC}/conf/${i}.dist ${WRKSRC}/conf/${i}.sample
+	${REINPLACE_CMD} -e '/"${i}"/d' ${WRKSRC}/viewvc-install
+.endfor
+	${REINPLACE_CMD} -e 's/conf.dist/conf.sample/g' \
+		${WRKSRC}/viewvc-install \
+		${WRKSRC}/bin/standalone.py
+
 do-install:
 	@(cd ${WRKSRC} && ${PYTHON_CMD} viewvc-install --prefix=${PREFIX}/${PORTNAME} --destdir="${STAGEDIR}" --clean-mode=false)
 

Modified: head/devel/viewvc/pkg-plist
==============================================================================
--- head/devel/viewvc/pkg-plist	Wed Aug  6 21:56:36 2014	(r364225)
+++ head/devel/viewvc/pkg-plist	Wed Aug  6 22:08:13 2014	(r364226)
@@ -1,6 +1,3 @@
- at unexec if cmp -s %D/viewvc/cvsgraph.conf %D/viewvc/cvsgraph.conf.dist; then rm -f %D/viewvc/cvsgraph.conf; fi
- at unexec if cmp -s %D/viewvc/mimetypes.conf %D/viewvc/mimetypes.conf.dist; then rm -f %D/viewvc/mimetypes.conf; fi
- at unexec if cmp -s %D/viewvc/viewvc.conf %D/viewvc/viewvc.conf.dist; then rm -f %D/viewvc/viewvc.conf; fi
 viewvc/bin/cgi/query.cgi
 viewvc/bin/cgi/viewvc.cgi
 viewvc/bin/cvsdbadmin
@@ -16,8 +13,7 @@ viewvc/bin/wsgi/query.fcgi
 viewvc/bin/wsgi/query.wsgi
 viewvc/bin/wsgi/viewvc.fcgi
 viewvc/bin/wsgi/viewvc.wsgi
-viewvc/cvsgraph.conf.dist
- at exec [ -f %B/cvsgraph.conf ] || cp %B/%f %B/cvsgraph.conf
+ at sample viewvc/cvsgraph.conf.sample
 viewvc/lib/PyFontify.py
 viewvc/lib/PyFontify.pyc
 viewvc/lib/accept.py
@@ -96,8 +92,7 @@ viewvc/lib/viewvc.py
 viewvc/lib/viewvc.pyc
 viewvc/lib/win32popen.py
 viewvc/lib/win32popen.pyc
-viewvc/mimetypes.conf.dist
- at exec [ -f %B/mimetypes.conf ] || cp %B/%f %B/mimetypes.conf
+ at sample viewvc/mimetypes.conf.sample
 viewvc/templates-contrib/README
 viewvc/templates-contrib/newvc/README
 viewvc/templates-contrib/newvc/templates/diff.ezt
@@ -245,38 +240,37 @@ viewvc/templates/query_results.ezt
 viewvc/templates/revision.ezt
 viewvc/templates/roots.ezt
 viewvc/templates/rss.ezt
-viewvc/viewvc.conf.dist
- at exec [ -f %B/viewvc.conf ] || cp %B/%f %B/viewvc.conf
- at dirrm viewvc/templates/include
+ at sample viewvc/viewvc.conf.sample
+ at dirrm viewvc/bin/cgi
+ at dirrm viewvc/bin/mod_python
+ at dirrm viewvc/bin/wsgi
+ at dirrm viewvc/bin
+ at dirrm viewvc/lib/vcauth/forbidden
+ at dirrm viewvc/lib/vcauth/forbiddenre
+ at dirrm viewvc/lib/vcauth/svnauthz
+ at dirrm viewvc/lib/vcauth
+ at dirrm viewvc/lib/vclib/ccvs/rcsparse/test-data
+ at dirrm viewvc/lib/vclib/ccvs/rcsparse
+ at dirrm viewvc/lib/vclib/ccvs
+ at dirrm viewvc/lib/vclib/svn
+ at dirrm viewvc/lib/vclib
+ at dirrm viewvc/lib
 @dirrm viewvc/templates/docroot/images
 @dirrm viewvc/templates/docroot
- at dirrm viewvc/templates-contrib/viewsvn/templates/include
+ at dirrm viewvc/templates/include
+ at dirrm viewvc/templates
+ at dirrm viewvc/templates-contrib/newvc/templates/docroot/images
+ at dirrm viewvc/templates-contrib/newvc/templates/docroot
+ at dirrm viewvc/templates-contrib/newvc/templates/include
+ at dirrm viewvc/templates-contrib/newvc/templates
+ at dirrm viewvc/templates-contrib/newvc
+ at dirrm viewvc/templates-contrib/viewsvn/extras
+ at dirrm viewvc/templates-contrib/viewsvn/screenshots
 @dirrm viewvc/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn
 @dirrm viewvc/templates-contrib/viewsvn/templates/docroot/images
 @dirrm viewvc/templates-contrib/viewsvn/templates/docroot
+ at dirrm viewvc/templates-contrib/viewsvn/templates/include
 @dirrm viewvc/templates-contrib/viewsvn/templates
- at dirrm viewvc/templates-contrib/viewsvn/screenshots
- at dirrm viewvc/templates-contrib/viewsvn/extras
 @dirrm viewvc/templates-contrib/viewsvn
- at dirrm viewvc/templates-contrib/newvc/templates/include
- at dirrm viewvc/templates-contrib/newvc/templates/docroot/images
- at dirrm viewvc/templates-contrib/newvc/templates/docroot
- at dirrm viewvc/templates-contrib/newvc/templates
- at dirrm viewvc/templates-contrib/newvc
 @dirrm viewvc/templates-contrib
- at dirrm viewvc/templates
- at dirrm viewvc/lib/vclib/svn
- at dirrm viewvc/lib/vclib/ccvs/rcsparse/test-data
- at dirrm viewvc/lib/vclib/ccvs/rcsparse
- at dirrm viewvc/lib/vclib/ccvs
- at dirrm viewvc/lib/vclib
- at dirrm viewvc/lib/vcauth/svnauthz
- at dirrm viewvc/lib/vcauth/forbiddenre
- at dirrm viewvc/lib/vcauth/forbidden
- at dirrm viewvc/lib/vcauth
- at dirrm viewvc/lib
- at dirrm viewvc/bin/wsgi
- at dirrm viewvc/bin/mod_python
- at dirrm viewvc/bin/cgi
- at dirrm viewvc/bin
 @dirrmtry viewvc