diff options
author | itetcu <itetcu@FreeBSD.org> | 2006-07-29 01:08:16 +0800 |
---|---|---|
committer | itetcu <itetcu@FreeBSD.org> | 2006-07-29 01:08:16 +0800 |
commit | 465d8bd1ab2314d436cc1d8dd860e14a1fe9e783 (patch) | |
tree | c1c6659fb687c4be6b559f09ed1bb75a0aa8dab9 /polish/ekg | |
parent | 36eceafefee0e6144d89606336d4156e97d85283 (diff) | |
download | freebsd-ports-gnome-465d8bd1ab2314d436cc1d8dd860e14a1fe9e783.tar.gz freebsd-ports-gnome-465d8bd1ab2314d436cc1d8dd860e14a1fe9e783.tar.zst freebsd-ports-gnome-465d8bd1ab2314d436cc1d8dd860e14a1fe9e783.zip |
Make polish/ekg not install libgadu.so and use the one provided with
polish/libgadu.
PR: ports/99725
Submitted by: Marcin Wisnicki
Approved by: maintainer timeout
Diffstat (limited to 'polish/ekg')
-rw-r--r-- | polish/ekg/Makefile | 15 | ||||
-rw-r--r-- | polish/ekg/files/patch-configure | 19 | ||||
-rw-r--r-- | polish/ekg/pkg-plist | 5 |
3 files changed, 21 insertions, 18 deletions
diff --git a/polish/ekg/Makefile b/polish/ekg/Makefile index 7428bdb8c058..7073e37a67d1 100644 --- a/polish/ekg/Makefile +++ b/polish/ekg/Makefile @@ -6,6 +6,7 @@ PORTNAME= ekg PORTVERSION= 1.6 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= polish net-im MASTER_SITES= http://dev.null.pl/ekg/ @@ -13,22 +14,19 @@ MASTER_SITES= http://dev.null.pl/ekg/ MAINTAINER= alex@bsdguru.org COMMENT= Text-mode Gadu-Gadu client -LIB_DEPENDS= aspell.16:${PORTSDIR}/polish/aspell +LIB_DEPENDS= aspell.16:${PORTSDIR}/polish/aspell \ + gadu.3:${PORTSDIR}/polish/libgadu USE_GMAKE= yes GNU_CONFIGURE= yes USE_GNOME= gnomehack pkgconfig -CONFIGURE_ARGS+= --enable-shared \ +CONFIGURE_ARGS+= --disable-shared \ --disable-static \ --enable-dynamic \ - --enable-aspell \ - --mandir=${PREFIX}/man + --enable-aspell CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" -MAKE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ - CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" INSTALLS_SHLIB= yes @@ -38,8 +36,5 @@ MANCOMPRESSED= no post-install: ${STRIP_CMD} ${PREFIX}/bin/ekg - ${RM} ${PREFIX}/lib/libgadu.so ${PREFIX}/lib/libgadu.so.3 - ${MV} ${PREFIX}/lib/libgadu.so.3.3 ${PREFIX}/lib/libgadu.so.3 - ${LN} -s ${PREFIX}/lib/libgadu.so.3 ${PREFIX}/lib/libgadu.so .include <bsd.port.mk> diff --git a/polish/ekg/files/patch-configure b/polish/ekg/files/patch-configure index 4ca5ff3f00ef..7891a5354efb 100644 --- a/polish/ekg/files/patch-configure +++ b/polish/ekg/files/patch-configure @@ -1,6 +1,19 @@ ---- configure Mon Jun 28 22:13:05 2004 -+++ configure Sat Jul 17 10:12:27 2004 -@@ -4554,7 +4554,6 @@ +--- configure.orig Sun Jul 2 17:24:39 2006 ++++ configure Sun Jul 2 17:25:50 2006 +@@ -3813,12 +3813,6 @@ + lib_static_enabled=no + fi + +-if test "x$enable_static" = "xno" -a "x$enable_shared" != "xyes"; then +- { { echo "$as_me:$LINENO: error: You must choose either static or shared version of libgadu." >&5 +-echo "$as_me: error: You must choose either static or shared version of libgadu." >&2;} +- { (exit 1); exit 1; }; } +-fi +- + # Check whether --enable-dynamic or --disable-dynamic was given. + if test "${enable_dynamic+set}" = set; then + enableval="$enable_dynamic" +@@ -4770,7 +4764,6 @@ LIBS_LIBGADU="$LIBS_LIBGADU $OPENSSL_LIBS" CFLAGS="$CFLAGS $OPENSSL_INCLUDES" CFLAGS_LIBGADU="$CFLAGS_LIBGADU $OPENSSL_INCLUDES" diff --git a/polish/ekg/pkg-plist b/polish/ekg/pkg-plist index 60c65f0de995..a8813e92ff49 100644 --- a/polish/ekg/pkg-plist +++ b/polish/ekg/pkg-plist @@ -1,9 +1,4 @@ bin/ekg -include/libgadu-config.h -include/libgadu.h -lib/libgadu.so -lib/libgadu.so.3 -libdata/pkgconfig/libgadu.pc %%DATADIR%%/themes/arim.theme %%DATADIR%%/themes/dj.theme %%DATADIR%%/themes/eileen.theme |