From c48aa12aa5e946f0b7a2decc2d0a55cb74fcb422 Mon Sep 17 00:00:00 2001
From: Pav Lucistnik <pav@FreeBSD.org>
Date: Mon, 17 Nov 2003 01:35:14 +0000
Subject: - Use system gettext instead of bundled one - Respect ${PTHREAD_LIBS}

PR:		ports/58542
Submitted by:	Simon Barner <barner@in.tum.de>
Approved by:	marcus (backup mentor)
---
 net/linneighborhood/Makefile              |  9 ++++++---
 net/linneighborhood/files/patch-configure | 32 -------------------------------
 net/linneighborhood/pkg-plist             |  3 +--
 3 files changed, 7 insertions(+), 37 deletions(-)
 delete mode 100644 net/linneighborhood/files/patch-configure

(limited to 'net')

diff --git a/net/linneighborhood/Makefile b/net/linneighborhood/Makefile
index 1805b0386cb0..92307c5bbf40 100644
--- a/net/linneighborhood/Makefile
+++ b/net/linneighborhood/Makefile
@@ -8,22 +8,25 @@
 
 PORTNAME=	LinNeighborhood
 PORTVERSION=	0.6.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.bnro.de/~schmidjo/download/
 
 MAINTAINER=	h.eichmann@gmx.de
 COMMENT=	GTK+ gui for browsing and mounting SMB filesystems
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext
 RUN_DEPENDS=	smbclient:${PORTSDIR}/net/samba
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
+USE_REINPLACE=	yes
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
+		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
 
-pre-configure:
+post-patch:
 	${CP} ${FILESDIR}/mntent* ${WRKSRC}/src
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' ${WRKSRC}/configure
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/net/linneighborhood/files/patch-configure b/net/linneighborhood/files/patch-configure
deleted file mode 100644
index 145bad4a5e06..000000000000
--- a/net/linneighborhood/files/patch-configure
+++ /dev/null
@@ -1,32 +0,0 @@
---- 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"
- #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
diff --git a/net/linneighborhood/pkg-plist b/net/linneighborhood/pkg-plist
index dd9ec10209b5..affe370998a6 100644
--- a/net/linneighborhood/pkg-plist
+++ b/net/linneighborhood/pkg-plist
@@ -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
@@ -12,4 +11,4 @@ share/locale/pl/LC_MESSAGES/LinNeighborhood.mo
 share/locale/it/LC_MESSAGES/LinNeighborhood.mo
 share/locale/zh_TW/LC_MESSAGES/LinNeighborhood.mo
 share/icons/LinNeighborhood.xpm
-@unexec rmdir %D/share/icons
+@dirrm share/icons
-- 
cgit v1.2.3