[Midnightbsd-cvs] mports [18228] trunk/devel/opengrok: opengrok 0.12.1

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Wed Mar 18 09:14:46 EDT 2015


Revision: 18228
          http://svnweb.midnightbsd.org/mports/?rev=18228
Author:   laffer1
Date:     2015-03-18 09:14:45 -0400 (Wed, 18 Mar 2015)
Log Message:
-----------
opengrok 0.12.1

Modified Paths:
--------------
    trunk/devel/opengrok/Makefile
    trunk/devel/opengrok/distinfo
    trunk/devel/opengrok/files/opengrok.in
    trunk/devel/opengrok/pkg-descr
    trunk/devel/opengrok/pkg-plist

Property Changed:
----------------
    trunk/devel/opengrok/files/opengrok.in

Modified: trunk/devel/opengrok/Makefile
===================================================================
--- trunk/devel/opengrok/Makefile	2015-03-18 12:54:51 UTC (rev 18227)
+++ trunk/devel/opengrok/Makefile	2015-03-18 13:14:45 UTC (rev 18228)
@@ -2,14 +2,16 @@
 # $FreeBSD: ports/devel/opengrok/Makefile,v 1.5 2011/12/26 17:21:01 jgh Exp $
 
 PORTNAME=	opengrok
-PORTVERSION=	0.11.1
+PORTVERSION=	0.12.1
 CATEGORIES=	devel java
-MASTER_SITES=	http://hub.opensolaris.org/bin/download/Project+opengrok/files/
+MASTER_SITES=	http://java.net/projects/opengrok/downloads/download/
 
 MAINTAINER=	ports at MidnightBSD.org
-COMMENT=	Fast and powerful code search and cross-reference egine
-LICENSE=	cddl
+COMMENT=	Fast and powerful code search and cross-reference engine
 
+LICENSE=	cddl apache2
+LICENSE_COMB=	multi
+
 RUN_DEPENDS=	exctags:${PORTSDIR}/devel/ctags
 
 USE_JAVA=	yes
@@ -18,17 +20,23 @@
 SHAREOWN=	www
 SHAREGRP=	www
 NO_BUILD=	yes
+PORTDOCS=	${DOCS}
 SUB_FILES=	opengrok
-SUB_LIST+=	LIBFILES="${LIBFILES:S,^,${DATADIR}/,}" \
+SUB_LIST+=	LIBFILES="${LIBFILES:S,^,${DATADIR}/lib/,}" \
 		JARFILE="${JARFILE}"
-PLIST_SUB=	T=${WEBAPP_DIRS:S|^${LOCALBASE}/||} \
-		CONF_EXT=${CONF_EXT}
-CONF_EXT=	sample
+PLIST_SUB=	T=${WEBAPP_HOME:S|^${LOCALBASE}/||} \
+		OWNER=${SHAREOWN} GROUP=${SHAREGRP}
 
-OPTIONS=	TOMCAT6		"Use Jakarta Tomcat 6"		on	\
-		TOMCAT55	"Use Jakarta Tomcat 5.5"	off
+OPTIONS_SINGLE=		AS
+OPTIONS_SINGLE_AS=	TOMCAT7 TOMCAT6 RESIN3
+OPTIONS_DEFAULT=	TOMCAT6
 
