Date: Sat, 25 Oct 2003 15:40:19 -0700 (PDT) From: Simon Barner <barner@in.tum.de> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/58542: sysutils/linneighborhood: fix libintl and libiconv depedencies => avoid conflicts with other ports Message-ID: <200310252240.h9PMeJ0U096759@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/58542; it has been noted by GNATS. From: Simon Barner <barner@in.tum.de> To: FreeBSD-gnats-submit@FreeBSD.org Cc: h.eichmann@gmx.de Subject: Re: ports/58542: sysutils/linneighborhood: fix libintl and libiconv depedencies => avoid conflicts with other ports Date: Sun, 26 Oct 2003 00:34:51 +0200 Sorry, I forgot to remove some unneccessary things that were left from my experiments. Here is the updated patch: diff -ruN linneighborhood/Makefile linneighborhood.patched/Makefile --- linneighborhood/Makefile Tue Aug 26 22:25:55 2003 +++ linneighborhood.patched/Makefile Sun Oct 26 00:25:52 2003 @@ -15,17 +15,25 @@ MAINTAINER= h.eichmann@gmx.de COMMENT= GTK+ gui for browsing and mounting SMB filesystems -LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \ + iconv.3:${PORTSDIR}/converters/libiconv RUN_DEPENDS= smbclient:${PORTSDIR}/net/samba +USE_REINPLACE= yes GNU_CONFIGURE= yes +CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ + LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" USE_GMAKE= yes USE_GNOME= gtk12 +.include <bsd.port.pre.mk> + pre-configure: - ${CP} ${FILESDIR}/mntent* ${WRKSRC}/src + @${CP} ${FILESDIR}/mntent* ${WRKSRC}/src + @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ + s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/configure post-install: @${CAT} ${PKGMESSAGE} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff -ruN linneighborhood/files/patch-configure linneighborhood.patched/files/patch-configure --- linneighborhood/files/patch-configure Wed Apr 16 13:44:55 2003 +++ linneighborhood.patched/files/patch-configure Sat Oct 25 23:42:34 2003 @@ -1,32 +1,11 @@ ---- configure.orig Sun Jun 9 09:58:45 2002 -+++ configure Thu Feb 13 07:53:13 2003 -@@ -4800,13 +4800,13 @@ - { (exit 1); exit 1; }; } - fi - --echo "$as_me:4803: checking for pthread_exit in -lpthread" >&5 --echo $ECHO_N "checking for pthread_exit in -lpthread... $ECHO_C" >&6 -+echo "$as_me:4803: checking for pthread_exit in -lc_r" >&5 -+echo $ECHO_N "checking for pthread_exit in -lc_r... $ECHO_C" >&6 - if test "${ac_cv_lib_pthread_pthread_exit+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lpthread $LIBS" -+LIBS="-lc_r $LIBS" - cat >conftest.$ac_ext <<_ACEOF - #line 4811 "configure" +--- configure.orig Sat Oct 25 23:40:13 2003 ++++ configure Sat Oct 25 23:40:49 2003 +@@ -3858,7 +3858,7 @@ + cat >conftest.$ac_ext <<_ACEOF + #line 3859 "configure" #include "confdefs.h" -@@ -4857,10 +4857,10 @@ - - if test "x$lib_pthread" = "xno" ; then - { { echo "$as_me:4859: error: -- *** libpthread.so: posix thread library no found *** -+ *** libc_r.so: posix thread library no found *** - " >&5 - echo "$as_me: error: -- *** libpthread.so: posix thread library no found *** -+ *** libc_r.so: posix thread library no found *** - " >&2;} - { (exit 1); exit 1; }; } - fi +-#include <libintl.h> ++#include "%%LOCALBASE%%/include/libintl.h" + _ACEOF + if { (eval echo "$as_me:3863: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 diff -ruN linneighborhood/pkg-plist linneighborhood.patched/pkg-plist --- linneighborhood/pkg-plist Sat Aug 23 14:40:20 2003 +++ linneighborhood.patched/pkg-plist Sat Oct 25 23:50:37 2003 @@ -1,5 +1,4 @@ bin/LinNeighborhood -lib/charset.alias share/locale/de/LC_MESSAGES/LinNeighborhood.mo share/locale/sv/LC_MESSAGES/LinNeighborhood.mo share/locale/ja/LC_MESSAGES/LinNeighborhood.mo
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200310252240.h9PMeJ0U096759>