Date: Sun, 2 Jul 2006 23:28:08 +0200 (CEST) From: Marcin Wisnicki <mwisnicki+freebsd@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: alex@bsdguru.org Subject: ports/99725: [PATCH] polish/ekg: file conflicts with polish/libgadu Message-ID: <200607022128.k62LS8MG095581@ghost.pnet.one.pl> Resent-Message-ID: <200607022130.k62LUJ6s011503@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 99725 >Category: ports >Synopsis: [PATCH] polish/ekg: file conflicts with polish/libgadu >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Jul 02 21:30:18 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Marcin Wisnicki >Release: FreeBSD 6.1-STABLE i386 >Organization: >Environment: System: FreeBSD ghost.pnet.one.pl 6.1-STABLE FreeBSD 6.1-STABLE #0: Sat Jun 24 06:58:43 CEST 2006 >Description: This port installs its own copy of libgadu.so that conflicts with libgadu port. Because setting CONFLICTS on both ports is undesirable, polish/ekg should instead not install libgadu.so and use the one provided with polish/libgadu. Following patch adds dependency on libgadu and hacks configure to allow building with external library. Unnecessary parts of port were removed (MAKE_ENV, mandir) I am also going to submit a pr against polish/libgadu that sets conflict with older versions of polish/ekg. As a consequence, upgrading ekg with portupgrade if libgadu is already installed will be broken. If this patch is going to be commited, something like this should be added to UPDATING: If you have installed both ekg-1.6,2 and libgadu-20051229_1 then you should first deinstall them and install polish/ekg after that, eg: pkg_deinstall -f pl-ekg-\* pl-libgadu-\* portinstall polish/ekg Port maintainer (alex@bsdguru.org) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- pl-ekg-1.6_1,2.patch begins here --- diff -ruN --exclude=CVS /usr/ports/polish/ekg.orig/Makefile /usr/ports/polish/ekg/Makefile --- /usr/ports/polish/ekg.orig/Makefile Mon Nov 14 17:09:05 2005 +++ /usr/ports/polish/ekg/Makefile Sun Jul 2 21:29:28 2006 @@ -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 @@ 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 @@ 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 -ruN --exclude=CVS /usr/ports/polish/ekg.orig/files/patch-configure /usr/ports/polish/ekg/files/patch-configure --- /usr/ports/polish/ekg.orig/files/patch-configure Wed Jul 21 23:36:45 2004 +++ /usr/ports/polish/ekg/files/patch-configure Sun Jul 2 17:26:06 2006 @@ -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 -ruN --exclude=CVS /usr/ports/polish/ekg.orig/pkg-plist /usr/ports/polish/ekg/pkg-plist --- /usr/ports/polish/ekg.orig/pkg-plist Thu Jan 26 06:16:28 2006 +++ /usr/ports/polish/ekg/pkg-plist Sun Jul 2 21:38:12 2006 @@ -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 --- pl-ekg-1.6_1,2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200607022128.k62LS8MG095581>