SF.net SVN: gar:[26217] csw/mgar/pkg/tomcat6/trunk

[dmichelsen at users.sourceforge.net]

Revision: 26217
          http://sourceforge.net/p/gar/code/26217
Author:   dmichelsen
Date:     2017-05-31 13:03:00 +0000 (Wed, 31 May 2017)
Log Message:
-----------
tomcat6/trunk: Update to 6.0.53 and libtcnative 1.2.12

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

Modified: csw/mgar/pkg/tomcat6/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tomcat6/trunk/Makefile	2017-05-31 10:56:34 UTC (rev 26216)
+++ csw/mgar/pkg/tomcat6/trunk/Makefile	2017-05-31 13:03:00 UTC (rev 26217)
@@ -1,5 +1,6 @@
 NAME = tomcat6
-VERSION = 6.0.43
+VERSION = 6.0.53
+TCNATIVE_VERSION = 1.2.12
 GARTYPE = v2
 
 DESCRIPTION  =  Apache Jakarta Tomcat 6 Servlet/JSP Container
@@ -24,6 +25,7 @@
 
 PACKAGES += CSWlibtcnative1-0
 SPKG_DESC_CSWlibtcnative1-0 = Tomcat Native Java library
+SPKG_VERSION_CSWlibtcnative1-0 = $(TCNATIVE_VERSION)
 PKGFILES_CSWlibtcnative1-0 += $(call pkgfiles_lib,libtcnative-1.so)
 RUNTIME_DEP_PKGS_CSWlibtcnative1-0 += CSWlibapr1-0
 RUNTIME_DEP_PKGS_CSWlibtcnative1-0 += CSWlibssl1-0-0
@@ -30,6 +32,7 @@
 
 PACKAGES += CSWlibtcnative-dev
 SPKG_DESC_CSWlibtcnative-dev = Development files for Tomcat Native Java library
+SPKG_VERSION_CSWlibtcnative-dev = $(TCNATIVE_VERSION)
 # The .so *must* go into the library package as this name id dlopen'ed by java
 PKGFILES_DEVEL_SHAREDLIBLINK =
 CHECKPKG_OVERRIDES_CSWlibtcnative1-0 += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libtcnative-1.so
@@ -38,11 +41,11 @@
 
 LICENSE = LICENSE
 
-CONFIGURE_SCRIPTS = $(WORKSRC)/bin/tomcat-native-1.1.32-src/jni/native/configure
-BUILD_SCRIPTS = $(WORKSRC)/bin/tomcat-native-1.1.32-src/jni/native/Makefile
+CONFIGURE_SCRIPTS = $(WORKSRC)/bin/tomcat-native-$(TCNATIVE_VERSION)-src/native/configure
+BUILD_SCRIPTS = $(WORKSRC)/bin/tomcat-native-$(TCNATIVE_VERSION)-src/native/Makefile
 TEST_SCRIPTS =
 INSTALL_SCRIPTS += tomcat
-INSTALL_SCRIPTS += $(WORKSRC)/bin/tomcat-native-1.1.32-src/jni/native/Makefile
+INSTALL_SCRIPTS += $(WORKSRC)/bin/tomcat-native-$(TCNATIVE_VERSION)-src/native/Makefile
 
 CONFIGURE_ARGS += $(DIRPATHS)
 CONFIGURE_ARGS += --with-apr=$(bindir)/apr-1-config
@@ -89,7 +92,7 @@
 	mkdir -p $(DESTDIR)/opt/csw/share
 	cp -fr $(WORKSRC) $(DESTDIR)/opt/csw/share/$(NAME)
 	@# The native library stuff goes into another package
-	rm -rf $(DESTDIR)/opt/csw/share/$(NAME)/bin/tomcat-native-1.1.32-src
+	rm -rf $(DESTDIR)/opt/csw/share/$(NAME)/bin/tomcat-native-$(TCNATIVE_VERSION)-src
 	cp -fr $(FILEDIR)/csw$(NAME) $(DESTDIR)/etc/opt/csw/init.d
 	mv $(DESTDIR)/opt/csw/share/$(NAME)/conf $(DESTDIR)/etc/opt/csw/$(NAME)/conf
 	mv $(DESTDIR)/opt/csw/share/$(NAME)/logs $(DESTDIR)/var/opt/csw/$(NAME)
@@ -101,6 +104,6 @@
 	ln -s ../../../../var/opt/csw/$(NAME)/work $(DESTDIR)/opt/csw/share/$(NAME)/work
 	ln -s ../../../../var/opt/csw/$(NAME)/temp $(DESTDIR)/opt/csw/share/$(NAME)/temp
 	ginstall -m 644 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/$(NAME)
-	cd $(WORKSRC)/bin/tomcat-native-1.1.32-src/jni/native && /usr/bin/env -i $(INSTALL_ENV) gmake $(INSTALL_ARGS)
+	cd $(WORKSRC)/bin/tomcat-native-$(TCNATIVE_VERSION)-src/native && /usr/bin/env -i $(INSTALL_ENV) gmake $(INSTALL_ARGS)
 	@$(MAKECOOKIE)
 

Modified: csw/mgar/pkg/tomcat6/trunk/checksums
===================================================================
--- csw/mgar/pkg/tomcat6/trunk/checksums	2017-05-31 10:56:34 UTC (rev 26216)
+++ csw/mgar/pkg/tomcat6/trunk/checksums	2017-05-31 13:03:00 UTC (rev 26217)
@@ -1 +1 @@
-0abbb1852a608c8b4ccb7003c700337b  apache-tomcat-6.0.43.tar.gz
+b405f4d8aed2564e23a9d261de2f9ff4  apache-tomcat-6.0.53.tar.gz

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