-.include <bsd.port.pre.mk>
+TOMCAT6_BUILD_DEPENDS=	${WEBAPP_HOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
+TOMCAT6_RUN_DEPENDS=	${WEBAPP_HOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
+TOMCAT7_BUILD_DEPENDS=	${WEBAPP_HOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7
+TOMCAT7_RUN_DEPENDS=	${WEBAPP_HOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7
+RESIN3_BUILD_DEPENDS=	${WEBAPP_HOME}/lib/resin.jar:${PORTSDIR}/www/resin3
+RESIN3_RUN_DEPENDS=	${WEBAPP_HOME}/lib/resin.jar:${PORTSDIR}/www/resin3
 
 JARFILE=	${DATADIR}/opengrok.jar
 DOCS=		CHANGES.txt EXAMPLE.txt LICENSE.txt
@@ -35,56 +43,43 @@
 LIBFILES=	ant.jar \
 		bcel-5.2.jar \
 		jrcs.jar \
-		lucene-core-3.0.2.jar \
-		lucene-spellchecker-3.0.2.jar \
+		lucene-analyzers-common-4.7.1.jar \
+		lucene-core-4.7.1.jar \
+		lucene-queryparser-4.7.1.jar \
+		lucene-suggest-4.7.1.jar \
 		swing-layout-0.9.jar
 
-.if defined(WITH_TOMCAT6)
-WEBAPP_DIRS=	apache-tomcat6.0
-BUILD_DEPENDS+=	${LOCALBASE}/apache-tomcat6.0/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
-RUN_DEPENDS+=	${LOCALBASE}/apache-tomcat6.0/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
+.include <bsd.mport.options.mk>
+
+.if ${PORT_OPTIONS:MTOMCAT7}
+WEBAPP_HOME?=	${LOCALBASE}/apache-tomcat-7.0
 .endif
 
-.if defined(WITH_TOMCAT55)
-WEBAPP_DIRS=	tomcat5.5
-BUILD_DEPENDS+=	${LOCALBASE}/tomcat5.5/bin/bootstrap.jar:${PORTSDIR}/www/tomcat55
-RUN_DEPENDS+=	${LOCALBASE}/tomcat5.5/bin/bootstrap.jar:${PORTSDIR}/www/tomcat55
+.if ${PORT_OPTIONS:MTOMCAT6}
+WEBAPP_HOME?=	${LOCALBASE}/apache-tomcat-6.0
 .endif
 
-.if ( defined(WITH_TOMCAT6) && ( defined(WITH_TOMCAT55) || defined(WITH_RESIN3)))
-IGNORE=	you can only define one application server
-.elif ( defined(WITH_TOMCAT55) && ( defined(WITH_TOMCAT6) || defined(WITH_RESIN3)))
-IGNORE=	you can only define one application server
-.elif ( defined(WITH_RESIN) && ( defined(WITH_TOMCAT6) || defined(WITH_TOMCAT55)))
-IGNORE=	you can only define one application server
-.elif !defined(WEBAPP_DIRS)
-IGNORE=	you need at least one application server
+.if ${PORT_OPTIONS:MRESIN3}
+WEBAPP_HOME?=	${LOCALBASE}/resin3
 .endif
 
+WEBAPPS_DIR=	${WEBAPP_HOME:S|^${LOCALBASE}/||}/webapps
+
 post-extract:
-	@${MKDIR} ${WRKSRC}/lib/${PORTNAME}
-	@${TAR} xf ${WRKSRC}/lib/source.war -C ${WRKSRC}/lib/${PORTNAME}
+	@${MKDIR} ${WRKSRC}/lib/opengrok
+	@${TAR} -xf ${WRKSRC}/lib/source.war -C ${WRKSRC}/lib/opengrok
 
 do-install:
-	@${INSTALL} -d -o ${WWWOWN} -g ${WWWGRP} ${PREFIX}/${WEBAPP_DIRS}/webapps/${PORTNAME}
-	@${MV} ${WRKSRC}/lib/${PORTNAME}/WEB-INF/web.xml ${WRKSRC}/lib/${PORTNAME}/WEB-INF/web.xml.${CONF_EXT}
-	@cd ${WRKSRC}/lib/${PORTNAME} && ${COPYTREE_SHARE} \* ${PREFIX}/${WEBAPP_DIRS}/webapps/${PORTNAME}
+	@${MKDIR} ${STAGEDIR}${DATADIR}/lib ${STAGEDIR}${DOCSDIR} \
+		${STAGEDIR}${PREFIX}/${WEBAPPS_DIR}/${PORTNAME}
+	(cd ${WRKSRC}/lib/opengrok && ${COPYTREE_SHARE} . \
+		${STAGEDIR}${PREFIX}/${WEBAPPS_DIR}/${PORTNAME})
+	(cd ${STAGEDIR}${PREFIX}/${WEBAPPS_DIR}/${PORTNAME}/WEB-INF && \
+		${MV} web.xml web.xml.sample)
+	${INSTALL_DATA} ${LIBFILES:S,^,${WRKSRC}/lib/lib/,} \
+		${STAGEDIR}${DATADIR}/lib/
+	${INSTALL_DATA} ${WRKSRC}/lib/opengrok.jar ${STAGEDIR}${DATADIR}/
+	${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/doc/,} ${STAGEDIR}${DOCSDIR}/
+	${INSTALL_SCRIPT} ${WRKDIR}/opengrok ${STAGEDIR}${PREFIX}/bin
 
-	@if [ ! -e "${PREFIX}/${WEBAPP_DIRS}/webapps/${PORTNAME}/WEB-INF/web.xml" ]; then \
-			${ECHO_MSG} "	Installing local configuration file: ${PREFIX}/${WEBAPP_DIRS}/webapps/${PORTNAME}/WEB-INF/web.xml"; \
-			${INSTALL_DATA} ${WRKSRC}/lib/${PORTNAME}/WEB-INF/web.xml.${CONF_EXT} ${PREFIX}/${WEBAPP_DIRS}/webapps/${PORTNAME}/WEB-INF/web.xml; \
-		else \
-			${ECHO_MSG} "	Preserving local configuration file: ${PREFIX}/${WEBAPP_DIRS}/webapps/${PORTNAME}/WEB-INF/web.xml"; \
-	fi;
-	@${INSTALL_DATA} ${WRKSRC}/lib/${PORTNAME}/WEB-INF/web.xml.${CONF_EXT} ${PREFIX}/${WEBAPP_DIRS}/webapps/${PORTNAME}/WEB-INF
-
-	@${MKDIR} ${DATADIR}/lib
-	@${INSTALL_DATA} ${LIBFILES:S,^,${WRKSRC}/lib/lib/,} ${DATADIR}/lib/
-	@${INSTALL_DATA} ${WRKSRC}/lib/opengrok.jar ${DATADIR}/
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/doc/,} ${DOCSDIR}/
-.endif
-	@${INSTALL_SCRIPT} ${WRKDIR}/opengrok ${PREFIX}/bin
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: trunk/devel/opengrok/distinfo
===================================================================
--- trunk/devel/opengrok/distinfo	2015-03-18 12:54:51 UTC (rev 18227)
+++ trunk/devel/opengrok/distinfo	2015-03-18 13:14:45 UTC (rev 18228)
@@ -1,2 +1,2 @@
-SHA256 (opengrok-0.11.1.tar.gz) = b49e795f3421117e0e1176bf786335c3aba70ad67ad77fb2800f9f4d6ae246c5
-SIZE (opengrok-0.11.1.tar.gz) = 7057514
+SHA256 (opengrok-0.12.1.tar.gz) = e93cee4e4909ea2671f475683da448d0de768006d5242c7c95fa891fdcc30a46
+SIZE (opengrok-0.12.1.tar.gz) = 14506193

Modified: trunk/devel/opengrok/files/opengrok.in
===================================================================
--- trunk/devel/opengrok/files/opengrok.in	2015-03-18 12:54:51 UTC (rev 18227)
+++ trunk/devel/opengrok/files/opengrok.in	2015-03-18 13:14:45 UTC (rev 18228)
@@ -12,4 +12,4 @@
 	set CLASSPATH = ""
 endif
 
-exec "${JAVA}" -cp "${CLASSPATH}" -jar %%JARFILE%% -c %%LOCALBASE%%/bin/exctags $*
+exec "${JAVA}" -cp "${CLASSPATH}" -jar %%JARFILE%% -c %%LOCALBASE%%/bin/exctags -w opengrok $*


Property changes on: trunk/devel/opengrok/files/opengrok.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/devel/opengrok/pkg-descr
===================================================================
--- trunk/devel/opengrok/pkg-descr	2015-03-18 12:54:51 UTC (rev 18227)
+++ trunk/devel/opengrok/pkg-descr	2015-03-18 13:14:45 UTC (rev 18228)
@@ -1,8 +1,8 @@
-OpenGrok is a fast and usable source code search and cross reference engine.
+OpenGrok is a fast source code search and cross reference engine.
 It helps you search, cross-reference and navigate your source tree.  It can
 understand various program file formats and version control histories like
 Mercurial, Git, SCCS, RCS, CVS, Subversion, Teamware, ClearCase, Perforce
-and Bazaar.  In other words it lets you grok (profoundly understand) the open
-source, hence the name OpenGrok.  It is written in Java.
+and Bazaar.  In other words it lets you grok (profoundly understand) the
+open source, hence the name OpenGrok.  It is written in Java.
 
-WWW:	http://opensolaris.org/os/project/opengrok/
+WWW: http://opengrok.github.io/OpenGrok/

Modified: trunk/devel/opengrok/pkg-plist
===================================================================
--- trunk/devel/opengrok/pkg-plist	2015-03-18 12:54:51 UTC (rev 18227)
+++ trunk/devel/opengrok/pkg-plist	2015-03-18 13:14:45 UTC (rev 18228)
@@ -1,25 +1,26 @@
- at unexec if cmp -s %D%/%%T%%/webapps/opengrok/WEB-INF/web.xml %D%/%%T%%/webapps/opengrok/WEB-INF/web.xml.%%CONF_EXT%%; then rm -f %D%/%%T%%/webapps/opengrok/WEB-INF/web.xml; fi
 bin/opengrok
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES.txt
-%%PORTDOCS%%%%DOCSDIR%%/EXAMPLE.txt
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
 %%DATADIR%%/lib/ant.jar
 %%DATADIR%%/lib/bcel-5.2.jar
 %%DATADIR%%/lib/jrcs.jar
-%%DATADIR%%/lib/lucene-core-3.0.2.jar
-%%DATADIR%%/lib/lucene-spellchecker-3.0.2.jar
+%%DATADIR%%/lib/lucene-analyzers-common-4.7.1.jar
+%%DATADIR%%/lib/lucene-core-4.7.1.jar
+%%DATADIR%%/lib/lucene-queryparser-4.7.1.jar
+%%DATADIR%%/lib/lucene-suggest-4.7.1.jar
 %%DATADIR%%/lib/swing-layout-0.9.jar
 %%DATADIR%%/opengrok.jar
+ at group %%OWNER%%
+ at owner %%GROUP%%
 %%T%%/webapps/opengrok/META-INF/MANIFEST.MF
 %%T%%/webapps/opengrok/WEB-INF/lib/ant.jar
 %%T%%/webapps/opengrok/WEB-INF/lib/bcel-5.2.jar
 %%T%%/webapps/opengrok/WEB-INF/lib/jrcs.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/lucene-core-3.0.2.jar
-%%T%%/webapps/opengrok/WEB-INF/lib/lucene-spellchecker-3.0.2.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/lucene-analyzers-common-4.7.1.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/lucene-core-4.7.1.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/lucene-queryparser-4.7.1.jar
+%%T%%/webapps/opengrok/WEB-INF/lib/lucene-suggest-4.7.1.jar
 %%T%%/webapps/opengrok/WEB-INF/lib/opengrok.jar
 %%T%%/webapps/opengrok/WEB-INF/lib/swing-layout-0.9.jar
-%%T%%/webapps/opengrok/WEB-INF/web.xml.%%CONF_EXT%%
- at exec if [ ! -f %D%/%%T%%/webapps/opengrok/WEB-INF/web.xml ]; then cp %D%/%%T%%/webapps/opengrok/WEB-INF/web.xml.%%CONF_EXT%% %D%/%%T%%/webapps/opengrok/WEB-INF/web.xml; fi
+ at sample %%T%%/webapps/opengrok/WEB-INF/web.xml.sample
 %%T%%/webapps/opengrok/default/img/Logo.png
 %%T%%/webapps/opengrok/default/img/bg.png
 %%T%%/webapps/opengrok/default/img/button1.png
@@ -113,16 +114,5 @@
 %%T%%/webapps/opengrok/search.jsp
 %%T%%/webapps/opengrok/status.jsp
 %%T%%/webapps/opengrok/utils.js
- at dirrmtry %%T%%/webapps/opengrok/META-INF
- at dirrmtry %%T%%/webapps/opengrok/WEB-INF/lib
- at dirrmtry %%T%%/webapps/opengrok/WEB-INF
- at dirrmtry %%T%%/webapps/opengrok/default/img
- at dirrmtry %%T%%/webapps/opengrok/default
- at dirrmtry %%T%%/webapps/opengrok/offwhite/img
- at dirrmtry %%T%%/webapps/opengrok/offwhite
- at dirrmtry %%T%%/webapps/opengrok/polished/img
- at dirrmtry %%T%%/webapps/opengrok/polished
- at dirrmtry %%T%%/webapps/opengrok
- at dirrmtry %%DATADIR%%/lib
- at dirrmtry %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+ at group
+ at owner



More information about the Midnightbsd-cvs mailing list