SF.net SVN: gar:[26121] csw/mgar/pkg/znapzend/trunk

cgrzemba at users.sourceforge.net cgrzemba at users.sourceforge.net
Tue Mar 14 14:25:14 CET 2017 

Revision: 26121
          http://sourceforge.net/p/gar/code/26121
Author:   cgrzemba
Date:     2017-03-14 13:25:14 +0000 (Tue, 14 Mar 2017)
Log Message:
-----------
- update version 0.15.7
- use self distributed perl modules
- use system perl, Perl5.10 has no App::cpanminus

Modified Paths:
--------------
    csw/mgar/pkg/znapzend/trunk/Makefile
    csw/mgar/pkg/znapzend/trunk/checksums
    csw/mgar/pkg/znapzend/trunk/files/cswznapzend

Added Paths:
-----------
    csw/mgar/pkg/znapzend/trunk/files/001-perl-install-dir.Makefile.in.patch

Modified: csw/mgar/pkg/znapzend/trunk/Makefile
===================================================================
--- csw/mgar/pkg/znapzend/trunk/Makefile	2017-03-09 20:09:05 UTC (rev 26120)
+++ csw/mgar/pkg/znapzend/trunk/Makefile	2017-03-14 13:25:14 UTC (rev 26121)
@@ -2,8 +2,9 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = znapzend
-VERSION = 0.14.0
+VERSION = 0.15.7
 GARTYPE = v2
+AUTHOR = oetiker
 
 DESCRIPTION = The Multilevel Backup Tool for ZFS
 define BLURB
@@ -11,46 +12,53 @@
   The ZnapZend configuration is stored as properties in the ZFS filesystem itself.
 endef
 
-GITHUB_USER  = oetiker
+GITHUB_USER  = $(AUTHOR)
 #MASTER_SITES = $(GITHUB_MIRROR)
 MASTER_SITES = https://github.com/$(GITHUB_USER)/$(NAME)/releases/download/v$(VERSION)/
+# MASTER_SITES = http://github.com/$(AUTHOR)/$(NAME)/
 VENDOR_URL   = http://www.znapzend.org/
 
 DISTFILES  = $(DISTNAME).tar.gz
 DISTFILES += cswznapzend
 
+PACKAGING_PLATFORMS = solaris11-sparc solaris11-i386
+PKGFORMAT-5.11 = svr4
+
+PATCHFILES += 001-perl-install-dir.Makefile.in.patch
+
 INITSMF = /etc/opt/csw/init.d/cswznapzend
 
+EXTRA_CONFIGURE_ENV = PATH=/usr/xpg4/bin:$(PATH)
+EXTRA_BUILD_ENV = PATH=/opt/csw/gnu:$(PATH)
+
 CONFIGURE_ARGS =  $(DIRPATHS)
 CONFIGURE_ARGS += --datadir=$(libdir)/perl/csw/
-CONFIGURE_ARGS += PERL5LIB=$(libdir)/perl/csw/
+CONFIGURE_ARGS += --enable-svcinstall=/var/opt/csw/svc/manifest
+CONFIGURE_ARGS += PERL5LIB=$(libdir)/$(NAME)
+CONFIGURE_ARGS += PERL=/usr/bin/perl
+INSTALL_ARGS =	libperldir=$(libdir)/$(NAME)
 
-BUILD_DEP_PKGS += CSWpm-pod-simple
-BUILD_DEP_PKGS += CSWpm-mojolicious
-BUILD_DEP_PKGS += CSWpm-mojo-ioloop-forkcall
-
-RUNTIME_DEP_PKGS_CSWznapzend += CSWperl
-RUNTIME_DEP_PKGS_CSWznapzend += CSWpm-pod-simple
-CHECKPKG_OVERRIDES_CSWznapzend += surplus-dependency|CSWpm-pod-simple
-RUNTIME_DEP_PKGS_CSWznapzend += CSWpm-mojolicious
-CHECKPKG_OVERRIDES_CSWznapzend += surplus-dependency|CSWpm-mojolicious
-RUNTIME_DEP_PKGS_CSWznapzend += CSWpm-mojo-ioloop-forkcall
-CHECKPKG_OVERRIDES_CSWznapzend += surplus-dependency|CSWpm-mojo-ioloop-forkcall
+# RUNTIME_DEP_PKGS_CSWznapzend += CSWperl
 # Can be used as an option
 RUNTIME_DEP_PKGS_CSWznapzend += CSWmbuffer
 CHECKPKG_OVERRIDES_CSWznapzend += surplus-dependency|CSWmbuffer
+CHECKPKG_OVERRIDES_CSWznapzend += missing-dependency|CSWperl
 
-ARCHALL_CSWznapzend = 1
-
 # Ok: usage examples
-CHECKPKG_OVERRIDES_CSWznapzend += file-with-bad-content|/usr/local|root/opt/csw/doc/znapzendzetup.pod
 CHECKPKG_OVERRIDES_CSWznapzend += file-with-bad-content|/usr/local|root/opt/csw/bin/znapzendzetup
