Revision: 26562
http://sourceforge.net/p/gar/code/26562
Author: dmichelsen
Date: 2019-07-23 17:44:33 +0000 (Tue, 23 Jul 2019)
Log Message:
-----------
libzip: Initial commit
Added Paths:
-----------
csw/mgar/pkg/libzip/
csw/mgar/pkg/libzip/Makefile
csw/mgar/pkg/libzip/branches/
csw/mgar/pkg/libzip/tags/
csw/mgar/pkg/libzip/trunk/
csw/mgar/pkg/libzip/trunk/Makefile
csw/mgar/pkg/libzip/trunk/checksums
csw/mgar/pkg/libzip/trunk/files/
csw/mgar/pkg/libzip/trunk/files/0001-Fix-order-of-gnutls-includes.patch
Added: csw/mgar/pkg/libzip/Makefile
===================================================================
--- csw/mgar/pkg/libzip/Makefile (rev 0)
+++ csw/mgar/pkg/libzip/Makefile 2019-07-23 17:44:33 UTC (rev 26562)
@@ -0,0 +1,2 @@
+%:
+ $(MAKE) -C trunk $*
Index: csw/mgar/pkg/libzip/trunk
===================================================================
--- csw/mgar/pkg/libzip/trunk 2019-07-22 16:30:44 UTC (rev 26561)
+++ csw/mgar/pkg/libzip/trunk 2019-07-23 17:44:33 UTC (rev 26562)
Property changes on: csw/mgar/pkg/libzip/trunk
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+work
Added: csw/mgar/pkg/libzip/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libzip/trunk/Makefile (rev 0)
+++ csw/mgar/pkg/libzip/trunk/Makefile 2019-07-23 17:44:33 UTC (rev 26562)
@@ -0,0 +1,69 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = libzip
+VERSION = 1.5.2
+GARTYPE = v2
+
+DESCRIPTION = A C library for reading, creating, and modifying zip archives
+
+MASTER_SITES = https://libzip.org/download/
+DISTFILES += $(DISTNAME).tar.xz
+
+PATCHFILES += 0001-Fix-order-of-gnutls-includes.patch
+
+VENDOR_URL = https://libzip.org
+
+PACKAGES += CSWlibzip5
+SPKG_DESC_CSWlibzip5 = C library for reading, creating, and modifying zip
archives, libzip.so.5
+PKGFILES_CSWlibzip5 += $(call pkgfiles_lib,libzip.so.5)
+RUNTIME_DEP_PKGS_CSWlibzip5 += CSWlibbz2-1-0
+RUNTIME_DEP_PKGS_CSWlibzip5-sparc += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWlibzip5 += CSWlibnettle7
+RUNTIME_DEP_PKGS_CSWlibzip5 += CSWlibgnutls28
+RUNTIME_DEP_PKGS_CSWlibzip5 += CSWlibz1
+RUNTIME_DEP_PKGS_CSWlibzip5 += $(RUNTIME_DEP_PKGS_CSWlibzip5-$(GARCH))
+
+PACKAGES += CSWlibzip-dev
+SPKG_DESC_CSWlibzip-dev = Development files for libzip.so.5
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWlibzip-dev += CSWlibzip5
+
+PACKAGES += CSWlibzip-utils
+SPKG_DESC_CSWlibzip-utils = Utility programs shipped with libzip
+PKGFILES_CSWlibzip-utils += $(call baseisadirs,$(bindir),zipcmp)
+PKGFILES_CSWlibzip-utils += $(call baseisadirs,$(bindir),zipmerge)
+PKGFILES_CSWlibzip-utils += $(call baseisadirs,$(bindir),ziptool)
+PKGFILES_CSWlibzip-utils += $(mandir)/man1/.*
+RUNTIME_DEP_PKGS_CSWlibzip-utils += CSWlibzip5
+RUNTIME_DEP_PKGS_CSWlibzip-utils-sparc += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWlibzip-utils-sparc += CSWlibnettle7
+RUNTIME_DEP_PKGS_CSWlibzip-utils += CSWlibz1
+RUNTIME_DEP_PKGS_CSWlibzip-utils +=
$(RUNTIME_DEP_PKGS_CSWlibzip-utils-$(GARCH))
+
+BUILD64 = 1
+ISAEXEC = 1
+
+CONFIGURE_SCRIPTS = cmake
+
+BUILD_SCRIPTS = $(WORKSRC)/solaris/Makefile
+
+# The -DMAKE= is needed because docs generation uses $(MAKE) -C which the
default /usr/ccs/bin/make does not understand
+CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX:PATH=$(prefix)
+CMAKE_ARGS += -DCMAKE_INSTALL_BINDIR=$(bindir:$(prefix)/%=%)
+CMAKE_ARGS += -DCMAKE_INSTALL_LIBDIR=$(libdir:$(prefix)/%=%)
+CMAKE_ARGS += -DCMAKE_C_FLAGS="$(CFLAGS)"
+
+EXTRA_LINKER_FLAGS += -liconv
+
+TEST_SCRIPTS = $(WORKSRC)/solaris/Makefile
+
+INSTALL_SCRIPTS = $(WORKSRC)/solaris/Makefile
+
+include gar/category.mk
+
+configure-cmake:
+ mkdir $(WORKSRC)/solaris
+ #cd $(WORKSRC)/solaris && $(CONFIGURE_ENV) cmake
-DMAKE=/opt/csw/bin/gmake -Dbuild_doc=YES -DCMAKE_INSTALL_PREFIX:PATH=$(prefix)
-G 'Unix Makefiles' $(abspath $(WORKSRC))
+ cd $(WORKSRC)/solaris && $(CONFIGURE_ENV) cmake $(CMAKE_ARGS) $(abspath
$(WORKSRC))
+ @$(MAKECOOKIE)
Property changes on: csw/mgar/pkg/libzip/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: csw/mgar/pkg/libzip/trunk/checksums
===================================================================
--- csw/mgar/pkg/libzip/trunk/checksums (rev 0)
+++ csw/mgar/pkg/libzip/trunk/checksums 2019-07-23 17:44:33 UTC (rev 26562)
@@ -0,0 +1 @@
+f9dd38d273bcdec5d3d1498fe6684f42 libzip-1.5.2.tar.xz
Added: csw/mgar/pkg/libzip/trunk/files/0001-Fix-order-of-gnutls-includes.patch
===================================================================
--- csw/mgar/pkg/libzip/trunk/files/0001-Fix-order-of-gnutls-includes.patch
(rev 0)
+++ csw/mgar/pkg/libzip/trunk/files/0001-Fix-order-of-gnutls-includes.patch
2019-07-23 17:44:33 UTC (rev 26562)
@@ -0,0 +1,26 @@
+From 5c09ffa5f5e2668172757d04bafec16c2f406a2e Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <d...@opencsw.org>
+Date: Tue, 23 Jul 2019 13:23:58 +0200
+Subject: [PATCH] Fix order of gnutls includes
+
+---
+ lib/zip_crypto_gnutls.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/zip_crypto_gnutls.h b/lib/zip_crypto_gnutls.h
+index 40d34a5..9e06398 100644
+--- a/lib/zip_crypto_gnutls.h
++++ b/lib/zip_crypto_gnutls.h
+@@ -37,8 +37,8 @@
+ #include <nettle/aes.h>
+ #include <nettle/pbkdf2.h>
+
+-#include <gnutls/crypto.h>
+ #include <gnutls/gnutls.h>
++#include <gnutls/crypto.h>
+
+ typedef struct {
+ union {
+--
+2.4.0
+
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
