SF.net SVN: gar:[22619] csw/mgar/pkg/lftp/trunk

chninkel at users.sourceforge.net chninkel at users.sourceforge.net
Fri Nov 29 22:16:48 CET 2013


Revision: 22619
          http://gar.svn.sourceforge.net/gar/?rev=22619&view=rev
Author:   chninkel
Date:     2013-11-29 21:16:48 +0000 (Fri, 29 Nov 2013)
Log Message:
-----------
lftp/trunk: Remove patch dont_use_csw_getopt_h.patch that is not required anymore

Modified Paths:
--------------
    csw/mgar/pkg/lftp/trunk/Makefile
    csw/mgar/pkg/lftp/trunk/files/changelog.CSW

Removed Paths:
-------------
    csw/mgar/pkg/lftp/trunk/files/dont_use_csw_getopt_h.patch

Modified: csw/mgar/pkg/lftp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lftp/trunk/Makefile	2013-11-29 20:50:07 UTC (rev 22618)
+++ csw/mgar/pkg/lftp/trunk/Makefile	2013-11-29 21:16:48 UTC (rev 22619)
@@ -50,8 +50,6 @@
 # (patch only mandatory to compile with gnutls)
 #PATCHFILES = munmap.patch
 
-PATCHFILES += dont_use_csw_getopt_h.patch
-
 # Update the system-wide lftp.conf path in the man page
 PATCHFILES += 0007-update-configuration-files-paths-in-documentation.patch
 
@@ -89,9 +87,9 @@
 include gar/category.mk
 
 # we re-run autoconf because we patched a m4 file
-pre-configure-modulated:
-	cd $(WORKSRC) && autoconf
-	@$(MAKECOOKIE)
+#pre-configure-modulated:
+#	cd $(WORKSRC) && autoconf
+#	@$(MAKECOOKIE)
 
 post-merge:
 	@ginstall -D $(DOWNLOADDIR)/changelog.CSW $(PKGROOT)/$(docdir)/lftp/changelog.CSW

Modified: csw/mgar/pkg/lftp/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/lftp/trunk/files/changelog.CSW	2013-11-29 20:50:07 UTC (rev 22618)
+++ csw/mgar/pkg/lftp/trunk/files/changelog.CSW	2013-11-29 21:16:48 UTC (rev 22619)
@@ -1,6 +1,7 @@
 lftp (4.4.13,REV=2013.11.29) unstable
 
   * New upstream release.
+  * Removed patch dont_use_csw_getopt_h.patch that is not required anymore
 
  -- Yann Rouillard <yann at opencsw.org>  Fri, 29 Nov 2013 21:34:50 +0100
 

Deleted: csw/mgar/pkg/lftp/trunk/files/dont_use_csw_getopt_h.patch
===================================================================
--- csw/mgar/pkg/lftp/trunk/files/dont_use_csw_getopt_h.patch	2013-11-29 20:50:07 UTC (rev 22618)
+++ csw/mgar/pkg/lftp/trunk/files/dont_use_csw_getopt_h.patch	2013-11-29 21:16:48 UTC (rev 22619)
@@ -1,26 +0,0 @@
---- lftp-4.0.6/m4/getopt.m4.orig	Sat Mar 27 14:36:10 2010
-+++ lftp-4.0.6/m4/getopt.m4	Sat Mar 27 14:39:57 2010
-@@ -57,7 +57,7 @@
-   gl_CHECK_NEXT_HEADERS([getopt.h])
-   AC_CHECK_HEADERS_ONCE([getopt.h])
-   if test $ac_cv_header_getopt_h = yes; then
--    HAVE_GETOPT_H=1
-+    HAVE_GETOPT_H=0
-   else
-     HAVE_GETOPT_H=0
-   fi
-@@ -67,12 +67,12 @@
- 
-   dnl Test whether <getopt.h> is available.
-   if test -z "$gl_replace_getopt" && test $gl_getopt_required = GNU; then
--    AC_CHECK_HEADERS([getopt.h], [], [gl_replace_getopt=yes])
-+    AC_CHECK_HEADERS([getopt.h], [gl_replace_getopt=yes], [gl_replace_getopt=yes])
-   fi
- 
-   dnl Test whether the function getopt_long is available.
-   if test -z "$gl_replace_getopt" && test $gl_getopt_required = GNU; then
--    AC_CHECK_FUNCS([getopt_long_only], [], [gl_replace_getopt=yes])
-+    AC_CHECK_FUNCS([getopt_long_only], [gl_replace_getopt=yes], [gl_replace_getopt=yes])
-   fi
- 
-   dnl BSD getopt_long uses an incompatible method to reset option processing.

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