+CHECKPKG_OVERRIDES_CSWznapzend += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/znapzend.xml
+CHECKPKG_OVERRIDES_CSWznapzend += file-with-bad-content|/usr/local|root/opt/csw/lib/znapzend/ExtUtils/MakeMaker.pm
+CHECKPKG_OVERRIDES_CSWznapzend += file-with-bad-content|/usr/local|root/opt/csw/lib/znapzend/App/cpanminus.pm
+CHECKPKG_OVERRIDES_CSWznapzend += file-with-bad-content|/usr/local|root/opt/csw/lib/znapzend/App/cpanminus/fatscript.pm
+CHECKPKG_OVERRIDES_CSWznapzend += file-with-bad-content|/usr/local|root/opt/csw/lib/znapzend/TAP/Parser/SourceHandler/Perl.pm
+CHECKPKG_OVERRIDES_CSWznapzend += perllocal-pod-in-pkgmap|/opt/csw/lib/znapzend/sun4-solaris-64int/perllocal.pod
+CHECKPKG_OVERRIDES_CSWznapzend += perllocal-pod-in-pkgmap|/opt/csw/lib/znapzend/i86pc-solaris-64int/perllocal.pod
+include gar/category.mk
 
-# Ok: location of DTD
-CHECKPKG_OVERRIDES_CSWznapzend += file-with-bad-content|/usr/share|root/opt/csw/init/znapzend.xml
+pre-configure:
+	cd $(WORKSRC) && automake-1.14
+	@$(MAKECOOKIE)
 
-include gar/category.mk
-
-post-install:
-	ginstall -d $(DESTDIR)/etc/opt/csw/init.d
-	ginstall $(WORKDIR)/cswznapzend $(DESTDIR)/etc/opt/csw/init.d
+# post-install:
+# 	ginstall -d $(DESTDIR)/etc/opt/csw/init.d
+# 	ginstall $(WORKDIR)/cswznapzend $(DESTDIR)/etc/opt/csw/init.d

Modified: csw/mgar/pkg/znapzend/trunk/checksums
===================================================================
--- csw/mgar/pkg/znapzend/trunk/checksums	2017-03-09 20:09:05 UTC (rev 26120)
+++ csw/mgar/pkg/znapzend/trunk/checksums	2017-03-14 13:25:14 UTC (rev 26121)
@@ -1 +1 @@
-08b849cc05158374f533aeb2cc9bf7ea  znapzend-0.14.0.tar.gz
+d76cbeb62a820f1e9b271ca5a185054f  znapzend-0.15.7.tar.gz

Added: csw/mgar/pkg/znapzend/trunk/files/001-perl-install-dir.Makefile.in.patch
===================================================================
--- csw/mgar/pkg/znapzend/trunk/files/001-perl-install-dir.Makefile.in.patch	                        (rev 0)
+++ csw/mgar/pkg/znapzend/trunk/files/001-perl-install-dir.Makefile.in.patch	2017-03-14 13:25:14 UTC (rev 26121)
@@ -0,0 +1,13 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -60,8 +60,8 @@ install-exec-hook:
+ 	[ "$(PERL5LIB)" = "" ] || cd "$(DESTDIR)$(exec_prefix)" && $(PERL) -i -p -e 's{.*# PERL5LIB}{use lib qw($(PERL5LIB)); # PERL5LIB}' $(BIN) || true
+ 	cd "$(DESTDIR)$(exec_prefix)" && $(PERL) -i -p -e 's{^use .*# LIBDIR}{use lib qw($(libdir)); # LIBDIR}' $(BIN)
+ 	cd "$(DESTDIR)$(exec_prefix)" && $(PERL) -i -p -e 's{^#!.*perl.*}{#!$(PERL)};' $(BIN)
+-	mkdir -p $(DESTDIR)$(libdir)
+-	[ ! -d $(THIRDPARTY_DIR)/lib/perl5 ] || cp -fr $(THIRDPARTY_DIR)/lib/perl5/* $(DESTDIR)$(libdir)
++	mkdir -p $(DESTDIR)$(libperldir)
++	[ ! -d $(THIRDPARTY_DIR)/lib/perl5 ] || cp -fr $(THIRDPARTY_DIR)/lib/perl5/* $(DESTDIR)$(libperldir)
+ 
+ test:
+ 	$(PERL) -Ithirdparty/lib/perl5 "-MExtUtils::Command::MM" "-e" "test_harness(0, 'lib','thirdparty/lib/perl5')" t/*.t

Modified: csw/mgar/pkg/znapzend/trunk/files/cswznapzend
===================================================================
--- csw/mgar/pkg/znapzend/trunk/files/cswznapzend	2017-03-09 20:09:05 UTC (rev 26120)
+++ csw/mgar/pkg/znapzend/trunk/files/cswznapzend	2017-03-14 13:25:14 UTC (rev 26121)
@@ -5,27 +5,4 @@
 # ### OpenCSW parameters ###
 #AUTOENABLE no      # Don't enable by default
 #FMRI system        # FMRI path for service (S10+), default is /network.
-
-
-PATH=/bin:/sbin:/usr/bin:/usr/sbin
-export PATH
-
-case "$1" in
-	start)
-		echo "Starting znapzend..."
-		/opt/csw/bin/znapzend --daemonize --pidfile=/var/run/znapzend.pid
-	;;
-	stop)
-		echo "Stopping znapzend..."
-		/usr/bin/kill `cat /var/run/znapzend.pid`
-	;;
-	restart)
-		$0 stop
-		$0 start
-	;;
-	*)
-		echo "$0 {start | stop | restart}"
-		exit 1;
-	;;
-esac
-
+#MANIFEST /var/opt/csw/svc/manifest/znapzend.xml

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

More information about the devel mailing list