Date: Sun, 2 Jul 2006 23:43:48 +0200 (CEST) From: Marcin Wisnicki <mwisnicki+freebsd@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: alex@BSDGuru.org Subject: ports/99727: [PATCH] polish/libgadu: file conflicts with polish/ekg Message-ID: <200607022143.k62LhmXo096591@ghost.pnet.one.pl> Resent-Message-ID: <200607022150.k62LoGMg014654@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 99727 >Category: ports >Synopsis: [PATCH] polish/libgadu: file conflicts with polish/ekg >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:50:16 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 is related to bug http://www.freebsd.org/cgi/query-pr.cgi?pr=99725 Following patch adds conflict with older versions of ekg to prevent overwrite of libgadu.so. It is assumed that ports/99725 will be applied. Additionally I hacked Makefile to install correct files instead of playing with them in post-install stage. Added file(s): - files/patch-Makefile.in Port maintainer (alex@BSDGuru.org) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- pl-libgadu-20051229_2.patch begins here --- diff -ruN --exclude=CVS /usr/ports/polish/libgadu.orig/Makefile /usr/ports/polish/libgadu/Makefile --- /usr/ports/polish/libgadu.orig/Makefile Sat May 13 03:03:09 2006 +++ /usr/ports/polish/libgadu/Makefile Sun Jul 2 21:05:43 2006 @@ -2,17 +2,19 @@ # Date created: 29 December 2005 # Whom: Aleksander Fafula <alex@BSDGuru.org> # -# $FreeBSD: /repoman/r/pcvs/ports/polish/libgadu/Makefile,v 1.3 2006/05/13 01:03:09 edwin Exp $ +# $FreeBSD: ports/polish/libgadu/Makefile,v 1.3 2006/05/13 01:03:09 edwin Exp $ PORTNAME= libgadu PORTVERSION= 20051229 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= polish net MASTER_SITES= http://bsdguru.org/distfiles/ MAINTAINER= alex@BSDGuru.org COMMENT= This library is used by many IMs with Gadu-Gadu support +CONFLICTS= pl-ekg-1.[0-5]* pl-ekg-1.6,2 + USE_GMAKE= yes USE_GNOME= gnomehack pkgconfig USE_AUTOTOOLS= aclocal:15 autoheader:259 autoconf:259 @@ -21,10 +23,5 @@ CONFIGURE_ARGS= --enable-shared --disable-static --without-openssl INSTALLS_SHLIB= yes - -post-install: - ${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/libgadu.orig/files/patch-Makefile.in /usr/ports/polish/libgadu/files/patch-Makefile.in --- /usr/ports/polish/libgadu.orig/files/patch-Makefile.in Thu Jan 1 01:00:00 1970 +++ /usr/ports/polish/libgadu/files/patch-Makefile.in Sun Jul 2 19:41:31 2006 @@ -0,0 +1,27 @@ +--- lib/Makefile.in.orig Sat Jun 25 08:41:07 2005 ++++ lib/Makefile.in Sun Jul 2 19:41:00 2006 +@@ -27,7 +27,7 @@ + + SHAREDMM = libgadu.so + SHAREDM = $(SHAREDMM).$(VERSION_MAJOR) +-SHARED = $(SHAREDM).$(VERSION_MINOR) ++SHARED = $(SHAREDM) + STATIC = libgadu.a + + all: @static@ @shared@ +@@ -57,7 +57,6 @@ + + $(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) + + # +@@ -82,7 +81,6 @@ + + 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) + + install-static: install-common --- pl-libgadu-20051229_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?200607022143.k62LhmXo096591>