Update of
/cvsroot/fink/experimental/rangerrick/10.4-transitional/main/finkinfo/net
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13596/10.4-transitional/main/finkinfo/net
Added Files:
ekg-unified.info ekg-unified.patch
Log Message:
more fixes
--- NEW FILE: ekg-unified.patch ---
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 @@
# 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.
- CFLAGS="-shared -fPIC -Wl,-z,defs $CFLAGS $PTHREAD_CFLAGS"
+ CFLAGS="-dynamiclib -fPIC $CFLAGS $PTHREAD_CFLAGS"
LIBS="$PTHREAD_LIBS $LIBS"
CC="$PTHREAD_CC"
@@ -8446,7 +8446,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`
- PY_LINKFORSHARED="$(python -c "import
distutils.sysconfig; print
distutils.sysconfig.get_config_var('LINKFORSHARED')")"
+ PY_LINKFORSHARED="$($PYTHON -c "import
distutils.sysconfig; print
distutils.sysconfig.get_config_var('LINKFORSHARED')")"
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
@@ -1,6 +1,6 @@
# $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.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 -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 @@
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)
ioctld: ioctld.c
- $(CC) $(CFLAGS) ioctld.c -o ioctld $(LIBS) @IOCTLD_OBJS@
+ glibtool --tag=CC --mode=link $(CC) $(CFLAGS) ioctld.c -o ioctld
$(LIBS) @IOCTLD_OBJS@
dep: .depend
@@ -42,17 +42,15 @@
install-ekg: @strip_ekg@
$(INSTALL) -d $(DESTDIR)$(bindir)
- $(INSTALL) -m 755 ekg $(DESTDIR)$(bindir)
+ glibtool --tag=CC --mode=install $(INSTALL) -m 755 ekg
$(DESTDIR)$(bindir)
install-ioctld: @strip_ioctld@
$(INSTALL) -d $(DESTDIR)$(libexecdir)
- $(INSTALL) -m 755 ioctld $(DESTDIR)$(libexecdir)
+ glibtool --tag=CC --mode=install $(INSTALL) -m 755 ioctld
$(DESTDIR)$(libexecdir)
strip-ekg:
- $(STRIP) ekg
strip-ioctld:
- $(STRIP) ioctld
#
--- NEW FILE: ekg-unified.info ---
Package: ekg-unified
Version: 1.6
Revision: 26
Description: Gadu-Gadu program
License: GPL/LGPL
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
Depends: %N-shlibs (>= %v-%r), libjpeg-shlibs, readline5-shlibs,
libncurses5-shlibs, python24-shlibs
BuildDepends: gsm, libjpeg, libtool14, libncurses5, system-openssl-dev,
python24, readline5, sed
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
SetCFLAGS: -Os -I%p/lib/system-openssl/include -I%p/include
SetLDFLAGS: -L%p/lib/system-openssl/lib -L%p/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
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
<<
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
<<
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
<<
<<
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)
<<
SplitOff3: <<
Package: ekg
Description: Upgrade package for ekg
Depends: %N (= %v-%r)
DocFiles: ChangeLog* lib/COPYING
<<
SplitOff4: <<
Package: ekg-shlibs
Description: Upgrade package for ekg-shlibs
Depends: %N-shlibs (= %v-%r)
DocFiles: ChangeLog* lib/COPYING
<<
SplitOff5: <<
Package: ekg-dev
Description: Upgrade package for ekg-dev
Depends: %N-dev (= %v-%r)
DocFiles: ChangeLog* lib/COPYING
<<
SplitOff6: <<
Package: ekg-ssl
Description: Upgrade package for ekg-ssl
Depends: %N (= %v-%r)
DocFiles: ChangeLog* lib/COPYING
<<
SplitOff7: <<
Package: ekg-ssl-shlibs
Description: Upgrade package for ekg-ssl-shlibs
Depends: %N-shlibs (= %v-%r)
DocFiles: ChangeLog* lib/COPYING
<<
SplitOff8: <<
Package: ekg-ssl-dev
Description: Upgrade package for ekg-ssl-dev
Depends: %N-dev (= %v-%r)
DocFiles: ChangeLog* lib/COPYING
<<
Homepage: http://dev.null.pl/ekg/
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
