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

Sat Mar 27 16:38:41 CET 2010

Revision: 9400
          http://gar.svn.sourceforge.net/gar/?rev=9400&view=rev
Author:   chninkel
Date:     2010-03-27 15:38:41 +0000 (Sat, 27 Mar 2010)

Log Message:
-----------
lftp: switched to dynamic prototype

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

Removed Paths:
-------------
    csw/mgar/pkg/lftp/trunk/files/CSWlftp.prototype

Modified: csw/mgar/pkg/lftp/trunk/Makefile
===================================================================

--- csw/mgar/pkg/lftp/trunk/Makefile	2010-03-27 15:37:14 UTC (rev 9399)
+++ csw/mgar/pkg/lftp/trunk/Makefile	2010-03-27 15:38:41 UTC (rev 9400)
@@ -16,7 +16,7 @@
 GARVERSION = 4.0.6
 CATEGORIES = net
 
-DESCRIPTION = sophisticated command-line ftp/http client
+DESCRIPTION = A sophisticated command-line ftp/http client
 define BLURB
    lftp is a sophisticated command line based file transfer program. Supported protocols include FTP, HTTP, SFTP, and FISH. It has a multithreaded design allowing you to issue and execute multiple commands simultaneously or in the background. It also features mirroring capabilities and will reconnect and continue transfers in the event of a disconnection. Also, if you quit the program while transfers are still in progress, it will switch to nohup mode and finish the transfers in the background. Additional protocols supported: FTP over HTTP proxy, HTTPS and FTP over SSL. There are lots of tunable parameters, including rate limitation, number of connections limitation and more.
 endef
@@ -26,11 +26,7 @@
 
 RUNTIME_DEP_PKGS = CSWexpat CSWggettextrt CSWiconv CSWosslrt CSWreadline 
 
-# we're using conf handling class from the cswclassutils package
-RUNTIME_DEP_PKGS += CSWcswclassutils
-SPKG_CLASSES = none cswpreserveconf
 
-
 ###### Upstream and opencsw files information #######
 
 MASTER_SITES = http://ftp.yars.free.net/pub/source/lftp/
@@ -39,7 +35,6 @@
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
-DISTFILES += CSWlftp.prototype
 DISTFILES += changelog.CSW
 
 # do some type conversion before munmap call
@@ -56,6 +51,8 @@
 
 PATCHFILES += dont_use_csw_getopt_h.patch
 
+PRESERVECONF = /opt/csw/etc/lftp.conf
+
 ##### Build and installation information #####
 
 
@@ -69,7 +66,7 @@
 include gar/category.mk
 
 post-merge:
-	@ginstall -D $(PKGROOT)/$(sysconfdir)/lftp.conf $(PKGROOT)/$(sysconfdir)/lftp.conf.CSW
 	@ginstall -D $(DOWNLOADDIR)/changelog.CSW $(PKGROOT)/$(docdir)/lftp/changelog.CSW
+	@rm $(PKGROOT)/$(libdir)/charset.alias
 	@$(MAKECOOKIE)
 

Modified: csw/mgar/pkg/lftp/trunk/checksums
===================================================================
--- csw/mgar/pkg/lftp/trunk/checksums	2010-03-27 15:37:14 UTC (rev 9399)
+++ csw/mgar/pkg/lftp/trunk/checksums	2010-03-27 15:38:41 UTC (rev 9400)
@@ -1,5 +1,4 @@
-5bc881a13c106b1c97f2137ff1755817  CSWlftp.prototype
-9762d1259c88dd7dac2f9206a39e7cf5  changelog.CSW
+8d5bb5bcf431f9e256836bbfa95ea374  changelog.CSW
 a8baca88197dfe533c639c1fe866fa5c  dont_use_csw_getopt_h.patch
 42f31ca6b10d7bc4e9cd7408b476ee9b  lftp-4.0.6.tar.gz
 1a9dd9857cef5453fc14102dbc2e7713  sun_cc_no_restrict.patch

