SF.net SVN: gar:[24582] csw/mgar/pkg
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Tue Jan 20 22:23:13 CET 2015
Revision: 24582
http://sourceforge.net/p/gar/code/24582
Author: dmichelsen
Date: 2015-01-20 21:23:13 +0000 (Tue, 20 Jan 2015)
Log Message:
-----------
libpsl/trunk: Initial commit
Added Paths:
-----------
csw/mgar/pkg/libpsl/
csw/mgar/pkg/libpsl/Makefile
csw/mgar/pkg/libpsl/branches/
csw/mgar/pkg/libpsl/tags/
csw/mgar/pkg/libpsl/trunk/
csw/mgar/pkg/libpsl/trunk/Makefile
csw/mgar/pkg/libpsl/trunk/checksums
csw/mgar/pkg/libpsl/trunk/files/
csw/mgar/pkg/libpsl/trunk/files/0001-Solaris-needs-lsocket-lnsl-for-inet_ntop.patch
csw/mgar/pkg/libpsl/trunk/files/0001-Use-GTK_DOC_USE_LIBTOOL.patch
Added: csw/mgar/pkg/libpsl/Makefile
===================================================================
--- csw/mgar/pkg/libpsl/Makefile (rev 0)
+++ csw/mgar/pkg/libpsl/Makefile 2015-01-20 21:23:13 UTC (rev 24582)
@@ -0,0 +1,2 @@
+%:
+ $(MAKE) -C trunk $*
Index: csw/mgar/pkg/libpsl/trunk
===================================================================
--- csw/mgar/pkg/libpsl/trunk 2015-01-20 14:47:31 UTC (rev 24581)
+++ csw/mgar/pkg/libpsl/trunk 2015-01-20 21:23:13 UTC (rev 24582)
Property changes on: csw/mgar/pkg/libpsl/trunk
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+work
Added: csw/mgar/pkg/libpsl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libpsl/trunk/Makefile (rev 0)
+++ csw/mgar/pkg/libpsl/trunk/Makefile 2015-01-20 21:23:13 UTC (rev 24582)
@@ -0,0 +1,50 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = libpsl
+VERSION = 0.6.2
+GARTYPE = v2
+
+DESCRIPTION = Brief description
+define BLURB
+ Long description
+endef
+
+MASTER_SITES = https://github.com/rockdaboot/libpsl/archive/
+DISTFILES += $(VERSION).tar.gz
+
+# Use patch until this is fixed:
+# https://github.com/rockdaboot/libpsl/issues/19
+#PATCHFILES += 0001-Use-GTK_DOC_USE_LIBTOOL.patch
+
+PATCHFILES += 0001-Solaris-needs-lsocket-lnsl-for-inet_ntop.patch
+
+PACKAGES += CSWlibpsl0
+SPKG_DESC_CSWlibpsl0 = Public Suffix List library, libpsl.so.0
+# PKGFILES is catchall
+
+PACKAGES += CSWlibpsl-dev
+SPKG_DESC_CSWlibpsl-dev = Development files for libpsl.so.0
+PKGFILES_CSWlibpsl-dev += $(PKGFILES_DEVEL)
+PKGFILES_CSWlibpsl-dev += $(bindir)/.*
+RUNTIME_DEP_PKGS_CSWlibpsl-dev += CSWlibicuuc52
+RUNTIME_DEP_PKGS_CSWlibpsl-dev += CSWlibpsl0
+
+BUILD64_LIBS_ONLY = 1
+
+CONFIGURE_ARGS = $(DIRPATHS)
+
+# This is needed for sha1sum
+BUILD_ENV_PATH = /opt/csw/gnu:$(PATH)
+
+include gar/category.mk
+
+post-patch:
+ cd $(WORKSRC) && ./autogen.sh
+ @$(MAKECOOKIE)
+
+post-install:
+ @# Remove directory until this is fixed:
+ @# https://github.com/rockdaboot/libpsl/issues/21
+ rmdir $(DESTDIR)/libpsl
+ @$(MAKECOOKIE)
Property changes on: csw/mgar/pkg/libpsl/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: csw/mgar/pkg/libpsl/trunk/checksums
===================================================================
--- csw/mgar/pkg/libpsl/trunk/checksums (rev 0)
+++ csw/mgar/pkg/libpsl/trunk/checksums 2015-01-20 21:23:13 UTC (rev 24582)
@@ -0,0 +1 @@
+635982e26375a4d2737771fe985b056f 0.6.2.tar.gz
Added: csw/mgar/pkg/libpsl/trunk/files/0001-Solaris-needs-lsocket-lnsl-for-inet_ntop.patch
===================================================================
--- csw/mgar/pkg/libpsl/trunk/files/0001-Solaris-needs-lsocket-lnsl-for-inet_ntop.patch (rev 0)
+++ csw/mgar/pkg/libpsl/trunk/files/0001-Solaris-needs-lsocket-lnsl-for-inet_ntop.patch 2015-01-20 21:23:13 UTC (rev 24582)
@@ -0,0 +1,46 @@
+From 8315319044b92330fb9ce0c9fd78a97892e9d024 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 20 Jan 2015 20:21:55 +0100
+Subject: [PATCH] Solaris needs -lsocket -lnsl for inet_ntop
+
+---
+ configure.ac | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index da9936c..af6525c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -28,6 +28,9 @@ GTK_DOC_CHECK([1.15],[--flavour no-tmpl])
+ ],[
+ AM_CONDITIONAL([ENABLE_GTK_DOC], false)
+ ])
++m4_ifdef([GTK_DOC_USE_LIBTOOL], [], [
++AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], false)
++])
+
+ #
+ # enable creation of man pages
+@@ -171,6 +174,19 @@ AM_CONDITIONAL([BUILTIN_GENERATOR_LIBIDN2], test "x$enable_builtin" = "xlibidn2"
+ AM_CONDITIONAL([BUILTIN_GENERATOR_LIBIDN], test "x$enable_builtin" = "xlibidn")
+ AM_CONDITIONAL([WITH_BUILTIN], test $enable_builtin = yes)
+
++# Solaris has socket in libsocket and inet_ntop in libnsl, but also needs libsocket, so the order is important here
++AC_CHECK_LIB([socket], [socket], [NEEDS_SOCKET=yes], [])
++if test -n "$NEEDS_SOCKET" ; then
++ AC_CHECK_LIB([nsl], [inet_ntop], [NEEDS_NSL=yes], [])
++fi
++if test -n "$NEEDS_SOCKET" && test -n "$NEEDS_NSL" ; then
++ LIBS="$LIBS -lsocket -lnsl"
++elif test -n "$NEEDS_SOCKET" ; then
++ LIBS="$LIBS -lsocket"
++elif test -n "$NEEDS_NSL" ; then
++ LIBS="$LIBS -lnsl"
++fi
++
+ # Check for valgrind
+ ac_enable_valgrind=no
+ AC_ARG_ENABLE(valgrind-tests,
+--
+2.2.1
+
Added: csw/mgar/pkg/libpsl/trunk/files/0001-Use-GTK_DOC_USE_LIBTOOL.patch
===================================================================
--- csw/mgar/pkg/libpsl/trunk/files/0001-Use-GTK_DOC_USE_LIBTOOL.patch (rev 0)
+++ csw/mgar/pkg/libpsl/trunk/files/0001-Use-GTK_DOC_USE_LIBTOOL.patch 2015-01-20 21:23:13 UTC (rev 24582)
@@ -0,0 +1,26 @@
+From 9b4689bad0183bd155cb57b512aad9de693e8884 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 20 Jan 2015 15:39:53 +0100
+Subject: [PATCH] Use GTK_DOC_USE_LIBTOOL
+
+---
+ configure.ac | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index da9936c..c04ccb7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -28,6 +28,9 @@ GTK_DOC_CHECK([1.15],[--flavour no-tmpl])
+ ],[
+ AM_CONDITIONAL([ENABLE_GTK_DOC], false)
+ ])
++m4_ifdef([GTK_DOC_USE_LIBTOOL], [], [
++AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], false)
++])
+
+ #
+ # enable creation of man pages
+--
+2.2.1
+
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