- Use new libtool stuff

- dirrmtry
- USE_GETTEXT


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5741 df743ca5-7f9a-e211-a948-0013205c9059

7 files changed, 20 insertions, 14 deletions

diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index 9c49f8861..a1a5a4834 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/epiphany-extensions/Makefile,v 1.63 2006/01/31 18:59:19 marcus Exp $
+#   $MCom: ports/www/epiphany-extensions/Makefile,v 1.64 2006/02/14 07:20:15 marcus Exp $
 #
 
 PORTNAME=	epiphany
 PORTVERSION=	1.9.7
+PORTREVISION=	1
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}${PKGNAMESUFFIX}/1.9
@@ -21,11 +22,12 @@ COMMENT=	A set of add-ons for the Epiphany web browser
 BUILD_DEPENDS=	epiphany:${PORTSDIR}/www/epiphany
 RUN_DEPENDS=	epiphany:${PORTSDIR}/www/epiphany
 
+USE_GETTEXT=	yes
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GECKO=	firefox mozilla seamonkey
 USE_GNOME=	gnomeprefix gnomehack intlhack gnometarget
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
diff --git a/www/epiphany-extensions/pkg-plist b/www/epiphany-extensions/pkg-plist
index 52af6cb5c..580220c46 100644
--- a/www/epiphany-extensions/pkg-plist
+++ b/www/epiphany-extensions/pkg-plist
@@ -79,7 +79,7 @@ share/locale/zh_TW/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
 @dirrm share/gnome/epiphany-extensions/xml
 @dirrm share/gnome/epiphany-extensions/glade
 @dirrm share/gnome/epiphany-extensions
-@unexec rmdir %D/lib/epiphany/%%VERSION%%/extensions 2>/dev/null || true
-@unexec rmdir %D/lib/epiphany/%%VERSION%%/plugins 2>/dev/null || true
-@unexec rmdir %D/lib/epiphany/%%VERSION%% 2>/dev/null || true
-@unexec rmdir %D/lib/epiphany 2>/dev/null || true
+@dirrmtry lib/epiphany/%%VERSION%%/extensions
+@dirrmtry lib/epiphany/%%VERSION%%/plugins
+@dirrmtry lib/epiphany/%%VERSION%%
+@dirrmtry lib/epiphany
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index a072f2a6c..d877d07e7 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/epiphany/Makefile,v 1.97 2006/01/31 20:36:53 marcus Exp $
+#   $MCom: ports/www/epiphany/Makefile,v 1.98 2006/02/14 04:27:38 marcus Exp $
 #
 
 PORTNAME=	epiphany
@@ -20,13 +20,14 @@ BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-
 LIB_DEPENDS=	dbus-1.2:${PORTSDIR}/devel/dbus
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
 
+USE_GETTEXT=	yes
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 GNOME_DESKTOP_VERSION=2
 USE_GECKO=	firefox mozilla seamonkey
 USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop desktopfileutils \
 		libgnomeprintui
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 INSTALLS_OMF=	yes
 CONFIGURE_ARGS=	--with-mozilla=${GECKO} \
diff --git a/www/epiphany/pkg-plist b/www/epiphany/pkg-plist
index 4eb046746..4fdce53e0 100644
--- a/www/epiphany/pkg-plist
+++ b/www/epiphany/pkg-plist
@@ -236,9 +236,9 @@ share/locale/zh_TW/LC_MESSAGES/epiphany.mo
 @dirrm share/gnome/epiphany/art
 @dirrm share/gnome/epiphany
 @dirrm %%DOCSDIR%%
-@unexec rmdir %D/lib/epiphany/%%EPHY_VERSION%%/plugins 2>/dev/null || true
-@unexec rmdir %D/lib/epiphany/%%EPHY_VERSION%% 2>/dev/null || true
-@unexec rmdir %D/lib/epiphany 2>/dev/null || true
+@dirrmtry lib/epiphany/%%EPHY_VERSION%%/plugins
+@dirrmtry lib/epiphany/%%EPHY_VERSION%%
+@dirrmtry lib/epiphany
 @dirrm include/epiphany/%%EPHY_VERSION%%/epiphany
 @dirrm include/epiphany/%%EPHY_VERSION%%
 @dirrm include/epiphany
diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index 0d9d6335f..92ce692cf 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/gtkhtml3/Makefile,v 1.69 2006/02/02 12:08:58 ahze Exp $
+#   $MCom: ports/www/gtkhtml3/Makefile,v 1.70 2006/02/13 23:24:02 ahze Exp $
 #
 
 PORTNAME=	gtkhtml3
 PORTVERSION=	3.9.91
+PORTREVISION=	1
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/3.9
@@ -19,6 +20,7 @@ COMMENT=	Lightweight HTML rendering/printing/editing engine
 
 LIB_DEPENDS=	soup-2.2.8:${PORTSDIR}/devel/libsoup
 
+USE_GETTEXT=	yes
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
diff --git a/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile
index 0d9d6335f..92ce692cf 100644
--- a/www/gtkhtml38/Makefile
+++ b/www/gtkhtml38/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/gtkhtml3/Makefile,v 1.69 2006/02/02 12:08:58 ahze Exp $
+#   $MCom: ports/www/gtkhtml3/Makefile,v 1.70 2006/02/13 23:24:02 ahze Exp $
 #
 
 PORTNAME=	gtkhtml3
 PORTVERSION=	3.9.91
+PORTREVISION=	1
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/3.9
@@ -19,6 +20,7 @@ COMMENT=	Lightweight HTML rendering/printing/editing engine
 
 LIB_DEPENDS=	soup-2.2.8:${PORTSDIR}/devel/libsoup
 
+USE_GETTEXT=	yes
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
diff --git a/www/swfdec-plugin/Makefile b/www/swfdec-plugin/Makefile
index 3900f349f..59749a3ee 100644
--- a/www/swfdec-plugin/Makefile
+++ b/www/swfdec-plugin/Makefile
@@ -33,7 +33,6 @@ USE_GSTREAMER80=	gconf
 USE_GETOPT_LONG=	yes
 USE_REINPLACE=	yes
 USE_AUTOTOOLS=	libtool:15
-GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"