Author: qboosh Date: Sun Mar 27 17:42:06 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 3.2.5
- updated kame,DESTDIR,shared patches, added ac patch (autoheader fixes for
kame)
---- Files affected:
packages/ncftp:
ncftp-DESTDIR.patch (1.6 -> 1.7) , ncftp-shared.patch (1.7 -> 1.8) ,
ncftp.spec (1.88 -> 1.89) , ncftp-ac.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/ncftp/ncftp-DESTDIR.patch
diff -u packages/ncftp/ncftp-DESTDIR.patch:1.6
packages/ncftp/ncftp-DESTDIR.patch:1.7
--- packages/ncftp/ncftp-DESTDIR.patch:1.6 Tue Apr 6 23:24:40 2010
+++ packages/ncftp/ncftp-DESTDIR.patch Sun Mar 27 19:42:00 2011
@@ -1,5 +1,5 @@
---- ncftp-3.2.2/libncftp/Makefile.in.orig 2008-08-19 06:44:17.000000000
+0200
-+++ ncftp-3.2.2/libncftp/Makefile.in 2008-08-27 19:38:09.914117548 +0200
+--- ncftp-3.2.5/libncftp/Makefile.in.orig 2009-11-30 19:32:47.000000000
+0100
++++ ncftp-3.2.5/libncftp/Makefile.in 2011-03-27 15:53:37.145736435 +0200
@@ -6,6 +6,7 @@
PKGNAME=libncftp
VERSION=@LIBNCFTP_VERSION@
@@ -8,41 +8,41 @@
@SET_MAKE@
CC=@CC@
-@@ -66,24 +66,24 @@
- -@/bin/ls -l $(LIBSOS) $(LIBSO)
+@@ -76,24 +77,24 @@
+ -@$(LIST) $(LIBSOS) $(LIBSO)
soinstall: $(LIBSO)
-- [ -d "$(PREFIX)/lib" ] || mkdir -m 755 -p "$(PREFIX)/lib"
-- [ -d "$(PREFIX)/include" ] || mkdir -m 755 -p "$(PREFIX)/include"
-- cp $(LIBSO) $(PREFIX)/lib/$(LIBSO)
-- ( cd $(PREFIX)/lib ; /bin/rm -f $(LIBSOS) ; /bin/ln -s $(LIBSO)
$(LIBSOS) )
-- cp ncftp.h ncftp_errno.h $(PREFIX)/include
+- [ -d "$(PREFIX)/lib" ] || $(MKDIR) "$(PREFIX)/lib"
+- [ -d "$(PREFIX)/include" ] || $(MKDIR) "$(PREFIX)/include"
+- $(COPY) $(LIBSO) $(PREFIX)/lib/$(LIBSO)
+- ( cd $(PREFIX)/lib ; $(DELETE) $(LIBSOS) ; $(SYMLINK) $(LIBSO)
$(LIBSOS) )
+- $(COPY) ncftp.h ncftp_errno.h $(PREFIX)/include
- -chmod a+r $(PREFIX)/lib/$(LIBSO) $(PREFIX)/include/ncftp.h
$(PREFIX)/include/ncftp_errno.h
-- -@/bin/ls -ld $(PREFIX)/lib/$(LIBSO)
-+ [ -d "$(DESTDIR)$(LIBDIR)" ] || mkdir -m 755 -p "$(DESTDIR)$(LIBDIR)"
-+ [ -d "$(DESTDIR)/$(PREFIX)/include" ] || mkdir -m 755 -p
"$(DESTDIR)/$(PREFIX)/include"
-+ cp $(LIBSO) $(DESTDIR)$(LIBDIR)/$(LIBSO)
-+ ( cd $(DESTDIR)$(LIBDIR) ; /bin/rm -f $(LIBSOS) ; /bin/ln -s $(LIBSO)
$(LIBSOS) )
-+ cp ncftp.h ncftp_errno.h $(DESTDIR)/$(PREFIX)/include
-+ -chmod a+r $(DESTDIR)$(LIBDIR)/$(LIBSO)
$(DESTDIR)/$(PREFIX)/include/ncftp.h $(DESTDIR)/$(PREFIX)/include/ncftp_errno.h
-+ -@/bin/ls -ld $(DESTDIR)$(LIBDIR)/$(LIBSO)
+- -@$(LIST) $(PREFIX)/lib/$(LIBSO)
++ [ -d "$(DESTDIR)$(LIBDIR)" ] || $(MKDIR) "$(DESTDIR)$(LIBDIR)"
++ [ -d "$(DESTDIR)$(PREFIX)/include" ] || $(MKDIR)
"$(DESTDIR)$(PREFIX)/include"
++ $(COPY) $(LIBSO) $(DESTDIR)$(LIBDIR)/$(LIBSO)
++ ( cd $(DESTDIR)$(LIBDIR) ; $(DELETE) $(LIBSOS) ; $(SYMLINK) $(LIBSO)
$(LIBSOS) )
++ $(COPY) ncftp.h ncftp_errno.h $(DESTDIR)$(PREFIX)/include
++ -chmod a+r $(DESTDIR)$(LIBDIR)/$(LIBSO)
$(DESTDIR)$(PREFIX)/include/ncftp.h $(DESTDIR)$(PREFIX)/include/ncftp_errno.h
++ -@$(LIST) $(DESTDIR)$(LIBDIR)/$(LIBSO)
-@echo
-@echo "Make sure that your dynamic loader searches for the directory
$(PREFIX)/lib."
-@echo "For example, edit /etc/ld.so.conf accordingly if your system
uses ld.so."
install: $(LIB)
-- [ -d "$(PREFIX)/lib" ] || mkdir -m 755 -p "$(PREFIX)/lib"
-- [ -d "$(PREFIX)/include" ] || mkdir -m 755 -p "$(PREFIX)/include"
-- cp $(LIB) $(PREFIX)/lib/$(LIB)
+- [ -d "$(PREFIX)/lib" ] || $(MKDIR) "$(PREFIX)/lib"
+- [ -d "$(PREFIX)/include" ] || $(MKDIR) "$(PREFIX)/include"
+- $(COPY) $(LIB) $(PREFIX)/lib/$(LIB)
- -@@RANLIB@ $(PREFIX)/lib/$(LIB)
-- cp ncftp.h ncftp_errno.h $(PREFIX)/include
+- $(COPY) ncftp.h ncftp_errno.h $(PREFIX)/include
- -chmod a+r $(LIB) $(PREFIX)/lib/$(LIB) $(PREFIX)/include/ncftp.h
$(PREFIX)/include/ncftp_errno.h
-+ [ -d "$(DESTDIR)$(LIBDIR)" ] || mkdir -m 755 -p "$(DESTDIR)$(LIBDIR)"
-+ [ -d "$(DESTDIR)/$(PREFIX)/include" ] || mkdir -m 755 -p
"$(DESTDIR)/$(PREFIX)/include"
-+ cp $(LIB) $(DESTDIR)$(LIBDIR)/$(LIB)
++ [ -d "$(DESTDIR)$(LIBDIR)" ] || $(MKDIR) "$(DESTDIR)$(LIBDIR)"
++ [ -d "$(DESTDIR)$(PREFIX)/include" ] || $(MKDIR)
"$(DESTDIR)$(PREFIX)/include"
++ $(COPY) $(LIB) $(DESTDIR)$(LIBDIR)/$(LIB)
+ -@@RANLIB@ $(DESTDIR)$(LIBDIR)/$(LIB)
-+ cp ncftp.h ncftp_errno.h $(DESTDIR)/$(PREFIX)/include
-+ -chmod a+r $(LIB) $(DESTDIR)$(LIBDIR)/$(LIB)
$(DESTDIR)/$(PREFIX)/include/ncftp.h $(DESTDIR)/$(PREFIX)/include/ncftp_errno.h
++ $(COPY) ncftp.h ncftp_errno.h $(DESTDIR)$(PREFIX)/include
++ -chmod a+r $(LIB) $(DESTDIR)$(LIBDIR)/$(LIB)
$(DESTDIR)$(PREFIX)/include/ncftp.h $(DESTDIR)$(PREFIX)/include/ncftp_errno.h
( cd ../sio ; $(MAKE) "PREFIX=$(PREFIX)" install)
( cd ../Strn ; $(MAKE) "PREFIX=$(PREFIX)" install_min )
================================================================
Index: packages/ncftp/ncftp-shared.patch
diff -u packages/ncftp/ncftp-shared.patch:1.7
packages/ncftp/ncftp-shared.patch:1.8
--- packages/ncftp/ncftp-shared.patch:1.7 Fri Aug 25 19:58:21 2006
+++ packages/ncftp/ncftp-shared.patch Sun Mar 27 19:42:00 2011
@@ -20,30 +20,30 @@
@Z30@
@CCDV@$(CC) $(CFLAGS) $(DEFS) $(CPPFLAGS) $(OBJS) -o
../bin/ncftp@EXEEXT@ $(LDFLAGS) -lncftp -lStrn -lsio $(LIBS)
-@$(STRIP) ../bin/ncftp@EXEEXT@
---- ncftp-3.1.5/sh_util/Makefile.in.orig Sun Dec 23 20:44:22 2001
-+++ ncftp-3.1.5/sh_util/Makefile.in Sun Mar 30 22:20:02 2003
+--- ncftp-3.2.5/sh_util/Makefile.in.orig 2010-04-05 23:39:00.000000000
+0200
++++ ncftp-3.2.5/sh_util/Makefile.in 2011-03-27 15:56:19.605729730 +0200
@@ -25,19 +25,19 @@
all: $(DPROGS)
-@echo 'Done making NcFTP shell utilities.'
--../bin/ncftpget@EXEEXT@: ncftpget.c gpshare.@OBJEXT@ preffw.@OBJEXT@
spoolutil.@OBJEXT@ util.@OBJEXT@ gl_getline.@OBJEXT@ version.@OBJEXT@ gpshare.h
syshdrs.h ../ncftp/util.h ../ncftp/pref.h ../ncftp/spool.h ../libncftp/ncftp.h
../libncftp/ncftp_errno.h ../libncftp/libncftp.a
-+../bin/ncftpget@EXEEXT@: ncftpget.c gpshare.@OBJEXT@ preffw.@OBJEXT@
spoolutil.@OBJEXT@ util.@OBJEXT@ gl_getline.@OBJEXT@ version.@OBJEXT@ gpshare.h
syshdrs.h ../ncftp/util.h ../ncftp/pref.h ../ncftp/spool.h ../libncftp/ncftp.h
../libncftp/ncftp_errno.h ../libncftp/libncftp.so
- @CCDV@$(CC) $(CFLAGS) $(DEFS) $(CPPFLAGS) gpshare.@OBJEXT@
preffw.@OBJEXT@ spoolutil.@OBJEXT@ util.@OBJEXT@ gl_getline.@OBJEXT@
version.@OBJEXT@ ncftpget.c -o ../bin/ncftpget@EXEEXT@ $(LDFLAGS) -lncftp
-lStrn -lsio $(LIBS)
+-../bin/ncftpget@EXEEXT@: ncftpget.c gpshare.@OBJEXT@ bookmark.@OBJEXT@
preffw.@OBJEXT@ spoolutil.@OBJEXT@ util.@OBJEXT@ gl_getline.@OBJEXT@
version.@OBJEXT@ gpshare.h syshdrs.h ../ncftp/util.h ../ncftp/pref.h
../ncftp/spool.h ../libncftp/ncftp.h ../libncftp/ncftp_errno.h
../libncftp/libncftp.a
++../bin/ncftpget@EXEEXT@: ncftpget.c gpshare.@OBJEXT@ bookmark.@OBJEXT@
preffw.@OBJEXT@ spoolutil.@OBJEXT@ util.@OBJEXT@ gl_getline.@OBJEXT@
version.@OBJEXT@ gpshare.h syshdrs.h ../ncftp/util.h ../ncftp/pref.h
../ncftp/spool.h ../libncftp/ncftp.h ../libncftp/ncftp_errno.h
../libncftp/libncftp.so
+ @CCDV@$(CC) $(CFLAGS) $(DEFS) $(CPPFLAGS) gpshare.@OBJEXT@
bookmark.@OBJEXT@ preffw.@OBJEXT@ spoolutil.@OBJEXT@ util.@OBJEXT@
gl_getline.@OBJEXT@ version.@OBJEXT@ ncftpget.c -o ../bin/ncftpget@EXEEXT@
$(LDFLAGS) -lncftp -lStrn -lsio $(LIBS)
-@$(STRIP) ../bin/ncftpget@EXEEXT@
--../bin/ncftpput@EXEEXT@: ncftpput.c gpshare.@OBJEXT@ preffw.@OBJEXT@
spoolutil.@OBJEXT@ util.@OBJEXT@ gl_getline.@OBJEXT@ version.@OBJEXT@ gpshare.h
syshdrs.h ../ncftp/util.h ../ncftp/pref.h ../ncftp/spool.h ../libncftp/ncftp.h
../libncftp/ncftp_errno.h ../libncftp/libncftp.a
-+../bin/ncftpput@EXEEXT@: ncftpput.c gpshare.@OBJEXT@ preffw.@OBJEXT@
spoolutil.@OBJEXT@ util.@OBJEXT@ gl_getline.@OBJEXT@ version.@OBJEXT@ gpshare.h
syshdrs.h ../ncftp/util.h ../ncftp/pref.h ../ncftp/spool.h ../libncftp/ncftp.h
../libncftp/ncftp_errno.h ../libncftp/libncftp.so
- @CCDV@$(CC) $(CFLAGS) $(DEFS) $(CPPFLAGS) gpshare.@OBJEXT@
preffw.@OBJEXT@ spoolutil.@OBJEXT@ util.@OBJEXT@ gl_getline.@OBJEXT@
version.@OBJEXT@ ncftpput.c -o ../bin/ncftpput@EXEEXT@ $(LDFLAGS) -lncftp
-lStrn -lsio $(LIBS)
+-../bin/ncftpput@EXEEXT@: ncftpput.c gpshare.@OBJEXT@ bookmark.@OBJEXT@
preffw.@OBJEXT@ spoolutil.@OBJEXT@ util.@OBJEXT@ gl_getline.@OBJEXT@
version.@OBJEXT@ gpshare.h syshdrs.h ../ncftp/util.h ../ncftp/pref.h
../ncftp/spool.h ../libncftp/ncftp.h ../libncftp/ncftp_errno.h
../libncftp/libncftp.a
++../bin/ncftpput@EXEEXT@: ncftpput.c gpshare.@OBJEXT@ bookmark.@OBJEXT@
preffw.@OBJEXT@ spoolutil.@OBJEXT@ util.@OBJEXT@ gl_getline.@OBJEXT@
version.@OBJEXT@ gpshare.h syshdrs.h ../ncftp/util.h ../ncftp/pref.h
../ncftp/spool.h ../libncftp/ncftp.h ../libncftp/ncftp_errno.h
../libncftp/libncftp.so
+ @CCDV@$(CC) $(CFLAGS) $(DEFS) $(CPPFLAGS) gpshare.@OBJEXT@
bookmark.@OBJEXT@ preffw.@OBJEXT@ spoolutil.@OBJEXT@ util.@OBJEXT@
gl_getline.@OBJEXT@ version.@OBJEXT@ ncftpput.c -o ../bin/ncftpput@EXEEXT@
$(LDFLAGS) -lncftp -lStrn -lsio $(LIBS)
-@$(STRIP) ../bin/ncftpput@EXEEXT@
--../bin/ncftpls@EXEEXT@: ncftpls.c gpshare.@OBJEXT@ preffw.@OBJEXT@
util.@OBJEXT@ gl_getline.@OBJEXT@ version.@OBJEXT@ gpshare.h syshdrs.h
../ncftp/util.h ../ncftp/pref.h ../libncftp/ncftp.h ../libncftp/ncftp_errno.h
../libncftp/libncftp.a
-+../bin/ncftpls@EXEEXT@: ncftpls.c gpshare.@OBJEXT@ preffw.@OBJEXT@
util.@OBJEXT@ gl_getline.@OBJEXT@ version.@OBJEXT@ gpshare.h syshdrs.h
../ncftp/util.h ../ncftp/pref.h ../libncftp/ncftp.h ../libncftp/ncftp_errno.h
../libncftp/libncftp.so
- @CCDV@$(CC) $(CFLAGS) $(DEFS) $(CPPFLAGS) gpshare.@OBJEXT@
preffw.@OBJEXT@ util.@OBJEXT@ gl_getline.@OBJEXT@ version.@OBJEXT@ ncftpls.c -o
../bin/ncftpls@EXEEXT@ $(LDFLAGS) -lncftp -lStrn -lsio $(LIBS)
+-../bin/ncftpls@EXEEXT@: ncftpls.c gpshare.@OBJEXT@ bookmark.@OBJEXT@
preffw.@OBJEXT@ util.@OBJEXT@ gl_getline.@OBJEXT@ version.@OBJEXT@ gpshare.h
syshdrs.h ../ncftp/util.h ../ncftp/pref.h ../libncftp/ncftp.h
../libncftp/ncftp_errno.h ../libncftp/libncftp.a
++../bin/ncftpls@EXEEXT@: ncftpls.c gpshare.@OBJEXT@ bookmark.@OBJEXT@
preffw.@OBJEXT@ util.@OBJEXT@ gl_getline.@OBJEXT@ version.@OBJEXT@ gpshare.h
syshdrs.h ../ncftp/util.h ../ncftp/pref.h ../libncftp/ncftp.h
../libncftp/ncftp_errno.h ../libncftp/libncftp.so
+ @CCDV@$(CC) $(CFLAGS) $(DEFS) $(CPPFLAGS) gpshare.@OBJEXT@
bookmark.@OBJEXT@ preffw.@OBJEXT@ util.@OBJEXT@ gl_getline.@OBJEXT@
version.@OBJEXT@ ncftpls.c -o ../bin/ncftpls@EXEEXT@ $(LDFLAGS) -lncftp -lStrn
-lsio $(LIBS)
-@$(STRIP) ../bin/ncftpls@EXEEXT@
--../bin/ncftpbatch@EXEEXT@: ncftpbatch.c preffw.@OBJEXT@ util.@OBJEXT@
spoolutil.@OBJEXT@ version.@OBJEXT@ gpshare.@OBJEXT@ ../ncftp/util.h
../ncftp/pref.h ../ncftp/spool.h gpshare.h syshdrs.h ../libncftp/ncftp.h
../libncftp/ncftp_errno.h ../libncftp/libncftp.a
-+../bin/ncftpbatch@EXEEXT@: ncftpbatch.c preffw.@OBJEXT@ util.@OBJEXT@
spoolutil.@OBJEXT@ version.@OBJEXT@ gpshare.@OBJEXT@ ../ncftp/util.h
../ncftp/pref.h ../ncftp/spool.h gpshare.h syshdrs.h ../libncftp/ncftp.h
../libncftp/ncftp_errno.h ../libncftp/libncftp.so
- @CCDV@$(CC) $(CFLAGS) $(DEFS) $(CPPFLAGS) preffw.@OBJEXT@ util.@OBJEXT@
spoolutil.@OBJEXT@ version.@OBJEXT@ gpshare.@OBJEXT@ ncftpbatch.c -o
../bin/ncftpbatch@EXEEXT@ $(LDFLAGS) -lncftp -lStrn -lsio $(LIBS)
+-../bin/ncftpbatch@EXEEXT@: ncftpbatch.c preffw.@OBJEXT@ util.@OBJEXT@
spoolutil.@OBJEXT@ version.@OBJEXT@ gpshare.@OBJEXT@ bookmark.@OBJEXT@
../ncftp/util.h ../ncftp/pref.h ../ncftp/spool.h gpshare.h syshdrs.h
../libncftp/ncftp.h ../libncftp/ncftp_errno.h ../libncftp/libncftp.a
++../bin/ncftpbatch@EXEEXT@: ncftpbatch.c preffw.@OBJEXT@ util.@OBJEXT@
spoolutil.@OBJEXT@ version.@OBJEXT@ gpshare.@OBJEXT@ bookmark.@OBJEXT@
../ncftp/util.h ../ncftp/pref.h ../ncftp/spool.h gpshare.h syshdrs.h
../libncftp/ncftp.h ../libncftp/ncftp_errno.h ../libncftp/libncftp.so
+ @CCDV@$(CC) $(CFLAGS) $(DEFS) $(CPPFLAGS) preffw.@OBJEXT@ util.@OBJEXT@
spoolutil.@OBJEXT@ version.@OBJEXT@ gpshare.@OBJEXT@ bookmark.@OBJEXT@
ncftpbatch.c -o ../bin/ncftpbatch@EXEEXT@ $(LDFLAGS) -lncftp -lStrn -lsio
$(LIBS)
-@$(STRIP) ../bin/ncftpbatch@EXEEXT@
-@( cd ../bin ; rm -f ncftpspooler@EXEEXT@ ; ln -s ncftpbatch@EXEEXT@
ncftpspooler@EXEEXT@ )
--- ncftp-3.1.5/vis/Makefile.in.orig Sun Dec 23 20:44:25 2001
================================================================
Index: packages/ncftp/ncftp.spec
diff -u packages/ncftp/ncftp.spec:1.88 packages/ncftp/ncftp.spec:1.89
--- packages/ncftp/ncftp.spec:1.88 Sat Jan 29 01:07:03 2011
+++ packages/ncftp/ncftp.spec Sun Mar 27 19:42:00 2011
@@ -1,26 +1,30 @@
# $Revision$, $Date$
+# NOTE: update kame patch to use val_getaddrinfo() when/if enabling DNSSEC
verification
Summary: Browser program for the File Transfer Protocol
Summary(de.UTF-8): NcFTP - ein Textmodus FTP-Client
Summary(es.UTF-8): Cliente FTP con una interface agradable
Summary(pl.UTF-8): Zaawansowany klient FTP
Summary(pt_BR.UTF-8): Cliente FTP com uma interface agradável
Name: ncftp
-Version: 3.2.3
+Version: 3.2.5
Release: 1
Epoch: 2
License: The Clarified Artistic License
Group: Applications/Networking
Source0: ftp://ftp.ncftp.com/ncftp/%{name}-%{version}-src.tar.bz2
-# Source0-md5: fac4aa169e1734e8d9617afd4a9b51e5
+# Source0-md5: b05c7a6d5269c04891f02f43d4312b30
Source1: %{name}.desktop
Source2: %{name}.png
Source3: ncftpbookmarks.1
-Source4: ftp://ftp.kame.net/pub/kame/misc/ncftp-323-v6-20091109.diff.gz
+# not updated yet, replaced by patch4
+#Source4: ftp://ftp.kame.net/pub/kame/misc/ncftp-323-v6-20091109.diff.gz
# Source4-md5: 9120dcbb0fceacb5174d01024b0ba5a5
Patch0: %{name}-DESTDIR.patch
Patch1: %{name}-shared.patch
Patch2: %{name}-ac25x.patch
Patch3: %{name}-home_etc.patch
+Patch4: %{name}-kame-v6.patch
+Patch5: %{name}-ac.patch
URL: http://www.ncftp.com/
BuildRequires: autoconf >= 2.53
BuildRequires: ncurses-devel >= 5.0
@@ -51,15 +55,19 @@
%prep
%setup -q
-gunzip -c %{SOURCE4} | patch -p1
+#gunzip -c %{SOURCE4} | patch -p1
+%patch4 -p1
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch5 -p1
%build
-%configure2_13 \
- --enable-ncurses \
+%{__autoconf} -I autoconf_local
+%{__autoheader} -I autoconf_local
+CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses"
+%configure \
--enable-ipv6
%{__make}
@@ -105,6 +113,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.89 2011/03/27 17:42:00 qboosh
+- updated to 3.2.5
+- updated kame,DESTDIR,shared patches, added ac patch (autoheader fixes for
kame)
+
Revision 1.88 2011/01/29 00:07:03 sparky
- dropped pre-cvs changelog
================================================================
Index: packages/ncftp/ncftp-ac.patch
diff -u /dev/null packages/ncftp/ncftp-ac.patch:1.1
--- /dev/null Sun Mar 27 19:42:06 2011
+++ packages/ncftp/ncftp-ac.patch Sun Mar 27 19:42:00 2011
@@ -0,0 +1,57 @@
+--- ncftp-3.2.5/configure.in.orig 2011-03-27 15:57:04.305737273 +0200
++++ ncftp-3.2.5/configure.in 2011-03-27 16:00:02.729737273 +0200
+@@ -42,7 +42,7 @@
+
+ dnl Try to use PATH rather than hardcode the installation path, if possible.
+ if test "${prefix-NONE}" != "NONE" && test "$prefix" != "/usr/local" && test
"$prefix" != "/usr"; then
+- AC_DEFINE_UNQUOTED(PREFIX_BINDIR, "$prefix/bin")
++ AC_DEFINE_UNQUOTED(PREFIX_BINDIR, "$prefix/bin", [bin directory])
+ fi
+
+
+@@ -152,7 +152,7 @@
+ ipv6=no
+ ;;
+ *) AC_MSG_RESULT(yes)
+- AC_DEFINE(ENABLE_IPV6)
++ AC_DEFINE(ENABLE_IPV6,,[Define if you want IPv6 support.])
+ ipv6=yes
+ ;;
+ esac ],
+@@ -179,13 +179,13 @@
+ ))
+
+ AC_CHECK_FUNC(getaddrinfo, [
+- AC_DEFINE(HAVE_GETADDRINFO)], [
++ AC_DEFINE(HAVE_GETADDRINFO,,[Define if you have the getaddrinfo
function.])], [
+ AC_LIBOBJ([getaddrinfo])
+ LIBSOBJS="$LIBSOBJS getaddrinfo.so"
+ ])
+
+ AC_CHECK_FUNC(getnameinfo, [
+- AC_DEFINE(HAVE_GETNAMEINFO)], [
++ AC_DEFINE(HAVE_GETNAMEINFO,,[Define if you have the getaddrname
function.])], [
+ AC_LIBOBJ([getnameinfo])
+ LIBSOBJS="$LIBSOBJS getnameinfo.so"
+ ])
+@@ -197,7 +197,7 @@
+ [struct sockaddr x;
+ x.sa_len = 0;],
+ AC_MSG_RESULT(yes)
+- AC_DEFINE(HAVE_SOCKADDR_SA_LEN),
++ AC_DEFINE(HAVE_SOCKADDR_SA_LEN,,[Define if sockaddr has sa_len
member]),
+ AC_MSG_RESULT(no))
+
+ # check if sockaddr_storage has ss_family member
+@@ -207,9 +207,9 @@
+ [struct sockaddr_storage x;
+ x.__ss_family = 0;],
+ AC_MSG_RESULT(yes)
+- AC_DEFINE(HAVE_SOCKADDR_STORAGE_SS_FAMILY),
++ AC_DEFINE(HAVE_SOCKADDR_STORAGE_SS_FAMILY,,[Define if sockaddr_storage
has ss_family member]),
+ AC_MSG_RESULT(no)
+- AC_DEFINE(HAVE_SOCKADDR_STORAGE___SS_FAMILY)
++ AC_DEFINE(HAVE_SOCKADDR_STORAGE___SS_FAMILY,,[Define if
sockaddr_storage has __ss_family member])
+ CPPFLAGS="$CPPFLAGS -D__ss_family=ss_family -D__ss_len=ss_len")
+
+ CPPFLAGS="-I$MAINDIR $CPPFLAGS"
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ncftp/ncftp-DESTDIR.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ncftp/ncftp-shared.patch?r1=1.7&r2=1.8&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ncftp/ncftp.spec?r1=1.88&r2=1.89&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
