[csw-devel] SF.net SVN: gar:[15194] csw/mgar/pkg/lftp/trunk

[chninkel at users.sourceforge.net]

Revision: 15194
          http://gar.svn.sourceforge.net/gar/?rev=15194&view=rev
Author:   chninkel
Date:     2011-07-23 00:16:17 +0000 (Sat, 23 Jul 2011)

Log Message:
-----------
lftp: some Makefile cleanup

Modified Paths:
--------------
    csw/mgar/pkg/lftp/trunk/Makefile

Removed Paths:
-------------
    csw/mgar/pkg/lftp/trunk/files/0006-no-ipv6_v6only-setsock-option-under-solaris-9.patch

Modified: csw/mgar/pkg/lftp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lftp/trunk/Makefile	2011-07-22 23:25:24 UTC (rev 15193)
+++ csw/mgar/pkg/lftp/trunk/Makefile	2011-07-23 00:16:17 UTC (rev 15194)
@@ -22,7 +22,6 @@
 endef
 
 PACKAGES = CSWlftp
-CATALOGNAME_CSWlftp = lftp
 
 RUNTIME_DEP_PKGS = CSWexpat
 RUNTIME_DEP_PKGS += CSWiconv
@@ -31,11 +30,6 @@
 RUNTIME_DEP_PKGS += CSWlibintl8
 RUNTIME_DEP_PKGS += CSWlibreadline6
 
-
-# Reference to configuration file default path for configure, can be safely ignored
-CHECKPKG_OVERRIDES_CSWlftp += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/lftp.1
-
-
 ###### Upstream and opencsw files information #######
 
 MASTER_SITES = http://ftp.yars.free.net/pub/source/lftp/
@@ -57,12 +51,10 @@
 
 PATCHFILES += dont_use_csw_getopt_h.patch
 
-# Add a --disable-ipv6 option to configure so we can disable ipv6 support
-# under Solaris 9 and workaround "IPV6_V6ONLY symbole missing" issue
-# see http://wiki.opencsw.org/porting-faq#toc14
-#PATCHFILES += disable_ipv6_configure_option.patch
-
-# Disable the use of IPV6_V6ONLY
+# Disable the use of IPV6_V6ONLY function
+# It is not mandatory here, lftp uses the option for the torrent listen socket
+# it opens a socket first for ipv4 then for ipv6, so the ipv6 one will never
+# catch the ipv4 connection even if IPV6_V6ONLY can't be set
 PATCHFILES += 0006-no-ipv6_v6only-setsock-option-under-solaris-9.patch
 
 # sun should not be used as a variable as sun is a macro under Solaris
@@ -72,42 +64,29 @@
 PATCHFILES += sun_len_definition.patch
 
 PRESERVECONF = $(sysconfdir)/lftp.conf
-
 MIGRATE_FILES_CSWlftp = lftp.conf
 
+MERGE_EXCLUDE_FILES  = .*/charset.alias
+
 ##### Build and installation information #####
 
-# We build solaris 10 specific version to be able to enable
-# ipv6 support on these platforms
-# see http://wiki.opencsw.org/porting-faq#toc14
-#PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386                                        
-#PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
-
-# to support shared /opt/csw setup
-# see http://wiki.opencsw.org/shared-opt-csw-setup
-localstatedir   = /var$(prefix)
-sysconfdir      = /etc$(prefix)
-
 # We don't want Sun Studio RPATH entries
 # see http://wiki.opencsw.org/checkpkg-error-tags#bad-rpath-entry
 EXTRA_LINKER_FLAGS = -norunpath
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-# Solaris 9 does not have IPV6_V6ONLY.
-# IPv6 support only works on Solaris 10.
-CONFIGURE_ARGS_5.9 = --disable-ipv6
-CONFIGURE_ARGS_5.10 = --enable-ipv6
-CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GAROSREL))
-
 # previous maintainer compiled with openssl
 # instead of gnutls, no need to change that
 CONFIGURE_ARGS += --without-gnutls --with-openssl=/opt/csw
 # Requested see https://www.opencsw.org/mantis/view.php?id=4481
 CONFIGURE_ARGS += --with-socksdante
 
+# No test suite here
 TEST_SCRIPTS =
 
+
+
 include gar/category.mk
 
 # we re-run autoconf because we patched a m4 file
@@ -117,6 +96,5 @@
 
 post-merge:
 	@ginstall -D $(DOWNLOADDIR)/changelog.CSW $(PKGROOT)/$(docdir)/lftp/changelog.CSW
-	@rm $(PKGROOT)/$(libdir)/charset.alias
 	@$(MAKECOOKIE)
 

Deleted: csw/mgar/pkg/lftp/trunk/files/0006-no-ipv6_v6only-setsock-option-under-solaris-9.patch
===================================================================
--- csw/mgar/pkg/lftp/trunk/files/0006-no-ipv6_v6only-setsock-option-under-solaris-9.patch	2011-07-22 23:25:24 UTC (rev 15193)
+++ csw/mgar/pkg/lftp/trunk/files/0006-no-ipv6_v6only-setsock-option-under-solaris-9.patch	2011-07-23 00:16:17 UTC (rev 15194)
@@ -1,25 +0,0 @@
-From 4dcd1af03e96e63ea860b8da1a3845f94c85b4a0 Mon Sep 17 00:00:00 2001
-From: Yann Rouillard <yann at pleiades.fr.eu.org>
-Date: Fri, 22 Jul 2011 23:26:04 +0200
-Subject: [PATCH] no ipv6_v6only setsock option under solaris 9
-
----
- src/network.cc |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/network.cc b/src/network.cc
-index fc7b407..e5af45a 100644
---- a/src/network.cc
-+++ b/src/network.cc
-@@ -285,7 +285,7 @@ int Networker::SocketAccept(int fd,sockaddr_u *u,const char *hostname)
- 
- void Networker::SocketSinglePF(int s,int pf)
- {
--#if INET6
-+#if INET6 && IPV6_V6ONLY
-    if(pf==PF_INET6) {
-       int on = 1;
-       if(-1==setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, (char *)&on, sizeof(on)))
--- 
-1.7.6
-


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