SF.net SVN: gar:[25106] csw/mgar/pkg/opengrok/trunk

[dmichelsen at users.sourceforge.net]

Revision: 25106
          http://sourceforge.net/p/gar/code/25106
Author:   dmichelsen
Date:     2015-06-22 07:41:02 +0000 (Mon, 22 Jun 2015)
Log Message:
-----------
opengrok/trunk: Update to 0.12.1

Modified Paths:
--------------
    csw/mgar/pkg/opengrok/trunk/Makefile
    csw/mgar/pkg/opengrok/trunk/checksums

Modified: csw/mgar/pkg/opengrok/trunk/Makefile
===================================================================
--- csw/mgar/pkg/opengrok/trunk/Makefile	2015-06-22 07:20:55 UTC (rev 25105)
+++ csw/mgar/pkg/opengrok/trunk/Makefile	2015-06-22 07:41:02 UTC (rev 25106)
@@ -2,7 +2,7 @@
 # TODO: Repository under /var/opt/csw/repos
 
 NAME = opengrok
-VERSION = 0.11.1
+VERSION = 0.12.1
 
 DESCRIPTION = A wicked fast source browser
 define BLURB
@@ -16,44 +16,47 @@
 endef
 
 MASTER_SITES = http://java.net/projects/opengrok/downloads/download/
-DISTFILES = $(NAME)-$(VERSION).tar.gz
+DISTFILES += $(DISTNAME).tar.gz
 
-RUNTIME_DEP_PKGS = CSWectags CSWjavasvn CSWtomcat6 CSWmercurial
-
 VENDOR_URL = http://opengrok.github.io/OpenGrok/
 
+PACKAGES += CSWopengrok
+SPKG_DESC_CSWopengrok = A wicked fast source browser
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWopengrok += CSWectags
+RUNTIME_DEP_PKGS_CSWopengrok += CSWtomcat8
+
+# The binaries are used from within scripts
+CHECKPKG_OVERRIDES_CSWopengrok += surplus-dependency|CSWectags
+CHECKPKG_OVERRIDES_CSWopengrok += surplus-dependency|CSWtomcat8
+
 CONFIGURE_SCRIPTS =
 BUILD_SCRIPTS =
 TEST_SCRIPTS =
-
 INSTALL_SCRIPTS = custom
 
 include gar/category.mk
 
 install-custom:
 	@echo " ==> Installing files"
-	@rm -rf $(DESTDIR)$(prefix)/share/tomcat5/webapps/source
-	@ginstall -d $(DESTDIR)$(prefix)/share/tomcat5/webapps/source
-	@(cat $(WORKSRC)/source.war | \
-		(cd $(DESTDIR)$(prefix)/share/tomcat5/webapps/source; \
+	rm -rf $(DESTDIR)$(prefix)/share/tomcat8/webapps/source
+	ginstall -d $(DESTDIR)$(prefix)/share/tomcat8/webapps/source
+	(cat $(WORKSRC)/lib/source.war | \
+		(cd $(DESTDIR)$(prefix)/share/tomcat8/webapps/source; \
 		jar xf /dev/fd/0) \
 	)
 	@# For Indexing. Structure of opengrok is opengrok in application root
 	@# directory and all libs in lib/. We use only WEB-INF whose directory structure
 	@# is slightly different.
-	@gln -s $(DESTDIR)$(prefix)/share/tomcat5/webapps/source/WEB-INF/lib/. \
-		$(DESTDIR)$(prefix)/share/tomcat5/webapps/source/WEB-INF/lib/lib
+	#gln -s $(DESTDIR)$(prefix)/share/tomcat8/webapps/source/WEB-INF/lib/. \
+	#	$(DESTDIR)$(prefix)/share/tomcat8/webapps/source/WEB-INF/lib/lib
 
-	@ginstall -d $(DESTDIR)$(prefix)/share/doc/opengrok
-	@ginstall $(WORKSRC)/*.txt \
-		$(DESTDIR)$(prefix)/share/doc/opengrok/
-	@mv $(DESTDIR)$(prefix)/share/tomcat5/webapps/source/WEB-INF/web.xml \
-		$(DESTDIR)$(prefix)/share/tomcat5/webapps/source/WEB-INF/web.xml.CSW
+	ginstall -d $(DESTDIR)$(prefix)/share/doc/opengrok
+	mv $(DESTDIR)$(prefix)/share/tomcat8/webapps/source/WEB-INF/web.xml \
+		$(DESTDIR)$(prefix)/share/tomcat8/webapps/source/WEB-INF/web.xml.CSW
 	@# TODO: Apply XML-Starlet to web.xml
-	@rm -rf $(DESTDIR)$(prefix)/share/doc/opengrok
-	@ginstall -d $(DESTDIR)$(prefix)/share/doc/opengrok
-	@ginstall $(WORKSRC)/*.txt \
-		$(DESTDIR)$(prefix)/share/doc/opengrok/
+	rm -rf $(DESTDIR)$(prefix)/share/doc/opengrok
+	ginstall -d $(DESTDIR)$(prefix)/share/doc/opengrok
 	@$(MAKECOOKIE)
 	
 

Modified: csw/mgar/pkg/opengrok/trunk/checksums
===================================================================
--- csw/mgar/pkg/opengrok/trunk/checksums	2015-06-22 07:20:55 UTC (rev 25105)
+++ csw/mgar/pkg/opengrok/trunk/checksums	2015-06-22 07:41:02 UTC (rev 25106)
@@ -1 +1 @@
-91f926bf86d44acd6415f22e7ebb8aa5  opengrok-0.11.1.tar.gz
+afc4560c9c9a27454c6d74024aa73ede  opengrok-0.12.1.tar.gz

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.