Author: ranger
Date: Thu Oct 8 21:21:43 2009
New Revision: 1635
URL:
<http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1635&repname=user%3a+ranger>
Log:
gadu updates and stuff
Added:
trunk/experimental/10.4/main/finkinfo/libs/libgadu3-dev.info
trunk/experimental/3rdparty/10.4/main/finkinfo/libs/perlmods/test-harness-pm-10.6.info
trunk/experimental/common/main/finkinfo/libs/libgadu3-dev.info
Modified:
trunk/experimental/10.4/crypto/finkinfo/kdenetwork4-mac.info
trunk/experimental/10.4/crypto/finkinfo/kdenetwork4-x11.info
trunk/experimental/10.4/main/finkinfo/kde/kdenetwork3.info
trunk/experimental/10.4/main/finkinfo/net/ekg-unified.info
trunk/experimental/10.4/main/finkinfo/net/ekg-unified.patch
trunk/experimental/3rdparty/10.4/main/finkinfo/libs/perlmods/test-harness-pm.info
trunk/experimental/common/crypto/finkinfo/kdenetwork4.info.in
trunk/experimental/common/main/finkinfo/kde/kdenetwork3.info
trunk/experimental/common/main/finkinfo/net/ekg-unified.info
trunk/experimental/common/main/finkinfo/net/ekg-unified.patch
trunk/experimental/generate-infofiles.pl
Modified: trunk/experimental/10.4/crypto/finkinfo/kdenetwork4-mac.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/crypto/finkinfo/kdenetwork4-mac.info&rev=1635&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/crypto/finkinfo/kdenetwork4-mac.info (original)
+++ trunk/experimental/10.4/crypto/finkinfo/kdenetwork4-mac.info Thu Oct 8
21:21:43 2009
@@ -18,7 +18,7 @@
cmake (>= 2.6.3-1),
blitz-%type_pkg[kde]-dev,
dbus-dev (>= 1.2.12-1),
- ekg-unified-dev (>= 1.6-1030),
+ libgadu3-dev,
fink (>= 0.29.7-1),
fontconfig2-dev (>= 2.4.1-1),
freetype219 (>= 2.3.7-7),
@@ -150,7 +150,7 @@
Description: KDE4 - instant messenger client
Depends: <<
blitz-%type_pkg[kde]-shlibs,
- ekg-unified-shlibs (>= 1.6-1030),
+ libgadu3-shlibs,
libmeanwhile-shlibs,
libmsn-0.1-shlibs,
libotr-shlibs,
Modified: trunk/experimental/10.4/crypto/finkinfo/kdenetwork4-x11.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/crypto/finkinfo/kdenetwork4-x11.info&rev=1635&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/crypto/finkinfo/kdenetwork4-x11.info (original)
+++ trunk/experimental/10.4/crypto/finkinfo/kdenetwork4-x11.info Thu Oct 8
21:21:43 2009
@@ -19,7 +19,7 @@
cmake (>= 2.6.3-1),
blitz-%type_pkg[kde]-dev,
dbus-dev (>= 1.2.12-1),
- ekg-unified-dev (>= 1.6-1030),
+ libgadu3-dev,
fink (>= 0.29.7-1),
fontconfig2-dev (>= 2.4.1-1),
freetype219 (>= 2.3.7-7),
@@ -151,7 +151,7 @@
Description: KDE4 - instant messenger client
Depends: <<
blitz-%type_pkg[kde]-shlibs,
- ekg-unified-shlibs (>= 1.6-1030),
+ libgadu3-shlibs,
libmeanwhile-shlibs,
libmsn-0.1-shlibs,
libotr-shlibs,
Modified: trunk/experimental/10.4/main/finkinfo/kde/kdenetwork3.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/kdenetwork3.info&rev=1635&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/kdenetwork3.info (original)
+++ trunk/experimental/10.4/main/finkinfo/kde/kdenetwork3.info Thu Oct 8
21:21:43 2009
@@ -22,7 +22,7 @@
arts-dev (>= 1.5.10-1),
autoconf (>= 2.63-1),
cctools-single-module,
- ekg-unified-dev,
+ libgadu3-dev,
expat1,
fink (>= 0.29.7-1),
freetype219 (>= 2.3.7-7),
@@ -1171,7 +1171,7 @@
Depends: <<
%N-common (>= %v-%r),
bind9-ssl-shlibs | bind9-shlibs,
- ekg-unified-shlibs,
+ libgadu3-shlibs,
glib-shlibs,
gtk+-shlibs,
xmms-shlibs (>= 1.2.7-3)
Added: trunk/experimental/10.4/main/finkinfo/libs/libgadu3-dev.info
URL:
<http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/10.4/main/finkinfo/libs/libgadu3-dev.info&rev=1635&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/libs/libgadu3-dev.info (added)
+++ trunk/experimental/10.4/main/finkinfo/libs/libgadu3-dev.info Thu Oct 8
21:21:43 2009
@@ -1,0 +1,57 @@
+Info4: <<
+Package: libgadu3-dev
+Version: 1.8.2
+Revision: 1
+Description: Gadu-Gadu IM dev
+License: GPL/LGPL
+Maintainer: Benjamin Reed <libga...@fink.racoonfink.com>
+
+Depends: libgadu3-shlibs (>= %v-%r)
+BuildDepends: <<
+ system-openssl-dev,
+ fink (>= 0.29.7-1),
+ pkgconfig (>= 0.1-1),
+ bind9-ssl-dev | bind9-dev
+<<
+Replaces: <<
+ ekg-dev (<< 1.8-1),
+ ekg-ssl-dev (<< 1.8-1),
+ ekg-unified-dev (<< 1.8-1)
+<<
+BuildDependsOnly: true
+
+Source: http://toxygen.net/libgadu/files/libgadu-%v.tar.gz
+Source-MD5: 1090f82f8a1bb99e9cdf5853188f625f
+PatchScript: perl -pi -e 's/-Wl,-z,defs//g' configure
+
+SetCFLAGS: -Os -I%p/lib/system-openssl/include
+SetLDFLAGS: -L%p/lib/system-openssl/lib
+ConfigureParams: --with-pthread --disable-dependency-tracking
+CompileScript: <<
+#!/bin/sh -ex
+
+ export
PKG_CONFIG_PATH="%p/lib/system-openssl/lib/pkgconfig:$PKG_CONFIG_PATH"
+ export lt_cv_sys_max_cmd_len=65536
+ ./configure %c
+ make
+<<
+
+InstallScript: make install DESTDIR=%d
+DocFiles: AUTHORS COPYING ChangeLog NEWS README
+SplitOff: <<
+ Package: libgadu3-shlibs
+ Description: Gadu-Gadu IM runtime lib
+ Depends: bind9-ssl-shlibs | bind9-shlibs
+ Replaces: <<
+ ekg-shlibs (<< 1.8-1),
+ ekg-ssl-shlibs (<< 1.8-1),
+ ekg-unified-shlibs (<< 1.8-1)
+ <<
+ DocFiles: COPYING README
+ Files: lib/libgadu.*.dylib
+ Shlibs: %p/lib/libgadu.3.dylib 13.0.0 %v (>= 1.8.2-1)
+<<
+
+Homepage: http://toxygen.net/libgadu/
+<<
+
Modified: trunk/experimental/10.4/main/finkinfo/net/ekg-unified.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/net/ekg-unified.info&rev=1635&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/net/ekg-unified.info (original)
+++ trunk/experimental/10.4/main/finkinfo/net/ekg-unified.info Thu Oct 8
21:21:43 2009
@@ -1,19 +1,20 @@
Package: ekg-unified
-Version: 1.6
-Revision: 1029
+Version: 1.7
+Revision: 1
Description: Gadu-Gadu program
License: GPL/LGPL
Maintainer: Benjamin Reed <e...@fink.racoonfink.com>
Depends: <<
- %N-shlibs (>= %v-%r),
+ libgadu3-shlibs,
libjpeg-shlibs,
readline5-shlibs (>= 5.0-1004),
libncurses5-shlibs (>= 5.4-20041023-1006),
- bind9-ssl-shlibs | bind9-shlibs
+ libbind6
<<
BuildDepends: <<
gsm,
+ libgadu3-dev,
libjpeg,
libtool14,
libncurses5 (>= 5.4-20041023-1006),
@@ -22,135 +23,131 @@
sed,
fink (>= 0.29.7-1),
pkgconfig,
- bind9-ssl-dev | bind9-dev
+ libbind6-dev,
+ fink (>= 0.29.7-1)
<<
Replaces: <<
ekg (<< %v-%r),
ekg-ssl (<< %v-%r)
<<
-CustomMirror: <<
- eur-PL: http://dev.null.pl/ekg
- nam-US: http://ranger.befunk.com/fink
- nam-US: http://astrange.ithinksw.net/~astrange/ranger-fink
- nam-CA: http://www.southofheaven.net/befunk
-<<
-Source: mirror:custom:ekg-%v.tar.gz
-Source-MD5: 1094eee5062d9b9900c4b28bd68fb564
-SourceDirectory: ekg-%v
-Patch: %n.patch
+Source: http://ekg.chmurka.net/ekg-%v.tar.gz
+Source-MD5: 2aa92b56517fdf09d75519a105772b74
+PatchFile: %n.patch
+PatchFile-MD5: 53051dbbe8c4e5b8f3c0c790df0a72e2
SetCFLAGS: -Os -I%p/lib/system-openssl/include
SetLDFLAGS: -L%p/lib/system-openssl/lib
SetMAKEFLAGS: -j1
NoSetMAKEFLAGS: true
-ConfigureParams: --enable-dynamic --enable-shared --enable-ui-readline
--enable-ui-ncurses --with-ncurses=%p --with-readline=%p --with-libgsm
--with-python=no --with-openssl --with-pthread --disable-ioctld
--sysconfdir=%p/etc --mandir=%p/share/man --disable-dependency-tracking
+ConfigureParams: --enable-aspell --enable-dynamic --enable-shared
--enable-ui-readline --enable-ui-ncurses --with-ncurses=%p --with-readline=%p
--with-libgsm --with-python=no --with-openssl --enable-libgadu-openssl
--with-pthread --disable-ioctld --sysconfdir=%p/etc --mandir=%p/share/man
--disable-dependency-tracking
CompileScript: <<
#!/bin/sh -ex
- export PKG_CONFIG_PATH="%p/lib/system-openssl/lib/pkgconfig:$PKG_CONFIG_PATH"
- export lt_cv_sys_max_cmd_len=65536
+ export
PKG_CONFIG_PATH="%p/lib/system-openssl/lib/pkgconfig:$PKG_CONFIG_PATH"
+ export lt_cv_sys_max_cmd_len=65536
# export ac_cv_path_PYTHON=%p/bin/python2.5
- ./configure %c
+ ./configure %c
+ make
<<
InstallScript: <<
#!/bin/sh -ex
- make install DESTDIR=%d
- mkdir -p %i/share/doc/%n
- pushd docs
- tar -cf - . | (cd %i/share/doc/%n; tar -xf -)
- popd
- rm -Rf %i/share/doc/%n/CVS/
- rm -Rf %i/share/doc/%n/api/CVS/
+ make install DESTDIR=%d
+ mkdir -p %i/share/doc/%n
+ pushd docs
+ tar -cf - . | (cd %i/share/doc/%n; tar -xf -)
+ popd
+ rm -Rf %i/share/doc/%n/CVS/
+ rm -Rf %i/share/doc/%n/api/CVS/
+
+ install -d -m 755 "%i/share/doc/installed-packages"
+ touch "%i/share/doc/installed-packages/ekg"
+ touch "%i/share/doc/installed-packages/ekg-ssl"
+ touch "%i/share/doc/installed-packages/ekg-dev"
+ touch "%i/share/doc/installed-packages/ekg-ssl-dev"
+ touch "%i/share/doc/installed-packages/ekg-unified-dev"
+ touch "%i/share/doc/installed-packages/ekg-shlibs"
+ touch "%i/share/doc/installed-packages/ekg-ssl-shlibs"
+ touch "%i/share/doc/installed-packages/ekg-unified-shlibs"
<<
DocFiles: ChangeLog* lib/COPYING
SplitOff: <<
Package: %N-dev
- Description: headers and development libraries for ekg
- Depends: %N (= %v-%r)
- Replaces: <<
- ekg-dev (<< %v-%r),
- ekg-ssl-dev (<< %v-%r),
- ekg-ssl (<< %v-%r),
- ekg (<< %v-%r)
+ Description: Compatibility dev package
+ Depends: <<
+ libgadu3-dev,
+ fink-obsolete-packages
<<
BuildDependsOnly: true
- DocFiles: ChangeLog* lib/COPYING
- Files: <<
- include
- lib/libgadu.dylib
- lib/*.la
- lib/*.a
- lib/pkgconfig
- <<
+ Files: share/doc/installed-packages/%n
<<
SplitOff2: <<
Package: %N-shlibs
- Description: shared libraries for ekg
- Depends: bind9-ssl-shlibs | bind9-shlibs
- Replaces: <<
- ekg-shlibs (<< %v-%r),
- ekg-ssl-shlibs (<< %v-%r)
+ Description: Compatibility shared lib package
+ Depends: <<
+ libgadu3-shlibs,
+ fink-obsolete-packages
<<
- DocFiles: ChangeLog* lib/COPYING
- Files: lib
- Shlibs: %p/lib/libgadu.3.dylib 4.0.0 %N-shlibs (>= 1.6-3)
+ BuildDependsOnly: true
+ Files: share/doc/installed-packages/%n
<<
SplitOff3: <<
Package: ekg
- Description: Upgrade package for ekg
+ Description: Compatibility binary package
Depends: <<
- %N (= %v-%r),
+ %N (>= %v-%r),
fink-obsolete-packages
<<
- DocFiles: ChangeLog* lib/COPYING
+ Files: share/doc/installed-packages/%n
<<
SplitOff4: <<
Package: ekg-shlibs
- Description: Upgrade package for ekg-shlibs
+ Description: Compatibility shared lib package
Depends: <<
- %N-shlibs (= %v-%r),
+ libgadu3-shlibs,
fink-obsolete-packages
<<
- DocFiles: ChangeLog* lib/COPYING
+ Files: share/doc/installed-packages/%n
<<
SplitOff5: <<
Package: ekg-dev
- Description: Upgrade package for ekg-dev
+ Description: Compatibility dev package
Depends: <<
- %N-dev (= %v-%r),
+ libgadu3-dev,
fink-obsolete-packages
<<
- DocFiles: ChangeLog* lib/COPYING
+ BuildDependsOnly: true
+ Files: share/doc/installed-packages/%n
<<
SplitOff6: <<
Package: ekg-ssl
- Description: Upgrade package for ekg-ssl
+ Description: Compatibility binary package
Depends: <<
- %N (= %v-%r),
+ %N (>= %v-%r),
fink-obsolete-packages
<<
- DocFiles: ChangeLog* lib/COPYING
+ Files: share/doc/installed-packages/%n
<<
SplitOff7: <<
Package: ekg-ssl-shlibs
- Description: Upgrade package for ekg-ssl-shlibs
+ Description: Compatibility shared lib package
Depends: <<
- %N-shlibs (= %v-%r),
+ libgadu3-shlibs,
fink-obsolete-packages
<<
- DocFiles: ChangeLog* lib/COPYING
+ Files: share/doc/installed-packages/%n
<<
SplitOff8: <<
Package: ekg-ssl-dev
- Description: Upgrade package for ekg-ssl-dev
+ Description: Compatibility dev package
Depends: <<
- %N-dev (= %v-%r),
+ libgadu3-dev,
fink-obsolete-packages
<<
- DocFiles: ChangeLog* lib/COPYING
+ BuildDependsOnly: true
+ Files: share/doc/installed-packages/%n
<<
-Homepage: http://dev.null.pl/ekg/
+Homepage: http://ekg.chmurka.net
Modified: trunk/experimental/10.4/main/finkinfo/net/ekg-unified.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/net/ekg-unified.patch&rev=1635&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/net/ekg-unified.patch (original)
+++ trunk/experimental/10.4/main/finkinfo/net/ekg-unified.patch Thu Oct 8
21:21:43 2009
@@ -1,7 +1,37 @@
-diff -uNr ekg-1.6/configure ekg-1.6-new/configure
---- ekg-1.6/configure 2005-10-29 15:37:31.000000000 -0400
-+++ ekg-1.6-new/configure 2008-08-11 15:14:44.000000000 -0400
-@@ -4312,7 +4312,7 @@
+diff -Nurd ekg-1.7/Makefile.in ekg-1.7-patched/Makefile.in
+--- ekg-1.7/Makefile.in 2006-08-05 11:46:21.000000000 -0400
++++ ekg-1.7-patched/Makefile.in 2009-10-08 14:44:47.000000000 -0400
+@@ -15,7 +15,7 @@
+
+ #
+
+-all: configure libgadu @ekg@ @make_ekgwap@
++all: configure @ekg@ @make_ekgwap@
+
+ libgadu:
+ cd lib && $(MAKE) all
+@@ -31,7 +31,7 @@
+
+ #
+
+-dep: dep-libgadu @dep_ekg@
++dep: @dep_ekg@
+
+ dep-libgadu:
+ cd lib && $(MAKE) dep
+@@ -46,7 +46,7 @@
+
+ #
+
+-install: all install-libgadu @install_ekg@ @install_ekgwap@
++install: all @install_ekg@ @install_ekgwap@
+
+ install-libgadu:
+ cd lib && $(MAKE) install
+diff -Nurd ekg-1.7/configure ekg-1.7-patched/configure
+--- ekg-1.7/configure 2007-04-28 16:57:00.000000000 -0400
++++ ekg-1.7-patched/configure 2009-10-08 14:41:28.000000000 -0400
+@@ -5437,7 +5437,7 @@
# FIXME: -fPIC is required for -shared on many architectures,
# so we specify it here, but the right way would probably be to
# properly detect whether it is actually required.
@@ -10,7 +40,7 @@
LIBS="$PTHREAD_LIBS $LIBS"
CC="$PTHREAD_CC"
-@@ -7420,7 +7420,7 @@
+@@ -8766,7 +8766,7 @@
{ (exit 1); exit 1; }; }
fi
@@ -19,7 +49,7 @@
CFLAGS="$CFLAGS $READLINE_INCLUDES"
-@@ -8446,7 +8446,7 @@
+@@ -10037,7 +10037,7 @@
PY_OTHER_LIBS=`sed -n -e 's/^LIBS=\(.*\)/\1/p'
$PY_MAKEFILE`
PY_OTHER_LIBM=`sed -n -e 's/^LIBC=\(.*\)/\1/p'
$PY_MAKEFILE`
PY_OTHER_LIBC=`sed -n -e 's/^LIBM=\(.*\)/\1/p'
$PY_MAKEFILE`
@@ -28,7 +58,7 @@
PY_LIBS="$PY_LOCALMODLIBS $PY_BASEMODLIBS
$PY_OTHER_LIBS $PY_OTHER_LIBC $PY_OTHER_LIBM $PY_LINKFORSHARED"
PYTHON_LIBS="-L$PY_EXEC_PREFIX/lib $PY_LIB_LOC
-lpython$PY_VERSION $PY_LIBS"
-@@ -8469,7 +8469,7 @@
+@@ -10060,7 +10060,7 @@
if test "x$have_python" = "xyes"; then
OBJS="$OBJS python.o"
@@ -37,93 +67,47 @@
CFLAGS="$CFLAGS $PYTHON_INCLUDES"
fi
-diff -uNr ekg-1.6rc3/examples/Makefile.in ekg-1.6rc3-new/examples/Makefile.in
---- ekg-1.6rc3/examples/Makefile.in 2003-06-24 16:56:52.000000000 -0400
-+++ ekg-1.6rc3-new/examples/Makefile.in 2005-08-22 14:21:48.000000000
-0400
+diff -Nurd ekg-1.7/examples/Makefile.in ekg-1.7-patched/examples/Makefile.in
+--- ekg-1.7/examples/Makefile.in 2003-06-24 16:56:52.000000000 -0400
++++ ekg-1.7-patched/examples/Makefile.in 2009-10-08 14:41:28.000000000
-0400
@@ -1,6 +1,6 @@
- # $Id: Makefile.in,v 1.13 2003/06/24 20:56:52 wojtekka Exp $
+ # $Id: Makefile.in,v 1.13 2003-06-24 20:56:52 wojtekka Exp $
-CC = @CC@
+CC = glibtool --tag=CC --mode=link @CC@
CFLAGS = @CFLAGS_LIBGADU@ @CFLAGS@ -I.. -I../lib -I../src
LIBS = @LIBS_LIBGADU@
MAKE = @MAKE@
-diff -uNr ekg-1.6/lib/Makefile.in ekg-1.6-new/lib/Makefile.in
---- ekg-1.6/lib/Makefile.in 2005-06-25 02:41:07.000000000 -0400
-+++ ekg-1.6-new/lib/Makefile.in 2008-08-11 20:22:19.000000000 -0400
-@@ -11,7 +11,7 @@
- VERSION_MINOR=3
+diff -Nurd ekg-1.7/src/Makefile.in ekg-1.7-patched/src/Makefile.in
+--- ekg-1.7/src/Makefile.in 2007-04-28 16:02:22.000000000 -0400
++++ ekg-1.7-patched/src/Makefile.in 2009-10-08 14:43:43.000000000 -0400
+@@ -10,7 +10,7 @@
+ sysconfdir = @sysconfdir@
CC = @CC@
--CFLAGS = @CFLAGS_LIBGADU@ -I. -I.. -Wall
-+CFLAGS = -I. -I.. @CFLAGS_LIBGADU@ -Wall
- LIBS = @LIBS_LIBGADU@
+-CFLAGS = -I.. -I../lib @CFLAGS@ -DDATADIR=\"${datadir}/ekg\"
-DSYSCONFDIR=\"${sysconfdir}\"
++CFLAGS = -I.. @CFLAGS@ -DDATADIR=\"${datadir}/ekg\"
-DSYSCONFDIR=\"${sysconfdir}\"
+ LDFLAGS = @LDFLAGS@
+ LIBS = @LIBS@
- MAKE = @MAKE@
-@@ -25,7 +25,7 @@
- LOBJS = common.lo libgadu.lo pubdir.lo http.lo dcc.lo events.lo pubdir50.lo
obsolete.lo
- SRCS = $(OBJS:.o=.c)
-
--SHAREDMM = libgadu.so
-+SHAREDMM = libgadu.la
- SHAREDM = $(SHAREDMM).$(VERSION_MAJOR)
- SHARED = $(SHAREDM).$(VERSION_MINOR)
- STATIC = libgadu.a
-@@ -51,14 +51,12 @@
- #
-
- %.lo: %.c
-- $(CC) -c $(CPPFLAGS) $(CFLAGS) -fPIC $< -o $@
-+ glibtool --tag=CC --mode=compile $(CC) -c $(CFLAGS) $(CPPFLAGS) -fPIC
$< -o $@
-
--shared: dep $(SHARED)
-+shared: dep $(SHAREDMM)
-
--$(SHARED): $(LOBJS)
-- $(CC) -shared -Wl,-soname,libgadu.so.$(VERSION_MAJOR) -o $(SHARED)
$(LOBJS) $(LIBS) -lc
-- $(LN_S) -f $(SHARED) $(SHAREDM)
-- $(LN_S) -f $(SHARED) $(SHAREDMM)
-+$(SHAREDMM): $(LOBJS)
-+ glibtool --tag=CC --mode=link $(CC) -o $(SHAREDMM) -rpath $(libdir)
-version-info $(VERSION_MAJOR):$(VERSION_MINOR) $(LOBJS) $(LIBS) $(LDFLAGS)
-
- #
-
-@@ -81,15 +79,12 @@
- $(INSTALL) -m 644 libgadu.pc $(DESTDIR)$(libdir)/pkgconfig
-
- install-shared: install-common @strip_libgadu_so@
-- $(INSTALL) -m 755 $(SHARED) $(DESTDIR)$(libdir)
-- cd $(DESTDIR)$(libdir) && $(LN_S) -f $(SHARED) $(SHAREDM)
-- cd $(DESTDIR)$(libdir) && $(LN_S) -f $(SHARED) $(SHAREDMM)
-+ glibtool --tag=CC --mode=install $(INSTALL) -m 755 $(SHAREDMM)
$(DESTDIR)$(libdir)
-
- install-static: install-common
- $(INSTALL) -m 755 $(STATIC) $(DESTDIR)$(libdir)
-
- strip-libgadu-so:
-- $(STRIP) $(SHARED)
-
- #
-
-diff -uNr ekg-1.6/src/Makefile.in ekg-1.6-new/src/Makefile.in
---- ekg-1.6/src/Makefile.in 2003-05-19 09:36:41.000000000 -0400
-+++ ekg-1.6-new/src/Makefile.in 2008-08-11 20:22:13.000000000 -0400
-@@ -25,11 +25,11 @@
+@@ -26,12 +26,12 @@
all: dep ekg @ioctld@
--ekg: $(OBJS) @libgadu_a@
-- $(CC) $(CFLAGS) -o ekg $(OBJS) -L../lib @lgadu@ @libgadu_a@ $(LDFLAGS)
$(LIBS)
-+ekg: $(OBJS) ../lib/libgadu.la
-+ glibtool --tag=CC --mode=link $(CC) $(CFLAGS) -o ekg $(OBJS)
../lib/libgadu.la $(LIBS) $(LDFLAGS)
+-ekg: $(OBJS) comptime.c @libgadu_a@
+- $(CC) $(CFLAGS) -c -o comptime.o comptime.c
+- $(CC) $(CFLAGS) -o ekg $(OBJS) comptime.o -L../lib @lgadu@ @libgadu_a@
$(LDFLAGS) $(LIBS)
++ekg: $(OBJS) comptime.c
++ glibtool --tag=CC --mode=compile $(CC) $(CFLAGS) -c -o comptime.lo
comptime.c
++ glibtool --tag=CC --mode=link $(CC) $(CFLAGS) -o ekg $(OBJS)
comptime.lo -lgadu $(LDFLAGS) $(LIBS)
ioctld: ioctld.c
- $(CC) $(CFLAGS) ioctld.c -o ioctld $(LIBS) @IOCTLD_OBJS@
-+ glibtool --tag=CC --mode=link $(CC) $(CFLAGS) ioctld.c -o ioctld
$(LIBS) $(LDFLAGS) @IOCTLD_OBJS@
++ glibtool --tag=CC --mode=link $(CC) $(CFLAGS) ioctld.c -o ioctld
$(LIBS) @IOCTLD_OBJS@
dep: .depend
-@@ -42,17 +42,15 @@
+@@ -44,17 +44,15 @@
install-ekg: @strip_ekg@
$(INSTALL) -d $(DESTDIR)$(bindir)
@@ -143,3 +127,14 @@
#
+diff -Nurd ekg-1.7/src/stuff.c ekg-1.7-patched/src/stuff.c
+--- ekg-1.7/src/stuff.c 2007-04-28 16:02:24.000000000 -0400
++++ ekg-1.7-patched/src/stuff.c 2009-10-08 15:15:25.000000000 -0400
+@@ -53,7 +53,6 @@
+ #include <unistd.h>
+
+ #include "commands.h"
+-#include "compat.h"
+ #include "dynstuff.h"
+ #include "libgadu.h"
+ #ifdef HAVE_OPENSSL
Added:
trunk/experimental/3rdparty/10.4/main/finkinfo/libs/perlmods/test-harness-pm-10.6.info
URL:
<http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/3rdparty/10.4/main/finkinfo/libs/perlmods/test-harness-pm-10.6.info&rev=1635&repname=user%3a+ranger>
==============================================================================
---
trunk/experimental/3rdparty/10.4/main/finkinfo/libs/perlmods/test-harness-pm-10.6.info
(added)
+++
trunk/experimental/3rdparty/10.4/main/finkinfo/libs/perlmods/test-harness-pm-10.6.info
Thu Oct 8 21:21:43 2009
@@ -1,0 +1,47 @@
+Info2: <<
+Package: test-harness-pm%type_pkg[perl]
+Version: 3.17
+Revision: 1
+Distribution: 10.6
+Description: Run standard test scripts with statistics
+Type: perl (5.10.0)
+License: Artistic
+Maintainer: Daniel Macks <dma...@netspace.org>
+
+Depends: perl%type_pkg[perl]-core
+InfoTest: <<
+ TestScript: <<
+ #!/bin/sh -ev
+ export HARNESS_PERL="/usr/bin/arch -i386 perl5.10.0"
+ %{default_script}
+ <<
+<<
+
+Source: mirror:cpan:authors/id/A/AN/ANDYA/Test-Harness-%v.tar.gz
+Source-MD5: d4b9f3bf6bd7fdc9f03c66a352a2c0da
+
+CompileScript: <<
+ %{default_script}
+ # on 10.6, Test::Harness "compatibility" API does not honor arch -i386 perl
stuff properly
+ rm -rf %i/lib/perl5/%type_raw[perl]/Test/Harness.pm
+<<
+
+UpdatePOD: true
+InstallScript: <<
+ %{default_script}
+ mkdir %i/lib/perl5/%type_raw[perl]/man
+ mv %i/share/man/man3 %i/lib/perl5/%type_raw[perl]/man
+ mv %i/bin/prove %i/bin/prove-%type_pkg[perl]
+ mv %i/share/man/man1/prove.1 %i/share/man/man1/prove-%type_pkg[perl].1
+<<
+DocFiles: Changes* README
+
+Homepage: http://search.cpan.org/dist/Test-Harness
+DescUsage: <<
+ The "prove" command is renamed to "prove-%type_pkg[perl]" so as not
+ to conflict with the "prove" command that comes with perl itself (in
+ the various perlXXX packages).
+<<
+DescPackaging: This package has language-version variants for historical
reasons.
+<<
+
Modified:
trunk/experimental/3rdparty/10.4/main/finkinfo/libs/perlmods/test-harness-pm.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/3rdparty/10.4/main/finkinfo/libs/perlmods/test-harness-pm.info&rev=1635&repname=user%3a+ranger>
==============================================================================
---
trunk/experimental/3rdparty/10.4/main/finkinfo/libs/perlmods/test-harness-pm.info
(original)
+++
trunk/experimental/3rdparty/10.4/main/finkinfo/libs/perlmods/test-harness-pm.info
Thu Oct 8 21:21:43 2009
@@ -3,9 +3,9 @@
Version: 3.17
Revision: 1
Architecture: (%type_pkg[perl] = 581) powerpc, (%type_pkg[perl] = 584) powerpc
-Distribution: (%type_pkg[perl] = 581) 10.4, (%type_pkg[perl] = 584) 10.4,
(%type_pkg[perl] = 586) 10.4, (%type_pkg[perl] = 586) 10.5, (%type_pkg[perl] =
5100) 10.5, (%type_pkg[perl] = 5100) 10.6
+Distribution: (%type_pkg[perl] = 581) 10.4, (%type_pkg[perl] = 584) 10.4,
(%type_pkg[perl] = 586) 10.4, (%type_pkg[perl] = 586) 10.5, (%type_pkg[perl] =
5100) 10.5
Description: Run standard test scripts with statistics
-Type: perl (5.8.1 5.8.4 5.8.6 5.8.8 5.10.0)
+Type: perl (5.8.1 5.8.4 5.8.6 5.8.8)
License: Artistic
Maintainer: Daniel Macks <dma...@netspace.org>
Modified: trunk/experimental/common/crypto/finkinfo/kdenetwork4.info.in
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/crypto/finkinfo/kdenetwork4.info.in&rev=1635&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/crypto/finkinfo/kdenetwork4.info.in (original)
+++ trunk/experimental/common/crypto/finkinfo/kdenetwork4.info.in Thu Oct 8
21:21:43 2009
@@ -35,7 +35,7 @@
cmake (>= 2.6.3-1),
blitz-%type_pkg[kde]-dev,
dbus-dev (>= 1.2.12-1),
- ekg-unified-dev (>= 1.6-1030),
+ libgadu3-dev,
fink (>= 0.28.0-1),
fontconfig2-dev (>= 2.4.1-1),
freetype219 (>= 2.3.7-7),
@@ -166,7 +166,7 @@
Description: KDE4 - instant messenger client
Depends: <<
blitz-%type_pkg[kde]-shlibs,
- ekg-unified-shlibs (>= 1.6-1030),
+ libgadu3-shlibs,
libmeanwhile-shlibs,
libmsn-0.1-shlibs,
libotr-shlibs,
Modified: trunk/experimental/common/main/finkinfo/kde/kdenetwork3.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/kde/kdenetwork3.info&rev=1635&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/kdenetwork3.info (original)
+++ trunk/experimental/common/main/finkinfo/kde/kdenetwork3.info Thu Oct 8
21:21:43 2009
@@ -22,7 +22,7 @@
arts-dev (>= 1.5.9-1),
autoconf (>= 2.60-1),
cctools-single-module,
- ekg-unified-dev,
+ libgadu3-dev,
expat1,
fink (>= 0.28),
freetype219 (>= 2.2.1-5),
@@ -457,7 +457,7 @@
Depends: <<
%N-common (>= %v-%r),
bind9-ssl-shlibs | bind9-shlibs,
- ekg-unified-shlibs,
+ libgadu3-shlibs,
glib-shlibs,
gtk+-shlibs,
xmms-shlibs (>= 1.2.7-3)
Added: trunk/experimental/common/main/finkinfo/libs/libgadu3-dev.info
URL:
<http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/common/main/finkinfo/libs/libgadu3-dev.info&rev=1635&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/libgadu3-dev.info (added)
+++ trunk/experimental/common/main/finkinfo/libs/libgadu3-dev.info Thu Oct 8
21:21:43 2009
@@ -1,0 +1,57 @@
+Info4: <<
+Package: libgadu3-dev
+Version: 1.8.2
+Revision: 1
+Description: Gadu-Gadu IM dev
+License: GPL/LGPL
+Maintainer: Benjamin Reed <libga...@fink.racoonfink.com>
+
+BuildDependsOnly: true
+Depends: libgadu3-shlibs (>= %v-%r)
+BuildDepends: <<
+ system-openssl-dev,
+ fink (>= 0.28.0-1),
+ pkgconfig (>= 0.1-1),
+ bind9-ssl-dev | bind9-dev
+<<
+Replaces: <<
+ ekg-dev (<< 1.8-1),
+ ekg-ssl-dev (<< 1.8-1),
+ ekg-unified-dev (<< 1.8-1),
+<<
+
+Source: http://toxygen.net/libgadu/files/libgadu-%v.tar.gz
+Source-MD5: 1090f82f8a1bb99e9cdf5853188f625f
+PatchScript: perl -pi -e 's/-Wl,-z,defs//g' configure
+
+SetCFLAGS: -Os -I%p/lib/system-openssl/include
+SetLDFLAGS: -L%p/lib/system-openssl/lib
+ConfigureParams: --with-pthread --disable-dependency-tracking
+CompileScript: <<
+#!/bin/sh -ex
+
+ export
PKG_CONFIG_PATH="%p/lib/system-openssl/lib/pkgconfig:$PKG_CONFIG_PATH"
+ export lt_cv_sys_max_cmd_len=65536
+ ./configure %c
+ make
+<<
+
+InstallScript: make install DESTDIR=%d
+DocFiles: AUTHORS COPYING ChangeLog NEWS README
+
+SplitOff: <<
+ Package: libgadu3-shlibs
+ Description: Gadu-Gadu IM runtime lib
+ Depends: bind9-ssl-shlibs | bind9-shlibs
+ Replaces: <<
+ ekg-shlibs (<< 1.8-1),
+ ekg-ssl-shlibs (<< 1.8-1),
+ ekg-unified-shlibs (<< 1.8-1)
+ <<
+ DocFiles: COPYING README
+ Files: lib/libgadu.*.dylib
+ Shlibs: %p/lib/libgadu.3.dylib 13.0.0 %v (>= 1.8.2-1)
+<<
+Homepage: http://toxygen.net/libgadu/
+
+<<
Modified: trunk/experimental/common/main/finkinfo/net/ekg-unified.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/net/ekg-unified.info&rev=1635&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/net/ekg-unified.info (original)
+++ trunk/experimental/common/main/finkinfo/net/ekg-unified.info Thu Oct 8
21:21:43 2009
@@ -1,112 +1,129 @@
Package: ekg-unified
-Version: 1.6
-Revision: 1029
+Version: 1.7
+Revision: 1
Description: Gadu-Gadu program
License: GPL/LGPL
Maintainer: Benjamin Reed <e...@fink.racoonfink.com>
-Depends: %N-shlibs (>= %v-%r), libjpeg-shlibs, readline5-shlibs (>= 5.0-1004),
libncurses5-shlibs (>= 5.4-20041023-1006), bind9-ssl-shlibs | bind9-shlibs
-BuildDepends: gsm, libjpeg, libtool14, libncurses5 (>= 5.4-20041023-1006),
system-openssl-dev, readline5 (>= 5.0-1004), sed, fink (>= 0.28.0-1),
pkgconfig, bind9-ssl-dev | bind9-dev
+Depends: <<
+ libgadu3-shlibs,
+ libjpeg-shlibs,
+ readline5-shlibs (>= 5.0-1004),
+ libncurses5-shlibs (>= 5.4-20041023-1006),
+ libbind6
+<<
+BuildDepends: <<
+ gsm,
+ libgadu3-dev,
+ libjpeg,
+ libtool14,
+ libncurses5 (>= 5.4-20041023-1006),
+ system-openssl-dev,
+ readline5 (>= 5.0-1004),
+ sed,
+ fink (>= 0.28.0-1),
+ pkgconfig,
+ libbind6-dev,
+ fink (>= 0.24.12-1)
+<<
Replaces: ekg (<< %v-%r), ekg-ssl (<< %v-%r)
-CustomMirror: <<
- eur-PL: http://dev.null.pl/ekg
- nam-US: http://ranger.befunk.com/fink
- nam-US: http://astrange.ithinksw.net/~astrange/ranger-fink
- nam-CA: http://www.southofheaven.net/befunk
-<<
-Source: mirror:custom:ekg-%v.tar.gz
-SourceDirectory: ekg-%v
-Source-MD5: 1094eee5062d9b9900c4b28bd68fb564
-Patch: %n.patch
+Source: http://ekg.chmurka.net/ekg-%v.tar.gz
+#SourceDirectory: ekg-%v
+Source-MD5: 2aa92b56517fdf09d75519a105772b74
+PatchFile: %n.patch
+PatchFile-MD5: 53051dbbe8c4e5b8f3c0c790df0a72e2
SetCFLAGS: -Os -I%p/lib/system-openssl/include
SetLDFLAGS: -L%p/lib/system-openssl/lib
SetMAKEFLAGS: -j1
NoSetMAKEFLAGS: true
-ConfigureParams: --enable-dynamic --enable-shared --enable-ui-readline
--enable-ui-ncurses --with-ncurses=%p --with-readline=%p --with-libgsm
--with-python=no --with-openssl --with-pthread --disable-ioctld
--sysconfdir=%p/etc --mandir=%p/share/man --disable-dependency-tracking
+ConfigureParams: --enable-aspell --enable-dynamic --enable-shared
--enable-ui-readline --enable-ui-ncurses --with-ncurses=%p --with-readline=%p
--with-libgsm --with-python=no --with-openssl --enable-libgadu-openssl
--with-pthread --disable-ioctld --sysconfdir=%p/etc --mandir=%p/share/man
--disable-dependency-tracking
# would use --with-python=yes to activate python stuff
# and export ac_cv_path_PYTHON=%p/bin/python2.5 to get the right path setups
CompileScript: <<
#!/bin/sh -ex
- export PKG_CONFIG_PATH="%p/lib/system-openssl/lib/pkgconfig:$PKG_CONFIG_PATH"
- export lt_cv_sys_max_cmd_len=65536
+ export
PKG_CONFIG_PATH="%p/lib/system-openssl/lib/pkgconfig:$PKG_CONFIG_PATH"
+ export lt_cv_sys_max_cmd_len=65536
# export ac_cv_path_PYTHON=%p/bin/python2.5
- ./configure %c
+ ./configure %c
+ make
<<
InstallScript: <<
#!/bin/sh -ex
- make install DESTDIR=%d
- mkdir -p %i/share/doc/%n
- pushd docs
- tar -cf - . | (cd %i/share/doc/%n; tar -xf -)
- popd
- rm -Rf %i/share/doc/%n/CVS/
- rm -Rf %i/share/doc/%n/api/CVS/
+ make install DESTDIR=%d
+ mkdir -p %i/share/doc/%n
+ pushd docs
+ tar -cf - . | (cd %i/share/doc/%n; tar -xf -)
+ popd
+ rm -Rf %i/share/doc/%n/CVS/
+ rm -Rf %i/share/doc/%n/api/CVS/
+
+ install -d -m 755 "%i/share/doc/installed-packages"
+ touch "%i/share/doc/installed-packages/ekg"
+ touch "%i/share/doc/installed-packages/ekg-ssl"
+ touch "%i/share/doc/installed-packages/ekg-dev"
+ touch "%i/share/doc/installed-packages/ekg-ssl-dev"
+ touch "%i/share/doc/installed-packages/ekg-unified-dev"
+ touch "%i/share/doc/installed-packages/ekg-shlibs"
+ touch "%i/share/doc/installed-packages/ekg-ssl-shlibs"
+ touch "%i/share/doc/installed-packages/ekg-unified-shlibs"
<<
DocFiles: ChangeLog* lib/COPYING
SplitOff: <<
Package: %N-dev
- Description: headers and development libraries for ekg
- Depends: %N (= %v-%r)
- Replaces: ekg-dev (<< %v-%r), ekg-ssl-dev (<< %v-%r), ekg-ssl (<<
%v-%r), ekg (<< %v-%r)
+ Description: Compatibility dev package
+ Depends: libgadu3-dev, fink-obsolete-packages
BuildDependsOnly: true
- DocFiles: ChangeLog* lib/COPYING
- Files: <<
- include
- lib/libgadu.dylib
- lib/*.la
- lib/*.a
- lib/pkgconfig
- <<
+ Files: share/doc/installed-packages/%n
<<
SplitOff2: <<
Package: %N-shlibs
- Description: shared libraries for ekg
- Depends: bind9-ssl-shlibs | bind9-shlibs
- Replaces: ekg-shlibs (<< %v-%r), ekg-ssl-shlibs (<< %v-%r)
- DocFiles: ChangeLog* lib/COPYING
- Files: lib
- Shlibs: %p/lib/libgadu.3.dylib 4.0.0 %N-shlibs (>= 1.6-3)
+ Description: Compatibility shared lib package
+ Depends: libgadu3-shlibs, fink-obsolete-packages
+ BuildDependsOnly: true
+ Files: share/doc/installed-packages/%n
<<
SplitOff3: <<
Package: ekg
- Description: Upgrade package for ekg
- Depends: %N (= %v-%r), fink-obsolete-packages
- DocFiles: ChangeLog* lib/COPYING
+ Description: Compatibility binary package
+ Depends: %N (>= %v-%r), fink-obsolete-packages
+ Files: share/doc/installed-packages/%n
<<
SplitOff4: <<
Package: ekg-shlibs
- Description: Upgrade package for ekg-shlibs
- Depends: %N-shlibs (= %v-%r), fink-obsolete-packages
- DocFiles: ChangeLog* lib/COPYING
+ Description: Compatibility shared lib package
+ Depends: libgadu3-shlibs, fink-obsolete-packages
+ Files: share/doc/installed-packages/%n
<<
SplitOff5: <<
Package: ekg-dev
- Description: Upgrade package for ekg-dev
- Depends: %N-dev (= %v-%r), fink-obsolete-packages
- DocFiles: ChangeLog* lib/COPYING
+ Description: Compatibility dev package
+ Depends: libgadu3-dev, fink-obsolete-packages
+ BuildDependsOnly: true
+ Files: share/doc/installed-packages/%n
<<
SplitOff6: <<
Package: ekg-ssl
- Description: Upgrade package for ekg-ssl
- Depends: %N (= %v-%r), fink-obsolete-packages
- DocFiles: ChangeLog* lib/COPYING
+ Description: Compatibility binary package
+ Depends: %N (>= %v-%r), fink-obsolete-packages
+ Files: share/doc/installed-packages/%n
<<
SplitOff7: <<
Package: ekg-ssl-shlibs
- Description: Upgrade package for ekg-ssl-shlibs
- Depends: %N-shlibs (= %v-%r), fink-obsolete-packages
- DocFiles: ChangeLog* lib/COPYING
+ Description: Compatibility shared lib package
+ Depends: libgadu3-shlibs, fink-obsolete-packages
+ Files: share/doc/installed-packages/%n
<<
SplitOff8: <<
Package: ekg-ssl-dev
- Description: Upgrade package for ekg-ssl-dev
- Depends: %N-dev (= %v-%r), fink-obsolete-packages
- DocFiles: ChangeLog* lib/COPYING
+ Description: Compatibility dev package
+ Depends: libgadu3-dev, fink-obsolete-packages
+ BuildDependsOnly: true
+ Files: share/doc/installed-packages/%n
<<
-Homepage: http://dev.null.pl/ekg/
+Homepage: http://ekg.chmurka.net
Modified: trunk/experimental/common/main/finkinfo/net/ekg-unified.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/net/ekg-unified.patch&rev=1635&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/net/ekg-unified.patch (original)
+++ trunk/experimental/common/main/finkinfo/net/ekg-unified.patch Thu Oct 8
21:21:43 2009
@@ -1,7 +1,37 @@
-diff -uNr ekg-1.6/configure ekg-1.6-new/configure
---- ekg-1.6/configure 2005-10-29 15:37:31.000000000 -0400
-+++ ekg-1.6-new/configure 2008-08-11 15:14:44.000000000 -0400
-@@ -4312,7 +4312,7 @@
+diff -Nurd ekg-1.7/Makefile.in ekg-1.7-patched/Makefile.in
+--- ekg-1.7/Makefile.in 2006-08-05 11:46:21.000000000 -0400
++++ ekg-1.7-patched/Makefile.in 2009-10-08 14:44:47.000000000 -0400
+@@ -15,7 +15,7 @@
+
+ #
+
+-all: configure libgadu @ekg@ @make_ekgwap@
++all: configure @ekg@ @make_ekgwap@
+
+ libgadu:
+ cd lib && $(MAKE) all
+@@ -31,7 +31,7 @@
+
+ #
+
+-dep: dep-libgadu @dep_ekg@
++dep: @dep_ekg@
+
+ dep-libgadu:
+ cd lib && $(MAKE) dep
+@@ -46,7 +46,7 @@
+
+ #
+
+-install: all install-libgadu @install_ekg@ @install_ekgwap@
++install: all @install_ekg@ @install_ekgwap@
+
+ install-libgadu:
+ cd lib && $(MAKE) install
+diff -Nurd ekg-1.7/configure ekg-1.7-patched/configure
+--- ekg-1.7/configure 2007-04-28 16:57:00.000000000 -0400
++++ ekg-1.7-patched/configure 2009-10-08 14:41:28.000000000 -0400
+@@ -5437,7 +5437,7 @@
# FIXME: -fPIC is required for -shared on many architectures,
# so we specify it here, but the right way would probably be to
# properly detect whether it is actually required.
@@ -10,7 +40,7 @@
LIBS="$PTHREAD_LIBS $LIBS"
CC="$PTHREAD_CC"
-@@ -7420,7 +7420,7 @@
+@@ -8766,7 +8766,7 @@
{ (exit 1); exit 1; }; }
fi
@@ -19,7 +49,7 @@
CFLAGS="$CFLAGS $READLINE_INCLUDES"
-@@ -8446,7 +8446,7 @@
+@@ -10037,7 +10037,7 @@
PY_OTHER_LIBS=`sed -n -e 's/^LIBS=\(.*\)/\1/p'
$PY_MAKEFILE`
PY_OTHER_LIBM=`sed -n -e 's/^LIBC=\(.*\)/\1/p'
$PY_MAKEFILE`
PY_OTHER_LIBC=`sed -n -e 's/^LIBM=\(.*\)/\1/p'
$PY_MAKEFILE`
@@ -28,7 +58,7 @@
PY_LIBS="$PY_LOCALMODLIBS $PY_BASEMODLIBS
$PY_OTHER_LIBS $PY_OTHER_LIBC $PY_OTHER_LIBM $PY_LINKFORSHARED"
PYTHON_LIBS="-L$PY_EXEC_PREFIX/lib $PY_LIB_LOC
-lpython$PY_VERSION $PY_LIBS"
-@@ -8469,7 +8469,7 @@
+@@ -10060,7 +10060,7 @@
if test "x$have_python" = "xyes"; then
OBJS="$OBJS python.o"
@@ -37,93 +67,47 @@
CFLAGS="$CFLAGS $PYTHON_INCLUDES"
fi
-diff -uNr ekg-1.6rc3/examples/Makefile.in ekg-1.6rc3-new/examples/Makefile.in
---- ekg-1.6rc3/examples/Makefile.in 2003-06-24 16:56:52.000000000 -0400
-+++ ekg-1.6rc3-new/examples/Makefile.in 2005-08-22 14:21:48.000000000
-0400
+diff -Nurd ekg-1.7/examples/Makefile.in ekg-1.7-patched/examples/Makefile.in
+--- ekg-1.7/examples/Makefile.in 2003-06-24 16:56:52.000000000 -0400
++++ ekg-1.7-patched/examples/Makefile.in 2009-10-08 14:41:28.000000000
-0400
@@ -1,6 +1,6 @@
- # $Id: Makefile.in,v 1.13 2003/06/24 20:56:52 wojtekka Exp $
+ # $Id: Makefile.in,v 1.13 2003-06-24 20:56:52 wojtekka Exp $
-CC = @CC@
+CC = glibtool --tag=CC --mode=link @CC@
CFLAGS = @CFLAGS_LIBGADU@ @CFLAGS@ -I.. -I../lib -I../src
LIBS = @LIBS_LIBGADU@
MAKE = @MAKE@
-diff -uNr ekg-1.6/lib/Makefile.in ekg-1.6-new/lib/Makefile.in
---- ekg-1.6/lib/Makefile.in 2005-06-25 02:41:07.000000000 -0400
-+++ ekg-1.6-new/lib/Makefile.in 2008-08-11 20:22:19.000000000 -0400
-@@ -11,7 +11,7 @@
- VERSION_MINOR=3
+diff -Nurd ekg-1.7/src/Makefile.in ekg-1.7-patched/src/Makefile.in
+--- ekg-1.7/src/Makefile.in 2007-04-28 16:02:22.000000000 -0400
++++ ekg-1.7-patched/src/Makefile.in 2009-10-08 14:43:43.000000000 -0400
+@@ -10,7 +10,7 @@
+ sysconfdir = @sysconfdir@
CC = @CC@
--CFLAGS = @CFLAGS_LIBGADU@ -I. -I.. -Wall
-+CFLAGS = -I. -I.. @CFLAGS_LIBGADU@ -Wall
- LIBS = @LIBS_LIBGADU@
+-CFLAGS = -I.. -I../lib @CFLAGS@ -DDATADIR=\"${datadir}/ekg\"
-DSYSCONFDIR=\"${sysconfdir}\"
++CFLAGS = -I.. @CFLAGS@ -DDATADIR=\"${datadir}/ekg\"
-DSYSCONFDIR=\"${sysconfdir}\"
+ LDFLAGS = @LDFLAGS@
+ LIBS = @LIBS@
- MAKE = @MAKE@
-@@ -25,7 +25,7 @@
- LOBJS = common.lo libgadu.lo pubdir.lo http.lo dcc.lo events.lo pubdir50.lo
obsolete.lo
- SRCS = $(OBJS:.o=.c)
-
--SHAREDMM = libgadu.so
-+SHAREDMM = libgadu.la
- SHAREDM = $(SHAREDMM).$(VERSION_MAJOR)
- SHARED = $(SHAREDM).$(VERSION_MINOR)
- STATIC = libgadu.a
-@@ -51,14 +51,12 @@
- #
-
- %.lo: %.c
-- $(CC) -c $(CPPFLAGS) $(CFLAGS) -fPIC $< -o $@
-+ glibtool --tag=CC --mode=compile $(CC) -c $(CFLAGS) $(CPPFLAGS) -fPIC
$< -o $@
-
--shared: dep $(SHARED)
-+shared: dep $(SHAREDMM)
-
--$(SHARED): $(LOBJS)
-- $(CC) -shared -Wl,-soname,libgadu.so.$(VERSION_MAJOR) -o $(SHARED)
$(LOBJS) $(LIBS) -lc
-- $(LN_S) -f $(SHARED) $(SHAREDM)
-- $(LN_S) -f $(SHARED) $(SHAREDMM)
-+$(SHAREDMM): $(LOBJS)
-+ glibtool --tag=CC --mode=link $(CC) -o $(SHAREDMM) -rpath $(libdir)
-version-info $(VERSION_MAJOR):$(VERSION_MINOR) $(LOBJS) $(LIBS) $(LDFLAGS)
-
- #
-
-@@ -81,15 +79,12 @@
- $(INSTALL) -m 644 libgadu.pc $(DESTDIR)$(libdir)/pkgconfig
-
- install-shared: install-common @strip_libgadu_so@
-- $(INSTALL) -m 755 $(SHARED) $(DESTDIR)$(libdir)
-- cd $(DESTDIR)$(libdir) && $(LN_S) -f $(SHARED) $(SHAREDM)
-- cd $(DESTDIR)$(libdir) && $(LN_S) -f $(SHARED) $(SHAREDMM)
-+ glibtool --tag=CC --mode=install $(INSTALL) -m 755 $(SHAREDMM)
$(DESTDIR)$(libdir)
-
- install-static: install-common
- $(INSTALL) -m 755 $(STATIC) $(DESTDIR)$(libdir)
-
- strip-libgadu-so:
-- $(STRIP) $(SHARED)
-
- #
-
-diff -uNr ekg-1.6/src/Makefile.in ekg-1.6-new/src/Makefile.in
---- ekg-1.6/src/Makefile.in 2003-05-19 09:36:41.000000000 -0400
-+++ ekg-1.6-new/src/Makefile.in 2008-08-11 20:22:13.000000000 -0400
-@@ -25,11 +25,11 @@
+@@ -26,12 +26,12 @@
all: dep ekg @ioctld@
--ekg: $(OBJS) @libgadu_a@
-- $(CC) $(CFLAGS) -o ekg $(OBJS) -L../lib @lgadu@ @libgadu_a@ $(LDFLAGS)
$(LIBS)
-+ekg: $(OBJS) ../lib/libgadu.la
-+ glibtool --tag=CC --mode=link $(CC) $(CFLAGS) -o ekg $(OBJS)
../lib/libgadu.la $(LIBS) $(LDFLAGS)
+-ekg: $(OBJS) comptime.c @libgadu_a@
+- $(CC) $(CFLAGS) -c -o comptime.o comptime.c
+- $(CC) $(CFLAGS) -o ekg $(OBJS) comptime.o -L../lib @lgadu@ @libgadu_a@
$(LDFLAGS) $(LIBS)
++ekg: $(OBJS) comptime.c
++ glibtool --tag=CC --mode=compile $(CC) $(CFLAGS) -c -o comptime.lo
comptime.c
++ glibtool --tag=CC --mode=link $(CC) $(CFLAGS) -o ekg $(OBJS)
comptime.lo -lgadu $(LDFLAGS) $(LIBS)
ioctld: ioctld.c
- $(CC) $(CFLAGS) ioctld.c -o ioctld $(LIBS) @IOCTLD_OBJS@
-+ glibtool --tag=CC --mode=link $(CC) $(CFLAGS) ioctld.c -o ioctld
$(LIBS) $(LDFLAGS) @IOCTLD_OBJS@
++ glibtool --tag=CC --mode=link $(CC) $(CFLAGS) ioctld.c -o ioctld
$(LIBS) @IOCTLD_OBJS@
dep: .depend
-@@ -42,17 +42,15 @@
+@@ -44,17 +44,15 @@
install-ekg: @strip_ekg@
$(INSTALL) -d $(DESTDIR)$(bindir)
@@ -143,3 +127,14 @@
#
+diff -Nurd ekg-1.7/src/stuff.c ekg-1.7-patched/src/stuff.c
+--- ekg-1.7/src/stuff.c 2007-04-28 16:02:24.000000000 -0400
++++ ekg-1.7-patched/src/stuff.c 2009-10-08 15:15:25.000000000 -0400
+@@ -53,7 +53,6 @@
+ #include <unistd.h>
+
+ #include "commands.h"
+-#include "compat.h"
+ #include "dynstuff.h"
+ #include "libgadu.h"
+ #ifdef HAVE_OPENSSL
Modified: trunk/experimental/generate-infofiles.pl
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/generate-infofiles.pl&rev=1635&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/generate-infofiles.pl (original)
+++ trunk/experimental/generate-infofiles.pl Thu Oct 8 21:21:43 2009
@@ -67,6 +67,7 @@
'kgpg',
'koffice',
'libcapsi',
+ 'libgadu',
'libgdiplus',
'libknotificationitem',
'libmal',
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
