From dedadf5fd9c04b06b0baaf7af503fd48d3a9e109 Mon Sep 17 00:00:00 2001
From: amdmi3 <amdmi3@FreeBSD.org>
Date: Mon, 18 Aug 2014 17:30:24 +0000
Subject: - Switch devel/liboop to USES=libtool, drop .la files - Fix glib2
 detection by adding USES=pkgconfig - Bump dependent ports as .so version has
 changed

Approved by:	portmgr blanket
---
 devel/liboop/Makefile                |  6 +++---
 devel/liboop/files/patch-Makefile.in | 11 +++++++++++
 devel/liboop/pkg-plist               | 18 +++++++++++-------
 net/nepim/Makefile                   |  4 ++--
 security/lsh/Makefile                |  1 +
 5 files changed, 28 insertions(+), 12 deletions(-)
 create mode 100644 devel/liboop/files/patch-Makefile.in

diff --git a/devel/liboop/Makefile b/devel/liboop/Makefile
index 86b2840..02c544c 100644
--- a/devel/liboop/Makefile
+++ b/devel/liboop/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	liboop
 PORTVERSION=	1.0
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	devel
 MASTER_SITES=	GENTOO/distfiles \
 		http://download.ofb.net/liboop/
@@ -16,13 +16,13 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	libadns.so:${PORTSDIR}/dns/adns \
 		libwwwcore.so:${PORTSDIR}/www/libwww
 
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libwww
 MAKE_ENV=	INSTALL_STRIP_FLAG=${STRIP}
 MAKE_JOBS_UNSAFE=	yes
-USE_AUTOTOOLS=	libtool
 USE_GNOME=	glib12 glib20
 USE_LDCONFIG=	yes
-USES=		pathfix tcl tar:bzip2
+USES=		libtool pathfix pkgconfig tcl tar:bzip2
 
 CPPFLAGS+=	-I${TCL_INCLUDEDIR} -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/devel/liboop/files/patch-Makefile.in b/devel/liboop/files/patch-Makefile.in
new file mode 100644
index 0000000..f2ced01
--- /dev/null
+++ b/devel/liboop/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	2014-08-18 21:23:58.000000000 +0400
++++ Makefile.in	2014-08-18 21:26:36.000000000 +0400
+@@ -196,7 +196,7 @@
+ 
+ test_oop_SOURCES = test-oop.c
+ test_oop_CFLAGS = $(GLIB2_CFLAGS) $(GLIB_INCLUDES) $(TCL_INCLUDES) $(WWW_INCLUDES)
+-test_oop_LDADD = $(lib_LTLIBRARIES)
++test_oop_LDADD = $(lib_LTLIBRARIES) $(GLIB2_LIBS) $(WWW_LIBS)
+ subdir = .
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/devel/liboop/pkg-plist b/devel/liboop/pkg-plist
index 77c32f7..f211070 100644
--- a/devel/liboop/pkg-plist
+++ b/devel/liboop/pkg-plist
@@ -6,28 +6,32 @@ include/oop-rl.h
 include/oop-tcl.h
 include/oop-www.h
 lib/liboop.a
-lib/liboop.la
 lib/liboop.so
 lib/liboop.so.4
+lib/liboop.so.4.0.1
 lib/liboop-adns.a
-lib/liboop-adns.la
 lib/liboop-adns.so
 lib/liboop-adns.so.3
+lib/liboop-adns.so.3.0.0
 lib/liboop-glib.a
-lib/liboop-glib.la
 lib/liboop-glib.so
-lib/liboop-glib.so.1
+lib/liboop-glib.so.0
+lib/liboop-glib.so.0.1.0
+lib/liboop-glib2.a
+lib/liboop-glib2.so
+lib/liboop-glib2.so.0
+lib/liboop-glib2.so.0.0.0
 lib/liboop-rl.a
-lib/liboop-rl.la
 lib/liboop-rl.so
 lib/liboop-rl.so.0
+lib/liboop-rl.so.0.0.0
 lib/liboop-tcl.a
-lib/liboop-tcl.la
 lib/liboop-tcl.so
 lib/liboop-tcl.so.0
+lib/liboop-tcl.so.0.0.0
 lib/liboop-www.a
-lib/liboop-www.la
 lib/liboop-www.so
 lib/liboop-www.so.0
+lib/liboop-www.so.0.0.0
 libdata/pkgconfig/liboop.pc
 libdata/pkgconfig/liboop-glib2.pc
diff --git a/net/nepim/Makefile b/net/nepim/Makefile
index f5144fc..fc69b06 100644
--- a/net/nepim/Makefile
+++ b/net/nepim/Makefile
@@ -3,9 +3,9 @@
 
 PORTNAME=	nepim
 PORTVERSION=	0.53
+PORTREVISION=	1
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR=	nepim
+MASTER_SITES=	SAVANNAH/nepim
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tool for measuring available bandwidth between hosts
diff --git a/security/lsh/Makefile b/security/lsh/Makefile
index 793d80c..1117205 100644
--- a/security/lsh/Makefile
+++ b/security/lsh/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	lsh
 PORTVERSION=	2.1
+PORTREVISION=	1
 CATEGORIES=	security ipv6
 MASTER_SITES=	GNU
 
-- 
cgit v1.1