Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/net
In directory vz-cvs-3.sog:/tmp/cvs-serv7806
Modified Files:
ekg-unified.info ekg-unified.patch
Log Message:
sync. w/ 10.!4/stable, validated on powerpc-darwin8
Index: ekg-unified.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/net/ekg-unified.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ekg-unified.patch 11 Jul 2011 04:08:34 -0000 1.1
+++ ekg-unified.patch 3 Apr 2012 04:45:42 -0000 1.2
@@ -1,7 +1,37 @@
-diff -uNr ekg-1.6rc3/configure ekg-1.6rc3-new/configure
---- ekg-1.6rc3/configure 2005-07-18 13:17:58.000000000 -0400
-+++ ekg-1.6rc3-new/configure 2005-08-22 14:24:00.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,16 @@
LIBS="$PTHREAD_LIBS $LIBS"
CC="$PTHREAD_CC"
-@@ -8446,7 +8446,7 @@
+@@ -8766,7 +8766,7 @@
+ { (exit 1); exit 1; }; }
+ fi
+
+- LDFLAGS="$READLINE_LIBS $LDFLAGS"
++ LDFLAGS="$LDFLAGS $READLINE_LIBS"
+ CFLAGS="$CFLAGS $READLINE_INCLUDES"
+
+
+@@ -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`
@@ -19,9 +58,18 @@
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"
-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
+@@ -10060,7 +10060,7 @@
+
+ if test "x$have_python" = "xyes"; then
+ OBJS="$OBJS python.o"
+- LDFLAGS="$PYTHON_LIBS $LDFLAGS"
++ LDFLAGS="$LDFLAGS $PYTHON_LIBS"
+ CFLAGS="$CFLAGS $PYTHON_INCLUDES"
+ fi
+
+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$
@@ -30,65 +78,28 @@
CFLAGS = @CFLAGS_LIBGADU@ @CFLAGS@ -I.. -I../lib -I../src
LIBS = @LIBS_LIBGADU@
MAKE = @MAKE@
-diff -uNr ekg-1.6rc3/lib/Makefile.in ekg-1.6rc3-new/lib/Makefile.in
---- ekg-1.6rc3/lib/Makefile.in 2005-06-25 02:41:07.000000000 -0400
-+++ ekg-1.6rc3-new/lib/Makefile.in 2005-08-22 14:21:48.000000000 -0400
-@@ -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 $(CPPFLAGS) $(CFLAGS) -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)
-
- #
-
-@@ -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 -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 = -I.. -I../lib @CFLAGS@ -DDATADIR=\"${datadir}/ekg\"
-DSYSCONFDIR=\"${sysconfdir}\"
++CFLAGS = -I.. @CFLAGS@ -DDATADIR=\"${datadir}/ekg\"
-DSYSCONFDIR=\"${sysconfdir}\"
+ LDFLAGS = @LDFLAGS@
+ LIBS = @LIBS@
-diff -uNr ekg-1.6rc3/src/Makefile.in ekg-1.6rc3-new/src/Makefile.in
---- ekg-1.6rc3/src/Makefile.in 2003-05-19 09:36:41.000000000 -0400
-+++ ekg-1.6rc3-new/src/Makefile.in 2005-08-22 14:21:48.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) -L../lib
../lib/libgadu.la $(LDFLAGS) $(LIBS)
+-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@
@@ -96,7 +107,7 @@
dep: .depend
-@@ -42,17 +42,15 @@
+@@ -44,17 +44,15 @@
install-ekg: @strip_ekg@
$(INSTALL) -d $(DESTDIR)$(bindir)
@@ -116,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
Index: ekg-unified.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/net/ekg-unified.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ekg-unified.info 11 Jul 2011 04:08:34 -0000 1.1
+++ ekg-unified.info 3 Apr 2012 04:45:42 -0000 1.2
@@ -1,113 +1,156 @@
Package: ekg-unified
-Version: 1.6
-Revision: 1027
-Distribution: 10.4, 10.5
+Version: 1.7
+Revision: 3
Description: Gadu-Gadu program
License: GPL/LGPL
Maintainer: Benjamin Reed <[email protected]>
-Depends: %N-shlibs (>= %v-%r), libjpeg-shlibs, readline5-shlibs (>= 5.0-1004),
libncurses5-shlibs (>= 5.4-20041023-1006), python24-shlibs (>= 1:2.4.2-1004)
-BuildDepends: gsm, libjpeg, libtool14, libncurses5 (>= 5.4-20041023-1006),
system-openssl-dev, python24 (>= 1:2.4.2-1004), readline5 (>= 5.0-1004), sed,
fink (>= 0.28.0-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
+Depends: <<
+ aspell-shlibs,
+ giflib-shlibs,
+ libgadu3-shlibs,
+ libjpeg8-shlibs,
+ readline5-shlibs (>= 5.0-1004),
+ libncurses5-shlibs (>= 5.4-20041023-1006),
+ libbind6
<<
-Source: mirror:custom:ekg-%v.tar.gz
-SourceDirectory: ekg-%v
-Source-MD5: 1094eee5062d9b9900c4b28bd68fb564
+BuildDepends: <<
+ aspell-dev,
+ giflib,
+ libgadu3-dev,
+ libjpeg8,
+ libtool2,
+ libncurses5 (>= 5.4-20041023-1006),
+ system-openssl-dev,
+ readline5 (>= 5.0-1004),
+ sed,
+ fink (>= 0.29.7-1),
+ pkgconfig,
+ libbind6-dev,
+ fink (>= 0.29.7-1)
+<<
+Replaces: <<
+ ekg (<< %v-%r),
+ ekg-ssl (<< %v-%r)
+<<
+
+Source: http://ekg.chmurka.net/ekg-%v.tar.gz
+Source-MD5: 2aa92b56517fdf09d75519a105772b74
PatchFile: %n.patch
-PatchFile-MD5: 1938af6fdde40914c0a7450eec43d4b7
+PatchFile-MD5: 53051dbbe8c4e5b8f3c0c790df0a72e2
-SetCFLAGS: -Os -I%p/lib/system-openssl/include -I%p/include
-SetLDFLAGS: -L%p/lib/system-openssl/lib -L%p/lib
+SetCFLAGS: -Os -I%p/lib/system-openssl/include
+SetLDFLAGS: -L%p/lib/system-openssl/lib
SetMAKEFLAGS: -j1
-NoSetCFLAGS: true
-NoSetLDFLAGS: true
NoSetMAKEFLAGS: true
-ConfigureParams: --enable-dynamic --enable-shared --enable-ui-readline
--enable-ui-ncurses --with-ncurses=%p --with-readline=%p --with-libgsm
--with-python=%p --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 --enable-force-ncurses
--with-ncurses=%p --with-readline=%p --without-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 ac_cv_path_PYTHON=%p/bin/python2.4
- ./configure %c
+ 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
+ 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)
- BuildDependsOnly: true
- DocFiles: ChangeLog* lib/COPYING
- Files: <<
- include
- lib/libgadu.dylib
- lib/*.la
- lib/*.a
- lib/pkgconfig
+ Description: OBSOLETE use package 'libgadu3-dev' instead
+ Depends: <<
+ libgadu3-dev,
+ fink-obsolete-packages
<<
+ BuildDependsOnly: true
+ Files: share/doc/installed-packages/%n
<<
SplitOff2: <<
Package: %N-shlibs
- Description: shared libraries for ekg
- 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: OBSOLETE use package 'libgadu3-shlibs' instead
+ 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)
- DocFiles: ChangeLog* lib/COPYING
+ Description: OBSOLETE use package 'ekg-unified' instead
+ 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)
- DocFiles: ChangeLog* lib/COPYING
+ Description: OBSOLETE use package 'libgadu3-shlibs' instead
+ 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)
- DocFiles: ChangeLog* lib/COPYING
+ Description: OBSOLETE use package 'libgadu3-dev' instead
+ 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)
- DocFiles: ChangeLog* lib/COPYING
+ Description: OBSOLETE use package 'ekg-unified' instead
+ 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)
- DocFiles: ChangeLog* lib/COPYING
+ Description: OBSOLETE use package 'libgadu3-shlibs' instead
+ 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)
- DocFiles: ChangeLog* lib/COPYING
+ Description: OBSOLETE use package 'libgadu3-dev' instead
+ 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
------------------------------------------------------------------------------
Better than sec? Nothing is better than sec when it comes to
monitoring Big Data applications. Try Boundary one-second
resolution app monitoring today. Free.
http://p.sf.net/sfu/Boundary-dev2dev
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
