Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/crypto
In directory vz-cvs-3.sog:/tmp/cvs-serv3793

Modified Files:
        silc-toolkit.info silc-toolkit.patch 
Log Message:
maintainer-okayed overhaul of poor upstream build-system


Index: silc-toolkit.patch
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/crypto/silc-toolkit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- silc-toolkit.patch  1 Jul 2010 01:37:10 -0000       1.1
+++ silc-toolkit.patch  25 Aug 2011 18:40:58 -0000      1.2
@@ -1,12 +1,222 @@
-diff -ru silc-toolkit-1.1.2/lib/silcclient/client_entry.h 
silc-toolkit-1.1.2-patched/lib/silcclient/client_entry.h
---- silc-toolkit-1.1.2/lib/silcclient/client_entry.h   2007-07-04 
00:18:29.000000000 -0500
-+++ silc-toolkit-1.1.2-patched/lib/silcclient/client_entry.h   2007-08-03 
21:34:29.000000000 -0500
-@@ -54,7 +54,7 @@
-                                        SilcChannelID *channel_id);
- SilcBool silc_client_del_channel(SilcClient client, SilcClientConnection conn,
-                                SilcChannelEntry channel);
--bool silc_client_replace_channel_id(SilcClient client,
-+SilcBool silc_client_replace_channel_id(SilcClient client,
-                                   SilcClientConnection conn,
-                                   SilcChannelEntry channel,
-                                   SilcChannelID *new_id);
+diff -Nurd -x'*~' silc-toolkit-1.1.10.orig/configure.ac 
silc-toolkit-1.1.10/configure.ac
+--- silc-toolkit-1.1.10.orig/configure.ac      2009-08-07 07:51:30.000000000 
-0400
++++ silc-toolkit-1.1.10/configure.ac   2011-08-23 02:54:37.000000000 -0400
+@@ -598,7 +598,6 @@
+ compile_libs=true
+ LIBSUBDIR=lib
+ 
+-LDFLAGS="-L\$(silc_top_srcdir)/lib $LDFLAGS"
+ 
+ # SIM support checking
+ # XXX These needs to be changed as more supported platforms appear.
+diff -Nurd -x'*~' silc-toolkit-1.1.10.orig/lib/Makefile.am 
silc-toolkit-1.1.10/lib/Makefile.am
+--- silc-toolkit-1.1.10.orig/lib/Makefile.am   2011-08-23 02:33:27.000000000 
-0400
++++ silc-toolkit-1.1.10/lib/Makefile.am        2011-08-23 03:37:07.000000000 
-0400
+@@ -29,9 +29,9 @@
+ SILCLIB_DIRS =        contrib silccore        silcutil        silcapputil     
silccrypt       silcskr silcmath        silcsim silcasn1        silcske 
silchttp        silcsftp        silcvcard
+ if SILC_ENABLE_SHARED
+ if SILC_WIN32
+-LIBTOOL_OPTS= -release $(LIB_BASE_VERSION) -rpath $(DESTDIR)$(libdir) 
-export-dynamic -no-undefined
++LIBTOOL_OPTS= -release $(LIB_BASE_VERSION) -export-dynamic -no-undefined
+ else
+-LIBTOOL_OPTS= -release $(LIB_BASE_VERSION) -rpath $(DESTDIR)$(libdir)
++LIBTOOL_OPTS= -release $(LIB_BASE_VERSION) -no-undefined
+ endif
+ LIBTOOL_SILC_VERSION = -version-info 
$(LIBSILC_CURRENT):$(LIBSILC_REVISION):$(LIBSILC_AGE)
+ LIBTOOL_SILCCLIENT_VERSION = -version-info 
$(LIBSILCCLIENT_CURRENT):$(LIBSILCCLIENT_REVISION):$(LIBSILCCLIENT_AGE)
+@@ -43,53 +43,45 @@
+ LIBTOOL_SILCSERVER_VERSION =
+ endif
+ 
+-if SILC_WIN32
+ SILC_LINK_LIBS=$(LIBS)
+-SILCCLIENT_LINK_LIBS=$(LIBS) -lsilc
+-SILCSERVER_LIBS=$(LIBS) -lsilc
+-else
+-SILC_LINK_LIBS=
+-SILCCLIENT_LINK_LIBS=
+-SILCSERVER_LIBS=
+-endif
++SILCCLIENT_LINK_LIBS=$(LIBS) libsilc.la
++SILCSERVER_LIBS=$(LIBS) libsilc.la
+ 
+-SILCLIB = libsilc.a
+ 
+ # SILC Client Library dirs
+ SILCCLIENTLIB_DIRS = silcclient
+-SILCCLIENTLIB = libsilcclient.a
+ 
+ 
+ SUBDIRS = $(SILCLIB_DIRS) $(SILCSERVERLIB_DIRS) $(SILCCLIENTLIB_DIRS)
+ 
+-CLEANFILES = libsilc.a $(SILCCLIENTLIB) $(SILCSERVERLIB)
+-DISTCLEANFILES = libsilc.a $(SILCCLIENTLIB) $(SILCSERVERLIB)
+ 
+ remove:
+       -rm -f $(CLEANFILES)
+ 
+-all:
+-      $(MAKE) remove $(SILCLIB) $(SILCSERVERLIB) $(SILCCLIENTLIB)
+-
+-install-exec-hook:
+-      -mkdir -p $(DESTDIR)$(libdir)
+-      -$(LIBTOOL) --mode=install $(INSTALL) libsilc.la $(DESTDIR)$(libdir)/
+-      -$(LIBTOOL) --mode=install $(INSTALL) libsilcclient.la 
$(DESTDIR)$(libdir)/
+ 
+ LIB_BASE_VERSION=@LIB_BASE_VERSION@
+ LIBSILC_CURRENT=@LIBSILC_CURRENT@
+ LIBSILC_REVISION=@LIBSILC_REVISION@
+ LIBSILC_AGE=@LIBSILC_AGE@
+ 
+-libsilc.a:
+-      find $(SILCLIB_DIRS) -type f -name *.lo | xargs $(LIBTOOL) --mode=link 
$(CC) $(CFLAGS) $(LDFLAGS) $(SILC_LINK_LIBS)     $(LIBTOOL_SILC_VERSION) 
$(LIBTOOL_OPTS) -o libsilc.la
++if SILC_SIM
++silcsimlibs = silcsim/libsilcsim.la
++else
++silcsimlibs =
++endif
++lib_LTLIBRARIES = libsilc.la
++libsilc_la_LDFLAGS = $(LIBTOOL_SILC_VERSION) $(LIBTOOL_OPTS)
++libsilc_la_SOURCES =
++libsilc_la_LIBADD = contrib/libcontrib.la silccore/libsilccore.la 
silcutil/libsilcutil.la silcapputil/libsilcapputil.la silccrypt/libsilccrypt.la 
silcskr/libsilcskr.la silcmath/libsilcmath.la $(silcsimlibs) 
silcasn1/libsilcasn1.la silcske/libsilcske.la silchttp/libsilchttp.la 
silcsftp/libsilcsftp.la silcvcard/libsilcvcard.la $(SILC_LINK_LIBS)
+ 
+ LIBSILCCLIENT_CURRENT=@LIBSILCCLIENT_CURRENT@
+ LIBSILCCLIENT_REVISION=@LIBSILCCLIENT_REVISION@
+ LIBSILCCLIENT_AGE=@LIBSILCCLIENT_AGE@
+ 
+-libsilcclient.a:
+-      find $(SILCCLIENTLIB_DIRS) -type f -name *.lo | xargs   $(LIBTOOL) 
--mode=link $(CC) $(CFLAGS) $(LDFLAGS)       $(SILCCLIENT_LINK_LIBS) 
$(LIBTOOL_SILCCLIENT_VERSION)   $(LIBTOOL_OPTS) -o libsilcclient.la
++lib_LTLIBRARIES += libsilcclient.la
++libsilcclient_la_LDFLAGS = $(LIBTOOL_SILCCLIENT_VERSION) $(LIBTOOL_OPTS)
++libsilcclient_la_SOURCES =
++libsilcclient_la_LIBADD = silcclient/libsilcclient.la $(SILCCLIENT_LINK_LIBS)
+ 
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+diff -Nurd -x'*~' silc-toolkit-1.1.10.orig/lib/silc.pc.in 
silc-toolkit-1.1.10/lib/silc.pc.in
+--- silc-toolkit-1.1.10.orig/lib/silc.pc.in    2009-08-07 07:51:24.000000000 
-0400
++++ silc-toolkit-1.1.10/lib/silc.pc.in 2011-08-23 03:18:16.000000000 -0400
+@@ -6,6 +6,6 @@
+ Name: @PACKAGE@
+ Description: SILC Library
+ Version: @VERSION@
+-Libs: -L${libdir} -lsilc @LIBS@
++Libs: -L${libdir} -lsilc
+ Cflags: -I${includedir}
+ 
+diff -Nurd -x'*~' silc-toolkit-1.1.10.orig/lib/silcclient.pc.in 
silc-toolkit-1.1.10/lib/silcclient.pc.in
+--- silc-toolkit-1.1.10.orig/lib/silcclient.pc.in      2009-08-07 
07:51:26.000000000 -0400
++++ silc-toolkit-1.1.10/lib/silcclient.pc.in   2011-08-23 03:18:13.000000000 
-0400
+@@ -7,6 +7,6 @@
+ Description: SILC Client Library
+ Version: @VERSION@
+ Requires: silc = @VERSION@
+-Libs: -L${libdir} -lsilcclient @LIBS@
++Libs: -L${libdir} -lsilcclient
+ Cflags: -I${includedir}
+ 
+diff -Nurd -x'*~' silc-toolkit-1.1.10.orig/lib/silcserver.pc.in 
silc-toolkit-1.1.10/lib/silcserver.pc.in
+--- silc-toolkit-1.1.10.orig/lib/silcserver.pc.in      2009-08-07 
07:51:26.000000000 -0400
++++ silc-toolkit-1.1.10/lib/silcserver.pc.in   2011-08-23 03:18:09.000000000 
-0400
+@@ -8,6 +8,6 @@
+ Version: @VERSION@
+ Conflicts: libsilc <= 1.1
+ Requires: silc = @VERSION@
+-Libs: -L${libdir} -lsilcserver @LIBS@
++Libs: -L${libdir} -lsilcserver
+ Cflags: -I${includedir}
+ 
+diff -Nurd -x'*~' silc-toolkit-1.1.10.orig/lib/silcsim/Makefile.am 
silc-toolkit-1.1.10/lib/silcsim/Makefile.am
+--- silc-toolkit-1.1.10.orig/lib/silcsim/Makefile.am   2009-08-07 
07:51:24.000000000 -0400
++++ silc-toolkit-1.1.10/lib/silcsim/Makefile.am        2011-08-23 
05:00:13.000000000 -0400
+@@ -36,24 +36,29 @@
+ #
+ # SILC Ciphers to be compiled as modules
+ #
+-SIM_CIPHER_OBJS =        none.o        blowfish.o        aes.o        rsa.o   
     twofish.o
++SIM_CIPHER_MODS = none.sim.la blowfish.sim.la aes.sim.la rsa.sim.la 
twofish.sim.la
+ 
+ #
+ # SILC Hash Functions to be compiled as modules
+ #
+-SIM_HASH_OBJS =       md5.o   sha1.o  sha256.o
++SIM_HASH_MODS = md5.sim.la sha1.sim.la sha256.sim.la
+ 
+ if SILC_SIM
+-all: $(SIM_CIPHER_OBJS) $(SIM_HASH_OBJS)
++pkglib_LTLIBRARIES = $(SIM_CIPHER_MODS) $(SIM_HASH_MODS)
++pkglibdir = $(MODULESDIR)
+ endif
++AM_LDFLAGS = -module -avoid-version
+ 
+-$(SIM_CIPHER_OBJS):
+-      @if test '!' -f lib$*.la ; then   $(LIBTOOL) --mode=link $(CCLD) -rpath 
$(silc_modulesdir)              ../silccrypt/$*.lo -o lib$*.la $(LTFLAGS);      
  cd $(srcdir) && $(LN_S) -f $(srcdir)/.libs/lib$*.so           
$(srcdir)/$*.sim.so;    fi
++none_sim_la_SOURCES     = ../silccrypt/none.c
++blowfish_sim_la_SOURCES = ../silccrypt/blowfish.c
++aes_sim_la_SOURCES      = ../silccrypt/aes.c
++rsa_sim_la_SOURCES      = ../silccrypt/rsa.c
++twofish_sim_la_SOURCES  = ../silccrypt/twofish.c
+ 
+-$(SIM_HASH_OBJS):
+-      @if test '!' -f lib$*.la ; then   $(LIBTOOL) --mode=link $(CCLD) -rpath 
$(silc_modulesdir)              ../silccrypt/$*.lo -o lib$*.la $(LTFLAGS);      
  cd $(srcdir) && $(LN_S) -f $(srcdir)/.libs/lib$*.so           
$(srcdir)/$*.sim.so;    fi
++md5_sim_la_SOURCES      = ../silccrypt/md5.c
++sha1_sim_la_SOURCES     = ../silccrypt/sha1.c
++sha256_sim_la_SOURCES   = ../silccrypt/sha256.c
+ 
+-CLEANFILES = *.sim.so *.la
+ 
+ include_HEADERS = silcsim.h silcsimutil.h
+ 
+@@ -62,9 +67,11 @@
+ #
+ # Installation
+ #
+-install-data-hook:
+-      -mkdir -p $(modulesdir)
+-      -$(INSTALL_DATA) $(top_srcdir)/lib/silcsim/*.so $(modulesdir)/
++install-exec-hook:
++if SILC_SIM
++      find $(DESTDIR)$(pkglibdir) -name \*.la -delete
++      (cd $(DESTDIR)$(pkglibdir); for f in *.so; do ln -s $$f `echo $$f | sed 
's/\.so$$/.dylib/'`; done)
++endif
+ 
+ include $(top_srcdir)/Makefile.defines.in
+ 
+diff -Nurd -x'*~' silc-toolkit-1.1.10.orig/lib/silcutil/Makefile.am 
silc-toolkit-1.1.10/lib/silcutil/Makefile.am
+--- silc-toolkit-1.1.10.orig/lib/silcutil/Makefile.am  2009-08-07 
07:51:28.000000000 -0400
++++ silc-toolkit-1.1.10/lib/silcutil/Makefile.am       2011-08-23 
03:10:36.000000000 -0400
+@@ -27,11 +27,13 @@
+ 
+ if SILC_WIN32
+ SUBDIRS=win32
++libsilcutil_la_LIBADD = win32/libsilcwin32util.la
+ else
+ if SILC_SYMBIAN
+ SUBDIRS=symbian
+ else
+ SUBDIRS=unix
++libsilcutil_la_LIBADD = unix/libsilcunixutil.la
+ endif
+ endif
+ 
+diff -Nurd -x'*~' silc-toolkit-1.1.10.orig/tutorial/Makefile.defines.in 
silc-toolkit-1.1.10/tutorial/Makefile.defines.in
+--- silc-toolkit-1.1.10.orig/tutorial/Makefile.defines.in      2009-08-07 
07:51:23.000000000 -0400
++++ silc-toolkit-1.1.10/tutorial/Makefile.defines.in   2011-08-23 
03:16:53.000000000 -0400
+@@ -18,4 +18,4 @@
+ include ../Makefile.defines_int
+ 
+ INCLUDES = $(ADD_INCLUDES) $(SILC_CFLAGS) \
+-      -I./ -I/usr/local/silc/include -I$(silc_install_prefix)/include
++      -I./ -I$(silc_install_prefix)/include
+diff -Nurd -x'*~' silc-toolkit-1.1.10.orig/tutorial/Makefile.defines_int.in 
silc-toolkit-1.1.10/tutorial/Makefile.defines_int.in
+--- silc-toolkit-1.1.10.orig/tutorial/Makefile.defines_int.in  2009-08-07 
07:51:23.000000000 -0400
++++ silc-toolkit-1.1.10/tutorial/Makefile.defines_int.in       2011-08-23 
03:16:34.000000000 -0400
+@@ -17,7 +17,7 @@
+ 
+ silc_install_prefix=@prefix@
+ SILC_COMMON_LIBS= @LIBS@ -L$(silc_install_prefix)/lib \
+-      -L/usr/local/silc/lib -lsilc -lsilcclient -lsilc
++      -lsilc -lsilcclient -lsilc
+ SILC_CFLAGS=@CFLAGS@
+ CC=@CC@
+ LIBTOOL = @LIBTOOL@

Index: silc-toolkit.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/crypto/silc-toolkit.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- silc-toolkit.info   1 Jul 2010 01:37:10 -0000       1.1
+++ silc-toolkit.info   25 Aug 2011 18:40:58 -0000      1.2
@@ -1,76 +1,64 @@
 Package: silc-toolkit
 Version: 1.1.10
-Revision: 2
+Revision: 3
 Maintainer: Corey Halpin <chal...@cs.wisc.edu>
 Source: http://silcnet.org/download/toolkit/sources/%n-%v.tar.bz2
 Source-MD5: f742b64064c40a2d22520549746cf2b4
-Depends: glib-shlibs, %n-shlibs (= %v-%r)
-BuildDepends: glib
+Depends: %n-shlibs (= %v-%r)
+BuildDepends: <<
+       autoconf2.6, 
+       automake1.11,
+       fink (>= 0.28),
+       fink-package-precedence,
+       libiconv-dev,
+       libtool2
+<<
 BuildDependsOnly: True
-SetCFLAGS: -no-cpp-precomp
-SetCPPFLAGS: -I/usr/include
-SetLDFLAGS: -L/usr/lib
-#Patch: %n.patch
+PatchFile: %n.patch
+PatchFile-MD5: dc75ab67f103547c2374b3a63a7b7c9b
+PatchScript: <<
+       %{default_script}
+       find . -name Makefile.am | xargs perl -pi -e 's/ no-dependencies//'
+<<
 ConfigureParams: <<
  --with-iconv \
- --enable-shared \
+ --disable-static \
+ --enable-dependency-tracking \
  --datadir=%p/share/silc-toolkit \
  --includedir=%p/include/silc \
  --mandir=%p/share/man \
  --with-simdir=%p/lib/silc-toolkit/modules
 <<
 CompileScript: <<
+  autoreconf -fi
   ./configure %c
-  find . -name Makefile -exec perl -pi -e 's:\.so:.dylib:g' {} \;
   make
+  fink-package-precedence --prohibit-bdep=%n .
 <<
 InstallScript: <<
-  install -d -m 755 %i/share/silc-toolkit;
+  install -d -m 755 %i/share/silc-toolkit
   make -j1 install DESTDIR=%d
-  find %d -name \*.la -exec perl -pi -e 's:-L%b/lib::' {} \;
-  install_name_tool -id %p/lib/silc-toolkit/modules/aes.sim.dylib \
-                        %i/lib/silc-toolkit/modules/aes.sim.dylib
-  install_name_tool -id %p/lib/silc-toolkit/modules/blowfish.sim.dylib \
-                        %i/lib/silc-toolkit/modules/blowfish.sim.dylib
-  install_name_tool -id %p/lib/silc-toolkit/modules/md5.sim.dylib \
-                        %i/lib/silc-toolkit/modules/md5.sim.dylib
-  install_name_tool -id %p/lib/silc-toolkit/modules/none.sim.dylib \
-                        %i/lib/silc-toolkit/modules/none.sim.dylib
-  install_name_tool -id %p/lib/silc-toolkit/modules/rsa.sim.dylib \
-                        %i/lib/silc-toolkit/modules/rsa.sim.dylib
-  install_name_tool -id %p/lib/silc-toolkit/modules/sha1.sim.dylib \
-                        %i/lib/silc-toolkit/modules/sha1.sim.dylib
-  install_name_tool -id %p/lib/silc-toolkit/modules/sha256.sim.dylib \
-                        %i/lib/silc-toolkit/modules/sha256.sim.dylib
-  install_name_tool -id %p/lib/silc-toolkit/modules/twofish.sim.dylib \
-                        %i/lib/silc-toolkit/modules/twofish.sim.dylib
 <<
 SplitOff: <<
  Package: %N-shlibs
  Replaces: %N (<<0.9.12-2)
+ Depends: libiconv
  Files: <<
    lib/libsilc-1.1.2.dylib
    lib/libsilcclient-1.1.3.dylib
-   lib/silc-toolkit/modules/aes.sim.dylib
-   lib/silc-toolkit/modules/blowfish.sim.dylib
-   lib/silc-toolkit/modules/md5.sim.dylib
-   lib/silc-toolkit/modules/none.sim.dylib
-   lib/silc-toolkit/modules/rsa.sim.dylib
-   lib/silc-toolkit/modules/sha1.sim.dylib
-   lib/silc-toolkit/modules/sha256.sim.dylib
-   lib/silc-toolkit/modules/twofish.sim.dylib
+   lib/silc-toolkit/modules
  <<
  Shlibs: <<
   %p/lib/libsilc-1.1.2.dylib                     4.0.0 %n (>= 1.1.7-1)
   %p/lib/libsilcclient-1.1.3.dylib               4.0.0 %n (>= 1.1.7-1)
-  %p/lib/silc-toolkit/modules/aes.sim.dylib      1.0.0 %n (>= 1.1.10-2)
-  %p/lib/silc-toolkit/modules/blowfish.sim.dylib 1.0.0 %n (>= 1.1.10-2)
-  %p/lib/silc-toolkit/modules/md5.sim.dylib      1.0.0 %n (>= 1.1.10-2)
-  %p/lib/silc-toolkit/modules/none.sim.dylib     1.0.0 %n (>= 1.1.10-2)
-  %p/lib/silc-toolkit/modules/rsa.sim.dylib      1.0.0 %n (>= 1.1.10-2)
-  %p/lib/silc-toolkit/modules/sha1.sim.dylib     1.0.0 %n (>= 1.1.10-2)
-  %p/lib/silc-toolkit/modules/sha256.sim.dylib   1.0.0 %n (>= 1.1.10-2)
-  %p/lib/silc-toolkit/modules/twofish.sim.dylib  1.0.0 %n (>= 1.1.10-2)
+  !%p/lib/silc-toolkit/modules/aes.sim.dylib
+  !%p/lib/silc-toolkit/modules/blowfish.sim.dylib
+  !%p/lib/silc-toolkit/modules/md5.sim.dylib
+  !%p/lib/silc-toolkit/modules/none.sim.dylib
+  !%p/lib/silc-toolkit/modules/rsa.sim.dylib
+  !%p/lib/silc-toolkit/modules/sha1.sim.dylib
+  !%p/lib/silc-toolkit/modules/sha256.sim.dylib
+  !%p/lib/silc-toolkit/modules/twofish.sim.dylib
  <<
  DocFiles: COPYING
 <<
@@ -83,6 +71,22 @@
 DescPackaging: <<
 Headers moved into a "silc" subdirectory in the name of tidiness.
 <<
+DescPort: <<
+       dmacks (1.1.10-3) overhauled autotools use for generating libs
+       and modules (gets dependent-lib linking and dependencies
+       propagated correctly). Not fixing that modules' sources are
+       also compiled into lib directly.
+
+       Retaining .dylib->.so links for modules because the package
+       has always had that (filenames are specified at runtime by
+       user-controlled config files). TODO: have dlopen try .so
+       if passed .dylib filename doesn't exist.
+
+       modules/ dir is not included in docs for the config files and
+       is not used when trying to dlopen the modules. But darwin
+       doesn't have rpath searching either. TODO: have dlopen try
+       prepending MODULESDIR if passed filename doesn't exist.
+<<
 DescUsage: <<
 This package does not install headers into the standard default location.
 To build against this toolkit, use: -I%p/include/silc


------------------------------------------------------------------------------
EMC VNX: the world's simplest storage, starting under $10K
The only unified storage solution that offers unified management 
Up to 160% more powerful than alternatives and 25% more efficient. 
Guaranteed. http://p.sf.net/sfu/emc-vnx-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to