From 8503536d3896846d823f7f76be54e0a99da8d8b6 Mon Sep 17 00:00:00 2001
From: Ade Lovett <ade@FreeBSD.org>
Date: Thu, 23 Feb 2006 10:40:44 +0000
Subject: Conversion to a single libtool environment.
Approved by: portmgr (kris)
---
www/gtkhtml/Makefile | 4 ++--
www/gtkhtml/files/gtkhtmlConf.sh | 2 +-
www/gtkhtml/pkg-plist | 5 ++++-
3 files changed, 7 insertions(+), 4 deletions(-)
(limited to 'www/gtkhtml')
diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile
index a2835636f566..82620ffbccab 100644
--- a/www/gtkhtml/Makefile
+++ b/www/gtkhtml/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkhtml
PORTVERSION= 1.1.10
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.1
@@ -23,7 +23,7 @@ USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix gnomehier glibwww libghttp libcapplet gal
INSTALLS_SHLIB= yes
-USE_AUTOTOOLS= libtool:13:inc
+GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-gconf=yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/www/gtkhtml/files/gtkhtmlConf.sh b/www/gtkhtml/files/gtkhtmlConf.sh
index 0aec8fc497b8..4f45451884d8 100644
--- a/www/gtkhtml/files/gtkhtmlConf.sh
+++ b/www/gtkhtml/files/gtkhtmlConf.sh
@@ -1,5 +1,5 @@
GTKHTML_LIBDIR="-L%%PREFIX%%/lib"
-GTKHTML_LIBS=" -L%%PREFIX%%/lib -lgtkhtml-1.1 -Wl,-E -L%%X11BASE%%/lib -L%%LOCALBASE%%/lib -lgal -lgnomeprint -lfreetype -lglade-gnome -lglade -lxml -lXpm -ljpeg -lgnomeui -lart_lgpl -lgdk_imlib -ltiff -lungif -lpng -lz -lSM -lICE -lgnome -lgnomesupport -lesd -laudiofile -lgdk_pixbuf -lgtk12 -lgdk12 -lgmodule12 -lglib12 -lintl -lXi -lXext -lX11 -lm -lgnomecanvaspixbuf -liconv -Wl,-E -L%%X11BASE%%/lib -L%%LOCALBASE%%/lib -lgconf-gtk-1 -lgconf-1 -loaf -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lwrap -lgtk12 -lgdk12 -lgmodule12 -lglib12 -lintl -lXi -lXext -lX11 -lm"
+GTKHTML_LIBS=" -L%%PREFIX%%/lib -lgtkhtml-1.1 -Wl,-E -L%%X11BASE%%/lib -L%%LOCALBASE%%/lib -lgal -lgnomeprint -lfreetype -lglade-gnome -lglade -lxml -lXpm -ljpeg -lgnomeui -lart_lgpl -lgdk_imlib -ltiff -lungif -lpng -lz -lSM -lICE -lgnome -lgnomesupport -lesd -laudiofile -lgdk_pixbuf -lgtk-12 -lgdk-12 -lgmodule-12 -lglib-12 -lintl -lXi -lXext -lX11 -lm -lgnomecanvaspixbuf -liconv -Wl,-E -L%%X11BASE%%/lib -L%%LOCALBASE%%/lib -lgconf-gtk-1 -lgconf-1 -loaf -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lwrap -lgtk-12 -lgdk-12 -lgmodule-12 -lglib-12 -lintl -lXi -lXext -lX11 -lm"
GTKHTML_INCLUDEDIR="-I%%PREFIX%%/include -I%%PREFIX%%/include/gtkhtml-1.1 -I%%X11BASE%%/include/gdk-pixbuf-1.0 -I%%X11BASE%%/include/gtk12 -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include -I%%X11BASE%%/include -I%%X11BASE%%/include/gnome-1.0 -I%%LOCALBASE%%/include/freetype2 -DNEED_GNOMESUPPORT_H -I%%X11BASE%%/lib/gnome-libs/include -I%%LOCALBASE%%/include/gnome-xml -I%%X11BASE%%/include/libglade-1.0 -I%%X11BASE%%/include/gconf/1 -I%%X11BASE%%/include -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include/orbit-1.0 -I%%LOCALBASE%%/include -I%%X11BASE%%/include/gtk12 -DGTKHTML_HAVE_GCONF"
GTKHTML_DATADIR="%%PREFIX%%/share/gnome"
MODULE_VERSION="%%VERSION%%"
diff --git a/www/gtkhtml/pkg-plist b/www/gtkhtml/pkg-plist
index 8bb643b123b2..3406323f9502 100644
--- a/www/gtkhtml/pkg-plist
+++ b/www/gtkhtml/pkg-plist
@@ -89,10 +89,13 @@ include/gtkhtml-1.1/gtkhtml/htmltypes.h
include/gtkhtml-1.1/gtkhtml/htmlundo-action.h
include/gtkhtml-1.1/gtkhtml/htmlundo.h
include/gtkhtml-1.1/gtkhtml/htmlvspace.h
+lib/bonobo/plugin/libstorage_http.a
+lib/bonobo/plugin/libstorage_http.la
lib/bonobo/plugin/libstorage_http.so
-lib/libgtkhtml-1.1.so.3
lib/libgtkhtml-1.1.a
+lib/libgtkhtml-1.1.la
lib/libgtkhtml-1.1.so
+lib/libgtkhtml-1.1.so.3
libdata/pkgconfig/gtkhtml-1.1.pc
share/doc/gtkhtml/gtkhtml-decl.txt
share/doc/gtkhtml/gtkhtml-sections.txt
--
cgit v1.2.3