From 25c25ab7010c3c39cb9bcbbeb59260cdbce3b6db Mon Sep 17 00:00:00 2001
From: bapt <bapt@FreeBSD.org>
Date: Sun, 2 Mar 2014 23:23:17 +0000
Subject: Convert to USES=libtool Use more options helpers dirrmtry directory
 not in the default mtree

---
 x11-wm/openbox/Makefile  | 16 +++++-----------
 x11-wm/openbox/pkg-plist |  4 ++++
 2 files changed, 9 insertions(+), 11 deletions(-)

(limited to 'x11-wm')

diff --git a/x11-wm/openbox/Makefile b/x11-wm/openbox/Makefile
index f464cec86e0a..2717e199ef74 100644
--- a/x11-wm/openbox/Makefile
+++ b/x11-wm/openbox/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	openbox
 PORTVERSION=	3.5.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://openbox.org/dist/openbox/
 
@@ -13,10 +13,9 @@ COMMENT=	Small, fast, standards compliant, extensible window manager
 LICENSE=	GPLv2
 
 GNU_CONFIGURE=	yes
-USES=		gmake pkgconfig
-USE_GNOME=	glib20 libxml2 gnomehack ltverhack
+USES=		libtool gmake pathfix pkgconfig
+USE_GNOME=	glib20 libxml2
 USE_XORG=	xft
-USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 
 CFLAGS+=	-I${LOCALBASE}/include
@@ -37,13 +36,8 @@ PANG_CONFIGURE_OFF=	--disable-pango
 NOTIFY_LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification
 NOTIFY_CONFIGURE_OFF=	--disable-startup-notification
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MIMLIB}
-USE_EFL=	imlib2
-.else
-CONFIGURE_ARGS+=	--disable-imlib2
-.endif
+IMLIB_CONFIGURE_ENABLE=	imlib2
+IMLIB_USE=	EFL=imlib2
 
 post-configure:
 	@${CHMOD} +x ${WRKSRC}/install-sh
diff --git a/x11-wm/openbox/pkg-plist b/x11-wm/openbox/pkg-plist
index 67d2f98e8d6e..765d39df5acc 100644
--- a/x11-wm/openbox/pkg-plist
+++ b/x11-wm/openbox/pkg-plist
@@ -33,10 +33,12 @@ lib/libobrender.a
 lib/libobrender.la
 lib/libobrender.so
 lib/libobrender.so.29
+lib/libobrender.so.29.0.1
 lib/libobt.a
 lib/libobt.la
 lib/libobt.so
 lib/libobt.so.2
+lib/libobt.so.2.0.1
 libdata/pkgconfig/obrender-%%VERSION%%.pc
 libdata/pkgconfig/obt-%%VERSION%%.pc
 libexec/openbox-autostart
@@ -163,6 +165,8 @@ share/xsessions/openbox.desktop
 %%NLS%%@dirrmtry share/locale/en@boldquot
 %%NLS%%@dirrmtry share/locale/bn_IN/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
 @dirrmtry share/xsessions
 @dirrm share/themes/Syscrash/openbox-3
 @dirrm share/themes/Syscrash
-- 
cgit