- New LIB_DEPENDS syntax.

- USES=libtool.
- Fix configure when $CC = gcc.

3 files changed, 9 insertions, 43 deletions

diff --git a/astro/gpsdrive/Makefile b/astro/gpsdrive/Makefile
index 349adf798087..332dfd03510e 100644
--- a/astro/gpsdrive/Makefile
+++ b/astro/gpsdrive/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gpsdrive
 PORTVERSION=	2.09
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	astro geography
 MASTER_SITES=	http://www.gpsdrive.de/packages/ \
 		LOCAL/beech
@@ -13,20 +13,18 @@ COMMENT=	GPS navigation system
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	pcre:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
 
-USES=		gmake perl5 pkgconfig
-USE_AUTOTOOLS=	libtool
+USES=		gmake libtool perl5 pkgconfig
 USE_GNOME=	gtk20
 USE_LDCONFIG=	yes
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-garmin
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib -lgmodule-2.0
 MAKE_JOBS_UNSAFE=	yes
 
-MANLANG=	"" de es
-
 OPTIONS_DEFINE=	NLS
 
 .include <bsd.port.options.mk>
@@ -39,6 +37,7 @@ PLIST_SUB+=	NLS="@comment "
 .endif
 
 post-patch:
+	@${REINPLACE_CMD} 's/test "$$CC" = "gcc"/false/' ${WRKSRC}/configure
 .if ! ${PORT_OPTIONS:MNLS}
 	@${REINPLACE_CMD} 's|SUBDIRS = src po man|SUBDIRS = src man|' \
 		${WRKSRC}/Makefile.in
diff --git a/astro/gpsdrive/files/patch-ltmain.sh b/astro/gpsdrive/files/patch-ltmain.sh
deleted file mode 100644
index 4abc20321994..000000000000
--- a/astro/gpsdrive/files/patch-ltmain.sh
+++ /dev/null
@@ -1,33 +0,0 @@
---- ltmain.sh.orig	Sun Jul 14 20:22:08 2002
-+++ ltmain.sh	Thu Jul 31 17:46:34 2003
-@@ -1043,7 +1043,7 @@
- 	    # These systems don't actually have a C library (as such)
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
--	  *-*-openbsd*)
-+	  *-*-openbsd* | *-*-freebsd*)
- 	    # Do not include libc due to us having libc/libc_r.
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
-@@ -2445,7 +2445,7 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
--	  *-*-openbsd*)
-+	  *-*-openbsd* | *-*-freebsd*)
- 	    # Do not include libc due to us having libc/libc_r.
- 	    ;;
- 	  *)
-@@ -4225,10 +4225,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false ; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/astro/gpsdrive/pkg-plist b/astro/gpsdrive/pkg-plist
index b3d5ee98c32c..eff95190c34b 100644
--- a/astro/gpsdrive/pkg-plist
+++ b/astro/gpsdrive/pkg-plist
@@ -13,13 +13,13 @@ bin/gpssql_restore.sh
 bin/wpcvt
 bin/wpget
 lib/libfly.a
-lib/libfly.la
 lib/libfly.so
 lib/libfly.so.2
+lib/libfly.so.2.0.0
 lib/libnautic.a
-lib/libnautic.la
 lib/libnautic.so
 lib/libnautic.so.2
+lib/libnautic.so.2.0.0
 man/de/man1/gpsdrive.1.gz
 man/es/man1/gpsdrive.1.gz
 man/man1/gpsdrive.1.gz