Deleted: csw/mgar/pkg/lftp/trunk/files/CSWlftp.prototype
===================================================================
--- csw/mgar/pkg/lftp/trunk/files/CSWlftp.prototype	2010-03-27 15:37:14 UTC (rev 9399)
+++ csw/mgar/pkg/lftp/trunk/files/CSWlftp.prototype	2010-03-27 15:38:41 UTC (rev 9400)
@@ -1,50 +0,0 @@
-f none /opt/csw/bin/lftp 0755 root bin
-f none /opt/csw/bin/lftpget 0755 root bin
-f cswpreserveconf /opt/csw/etc/lftp.conf.CSW 0644 root bin
-d none /opt/csw/lib/lftp 0755 root bin
-d none /opt/csw/share/doc/lftp 0755 root bin
-f none /opt/csw/share/doc/lftp/changelog.CSW 0644 root bin
-d none /opt/csw/share/lftp 0755 root bin
-f none /opt/csw/share/lftp/convert-netscape-cookies 0755 root bin
-f none /opt/csw/share/lftp/import-ncftp 0755 root bin
-f none /opt/csw/share/lftp/import-netscape 0755 root bin
-f none /opt/csw/share/lftp/verify-file 0755 root bin
-d none /opt/csw/share/locale/de 0755 root bin
-d none /opt/csw/share/locale/de/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/de/LC_MESSAGES/lftp.mo 0644 root bin
-d none /opt/csw/share/locale/es 0755 root bin
-d none /opt/csw/share/locale/es/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/es/LC_MESSAGES/lftp.mo 0644 root bin
-d none /opt/csw/share/locale/fr 0755 root bin
-d none /opt/csw/share/locale/fr/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/fr/LC_MESSAGES/lftp.mo 0644 root bin
-d none /opt/csw/share/locale/it 0755 root bin
-d none /opt/csw/share/locale/it/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/it/LC_MESSAGES/lftp.mo 0644 root bin
-d none /opt/csw/share/locale/ja 0755 root bin
-d none /opt/csw/share/locale/ja/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/ja/LC_MESSAGES/lftp.mo 0644 root bin
-d none /opt/csw/share/locale/ko 0755 root bin
-d none /opt/csw/share/locale/ko/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/ko/LC_MESSAGES/lftp.mo 0644 root bin
-d none /opt/csw/share/locale/pl 0755 root bin
-d none /opt/csw/share/locale/pl/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/pl/LC_MESSAGES/lftp.mo 0644 root bin
-d none /opt/csw/share/locale/pt_BR 0755 root bin
-d none /opt/csw/share/locale/pt_BR/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/pt_BR/LC_MESSAGES/lftp.mo 0644 root bin
-d none /opt/csw/share/locale/ru 0755 root bin
-d none /opt/csw/share/locale/ru/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/ru/LC_MESSAGES/lftp.mo 0644 root bin
-d none /opt/csw/share/locale/zh_CN 0755 root bin
-d none /opt/csw/share/locale/zh_CN/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/zh_CN/LC_MESSAGES/lftp.mo 0644 root bin
-d none /opt/csw/share/locale/zh_TW 0755 root bin
-d none /opt/csw/share/locale/zh_TW/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/zh_TW/LC_MESSAGES/lftp.mo 0644 root bin
-d none /opt/csw/share/man/man1 0755 root bin
-f none /opt/csw/share/man/man1/lftp.1 0644 root bin
-f none /opt/csw/share/man/man1/lftpget.1 0644 root bin
-i copyright=CSWlftp.copyright
-i depend=CSWlftp.depend
-i pkginfo=CSWlftp.pkginfo

Modified: csw/mgar/pkg/lftp/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/lftp/trunk/files/changelog.CSW	2010-03-27 15:37:14 UTC (rev 9399)
+++ csw/mgar/pkg/lftp/trunk/files/changelog.CSW	2010-03-27 15:38:41 UTC (rev 9400)
@@ -4,6 +4,9 @@
   * Applied sun_cc_no_restrict.patch to prevent the configure script
   from incorrectly thinking that Sun Studio 12 CC supports the __restrict__
   keyword.
+  * Applied dont_use_csw_getopt_h.patch to prevent lftp from using opencsw
+  getopt.h as it breaks the build.
+  * Switched to gar dynamic prototype.
 
  -- Yann Rouillard <yann at opencsw.org>  Fri, 26 Mar 2010 22:03:15 +0100
 


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