summaryrefslogtreecommitdiff
path: root/x11-toolkits
diff options
context:
space:
mode:
Diffstat (limited to 'x11-toolkits')
-rw-r--r--x11-toolkits/9libs/Makefile6
-rw-r--r--x11-toolkits/9libs/pkg-plist3
-rw-r--r--x11-toolkits/SoXt/Makefile3
-rw-r--r--x11-toolkits/SoXt/pkg-plist4
-rw-r--r--x11-toolkits/bakery/Makefile3
-rw-r--r--x11-toolkits/bakery/pkg-plist1
-rw-r--r--x11-toolkits/eel/Makefile3
-rw-r--r--x11-toolkits/eel/pkg-plist1
-rw-r--r--x11-toolkits/etox/Makefile4
-rw-r--r--x11-toolkits/etox/pkg-plist1
-rw-r--r--x11-toolkits/ewl/Makefile3
-rw-r--r--x11-toolkits/ewl/pkg-plist1
-rw-r--r--x11-toolkits/fox-devel/Makefile3
-rw-r--r--x11-toolkits/fox-devel/pkg-plist2
-rw-r--r--x11-toolkits/fox12/Makefile3
-rw-r--r--x11-toolkits/fox12/pkg-plist2
-rw-r--r--x11-toolkits/fox14/Makefile3
-rw-r--r--x11-toolkits/fox14/pkg-plist2
-rw-r--r--x11-toolkits/fox16/Makefile3
-rw-r--r--x11-toolkits/fox16/pkg-plist2
-rw-r--r--x11-toolkits/fxscintilla/Makefile3
-rw-r--r--x11-toolkits/fxscintilla/pkg-plist1
-rw-r--r--x11-toolkits/gal/Makefile4
-rw-r--r--x11-toolkits/gal/pkg-plist1
-rw-r--r--x11-toolkits/gal2/Makefile3
-rw-r--r--x11-toolkits/gal2/pkg-plist2
-rw-r--r--x11-toolkits/gdl/Makefile4
-rw-r--r--x11-toolkits/gdl/pkg-plist1
-rw-r--r--x11-toolkits/gtk--/Makefile9
-rw-r--r--x11-toolkits/gtk--/files/patch-gtkmm-config.in11
-rw-r--r--x11-toolkits/gtk--/pkg-plist12
-rw-r--r--x11-toolkits/gtk--2/Makefile4
-rw-r--r--x11-toolkits/gtk--2/pkg-plist6
-rw-r--r--x11-toolkits/gtk-sharp10/Makefile4
-rw-r--r--x11-toolkits/gtk-sharp10/pkg-plist12
-rw-r--r--x11-toolkits/gtk-sharp20/Makefile3
-rw-r--r--x11-toolkits/gtk-sharp20/pkg-plist14
-rw-r--r--x11-toolkits/gtk12/Makefile9
-rw-r--r--x11-toolkits/gtk12/files/patch-ab2
-rw-r--r--x11-toolkits/gtk12/files/patch-gdk.pc.in2
-rw-r--r--x11-toolkits/gtk12/files/patch-gtk+.pc.in2
-rw-r--r--x11-toolkits/gtk12/pkg-plist12
-rw-r--r--x11-toolkits/gtk20/Makefile3
-rw-r--r--x11-toolkits/gtk20/pkg-plist54
-rw-r--r--x11-toolkits/gtk30/Makefile3
-rw-r--r--x11-toolkits/gtk30/pkg-plist54
-rw-r--r--x11-toolkits/gtkdatabox2/Makefile4
-rw-r--r--x11-toolkits/gtkdatabox2/pkg-plist1
-rw-r--r--x11-toolkits/gtkextra/Makefile4
-rw-r--r--x11-toolkits/gtkextra/pkg-plist1
-rw-r--r--x11-toolkits/gtkextra2/Makefile2
-rw-r--r--x11-toolkits/gtkextra2/pkg-plist1
-rw-r--r--x11-toolkits/gtkglarea--/Makefile6
-rw-r--r--x11-toolkits/gtkglarea--/pkg-plist1
-rw-r--r--x11-toolkits/gtkglarea/Makefile3
-rw-r--r--x11-toolkits/gtkglarea/pkg-plist1
-rw-r--r--x11-toolkits/gtkglarea2/Makefile4
-rw-r--r--x11-toolkits/gtkglarea2/pkg-plist1
-rw-r--r--x11-toolkits/gtkglext/Makefile4
-rw-r--r--x11-toolkits/gtkglext/pkg-plist2
-rw-r--r--x11-toolkits/gtkglextmm/Makefile2
-rw-r--r--x11-toolkits/gtkglextmm/pkg-plist2
-rw-r--r--x11-toolkits/gtkmathview/Makefile2
-rw-r--r--x11-toolkits/gtkmm12/Makefile9
-rw-r--r--x11-toolkits/gtkmm12/files/patch-gtkmm-config.in11
-rw-r--r--x11-toolkits/gtkmm12/pkg-plist12
-rw-r--r--x11-toolkits/gtkmm20/Makefile4
-rw-r--r--x11-toolkits/gtkmm20/pkg-plist6
-rw-r--r--x11-toolkits/gtkmm24/Makefile13
-rw-r--r--x11-toolkits/gtkmm24/pkg-plist4
-rw-r--r--x11-toolkits/gtkmm30/Makefile4
-rw-r--r--x11-toolkits/gtkmm30/pkg-plist6
-rw-r--r--x11-toolkits/gtksourceview/Makefile3
-rw-r--r--x11-toolkits/gtksourceview/pkg-plist1
-rw-r--r--x11-toolkits/gtoolkit/Makefile2
-rw-r--r--x11-toolkits/guile-gnome/Makefile4
-rw-r--r--x11-toolkits/guile-gnome/pkg-plist8
-rw-r--r--x11-toolkits/guile-gtk/Makefile4
-rw-r--r--x11-toolkits/guile-gtk/pkg-plist1
-rw-r--r--x11-toolkits/inti/Makefile4
-rw-r--r--x11-toolkits/inti/pkg-plist2
-rw-r--r--x11-toolkits/lesstif/Makefile2
-rw-r--r--x11-toolkits/libXaw/Makefile1
-rw-r--r--x11-toolkits/libXmu/Makefile1
-rw-r--r--x11-toolkits/libXt/Makefile1
-rw-r--r--x11-toolkits/libbonoboui/Makefile4
-rw-r--r--x11-toolkits/libbonoboui/pkg-plist3
-rw-r--r--x11-toolkits/libbonobouimm/Makefile4
-rw-r--r--x11-toolkits/libbonobouimm/pkg-plist2
-rw-r--r--x11-toolkits/libgail-gnome/Makefile3
-rw-r--r--x11-toolkits/libgail-gnome/pkg-plist2
-rw-r--r--x11-toolkits/libgdiplus/Makefile1
-rw-r--r--x11-toolkits/libgdiplus/pkg-plist1
-rw-r--r--x11-toolkits/libgnomeprintui/Makefile3
-rw-r--r--x11-toolkits/libgnomeprintui/pkg-plist1
-rw-r--r--x11-toolkits/libgnomeprintuimm/Makefile13
-rw-r--r--x11-toolkits/libgnomeprintuimm/pkg-plist1
-rw-r--r--x11-toolkits/libgnomeui/Makefile3
-rw-r--r--x11-toolkits/libgnomeui/pkg-plist5
-rw-r--r--x11-toolkits/libgnomeuimm/Makefile4
-rw-r--r--x11-toolkits/libgnomeuimm/pkg-plist1
-rw-r--r--x11-toolkits/libgnomeuimm26/Makefile12
-rw-r--r--x11-toolkits/libgnomeuimm26/pkg-plist1
-rw-r--r--x11-toolkits/libgtk-java/Makefile2
-rw-r--r--x11-toolkits/libgtkeditor/Makefile16
-rw-r--r--x11-toolkits/libgtkeditor/files/patch-aa132
-rw-r--r--x11-toolkits/libgtkeditor/files/patch-ab46
-rw-r--r--x11-toolkits/libgtkeditor/files/patch-configure13
-rw-r--r--x11-toolkits/libgtkeditor/pkg-plist1
-rw-r--r--x11-toolkits/libpanelappletmm/Makefile4
-rw-r--r--x11-toolkits/libpanelappletmm/pkg-plist1
-rw-r--r--x11-toolkits/libsexy/Makefile3
-rw-r--r--x11-toolkits/libsexy/pkg-plist1
-rw-r--r--x11-toolkits/libsexymm/Makefile11
-rw-r--r--x11-toolkits/libsexymm/pkg-plist1
-rw-r--r--x11-toolkits/libwnck/Makefile3
-rw-r--r--x11-toolkits/libwnck/pkg-plist1
-rw-r--r--x11-toolkits/libxfce4gui/Makefile4
-rw-r--r--x11-toolkits/libxfce4gui/pkg-plist15
-rw-r--r--x11-toolkits/libzvt/Makefile4
-rw-r--r--x11-toolkits/libzvt/pkg-plist1
-rw-r--r--x11-toolkits/movingmotif/Makefile1
-rw-r--r--x11-toolkits/movingmotif/pkg-plist2
-rw-r--r--x11-toolkits/neXtaw/Makefile3
-rw-r--r--x11-toolkits/neXtaw/pkg-plist1
-rw-r--r--x11-toolkits/p5-qt/Makefile4
-rw-r--r--x11-toolkits/pango/Makefile3
-rw-r--r--x11-toolkits/pango/pkg-plist25
-rw-r--r--x11-toolkits/pangoxsl/Makefile2
-rw-r--r--x11-toolkits/pangoxsl/pkg-plist1
-rw-r--r--x11-toolkits/paragui-devel/Makefile3
-rw-r--r--x11-toolkits/paragui-devel/pkg-plist1
-rw-r--r--x11-toolkits/paragui/Makefile3
-rw-r--r--x11-toolkits/paragui/pkg-plist1
-rw-r--r--x11-toolkits/py-gnome-extras/Makefile4
-rw-r--r--x11-toolkits/py-gnome-extras/pkg-plist16
-rw-r--r--x11-toolkits/py-gnome/Makefile5
-rw-r--r--x11-toolkits/py-gnome/pkg-plist7
-rw-r--r--x11-toolkits/py-gnome2/Makefile3
-rw-r--r--x11-toolkits/py-gnome2/pkg-plist9
-rw-r--r--x11-toolkits/py-gtk/Makefile4
-rw-r--r--x11-toolkits/py-gtk/pkg-plist5
-rw-r--r--x11-toolkits/py-gtk2/Makefile3
-rw-r--r--x11-toolkits/py-gtk2/pkg-plist6
-rw-r--r--x11-toolkits/py-gtkglext/Makefile4
-rw-r--r--x11-toolkits/py-gtkglext/pkg-plist2
-rw-r--r--x11-toolkits/qtpixmap/Makefile4
-rw-r--r--x11-toolkits/qtpixmap/pkg-plist2
-rw-r--r--x11-toolkits/sdl_gui/Makefile5
-rw-r--r--x11-toolkits/sdl_gui/files/patch-src-Makefile.in7
-rw-r--r--x11-toolkits/sdl_gui/pkg-plist1
-rw-r--r--x11-toolkits/soqt/Makefile4
-rw-r--r--x11-toolkits/soqt/pkg-plist2
-rw-r--r--x11-toolkits/vdk/Makefile4
-rw-r--r--x11-toolkits/vdk/pkg-plist1
-rw-r--r--x11-toolkits/vdkbuilder/Makefile2
-rw-r--r--x11-toolkits/vdkbuilder/pkg-plist11
-rw-r--r--x11-toolkits/vte/Makefile3
-rw-r--r--x11-toolkits/vte/pkg-plist1
-rw-r--r--x11-toolkits/wxmozilla/Makefile2
-rw-r--r--x11-toolkits/wxmozilla/pkg-plist3
-rw-r--r--x11-toolkits/xbae/Makefile7
-rw-r--r--x11-toolkits/xmhtml/Makefile2
163 files changed, 594 insertions, 340 deletions
diff --git a/x11-toolkits/9libs/Makefile b/x11-toolkits/9libs/Makefile
index f892cf7f1ea7..bbe341e6462f 100644
--- a/x11-toolkits/9libs/Makefile
+++ b/x11-toolkits/9libs/Makefile
@@ -7,15 +7,15 @@
PORTNAME= 9libs
PORTVERSION= 1.0
+PORTREVISION= 1
CATEGORIES= x11-toolkits plan9
MASTER_SITES= ftp://ftp.cs.yorku.ca/pub/wily/src/
MAINTAINER= ports@FreeBSD.org
COMMENT= Plan9 compatibility libraries
-USE_XLIB= YES
-USE_AUTOTOOLS= libtool:13:inc
-GNU_CONFIGURE= YES
+USE_XLIB= yes
+GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--includedir=${PREFIX}/include/9libs
MAN3= add.3 balloc.3 bitblt.3 cachechars.3 event.3 frame.3 graphics.3 rgbpix.3 rune.3
diff --git a/x11-toolkits/9libs/pkg-plist b/x11-toolkits/9libs/pkg-plist
index c905fbc75d0f..50f40589730b 100644
--- a/x11-toolkits/9libs/pkg-plist
+++ b/x11-toolkits/9libs/pkg-plist
@@ -5,8 +5,11 @@ include/9libs/regexp.h
include/9libs/u.h
lib/9libs/include/conf9libs.h
lib/libXg.a
+lib/libXg.la
lib/libframe.a
+lib/libframe.la
lib/libplan9c.a
+lib/libplan9c.la
@dirrm lib/9libs/include
@dirrm lib/9libs
@dirrm include/9libs
diff --git a/x11-toolkits/SoXt/Makefile b/x11-toolkits/SoXt/Makefile
index 0107524a5e01..9b1779959706 100644
--- a/x11-toolkits/SoXt/Makefile
+++ b/x11-toolkits/SoXt/Makefile
@@ -7,6 +7,7 @@
PORTNAME= SoXt
PORTVERSION= 1.2.2
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.coin3d.org/pub/coin/src/
@@ -17,7 +18,7 @@ LIB_DEPENDS= Coin.44:${PORTSDIR}/graphics/Coin
USE_GL= yes
USE_MOTIF= yes
-USE_AUTOTOOLS= libtool:15
+GNU_CONFIGURE= yes
CONFIGURE_ENV+= LIBS="${PTHREAD_LIBS}"
CONFIGURE_ARGS+= --with-pthread=yes --with-coin=${X11BASE}
# avoid renaming of soxt-config and soxt-config.1
diff --git a/x11-toolkits/SoXt/pkg-plist b/x11-toolkits/SoXt/pkg-plist
index 91b4ec6dcf69..09463b87c416 100644
--- a/x11-toolkits/SoXt/pkg-plist
+++ b/x11-toolkits/SoXt/pkg-plist
@@ -31,8 +31,8 @@ include/Inventor/Xt/SoXtRenderArea.h
@dirrm include/Inventor/Xt/viewers
@dirrm include/Inventor/Xt/widgets
@dirrm include/Inventor/Xt
-lib/libSoXt.a
-lib/libSoXt.so.2
+lib/libSoXt.la
lib/libSoXt.so
+lib/libSoXt.so.2
share/aclocal/soxt.m4
share/Coin/conf/soxt-default.cfg
diff --git a/x11-toolkits/bakery/Makefile b/x11-toolkits/bakery/Makefile
index f1a2bb484e16..0e2995184cb4 100644
--- a/x11-toolkits/bakery/Makefile
+++ b/x11-toolkits/bakery/Makefile
@@ -7,6 +7,7 @@
PORTNAME= bakery
PORTVERSION= 2.3.17
+PORTREVISION= 1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.3
@@ -24,7 +25,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GCC= 3.4
USE_X_PREFIX= yes
-USE_AUTOTOOLS= libtool:15
+GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/bakery/pkg-plist b/x11-toolkits/bakery/pkg-plist
index e857882ef748..d9b5c0b56f59 100644
--- a/x11-toolkits/bakery/pkg-plist
+++ b/x11-toolkits/bakery/pkg-plist
@@ -26,6 +26,7 @@ include/bakery-%%API_VERSION%%/bakery/View/View_Composite.h
include/bakery-%%API_VERSION%%/bakery/bakery.h
include/bakery-%%API_VERSION%%/bakery/init.h
lib/libbakery-%%VERSION%%.a
+lib/libbakery-%%VERSION%%.la
lib/libbakery-%%VERSION%%.so
lib/libbakery-%%VERSION%%.so.16
libdata/pkgconfig/bakery-%%API_VERSION%%.pc
diff --git a/x11-toolkits/eel/Makefile b/x11-toolkits/eel/Makefile
index ad89ce490b38..0501a95c0408 100644
--- a/x11-toolkits/eel/Makefile
+++ b/x11-toolkits/eel/Makefile
@@ -8,6 +8,7 @@
PORTNAME= eel
PORTVERSION= 2.12.2
+PORTREVISION= 1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12
@@ -21,7 +22,7 @@ USE_GMAKE= yes
USE_X_PREFIX= yes
GNOME_DESKTOP_VERSION=2
USE_GNOME= gnomeprefix gnomehack gail gnomedesktop gnomemenus ltverhack
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-shared --enable-static
diff --git a/x11-toolkits/eel/pkg-plist b/x11-toolkits/eel/pkg-plist
index 135bed40338f..bf3b8194961e 100644
--- a/x11-toolkits/eel/pkg-plist
+++ b/x11-toolkits/eel/pkg-plist
@@ -45,6 +45,7 @@ include/eel-2/eel/eel-wrap-table.h
include/eel-2/eel/eel-xml-extensions.h
include/eel-2/eel/eel.h
lib/libeel-2.a
+lib/libeel-2.la
lib/libeel-2.so
lib/libeel-2.so.2
libdata/pkgconfig/eel-2.0.pc
diff --git a/x11-toolkits/etox/Makefile b/x11-toolkits/etox/Makefile
index 70f573f08fdc..12c99e4e8150 100644
--- a/x11-toolkits/etox/Makefile
+++ b/x11-toolkits/etox/Makefile
@@ -7,7 +7,7 @@
PORTNAME= etox
PORTVERSION= 0.9.0.004
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= vanilla
@@ -20,7 +20,7 @@ LIB_DEPENDS= evas.1:${PORTSDIR}/graphics/evas \
edb.1:${PORTSDIR}/databases/edb
USE_X_PREFIX= yes
-USE_AUTOTOOLS= libtool:15
+GNU_CONFIGURE= yes
USE_GNOME= gnomehack pkgconfig gnometarget
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11-toolkits/etox/pkg-plist b/x11-toolkits/etox/pkg-plist
index 9f30a46c004d..21847548f808 100644
--- a/x11-toolkits/etox/pkg-plist
+++ b/x11-toolkits/etox/pkg-plist
@@ -1,6 +1,7 @@
bin/etox-config
include/Etox.h
lib/libetox.a
+lib/libetox.la
lib/libetox.so
lib/libetox.so.0
libdata/pkgconfig/etox.pc
diff --git a/x11-toolkits/ewl/Makefile b/x11-toolkits/ewl/Makefile
index 00a47a63df96..b19e554d31f9 100644
--- a/x11-toolkits/ewl/Makefile
+++ b/x11-toolkits/ewl/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ewl
PORTVERSION= 0.0.4.005
+PORTREVISION= 1
pORTREVISION= 0
CATEGORIES= x11-toolkits
MASTER_SITES= http://enlightenment.freedesktop.org/files/
@@ -21,7 +22,7 @@ LIB_DEPENDS= embryo.9:${PORTSDIR}/lang/embryo \
ecore.1:${PORTSDIR}/x11/ecore
USE_X_PREFIX= yes
-USE_AUTOTOOLS= libtool:15
+GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= gnomehack pkgconfig gnometarget
INSTALLS_SHLIB= yes
diff --git a/x11-toolkits/ewl/pkg-plist b/x11-toolkits/ewl/pkg-plist
index d338b35aef0b..3e553f630d7f 100644
--- a/x11-toolkits/ewl/pkg-plist
+++ b/x11-toolkits/ewl/pkg-plist
@@ -65,6 +65,7 @@ include/ewl/ewl_tree2.h
include/ewl/ewl_widget.h
include/ewl/ewl_window.h
lib/libewl.a
+lib/libewl.la
lib/libewl.so
lib/libewl.so.0
libdata/pkgconfig/ewl.pc
diff --git a/x11-toolkits/fox-devel/Makefile b/x11-toolkits/fox-devel/Makefile
index 5ae3d8bea951..376458cb00ce 100644
--- a/x11-toolkits/fox-devel/Makefile
+++ b/x11-toolkits/fox-devel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fox
PORTVERSION= ${MAJORVER}.${SHVER}
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= http://www.fox-toolkit.org/ftp/ \
ftp://ftp.fox-toolkit.org/pub/ \
@@ -30,7 +31,7 @@ PLIST_SUB+= MAJORVER=${MAJORVER} SHVER=${SHVER}
USE_GL= yes
USE_REINPLACE= yes
-USE_AUTOTOOLS= libtool:15
+GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-opengl --with-x --enable-threadsafe
diff --git a/x11-toolkits/fox-devel/pkg-plist b/x11-toolkits/fox-devel/pkg-plist
index dcd47fb4f17f..2636deba2a5e 100644
--- a/x11-toolkits/fox-devel/pkg-plist
+++ b/x11-toolkits/fox-devel/pkg-plist
@@ -232,9 +232,11 @@ include/fox-%%MAJORVER%%/fxkeys.h
include/fox-%%MAJORVER%%/fxver.h
include/fox-%%MAJORVER%%/xincs.h
lib/libCHART-%%MAJORVER%%.a
+lib/libCHART-%%MAJORVER%%.la
lib/libCHART-%%MAJORVER%%.so
lib/libCHART-%%MAJORVER%%.so.%%SHVER%%
lib/libFOX-%%MAJORVER%%.a
+lib/libFOX-%%MAJORVER%%.la
lib/libFOX-%%MAJORVER%%.so
lib/libFOX-%%MAJORVER%%.so.%%SHVER%%
%%PORTDOCS%%%%DOCSDIR%%/html/SbSScreen1.jpg
diff --git a/x11-toolkits/fox12/Makefile b/x11-toolkits/fox12/Makefile
index e9660d551cca..930ea0cf02d5 100644
--- a/x11-toolkits/fox12/Makefile
+++ b/x11-toolkits/fox12/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fox
PORTVERSION= ${MAJORVER}.${SHVER}
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= http://www.fox-toolkit.org/ftp/ \
ftp://ftp.fox-toolkit.org/pub/ \
@@ -31,7 +32,7 @@ PLIST_SUB+= MAJORVER=${MAJORVER} SHVER=${SHVER}
USE_GNOME= lthack
USE_GL= yes
USE_REINPLACE= yes
-USE_AUTOTOOLS= libtool:13:inc
+GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-opengl --with-x --enable-threadsafe
INSTALLS_SHLIB= yes
diff --git a/x11-toolkits/fox12/pkg-plist b/x11-toolkits/fox12/pkg-plist
index a60d2c7efcf8..4fbc2eed8ba0 100644
--- a/x11-toolkits/fox12/pkg-plist
+++ b/x11-toolkits/fox12/pkg-plist
@@ -219,9 +219,11 @@ include/fox-%%MAJORVER%%/fxkeys.h
include/fox-%%MAJORVER%%/fxver.h
include/fox-%%MAJORVER%%/xincs.h
lib/libCHART-%%MAJORVER%%.a
+lib/libCHART-%%MAJORVER%%.la
lib/libCHART-%%MAJORVER%%.so
lib/libCHART-%%MAJORVER%%.so.%%SHVER%%
lib/libFOX-%%MAJORVER%%.a
+lib/libFOX-%%MAJORVER%%.la
lib/libFOX-%%MAJORVER%%.so
lib/libFOX-%%MAJORVER%%.so.%%SHVER%%
%%PORTDOCS%%%%DOCSDIR%%/html/SbSScreen1.jpg
diff --git a/x11-toolkits/fox14/Makefile b/x11-toolkits/fox14/Makefile
index 5ae3d8bea951..376458cb00ce 100644
--- a/x11-toolkits/fox14/Makefile
+++ b/x11-toolkits/fox14/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fox
PORTVERSION= ${MAJORVER}.${SHVER}
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= http://www.fox-toolkit.org/ftp/ \
ftp://ftp.fox-toolkit.org/pub/ \
@@ -30,7 +31,7 @@ PLIST_SUB+= MAJORVER=${MAJORVER} SHVER=${SHVER}
USE_GL= yes
USE_REINPLACE= yes
-USE_AUTOTOOLS= libtool:15
+GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-opengl --with-x --enable-threadsafe
diff --git a/x11-toolkits/fox14/pkg-plist b/x11-toolkits/fox14/pkg-plist
index dcd47fb4f17f..2636deba2a5e 100644
--- a/x11-toolkits/fox14/pkg-plist
+++ b/x11-toolkits/fox14/pkg-plist
@@ -232,9 +232,11 @@ include/fox-%%MAJORVER%%/fxkeys.h
include/fox-%%MAJORVER%%/fxver.h
include/fox-%%MAJORVER%%/xincs.h
lib/libCHART-%%MAJORVER%%.a
+lib/libCHART-%%MAJORVER%%.la
lib/libCHART-%%MAJORVER%%.so
lib/libCHART-%%MAJORVER%%.so.%%SHVER%%
lib/libFOX-%%MAJORVER%%.a
+lib/libFOX-%%MAJORVER%%.la
lib/libFOX-%%MAJORVER%%.so
lib/libFOX-%%MAJORVER%%.so.%%SHVER%%
%%PORTDOCS%%%%DOCSDIR%%/html/SbSScreen1.jpg
diff --git a/x11-toolkits/fox16/Makefile b/x11-toolkits/fox16/Makefile
index e9660d551cca..930ea0cf02d5 100644
--- a/x11-toolkits/fox16/Makefile
+++ b/x11-toolkits/fox16/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fox
PORTVERSION= ${MAJORVER}.${SHVER}
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= http://www.fox-toolkit.org/ftp/ \
ftp://ftp.fox-toolkit.org/pub/ \
@@ -31,7 +32,7 @@ PLIST_SUB+= MAJORVER=${MAJORVER} SHVER=${SHVER}
USE_GNOME= lthack
USE_GL= yes
USE_REINPLACE= yes
-USE_AUTOTOOLS= libtool:13:inc
+GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-opengl --with-x --enable-threadsafe
INSTALLS_SHLIB= yes
diff --git a/x11-toolkits/fox16/pkg-plist b/x11-toolkits/fox16/pkg-plist
index a60d2c7efcf8..4fbc2eed8ba0 100644
--- a/x11-toolkits/fox16/pkg-plist
+++ b/x11-toolkits/fox16/pkg-plist
@@ -219,9 +219,11 @@ include/fox-%%MAJORVER%%/fxkeys.h
include/fox-%%MAJORVER%%/fxver.h
include/fox-%%MAJORVER%%/xincs.h
lib/libCHART-%%MAJORVER%%.a
+lib/libCHART-%%MAJORVER%%.la
lib/libCHART-%%MAJORVER%%.so
lib/libCHART-%%MAJORVER%%.so.%%SHVER%%
lib/libFOX-%%MAJORVER%%.a
+lib/libFOX-%%MAJORVER%%.la
lib/libFOX-%%MAJORVER%%.so
lib/libFOX-%%MAJORVER%%.so.%%SHVER%%
%%PORTDOCS%%%%DOCSDIR%%/html/SbSScreen1.jpg
diff --git a/x11-toolkits/fxscintilla/Makefile b/x11-toolkits/fxscintilla/Makefile
index 621bae051352..86728116ffb3 100644
--- a/x11-toolkits/fxscintilla/Makefile
+++ b/x11-toolkits/fxscintilla/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fxscintilla
PORTVERSION= 1.63
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -14,8 +15,6 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= alecn2002@yandex.ru
COMMENT= A Fox toolkit reimplementation of Scintilla editing widget
-GNU_CONFIGURE= yes
-
USE_AUTOTOOLS= libtool:15
USE_REINPLACE= yes
CONFIGURE_ARGS+= --enable-shared --disable-static
diff --git a/x11-toolkits/fxscintilla/pkg-plist b/x11-toolkits/fxscintilla/pkg-plist
index 10875e02f605..cfa59a269691 100644
--- a/x11-toolkits/fxscintilla/pkg-plist
+++ b/x11-toolkits/fxscintilla/pkg-plist
@@ -2,6 +2,7 @@ include/fxscintilla/FXScintilla.h
include/fxscintilla/SciLexer.h
include/fxscintilla/Scintilla.h
lib/libfxscintilla.a
+lib/libfxscintilla.la
lib/libfxscintilla.so
lib/libfxscintilla.so.17
@dirrm include/fxscintilla
diff --git a/x11-toolkits/gal/Makefile b/x11-toolkits/gal/Makefile
index 17444c312bfd..1a8cbbdeeea7 100644
--- a/x11-toolkits/gal/Makefile
+++ b/x11-toolkits/gal/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gal
PORTVERSION= 0.24
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES?= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.24
@@ -26,7 +26,7 @@ USE_GNOME= gnomehack gnomeprefix gnomehier libglade gnomevfs
USE_ICONV= yes
GNOME_HTML_DIR= ${PREFIX}/share/doc/gal
INSTALLS_SHLIB= yes
-USE_AUTOTOOLS= libtool:13:inc
+GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-static --with-libiconv
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/gal/pkg-plist b/x11-toolkits/gal/pkg-plist
index d06520367fa6..125fd58c96f1 100644
--- a/x11-toolkits/gal/pkg-plist
+++ b/x11-toolkits/gal/pkg-plist
@@ -139,6 +139,7 @@ include/gal-1.0/gal/widgets/gtk-combo-text.h
include/gal-1.0/gal/widgets/widget-color-combo.h
include/gal-1.0/gal/widgets/widget-pixmap-combo.h
lib/libgal.a
+lib/libgal.la
lib/libgal.so
lib/libgal.so.23
libdata/pkgconfig/gal.pc
diff --git a/x11-toolkits/gal2/Makefile b/x11-toolkits/gal2/Makefile
index ca84b9d42e2d..ce06dad18656 100644
--- a/x11-toolkits/gal2/Makefile
+++ b/x11-toolkits/gal2/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gal2
PORTVERSION= 2.5.3
+PORTREVISION= 1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.5
@@ -25,7 +26,7 @@ USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix intlhack libgnomeui libgnomeprintui \
ltverhack
INSTALLS_SHLIB= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --enable-static --with-libiconv
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/gal2/pkg-plist b/x11-toolkits/gal2/pkg-plist
index 3c7ce3862c55..c6662a8c8f4f 100644
--- a/x11-toolkits/gal2/pkg-plist
+++ b/x11-toolkits/gal2/pkg-plist
@@ -150,9 +150,11 @@ include/gal-%%VERSION%%/gal/widgets/gal-combo-text.h
include/gal-%%VERSION%%/gal/widgets/widget-color-combo.h
include/gal-%%VERSION%%/gal/widgets/widget-pixmap-combo.h
lib/libgal-%%SHLIBVERSION%%.a
+lib/libgal-%%SHLIBVERSION%%.la
lib/libgal-%%SHLIBVERSION%%.so
lib/libgal-%%SHLIBVERSION%%.so.0
lib/libgal-a11y-%%SHLIBVERSION%%.a
+lib/libgal-a11y-%%SHLIBVERSION%%.la
lib/libgal-a11y-%%SHLIBVERSION%%.so
lib/libgal-a11y-%%SHLIBVERSION%%.so.0
libdata/pkgconfig/gal-%%VERSION%%.pc
diff --git a/x11-toolkits/gdl/Makefile b/x11-toolkits/gdl/Makefile
index 0bcfbbe58a07..446f699c7352 100644
--- a/x11-toolkits/gdl/Makefile
+++ b/x11-toolkits/gdl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gdl
PORTVERSION= 0.6.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R}
@@ -18,7 +18,7 @@ COMMENT= Components intended to be shared between GNOME development tools
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack libgnomeui
-USE_AUTOTOOLS= libtool:15
+GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/gdl/pkg-plist b/x11-toolkits/gdl/pkg-plist
index e191d6ff7a49..5ac2180a8fff 100644
--- a/x11-toolkits/gdl/pkg-plist
+++ b/x11-toolkits/gdl/pkg-plist
@@ -16,6 +16,7 @@ include/libgdl-1.0/gdl/gdl-tools.h
include/libgdl-1.0/gdl/gdl.h
include/libgdl-1.0/gdl/libgdltypebuiltins.h
lib/libgdl-1.a
+lib/libgdl-1.la
lib/libgdl-1.so
lib/libgdl-1.so.0
libdata/pkgconfig/gdl-1.0.pc
diff --git a/x11-toolkits/gtk--/Makefile b/x11-toolkits/gtk--/Makefile
index 68eb163caa41..1999a1e29a7d 100644
--- a/x11-toolkits/gtk--/Makefile
+++ b/x11-toolkits/gtk--/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkmm
PORTVERSION= 1.2.8
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gtkmm/1.2
@@ -23,14 +23,17 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gtk12
-USE_AUTOTOOLS= libtool:13:inc
-LIBTOOLFLAGS= --disable-ltlibs --release-ignore
+GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-static=yes \
--without-gnome \
--with-sigc-prefix=${LOCALBASE}
post-install:
+.for lib in gdkmm gtkmm
+ @${RM} ${PREFIX}/lib/lib${lib}.so ${PREFIX}/lib/lib${lib}.la
+ @${MV} ${PREFIX}/lib/lib${lib}.a ${PREFIX}/lib/lib${lib}-1.2.a
+.endfor
@${CAT} ${PKGMESSAGE}
.include <bsd.port.mk>
diff --git a/x11-toolkits/gtk--/files/patch-gtkmm-config.in b/x11-toolkits/gtk--/files/patch-gtkmm-config.in
new file mode 100644
index 000000000000..66ca1b94aa7a
--- /dev/null
+++ b/x11-toolkits/gtk--/files/patch-gtkmm-config.in
@@ -0,0 +1,11 @@
+--- gtkmm-config.in.orig Tue Jul 17 20:08:35 2001
++++ gtkmm-config.in Tue Jan 24 17:35:29 2006
+@@ -18,6 +18,6 @@
+
+-gtkmm_libs="$LIBDIRS -lgtkmm -lgdkmm @GTK_LIBS@ @SIGC_LIBS@"
++gtkmm_libs="$LIBDIRS -lgtkmm-1.2 -lgdkmm-1.2 @GTK_LIBS@ @SIGC_LIBS@"
+ gtkmm_cflags="$CFLAGS @GTK_CFLAGS@ @SIGC_CFLAGS@"
+
+-gthread_libs="-lgthread"
++gthread_libs="-lgthread-1.2"
+
diff --git a/x11-toolkits/gtk--/pkg-plist b/x11-toolkits/gtk--/pkg-plist
index e40e635ed7f8..a14d5069c338 100644
--- a/x11-toolkits/gtk--/pkg-plist
+++ b/x11-toolkits/gtk--/pkg-plist
@@ -186,12 +186,12 @@ lib/gtkmm/proc/gtkconvert.m4
lib/gtkmm/proc/gtkmmproc
lib/gtkmm/proc/list.m4
lib/gtkmm/proc/stage1.m4
-lib/libgdkmm.a
-lib/libgdkmm.so
-lib/libgdkmm.so.2
-lib/libgtkmm.a
-lib/libgtkmm.so
-lib/libgtkmm.so.2
+lib/libgdkmm-1.2.a
+lib/libgdkmm-1.2.so
+lib/libgdkmm-1.2.so.2
+lib/libgtkmm-1.2.a
+lib/libgtkmm-1.2.so
+lib/libgtkmm-1.2.so.2
share/aclocal/gtk--.m4
@dirrm include/gdk--
@dirrm include/gtk--/private
diff --git a/x11-toolkits/gtk--2/Makefile b/x11-toolkits/gtk--2/Makefile
index 80e500ee9be9..fbf06e469ad9 100644
--- a/x11-toolkits/gtk--2/Makefile
+++ b/x11-toolkits/gtk--2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkmm
PORTVERSION= 2.2.12
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME} \
${MASTER_SITE_SOURCEFORGE}
@@ -25,7 +25,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
LATEST_LINK= gtkmm2
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:13:inc
+GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
USE_GNOME= gnomehack lthack gtk20
diff --git a/x11-toolkits/gtk--2/pkg-plist b/x11-toolkits/gtk--2/pkg-plist
index 225d3b3fb86f..220fd56f9609 100644
--- a/x11-toolkits/gtk--2/pkg-plist
+++ b/x11-toolkits/gtk--2/pkg-plist
@@ -456,21 +456,27 @@ lib/gtkmm-2.0/proc/pm/Property.pm
lib/gtkmm-2.0/proc/pm/Util.pm
lib/gtkmm-2.0/proc/pm/WrapParser.pm
lib/libatkmm-1.0.a
+lib/libatkmm-1.0.la
lib/libatkmm-1.0.so
lib/libatkmm-1.0.so.6
lib/libgdkmm-2.0.a
+lib/libgdkmm-2.0.la
lib/libgdkmm-2.0.so
lib/libgdkmm-2.0.so.6
lib/libglibmm-2.0.a
+lib/libglibmm-2.0.la
lib/libglibmm-2.0.so
lib/libglibmm-2.0.so.6
lib/libgtkmm-2.0.a
+lib/libgtkmm-2.0.la
lib/libgtkmm-2.0.so
lib/libgtkmm-2.0.so.6
lib/libgtkmm_generate_extra_defs-2.0.a
+lib/libgtkmm_generate_extra_defs-2.0.la
lib/libgtkmm_generate_extra_defs-2.0.so
lib/libgtkmm_generate_extra_defs-2.0.so.6
lib/libpangomm-1.0.a
+lib/libpangomm-1.0.la
lib/libpangomm-1.0.so
lib/libpangomm-1.0.so.6
libdata/pkgconfig/atkmm-1.0.pc
diff --git a/x11-toolkits/gtk-sharp10/Makefile b/x11-toolkits/gtk-sharp10/Makefile
index 6a0240aaf232..742fe5accf2f 100644
--- a/x11-toolkits/gtk-sharp10/Makefile
+++ b/x11-toolkits/gtk-sharp10/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gtk-sharp
PORTVERSION= 1.0.10
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= x11-toolkits
MASTER_SITES= http://go-mono.com/sources/${PORTNAME}/
@@ -20,7 +20,7 @@ RUN_DEPENDS= mono:${PORTSDIR}/lang/mono
USE_X_PREFIX= yes
LATEST_LINK= gtk-sharp10
-USE_AUTOTOOLS= libtool:15
+GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
USE_GMAKE= yes
USE_PERL5_RUN= yes
diff --git a/x11-toolkits/gtk-sharp10/pkg-plist b/x11-toolkits/gtk-sharp10/pkg-plist
index a9ee5b4a1fc0..65590660c5ee 100644
--- a/x11-toolkits/gtk-sharp10/pkg-plist
+++ b/x11-toolkits/gtk-sharp10/pkg-plist
@@ -9,11 +9,23 @@ bin/gapi_format_xml
bin/gapi_pp.pl
bin/gconfsharp-schemagen
bin/gconfsharp-schemagen.exe
+lib/libgdksharpglue.a
+lib/libgdksharpglue.la
lib/libgdksharpglue.so
+lib/libgladesharpglue.a
+lib/libgladesharpglue.la
lib/libgladesharpglue.so
+lib/libglibsharpglue.a
+lib/libglibsharpglue.la
lib/libglibsharpglue.so
+lib/libgnomesharpglue.a
+lib/libgnomesharpglue.la
lib/libgnomesharpglue.so
+lib/libgtksharpglue.a
+lib/libgtksharpglue.la
lib/libgtksharpglue.so
+lib/libpangosharpglue.a
+lib/libpangosharpglue.la
lib/libpangosharpglue.so
lib/mono/gac/art-sharp/1.0.0.0__35e10195dab3c99f/art-sharp.dll
lib/mono/gac/art-sharp/1.0.0.0__35e10195dab3c99f/art-sharp.dll.config
diff --git a/x11-toolkits/gtk-sharp20/Makefile b/x11-toolkits/gtk-sharp20/Makefile
index f947b7abfb9e..58f9f576842a 100644
--- a/x11-toolkits/gtk-sharp20/Makefile
+++ b/x11-toolkits/gtk-sharp20/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gtk-sharp
PORTVERSION= 2.8.0
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= http://go-mono.com/sources/gtk-sharp-2.0/
@@ -21,7 +22,7 @@ RUN_DEPENDS= mono:${PORTSDIR}/lang/mono \
USE_X_PREFIX= yes
LATEST_LINK= gtk-sharp20
-USE_AUTOTOOLS= libtool:15
+GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
USE_GMAKE= yes
USE_PERL5_RUN= yes
diff --git a/x11-toolkits/gtk-sharp20/pkg-plist b/x11-toolkits/gtk-sharp20/pkg-plist
index d96d532171b2..4be9d072392f 100644
--- a/x11-toolkits/gtk-sharp20/pkg-plist
+++ b/x11-toolkits/gtk-sharp20/pkg-plist
@@ -8,12 +8,26 @@ lib/gtk-sharp-2.0/gapi2xml.pl
lib/gtk-sharp-2.0/gapi_codegen.exe
lib/gtk-sharp-2.0/gapi_pp.pl
lib/gtk-sharp-2.0/gconfsharp-schemagen.exe
+lib/libgdksharpglue-2.a
+lib/libgdksharpglue-2.la
lib/libgdksharpglue-2.so
+lib/libgladesharpglue-2.a
+lib/libgladesharpglue-2.la
lib/libgladesharpglue-2.so
+lib/libglibsharpglue-2.a
+lib/libglibsharpglue-2.la
lib/libglibsharpglue-2.so
+lib/libgnomesharpglue-2.a
+lib/libgnomesharpglue-2.la
lib/libgnomesharpglue-2.so
+lib/libgtksharpglue-2.a
+lib/libgtksharpglue-2.la
lib/libgtksharpglue-2.so
+lib/libpangosharpglue-2.a
+lib/libpangosharpglue-2.la
lib/libpangosharpglue-2.so
+lib/libvtesharpglue-2.a
+lib/libvtesharpglue-2.la
lib/libvtesharpglue-2.so
lib/mono/gac/art-sharp/2.8.0.0__35e10195dab3c99f/art-sharp.dll
lib/mono/gac/art-sharp/2.8.0.0__35e10195dab3c99f/art-sharp.dll.config
diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile
index a80b52d38699..326efdb569f9 100644
--- a/x11-toolkits/gtk12/Makefile
+++ b/x11-toolkits/gtk12/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtk
PORTVERSION= 1.2.10
-PORTREVISION= 13
+PORTREVISION= 15
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gtk+/1.2
@@ -19,9 +19,8 @@ COMMENT= Gimp Toolkit for X11 GUI (previous stable version)
USE_X_PREFIX= yes
USE_PERL5= yes
USE_GNOME= glib12
-USE_AUTOTOOLS= libtool:13:inc
INSTALLS_SHLIB= yes
-LIBTOOLFLAGS= --disable-ltlibs --release-suffix
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --includedir=${PREFIX}/include/gtk12 --with-native-locale \
--with-xinput=xfree
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
@@ -44,5 +43,9 @@ pre-build:
post-install:
@${MKDIR} ${PREFIX}/lib/gtk/themes/engines
@${LN} -sf ${PREFIX}/bin/gtk-config ${PREFIX}/bin/gtk12-config
+.for lib in gdk gtk
+ @${RM} ${PREFIX}/lib/lib${lib}.la ${PREFIX}/lib/lib${lib}.so
+ @${MV} ${PREFIX}/lib/lib${lib}.a ${PREFIX}/lib/lib${lib}-12.a
+.endfor
.include <bsd.port.mk>
diff --git a/x11-toolkits/gtk12/files/patch-ab b/x11-toolkits/gtk12/files/patch-ab
index 620f9437519a..5ef60b088b4d 100644
--- a/x11-toolkits/gtk12/files/patch-ab
+++ b/x11-toolkits/gtk12/files/patch-ab
@@ -14,6 +14,6 @@
done
- echo $libdirs @x_ldflags@ -lgtk -lgdk $my_glib_libs @INTLLIBS@ @x_libs@ @GDK_WLIBS@ -lm
-+ echo $libdirs @x_ldflags@ -lgtk@LT_RELEASE@ -lgdk@LT_RELEASE@ $my_glib_libs @INTLLIBS@ @x_libs@ @GDK_WLIBS@ -lm
++ echo $libdirs @x_ldflags@ -lgtk-@LT_RELEASE@ -lgdk-@LT_RELEASE@ $my_glib_libs @INTLLIBS@ @x_libs@ @GDK_WLIBS@ -lm
fi
diff --git a/x11-toolkits/gtk12/files/patch-gdk.pc.in b/x11-toolkits/gtk12/files/patch-gdk.pc.in
index f7b7a7b056df..5db084b049ac 100644
--- a/x11-toolkits/gtk12/files/patch-gdk.pc.in
+++ b/x11-toolkits/gtk12/files/patch-gdk.pc.in
@@ -6,5 +6,5 @@
Requires: glib
-Libs: -L${libdir} @x_ldflags@ -lgdk @INTLLIBS@ @GDK_WLIBS@ @x_libs@ -lm
-Cflags: -I${includedir}/gtk-1.2 @x_cflags@
-+Libs: -L${libdir} @x_ldflags@ -lgdk12 @INTLLIBS@ @GDK_WLIBS@ @x_libs@ -lm
++Libs: -L${libdir} @x_ldflags@ -lgdk-12 @INTLLIBS@ @GDK_WLIBS@ @x_libs@ -lm
+Cflags: -I${includedir} @x_cflags@
diff --git a/x11-toolkits/gtk12/files/patch-gtk+.pc.in b/x11-toolkits/gtk12/files/patch-gtk+.pc.in
index dc05caf18bdb..6ef64656dbc5 100644
--- a/x11-toolkits/gtk12/files/patch-gtk+.pc.in
+++ b/x11-toolkits/gtk12/files/patch-gtk+.pc.in
@@ -8,5 +8,5 @@ $FreeBSD$
Version: @VERSION@
Requires: gdk
-Libs: -L${libdir} -lgtk
-+Libs: -L${libdir} -lgtk12
++Libs: -L${libdir} -lgtk-12
Cflags:
diff --git a/x11-toolkits/gtk12/pkg-plist b/x11-toolkits/gtk12/pkg-plist
index d228143ed30c..85bb6e41b339 100644
--- a/x11-toolkits/gtk12/pkg-plist
+++ b/x11-toolkits/gtk12/pkg-plist
@@ -120,12 +120,12 @@ include/gtk12/gtk/gtkvscrollbar.h
include/gtk12/gtk/gtkvseparator.h
include/gtk12/gtk/gtkwidget.h
include/gtk12/gtk/gtkwindow.h
-lib/libgdk12.a
-lib/libgdk12.so
-lib/libgdk12.so.2
-lib/libgtk12.a
-lib/libgtk12.so
-lib/libgtk12.so.2
+lib/libgdk-12.a
+lib/libgdk-12.so
+lib/libgdk-12.so.2
+lib/libgtk-12.a
+lib/libgtk-12.so
+lib/libgtk-12.so.2
libdata/pkgconfig/gdk.pc
libdata/pkgconfig/gtk+.pc
share/aclocal/gtk.m4
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 40ac78aa1f11..c3b5d9917911 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gtk
PORTVERSION= 2.8.12
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.8,} \
ftp://ftp.gtk.org/pub/gtk/v2.8/ \
@@ -36,7 +37,7 @@ USE_XPM= yes
USE_REINPLACE= yes
USE_PERL5= yes
INSTALLS_SHLIB= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomehack atk pango ltverhack
CONFIGURE_ARGS= --enable-static --with-xinput=yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist
index f76d097bb68e..7201720ae6fd 100644
--- a/x11-toolkits/gtk20/pkg-plist
+++ b/x11-toolkits/gtk20/pkg-plist
@@ -228,41 +228,95 @@ include/gtk-2.0/gtk/gtkvscrollbar.h
include/gtk-2.0/gtk/gtkvseparator.h
include/gtk-2.0/gtk/gtkwidget.h
include/gtk-2.0/gtk/gtkwindow.h
+lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.a
+lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.la
lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-am-et.a
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-am-et.la
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-am-et.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cedilla.a
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cedilla.la
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cedilla.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cyrillic-translit.a
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cyrillic-translit.la
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cyrillic-translit.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-inuktitut.a
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-inuktitut.la
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-inuktitut.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.a
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.la
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai-broken.a
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai-broken.la
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai-broken.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-er.a
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-er.la
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-er.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-et.a
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-et.la
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-et.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-viqr.a
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-viqr.la
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-viqr.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-xim.a
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-xim.la
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-xim.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ani.a
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ani.la
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ani.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.a
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.la
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.a
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.la
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.a
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.la
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.a
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.la
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pcx.a
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pcx.la
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pcx.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-png.a
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-png.la
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-png.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pnm.a
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pnm.la
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pnm.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ras.a
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ras.la
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ras.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tga.a
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tga.la
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tga.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tiff.a
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tiff.la
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tiff.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-wbmp.a
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-wbmp.la
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-wbmp.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.a
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.la
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.a
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.la
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.so
lib/libgdk-x11-2.0.a
+lib/libgdk-x11-2.0.la
lib/libgdk-x11-2.0.so
lib/libgdk-x11-2.0.so.0
lib/libgdk_pixbuf-2.0.a
+lib/libgdk_pixbuf-2.0.la
lib/libgdk_pixbuf-2.0.so
lib/libgdk_pixbuf-2.0.so.0
lib/libgdk_pixbuf_xlib-2.0.a
+lib/libgdk_pixbuf_xlib-2.0.la
lib/libgdk_pixbuf_xlib-2.0.so
lib/libgdk_pixbuf_xlib-2.0.so.0
lib/libgtk-x11-2.0.a
+lib/libgtk-x11-2.0.la
lib/libgtk-x11-2.0.so
lib/libgtk-x11-2.0.so.0
libdata/pkgconfig/gdk-2.0.pc
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index 40ac78aa1f11..c3b5d9917911 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gtk
PORTVERSION= 2.8.12
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.8,} \
ftp://ftp.gtk.org/pub/gtk/v2.8/ \
@@ -36,7 +37,7 @@ USE_XPM= yes
USE_REINPLACE= yes
USE_PERL5= yes
INSTALLS_SHLIB= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomehack atk pango ltverhack
CONFIGURE_ARGS= --enable-static --with-xinput=yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index f76d097bb68e..7201720ae6fd 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -228,41 +228,95 @@ include/gtk-2.0/gtk/gtkvscrollbar.h
include/gtk-2.0/gtk/gtkvseparator.h
include/gtk-2.0/gtk/gtkwidget.h
include/gtk-2.0/gtk/gtkwindow.h
+lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.a
+lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.la
lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-am-et.a
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-am-et.la
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-am-et.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cedilla.a
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cedilla.la
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cedilla.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cyrillic-translit.a
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cyrillic-translit.la
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cyrillic-translit.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-inuktitut.a
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-inuktitut.la
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-inuktitut.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.a
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.la
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai-broken.a
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai-broken.la
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai-broken.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-er.a
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-er.la
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-er.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-et.a
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-et.la
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-et.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-viqr.a
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-viqr.la
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-viqr.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-xim.a
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-xim.la
lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-xim.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ani.a
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ani.la
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ani.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.a
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.la
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.a
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.la
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.a
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.la
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.a
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.la
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pcx.a
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pcx.la
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pcx.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-png.a
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-png.la
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-png.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pnm.a
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pnm.la
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pnm.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ras.a
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ras.la
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ras.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tga.a
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tga.la
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tga.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tiff.a
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tiff.la
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tiff.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-wbmp.a
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-wbmp.la
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-wbmp.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.a
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.la
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.a
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.la
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.so
lib/libgdk-x11-2.0.a
+lib/libgdk-x11-2.0.la
lib/libgdk-x11-2.0.so
lib/libgdk-x11-2.0.so.0
lib/libgdk_pixbuf-2.0.a
+lib/libgdk_pixbuf-2.0.la
lib/libgdk_pixbuf-2.0.so
lib/libgdk_pixbuf-2.0.so.0
lib/libgdk_pixbuf_xlib-2.0.a
+lib/libgdk_pixbuf_xlib-2.0.la
lib/libgdk_pixbuf_xlib-2.0.so
lib/libgdk_pixbuf_xlib-2.0.so.0
lib/libgtk-x11-2.0.a
+lib/libgtk-x11-2.0.la
lib/libgtk-x11-2.0.so
lib/libgtk-x11-2.0.so.0
libdata/pkgconfig/gdk-2.0.pc
diff --git a/x11-toolkits/gtkdatabox2/Makefile b/x11-toolkits/gtkdatabox2/Makefile
index a459c3a34f0c..d676ae7e348c 100644
--- a/x11-toolkits/gtkdatabox2/Makefile
+++ b/x11-toolkits/gtkdatabox2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkdatabox2
PORTVERSION= 0.2.4.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-toolkits
MASTER_SITES= http://www.eudoxos.de/gtk/gtkdatabox/download/
DISTNAME= gtkdatabox-${PORTVERSION}
@@ -18,7 +18,7 @@ COMMENT= A GTK+2 widget to display large amounts of numerical data
USE_X_PREFIX= yes
USE_GNOME= gtk20
-USE_AUTOTOOLS= libtool:13
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
CONFLICTS= gtkdatabox-0.1.*
diff --git a/x11-toolkits/gtkdatabox2/pkg-plist b/x11-toolkits/gtkdatabox2/pkg-plist
index 80d303234033..8cb2a0ef79b1 100644
--- a/x11-toolkits/gtkdatabox2/pkg-plist
+++ b/x11-toolkits/gtkdatabox2/pkg-plist
@@ -1,5 +1,6 @@
include/gtkdatabox.h
include/gtkdataboxmarshal.h
+lib/libgtkdatabox-0.2.4.so
lib/libgtkdatabox-0.2.4.so.5
lib/libgtkdatabox.a
lib/libgtkdatabox.la
diff --git a/x11-toolkits/gtkextra/Makefile b/x11-toolkits/gtkextra/Makefile
index 8d584d0a1971..db645cbc292d 100644
--- a/x11-toolkits/gtkextra/Makefile
+++ b/x11-toolkits/gtkextra/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkextra
PORTVERSION= 0.99.17
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits
MASTER_SITES= http://gtkextra.sourceforge.net/src/ \
${MASTER_SITE_SOURCEFORGE}
@@ -18,7 +18,7 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= A useful widget set complementary to GTK+
USE_X_PREFIX= yes
-USE_AUTOTOOLS= libtool:13:inc
+GNU_CONFIGURE= yes
USE_GNOME= gtk12
USE_GMAKE= yes
INSTALLS_SHLIB= yes
diff --git a/x11-toolkits/gtkextra/pkg-plist b/x11-toolkits/gtkextra/pkg-plist
index a49850b21179..93c2842408b8 100644
--- a/x11-toolkits/gtkextra/pkg-plist
+++ b/x11-toolkits/gtkextra/pkg-plist
@@ -33,6 +33,7 @@ include/gtkextra/gtkpsfont.h
include/gtkextra/gtksheet.h
include/gtkextra/gtktogglecombo.h
lib/libgtkextra.a
+lib/libgtkextra.la
lib/libgtkextra.so
lib/libgtkextra.so.17
share/aclocal/gtkextra.m4
diff --git a/x11-toolkits/gtkextra2/Makefile b/x11-toolkits/gtkextra2/Makefile
index 7685035eec6d..e8cce24bc95e 100644
--- a/x11-toolkits/gtkextra2/Makefile
+++ b/x11-toolkits/gtkextra2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkextra
PORTVERSION= 2.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= scigraphica
diff --git a/x11-toolkits/gtkextra2/pkg-plist b/x11-toolkits/gtkextra2/pkg-plist
index 2816563eb5ad..b960a16ba230 100644
--- a/x11-toolkits/gtkextra2/pkg-plist
+++ b/x11-toolkits/gtkextra2/pkg-plist
@@ -45,6 +45,7 @@ include/gtkextra-2.0/gtkextra/gtkpsfont.h
include/gtkextra-2.0/gtkextra/gtksheet.h
include/gtkextra-2.0/gtkextra/gtktogglecombo.h
lib/libgtkextra-x11-2.0.a
+lib/libgtkextra-x11-2.0.la
lib/libgtkextra-x11-2.0.so
lib/libgtkextra-x11-2.0.so.1
libdata/pkgconfig/gtkextra-2.0.pc
diff --git a/x11-toolkits/gtkglarea--/Makefile b/x11-toolkits/gtkglarea--/Makefile
index 54386a31ff56..5ce3931c4bf2 100644
--- a/x11-toolkits/gtkglarea--/Makefile
+++ b/x11-toolkits/gtkglarea--/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gtkglareamm
PORTVERSION= 1.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_DEBIAN}
MASTER_SITE_SUBDIR= pool/main/g/${PORTNAME}
@@ -18,12 +18,12 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= GtkGLArea-- is a wrapper for the GtkGLArea widget
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
-LIB_DEPENDS= gtkmm.2:${PORTSDIR}/x11-toolkits/gtk-- \
+LIB_DEPENDS= gtkmm-1.2.2:${PORTSDIR}/x11-toolkits/gtk-- \
gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea
USE_GL= yes
USE_GNOME= gtk12
-USE_AUTOTOOLS= libtool:15
+GNU_CONFIGURE= yes
USE_REINPLACE= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/x11-toolkits/gtkglarea--/pkg-plist b/x11-toolkits/gtkglarea--/pkg-plist
index eeda5778019b..a37abc493f22 100644
--- a/x11-toolkits/gtkglarea--/pkg-plist
+++ b/x11-toolkits/gtkglarea--/pkg-plist
@@ -2,6 +2,7 @@ include/gtkgl--/private/glarea_p.h
include/gtkgl--/gdkgl.h
include/gtkgl--/glarea.h
lib/libgtkglmm.a
+lib/libgtkglmm.la
lib/libgtkglmm.so
lib/libgtkglmm.so.1
@dirrm include/gtkgl--/private
diff --git a/x11-toolkits/gtkglarea/Makefile b/x11-toolkits/gtkglarea/Makefile
index ee2b896c0317..59cad7112436 100644
--- a/x11-toolkits/gtkglarea/Makefile
+++ b/x11-toolkits/gtkglarea/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gtkglarea
PORTVERSION= 1.2.3
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
@@ -19,7 +20,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_X_PREFIX= yes
USE_GL= yes
USE_GNOME= gnometarget gtk12 lthack
-USE_AUTOTOOLS= libtool:15
+GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib -lstdc++ ${PTHREAD_LIBS}"
CONFIGURE_ARGS= --with-lib-GL
diff --git a/x11-toolkits/gtkglarea/pkg-plist b/x11-toolkits/gtkglarea/pkg-plist
index d34277b5af75..c611751adf9c 100644
--- a/x11-toolkits/gtkglarea/pkg-plist
+++ b/x11-toolkits/gtkglarea/pkg-plist
@@ -1,6 +1,7 @@
include/gtkgl/gdkgl.h
include/gtkgl/gtkglarea.h
lib/libgtkgl.a
+lib/libgtkgl.la
lib/libgtkgl.so
lib/libgtkgl.so.5
share/aclocal/gtkgl.m4
diff --git a/x11-toolkits/gtkglarea2/Makefile b/x11-toolkits/gtkglarea2/Makefile
index 28ce2a1f9e13..cd82a7f61b8e 100644
--- a/x11-toolkits/gtkglarea2/Makefile
+++ b/x11-toolkits/gtkglarea2/Makefile
@@ -6,7 +6,7 @@
PORTNAME= gtkglarea
PORTVERSION= 1.99.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gtkglarea/1.99
@@ -21,7 +21,7 @@ USE_X_PREFIX= yes
USE_GNOME= gnomehack gtk20
USE_BZIP2= yes
USE_GL= yes
-USE_AUTOTOOLS= libtool:13:inc
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --with-lib-GL
diff --git a/x11-toolkits/gtkglarea2/pkg-plist b/x11-toolkits/gtkglarea2/pkg-plist
index 15d5747ea11f..790b06564e98 100644
--- a/x11-toolkits/gtkglarea2/pkg-plist
+++ b/x11-toolkits/gtkglarea2/pkg-plist
@@ -1,6 +1,7 @@
include/gtkgl-2.0/gtkgl/gdkgl.h
include/gtkgl-2.0/gtkgl/gtkglarea.h
lib/libgtkgl-2.0.a
+lib/libgtkgl-2.0.la
lib/libgtkgl-2.0.so
lib/libgtkgl-2.0.so.1
libdata/pkgconfig/gtkgl-2.0.pc
diff --git a/x11-toolkits/gtkglext/Makefile b/x11-toolkits/gtkglext/Makefile
index 6fd73b696b13..267ba1d6f233 100644
--- a/x11-toolkits/gtkglext/Makefile
+++ b/x11-toolkits/gtkglext/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkglext
PORTVERSION= 1.0.6
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0
@@ -21,7 +21,7 @@ USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack gtk20
USE_GL= yes
USE_REINPLACE= yes
-USE_AUTOTOOLS= libtool:15
+GNU_CONFIGURE= yes
USE_GMAKE= yes
INSTALLS_SHLIB= yes
diff --git a/x11-toolkits/gtkglext/pkg-plist b/x11-toolkits/gtkglext/pkg-plist
index bb0924a7c3f6..0c7241dec65a 100644
--- a/x11-toolkits/gtkglext/pkg-plist
+++ b/x11-toolkits/gtkglext/pkg-plist
@@ -36,9 +36,11 @@ include/gtkglext-1.0/gtk/gtkglwidget.h
@dirrm include/gtkglext-1.0
lib/gtkglext-1.0/include/gdkglext-config.h
lib/libgdkglext-x11-1.0.a
+lib/libgdkglext-x11-1.0.la
lib/libgdkglext-x11-1.0.so
lib/libgdkglext-x11-1.0.so.2
lib/libgtkglext-x11-1.0.a
+lib/libgtkglext-x11-1.0.la
lib/libgtkglext-x11-1.0.so
lib/libgtkglext-x11-1.0.so.2
@dirrm lib/gtkglext-1.0/include
diff --git a/x11-toolkits/gtkglextmm/Makefile b/x11-toolkits/gtkglextmm/Makefile
index adc06dd98cc0..78880aa954bb 100644
--- a/x11-toolkits/gtkglextmm/Makefile
+++ b/x11-toolkits/gtkglextmm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkglextmm
PORTVERSION= 1.0.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gtkglext
diff --git a/x11-toolkits/gtkglextmm/pkg-plist b/x11-toolkits/gtkglextmm/pkg-plist
index 311374f3e00e..633483591220 100644
--- a/x11-toolkits/gtkglextmm/pkg-plist
+++ b/x11-toolkits/gtkglextmm/pkg-plist
@@ -34,9 +34,11 @@ lib/gtkglextmm-1.0/proc/m4/convert.m4
lib/gtkglextmm-1.0/proc/m4/convert_gdkglext.m4
lib/gtkglextmm-1.0/proc/m4/convert_gtkglext.m4
lib/libgdkglextmm-x11-1.0.a
+lib/libgdkglextmm-x11-1.0.la
lib/libgdkglextmm-x11-1.0.so
lib/libgdkglextmm-x11-1.0.so.0
lib/libgtkglextmm-x11-1.0.a
+lib/libgtkglextmm-x11-1.0.la
lib/libgtkglextmm-x11-1.0.so
lib/libgtkglextmm-x11-1.0.so.0
@dirrm lib/gtkglextmm-1.0/proc/m4
diff --git a/x11-toolkits/gtkmathview/Makefile b/x11-toolkits/gtkmathview/Makefile
index 581389e6fec0..21b3e07d8922 100644
--- a/x11-toolkits/gtkmathview/Makefile
+++ b/x11-toolkits/gtkmathview/Makefile
@@ -24,7 +24,7 @@ USE_REINPLACE= yes
USE_GETOPT_LONG= yes
USE_X_PREFIX= yes
USE_GNOME= glib20 gtk20 gnomehack
-USE_AUTOTOOLS= libtool:13
+USE_AUTOTOOLS= libtool:15
CPPFLAGS= -I${LOCALBASE}/include -DHAVE_DECL_GETOPT
LDFLAGS= -L${LOCALBASE}/lib
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/x11-toolkits/gtkmm12/Makefile b/x11-toolkits/gtkmm12/Makefile
index 68eb163caa41..1999a1e29a7d 100644
--- a/x11-toolkits/gtkmm12/Makefile
+++ b/x11-toolkits/gtkmm12/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkmm
PORTVERSION= 1.2.8
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gtkmm/1.2
@@ -23,14 +23,17 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gtk12
-USE_AUTOTOOLS= libtool:13:inc
-LIBTOOLFLAGS= --disable-ltlibs --release-ignore
+GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-static=yes \
--without-gnome \
--with-sigc-prefix=${LOCALBASE}
post-install:
+.for lib in gdkmm gtkmm
+ @${RM} ${PREFIX}/lib/lib${lib}.so ${PREFIX}/lib/lib${lib}.la
+ @${MV} ${PREFIX}/lib/lib${lib}.a ${PREFIX}/lib/lib${lib}-1.2.a
+.endfor
@${CAT} ${PKGMESSAGE}
.include <bsd.port.mk>
diff --git a/x11-toolkits/gtkmm12/files/patch-gtkmm-config.in b/x11-toolkits/gtkmm12/files/patch-gtkmm-config.in
new file mode 100644
index 000000000000..66ca1b94aa7a
--- /dev/null
+++ b/x11-toolkits/gtkmm12/files/patch-gtkmm-config.in
@@ -0,0 +1,11 @@
+--- gtkmm-config.in.orig Tue Jul 17 20:08:35 2001
++++ gtkmm-config.in Tue Jan 24 17:35:29 2006
+@@ -18,6 +18,6 @@
+
+-gtkmm_libs="$LIBDIRS -lgtkmm -lgdkmm @GTK_LIBS@ @SIGC_LIBS@"
++gtkmm_libs="$LIBDIRS -lgtkmm-1.2 -lgdkmm-1.2 @GTK_LIBS@ @SIGC_LIBS@"
+ gtkmm_cflags="$CFLAGS @GTK_CFLAGS@ @SIGC_CFLAGS@"
+
+-gthread_libs="-lgthread"
++gthread_libs="-lgthread-1.2"
+
diff --git a/x11-toolkits/gtkmm12/pkg-plist b/x11-toolkits/gtkmm12/pkg-plist
index e40e635ed7f8..a14d5069c338 100644
--- a/x11-toolkits/gtkmm12/pkg-plist
+++ b/x11-toolkits/gtkmm12/pkg-plist
@@ -186,12 +186,12 @@ lib/gtkmm/proc/gtkconvert.m4
lib/gtkmm/proc/gtkmmproc
lib/gtkmm/proc/list.m4
lib/gtkmm/proc/stage1.m4
-lib/libgdkmm.a
-lib/libgdkmm.so
-lib/libgdkmm.so.2
-lib/libgtkmm.a
-lib/libgtkmm.so
-lib/libgtkmm.so.2
+lib/libgdkmm-1.2.a
+lib/libgdkmm-1.2.so
+lib/libgdkmm-1.2.so.2
+lib/libgtkmm-1.2.a
+lib/libgtkmm-1.2.so
+lib/libgtkmm-1.2.so.2
share/aclocal/gtk--.m4
@dirrm include/gdk--
@dirrm include/gtk--/private
diff --git a/x11-toolkits/gtkmm20/Makefile b/x11-toolkits/gtkmm20/Makefile
index 80e500ee9be9..fbf06e469ad9 100644
--- a/x11-toolkits/gtkmm20/Makefile
+++ b/x11-toolkits/gtkmm20/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkmm
PORTVERSION= 2.2.12
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME} \
${MASTER_SITE_SOURCEFORGE}
@@ -25,7 +25,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
LATEST_LINK= gtkmm2
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:13:inc
+GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
USE_GNOME= gnomehack lthack gtk20
diff --git a/x11-toolkits/gtkmm20/pkg-plist b/x11-toolkits/gtkmm20/pkg-plist
index 225d3b3fb86f..220fd56f9609 100644
--- a/x11-toolkits/gtkmm20/pkg-plist
+++ b/x11-toolkits/gtkmm20/pkg-plist
@@ -456,21 +456,27 @@ lib/gtkmm-2.0/proc/pm/Property.pm
lib/gtkmm-2.0/proc/pm/Util.pm
lib/gtkmm-2.0/proc/pm/WrapParser.pm
lib/libatkmm-1.0.a
+lib/libatkmm-1.0.la
lib/libatkmm-1.0.so
lib/libatkmm-1.0.so.6
lib/libgdkmm-2.0.a
+lib/libgdkmm-2.0.la
lib/libgdkmm-2.0.so
lib/libgdkmm-2.0.so.6
lib/libglibmm-2.0.a
+lib/libglibmm-2.0.la
lib/libglibmm-2.0.so
lib/libglibmm-2.0.so.6
lib/libgtkmm-2.0.a
+lib/libgtkmm-2.0.la
lib/libgtkmm-2.0.so
lib/libgtkmm-2.0.so.6
lib/libgtkmm_generate_extra_defs-2.0.a
+lib/libgtkmm_generate_extra_defs-2.0.la
lib/libgtkmm_generate_extra_defs-2.0.so
lib/libgtkmm_generate_extra_defs-2.0.so.6
lib/libpangomm-1.0.a
+lib/libpangomm-1.0.la
lib/libpangomm-1.0.so
lib/libpangomm-1.0.so.6
libdata/pkgconfig/atkmm-1.0.pc
diff --git a/x11-toolkits/gtkmm24/Makefile b/x11-toolkits/gtkmm24/Makefile
index 660246cec001..c20753e9cd55 100644
--- a/x11-toolkits/gtkmm24/Makefile
+++ b/x11-toolkits/gtkmm24/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gtkmm
PORTVERSION= 2.8.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R}
@@ -26,7 +26,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GCC= 3.4
-USE_AUTOTOOLS= libtool:15:inc
+GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
USE_GNOME= gnomehack gtk20
CONFIGURE_ARGS= --disable-demos \
@@ -51,13 +51,4 @@ post-patch:
@${REINPLACE_CMD} -e '/^SUBDIRS =/s/tests//' \
${WRKSRC}/Makefile.in
-patch-autotools::
- @(cd ${PATCH_WRKSRC}; \
- for file in ${LIBTOOLFILES}; do \
- ${CP} $$file $$file.tmp; \
- ${SED} -e "/^ltmain=/s^\$$ac_aux_dir/ltmain.sh^${LTMAIN}^g" \
- $$file.tmp > $$file; \
- ${RM} $$file.tmp; \
- done);
-
.include <bsd.port.mk>
diff --git a/x11-toolkits/gtkmm24/pkg-plist b/x11-toolkits/gtkmm24/pkg-plist
index 7bca404fad17..eb98cb0127da 100644
--- a/x11-toolkits/gtkmm24/pkg-plist
+++ b/x11-toolkits/gtkmm24/pkg-plist
@@ -444,15 +444,19 @@ lib/gtkmm-%%API_VERSION%%/proc/m4/convert_gtk.m4
lib/gtkmm-%%API_VERSION%%/proc/m4/convert_gtkmm.m4
lib/gtkmm-%%API_VERSION%%/proc/m4/convert_pango.m4
lib/libatkmm-1.6.a
+lib/libatkmm-1.6.la
lib/libatkmm-1.6.so
lib/libatkmm-1.6.so.1
lib/libgdkmm-%%VERSION%%.a
+lib/libgdkmm-%%VERSION%%.la
lib/libgdkmm-%%VERSION%%.so
lib/libgdkmm-%%VERSION%%.so.1
lib/libgtkmm-%%VERSION%%.a
+lib/libgtkmm-%%VERSION%%.la
lib/libgtkmm-%%VERSION%%.so
lib/libgtkmm-%%VERSION%%.so.1
lib/libpangomm-1.4.a
+lib/libpangomm-1.4.la
lib/libpangomm-1.4.so
lib/libpangomm-1.4.so.1
libdata/pkgconfig/atkmm-1.6.pc
diff --git a/x11-toolkits/gtkmm30/Makefile b/x11-toolkits/gtkmm30/Makefile
index 80e500ee9be9..fbf06e469ad9 100644
--- a/x11-toolkits/gtkmm30/Makefile
+++ b/x11-toolkits/gtkmm30/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkmm
PORTVERSION= 2.2.12
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME} \
${MASTER_SITE_SOURCEFORGE}
@@ -25,7 +25,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
LATEST_LINK= gtkmm2
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:13:inc
+GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
USE_GNOME= gnomehack lthack gtk20
diff --git a/x11-toolkits/gtkmm30/pkg-plist b/x11-toolkits/gtkmm30/pkg-plist
index 225d3b3fb86f..220fd56f9609 100644
--- a/x11-toolkits/gtkmm30/pkg-plist
+++ b/x11-toolkits/gtkmm30/pkg-plist
@@ -456,21 +456,27 @@ lib/gtkmm-2.0/proc/pm/Property.pm
lib/gtkmm-2.0/proc/pm/Util.pm
lib/gtkmm-2.0/proc/pm/WrapParser.pm
lib/libatkmm-1.0.a
+lib/libatkmm-1.0.la
lib/libatkmm-1.0.so
lib/libatkmm-1.0.so.6
lib/libgdkmm-2.0.a
+lib/libgdkmm-2.0.la
lib/libgdkmm-2.0.so
lib/libgdkmm-2.0.so.6
lib/libglibmm-2.0.a
+lib/libglibmm-2.0.la
lib/libglibmm-2.0.so
lib/libglibmm-2.0.so.6
lib/libgtkmm-2.0.a
+lib/libgtkmm-2.0.la
lib/libgtkmm-2.0.so
lib/libgtkmm-2.0.so.6
lib/libgtkmm_generate_extra_defs-2.0.a
+lib/libgtkmm_generate_extra_defs-2.0.la
lib/libgtkmm_generate_extra_defs-2.0.so
lib/libgtkmm_generate_extra_defs-2.0.so.6
lib/libpangomm-1.0.a
+lib/libpangomm-1.0.la
lib/libpangomm-1.0.so
lib/libpangomm-1.0.so.6
libdata/pkgconfig/atkmm-1.0.pc
diff --git a/x11-toolkits/gtksourceview/Makefile b/x11-toolkits/gtksourceview/Makefile
index 0b738f66243c..be2f3b44b840 100644
--- a/x11-toolkits/gtksourceview/Makefile
+++ b/x11-toolkits/gtksourceview/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gtksourceview
PORTVERSION= 1.4.2
+PORTREVISION= 1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.4
@@ -19,7 +20,7 @@ COMMENT= A text widget that adds syntax highlighting to the GtkTextView widget
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
USE_GNOME= gnomeprefix gnomehack libgnome libgnomeprintui intlhack \
ltverhack
diff --git a/x11-toolkits/gtksourceview/pkg-plist b/x11-toolkits/gtksourceview/pkg-plist
index 815a45a678ed..dc0462bd68a7 100644
--- a/x11-toolkits/gtksourceview/pkg-plist
+++ b/x11-toolkits/gtksourceview/pkg-plist
@@ -11,6 +11,7 @@ include/gtksourceview-1.0/gtksourceview/gtksourcetagtable.h
include/gtksourceview-1.0/gtksourceview/gtksourceview-typebuiltins.h
include/gtksourceview-1.0/gtksourceview/gtksourceview.h
lib/libgtksourceview-1.0.a
+lib/libgtksourceview-1.0.la
lib/libgtksourceview-1.0.so
lib/libgtksourceview-1.0.so.0
libdata/pkgconfig/gtksourceview-1.0.pc
diff --git a/x11-toolkits/gtoolkit/Makefile b/x11-toolkits/gtoolkit/Makefile
index 347531444cc2..38b0c00daaf2 100644
--- a/x11-toolkits/gtoolkit/Makefile
+++ b/x11-toolkits/gtoolkit/Makefile
@@ -35,7 +35,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/GToolKit
CONFIGURE_WRKSRC= ${WRKDIR}/${DISTNAME}
post-patch:
- ${REINPLACE_CMD} -e 's#gtk-config#gtk12-config#g' \
+ ${REINPLACE_CMD} -e 's#gtk-config#${GTK_CONFIG}#g' \
${CONFIGURE_WRKSRC}/configure
${REINPLACE_CMD} -e 's|)/Makefiles|)/Library/Makefiles|' \
${WRKSRC}/Makefile.gnustep
diff --git a/x11-toolkits/guile-gnome/Makefile b/x11-toolkits/guile-gnome/Makefile
index 82065853e450..b996cda683a2 100644
--- a/x11-toolkits/guile-gnome/Makefile
+++ b/x11-toolkits/guile-gnome/Makefile
@@ -7,7 +7,7 @@
PORTNAME= guile-gnome
PORTVERSION= 0.20
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= x11-toolkits gnome scheme
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-guile/0.20
@@ -19,7 +19,7 @@ COMMENT= Guile binding library for GNOME
LIB_DEPENDS= guilegtk-1.2.0:${PORTSDIR}/x11-toolkits/guile-gtk
USE_X_PREFIX= yes
-USE_AUTOTOOLS= libtool:13:inc
+GNU_CONFIGURE= yes
USE_GNOME= gnomeprefix bonobo gtkhtml libglade
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --with-bonobo --with-gtkhtml --without-gal \
diff --git a/x11-toolkits/guile-gnome/pkg-plist b/x11-toolkits/guile-gnome/pkg-plist
index 581e8f2f3885..d815d124b9a3 100644
--- a/x11-toolkits/guile-gnome/pkg-plist
+++ b/x11-toolkits/guile-gnome/pkg-plist
@@ -1,26 +1,34 @@
bin/gnomeg
lib/libguilebonobo.a
+lib/libguilebonobo.la
lib/libguilebonobo.so
lib/libguilebonobo.so.0
lib/libguilegdkpixbuf.a
+lib/libguilegdkpixbuf.la
lib/libguilegdkpixbuf.so
lib/libguilegdkpixbuf.so.0
lib/libguileghttp.a
+lib/libguileghttp.la
lib/libguileghttp.so
lib/libguileghttp.so.0
lib/libguileglade.a
+lib/libguileglade.la
lib/libguileglade.so
lib/libguileglade.so.0
lib/libguilegnome.a
+lib/libguilegnome.la
lib/libguilegnome.so
lib/libguilegnome.so.0
lib/libguilegnorba.a
+lib/libguilegnorba.la
lib/libguilegnorba.so
lib/libguilegnorba.so.0
lib/libguilegtkhtml.a
+lib/libguilegtkhtml.la
lib/libguilegtkhtml.so
lib/libguilegtkhtml.so.0
lib/libguilezvt.a
+lib/libguilezvt.la
lib/libguilezvt.so
lib/libguilezvt.so.0
share/gnome/guile-gnome/bonobo.defs
diff --git a/x11-toolkits/guile-gtk/Makefile b/x11-toolkits/guile-gtk/Makefile
index da860d73426f..ffd1d8557e68 100644
--- a/x11-toolkits/guile-gtk/Makefile
+++ b/x11-toolkits/guile-gtk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= guile-gtk
PORTVERSION= 0.31
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits scheme
#MASTER_SITES= ${MASTER_SITE_SAVANNAH}
#MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -24,7 +24,7 @@ USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gtk12 gnometarget
USE_REINPLACE= yes
-USE_AUTOTOOLS= libtool:13:inc
+GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/guile-gtk/pkg-plist b/x11-toolkits/guile-gtk/pkg-plist
index a451c48cd2a8..97cdf2b0903e 100644
--- a/x11-toolkits/guile-gtk/pkg-plist
+++ b/x11-toolkits/guile-gtk/pkg-plist
@@ -2,6 +2,7 @@ bin/build-guile-gtk
bin/build-guile-gtk-1.2
include/guile-gtk.h
lib/libguilegtk-1.2.a
+lib/libguilegtk-1.2.la
lib/libguilegtk-1.2.so
lib/libguilegtk-1.2.so.0
share/guile-gtk/gdk-1.2.defs
diff --git a/x11-toolkits/inti/Makefile b/x11-toolkits/inti/Makefile
index b1f674e5f715..a770112ebde9 100644
--- a/x11-toolkits/inti/Makefile
+++ b/x11-toolkits/inti/Makefile
@@ -8,7 +8,7 @@
PORTNAME= inti
PORTVERSION= 1.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= inti
@@ -18,7 +18,7 @@ COMMENT= A set of C++ classes for developing GNOME and GTK+ applications
USE_GNOME= glib20 gtk20 atk pango gnomehack gnomeprefix
USE_X_PREFIX= yes
-GNU_CONFIGURE= yes
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
INSTALLS_SHLIB= yes
diff --git a/x11-toolkits/inti/pkg-plist b/x11-toolkits/inti/pkg-plist
index 798109ad3541..a09076792b9a 100644
--- a/x11-toolkits/inti/pkg-plist
+++ b/x11-toolkits/inti/pkg-plist
@@ -320,6 +320,8 @@ include/inti-1.0/inti/utf-string.h
lib/inti-1.0/include/inti-config.h
@dirrm lib/inti-1.0/include
@dirrm lib/inti-1.0
+lib/libinti-1.0.a
+lib/libinti-1.0.la
lib/libinti-1.0.so
lib/libinti-1.0.so.9
libdata/pkgconfig/inti-1.0.pc
diff --git a/x11-toolkits/lesstif/Makefile b/x11-toolkits/lesstif/Makefile
index 985f497b788a..3267c4f961dd 100644
--- a/x11-toolkits/lesstif/Makefile
+++ b/x11-toolkits/lesstif/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
CONFLICTS?= open-motif-*
MANUAL_PACKAGE_BUILD= do not want to install during interactive build
-USE_AUTOTOOLS= automake:19:env autoconf:259 libtool:15:inc
+USE_AUTOTOOLS= automake:19:env autoconf:259 libtool:15
USE_X_PREFIX= yes
INSTALLS_SHLIB= yes
LIBTOOLFILES= aclocal.m4 test/aclocal.m4
diff --git a/x11-toolkits/libXaw/Makefile b/x11-toolkits/libXaw/Makefile
index 3074131e6720..8cb332231963 100644
--- a/x11-toolkits/libXaw/Makefile
+++ b/x11-toolkits/libXaw/Makefile
@@ -29,7 +29,6 @@ PREFIX?= ${X11BASE}
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:13
CFLAGS+= -DMALLOC_0_RETURNS_NULL
INSTALLS_SHLIB= yes
USE_GNOME= gnomehack pkgconfig
diff --git a/x11-toolkits/libXmu/Makefile b/x11-toolkits/libXmu/Makefile
index 2552db315f85..4381ccf00f8c 100644
--- a/x11-toolkits/libXmu/Makefile
+++ b/x11-toolkits/libXmu/Makefile
@@ -25,7 +25,6 @@ PREFIX?= ${X11BASE}
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:13:inc
CFLAGS+= -DMALLOC_0_RETURNS_NULL
INSTALLS_SHLIB= yes
USE_GNOME= gnomehack pkgconfig
diff --git a/x11-toolkits/libXt/Makefile b/x11-toolkits/libXt/Makefile
index 742474947084..e42cd264dd2e 100644
--- a/x11-toolkits/libXt/Makefile
+++ b/x11-toolkits/libXt/Makefile
@@ -26,7 +26,6 @@ PREFIX?= ${X11BASE}
GNU_CONFIGURE= yes
USE_GMAKE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_AUTOTOOLS= libtool:13
CFLAGS+= -DMALLOC_0_RETURNS_NULL
INSTALLS_SHLIB= yes
USE_GNOME= gnomehack pkgconfig
diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile
index 4dc9f1f2161e..b9fd1fad5308 100644
--- a/x11-toolkits/libbonoboui/Makefile
+++ b/x11-toolkits/libbonoboui/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libbonoboui
PORTVERSION= 2.10.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10
@@ -21,7 +21,7 @@ USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnomehier intlhack \
libgnomecanvas libgnome
-USE_AUTOTOOLS= libtool:15
+GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
diff --git a/x11-toolkits/libbonoboui/pkg-plist b/x11-toolkits/libbonoboui/pkg-plist
index fd8a93b24494..a6424c427d06 100644
--- a/x11-toolkits/libbonoboui/pkg-plist
+++ b/x11-toolkits/libbonoboui/pkg-plist
@@ -34,8 +34,11 @@ include/libbonoboui-2.0/bonobo/bonobo-zoomable.h
include/libbonoboui-2.0/libbonoboui.h
lib/bonobo-2.0/samples/bonobo-sample-controls-2
lib/libbonoboui-2.a
+lib/libbonoboui-2.la
lib/libbonoboui-2.so
lib/libbonoboui-2.so.0
+lib/libglade/2.0/libbonobo.a
+lib/libglade/2.0/libbonobo.la
lib/libglade/2.0/libbonobo.so
libdata/bonobo/servers/Bonobo_Sample_Controls.server
libdata/bonobo/servers/CanvDemo.server
diff --git a/x11-toolkits/libbonobouimm/Makefile b/x11-toolkits/libbonobouimm/Makefile
index 473d2a0d6aa1..290f379631f8 100644
--- a/x11-toolkits/libbonobouimm/Makefile
+++ b/x11-toolkits/libbonobouimm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libbonobouimm
PORTVERSION= 1.3.7
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R}
@@ -24,7 +24,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomehack lthack gnomeprefix libbonoboui
-USE_AUTOTOOLS= libtool:13:inc
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-static
diff --git a/x11-toolkits/libbonobouimm/pkg-plist b/x11-toolkits/libbonobouimm/pkg-plist
index a85837a18b34..a7e9fc5201de 100644
--- a/x11-toolkits/libbonobouimm/pkg-plist
+++ b/x11-toolkits/libbonobouimm/pkg-plist
@@ -26,9 +26,11 @@ lib/libbonobouimm-2.0/include/libbonobouimmconfig.h
lib/libbonobouimm-2.0/proc/m4/convert.m4
lib/libbonobouimm-2.0/proc/m4/convert_libbonoboui.m4
lib/libbonobouimm_servers-1.3.a
+lib/libbonobouimm_servers-1.3.la
lib/libbonobouimm_servers-1.3.so
lib/libbonobouimm_servers-1.3.so.7
lib/libbonobouimm_widgets-1.3.a
+lib/libbonobouimm_widgets-1.3.la
lib/libbonobouimm_widgets-1.3.so
lib/libbonobouimm_widgets-1.3.so.7
libdata/bonobo/servers/Bonobomm_Sample_Controls.server
diff --git a/x11-toolkits/libgail-gnome/Makefile b/x11-toolkits/libgail-gnome/Makefile
index a6a64775cca6..76ec2edff6c8 100644
--- a/x11-toolkits/libgail-gnome/Makefile
+++ b/x11-toolkits/libgail-gnome/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libgail-gnome
PORTVERSION= 1.1.3
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.1
@@ -19,7 +20,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
INSTALLS_SHLIB= yes
-USE_AUTOTOOLS= libtool:15
+GNU_CONFIGURE= yes
GNOME_DESKTOP_VERSION=2
USE_GNOME= gnomeprefix gnomehack gnomepanel atspi
USE_REINPLACE= yes
diff --git a/x11-toolkits/libgail-gnome/pkg-plist b/x11-toolkits/libgail-gnome/pkg-plist
index 0f1b60be4b9c..e096717a7d9c 100644
--- a/x11-toolkits/libgail-gnome/pkg-plist
+++ b/x11-toolkits/libgail-gnome/pkg-plist
@@ -1,2 +1,4 @@
+lib/gtk-2.0/modules/libgail-gnome.a
+lib/gtk-2.0/modules/libgail-gnome.la
lib/gtk-2.0/modules/libgail-gnome.so
libdata/pkgconfig/libgail-gnome.pc
diff --git a/x11-toolkits/libgdiplus/Makefile b/x11-toolkits/libgdiplus/Makefile
index a9729aa4bee3..9b3e807f745c 100644
--- a/x11-toolkits/libgdiplus/Makefile
+++ b/x11-toolkits/libgdiplus/Makefile
@@ -8,6 +8,7 @@
PORTNAME= libgdiplus
PORTVERSION= 1.1.13.2
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= http://www.go-mono.com/sources/libgdiplus-1.1/
diff --git a/x11-toolkits/libgdiplus/pkg-plist b/x11-toolkits/libgdiplus/pkg-plist
index d99388881552..2ee543daf3d3 100644
--- a/x11-toolkits/libgdiplus/pkg-plist
+++ b/x11-toolkits/libgdiplus/pkg-plist
@@ -1,4 +1,5 @@
lib/libgdiplus.a
+lib/libgdiplus.la
lib/libgdiplus.so
lib/libgdiplus.so.0
libdata/pkgconfig/libgdiplus.pc
diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile
index dfef08682160..8e123ba22aac 100644
--- a/x11-toolkits/libgnomeprintui/Makefile
+++ b/x11-toolkits/libgnomeprintui/Makefile
@@ -8,6 +8,7 @@
PORTNAME= libgnomeprintui
PORTVERSION= 2.12.1
+PORTREVISION= 1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12
@@ -27,7 +28,7 @@ USE_GNOME= gnomeprefix gnomehack libgnomeprint libgnomecanvas \
intlhack ltverhack
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:15
USE_BISON= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/libgnomeprintui/pkg-plist b/x11-toolkits/libgnomeprintui/pkg-plist
index 0a333a7a0faa..7363dec5e82b 100644
--- a/x11-toolkits/libgnomeprintui/pkg-plist
+++ b/x11-toolkits/libgnomeprintui/pkg-plist
@@ -8,6 +8,7 @@ include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-preview.h
include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-unit-selector.h
include/libgnomeprintui-2.2/libgnomeprintui/libgnomeprintui-enum-types.h
lib/libgnomeprintui-2-2.a
+lib/libgnomeprintui-2-2.la
lib/libgnomeprintui-2-2.so
lib/libgnomeprintui-2-2.so.0
libdata/pkgconfig/libgnomeprintui-2.2.pc
diff --git a/x11-toolkits/libgnomeprintuimm/Makefile b/x11-toolkits/libgnomeprintuimm/Makefile
index 16ae384653ed..f6ed11b626ba 100644
--- a/x11-toolkits/libgnomeprintuimm/Makefile
+++ b/x11-toolkits/libgnomeprintuimm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libgnomeprintuimm
PORTVERSION= 2.5.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.5
@@ -27,7 +27,7 @@ USE_GNOME= gnomeprefix gnomehack libgnomeprintui
USE_GCC= 3.4
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
-USE_AUTOTOOLS= libtool:15:inc
+GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-static
PLIST_SUB= VERSION="2.5" API_VERSION="2.6"
@@ -37,13 +37,4 @@ post-patch:
@${REINPLACE_CMD} -e "s|\(-lglibmm\)|-L\$$(GMM_PROCDIR)/../.. \1|" \
${WRKSRC}/tools/extra_defs_gen/Makefile.in
-patch-autotools::
- @(cd ${PATCH_WRKSRC}; \
- for file in ${LIBTOOLFILES}; do \
- ${CP} $$file $$file.tmp; \
- ${SED} -e "/^ltmain=/s^\$$ac_aux_dir/ltmain.sh^${LTMAIN}^g" \
- $$file.tmp > $$file; \
- ${RM} $$file.tmp; \
- done);
-
.include <bsd.port.mk>
diff --git a/x11-toolkits/libgnomeprintuimm/pkg-plist b/x11-toolkits/libgnomeprintuimm/pkg-plist
index 46da8ccae183..68d7dba27313 100644
--- a/x11-toolkits/libgnomeprintuimm/pkg-plist
+++ b/x11-toolkits/libgnomeprintuimm/pkg-plist
@@ -14,6 +14,7 @@ include/libgnomeprintuimm-%%API_VERSION%%/libgnomeprintuimm/private/printdialog_
include/libgnomeprintuimm-%%API_VERSION%%/libgnomeprintuimm/types.h
include/libgnomeprintuimm-%%API_VERSION%%/libgnomeprintuimm/wrap_init.h
lib/libgnomeprintuimm-%%VERSION%%.a
+lib/libgnomeprintuimm-%%VERSION%%.la
lib/libgnomeprintuimm-%%VERSION%%.so
lib/libgnomeprintuimm-%%VERSION%%.so.3
lib/libgnomeprintuimm-%%API_VERSION%%/include/libgnomeprintuimmconfig.h
diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile
index 62a35287242b..8e294ee5e465 100644
--- a/x11-toolkits/libgnomeui/Makefile
+++ b/x11-toolkits/libgnomeui/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libgnomeui
PORTVERSION= 2.12.1
+PORTREVISION= 1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12
@@ -25,7 +26,7 @@ USE_XPM= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnomehier libbonoboui ltverhack
INSTALLS_SHLIB= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:15
USE_BISON= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
diff --git a/x11-toolkits/libgnomeui/pkg-plist b/x11-toolkits/libgnomeui/pkg-plist
index b86c770e8cdb..bc295b7fa271 100644
--- a/x11-toolkits/libgnomeui/pkg-plist
+++ b/x11-toolkits/libgnomeui/pkg-plist
@@ -49,9 +49,14 @@ include/libgnomeui-2.0/libgnomeui/gnome-window-icon.h
include/libgnomeui-2.0/libgnomeui/gnome-window.h
include/libgnomeui-2.0/libgnomeui/gnometypebuiltins.h
include/libgnomeui-2.0/libgnomeui/libgnomeui.h
+lib/gtk-2.0/%%GTK_VERSION%%/filesystems/libgnome-vfs.a
+lib/gtk-2.0/%%GTK_VERSION%%/filesystems/libgnome-vfs.la
lib/gtk-2.0/%%GTK_VERSION%%/filesystems/libgnome-vfs.so
+lib/libglade/2.0/libgnome.a
+lib/libglade/2.0/libgnome.la
lib/libglade/2.0/libgnome.so
lib/libgnomeui-2.a
+lib/libgnomeui-2.la
lib/libgnomeui-2.so
lib/libgnomeui-2.so.0
libdata/pkgconfig/libgnomeui-2.0.pc
diff --git a/x11-toolkits/libgnomeuimm/Makefile b/x11-toolkits/libgnomeuimm/Makefile
index 44ba28371a66..e1b423b4776f 100644
--- a/x11-toolkits/libgnomeuimm/Makefile
+++ b/x11-toolkits/libgnomeuimm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libgnomeuimm
PORTVERSION= 2.0.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gtkmm
@@ -25,7 +25,7 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomehack libgnomeui
-USE_AUTOTOOLS= libtool:13:inc
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-static
diff --git a/x11-toolkits/libgnomeuimm/pkg-plist b/x11-toolkits/libgnomeuimm/pkg-plist
index 92a22c7f552e..da4f0d2df3f4 100644
--- a/x11-toolkits/libgnomeuimm/pkg-plist
+++ b/x11-toolkits/libgnomeuimm/pkg-plist
@@ -50,6 +50,7 @@ lib/libgnomeuimm-2.0/include/libgnomeuimmconfig.h
lib/libgnomeuimm-2.0/proc/m4/convert.m4
lib/libgnomeuimm-2.0/proc/m4/convert_libgnomeuimm.m4
lib/libgnomeuimm-2.0.a
+lib/libgnomeuimm-2.0.la
lib/libgnomeuimm-2.0.so
lib/libgnomeuimm-2.0.so.1
libdata/pkgconfig/libgnomeuimm-2.0.pc
diff --git a/x11-toolkits/libgnomeuimm26/Makefile b/x11-toolkits/libgnomeuimm26/Makefile
index faf5a88dad80..51447e451e1a 100644
--- a/x11-toolkits/libgnomeuimm26/Makefile
+++ b/x11-toolkits/libgnomeuimm26/Makefile
@@ -8,6 +8,7 @@
PORTNAME= libgnomeuimm
PORTVERSION= 2.12.0
+PORTREVISION= 1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R}
@@ -31,7 +32,7 @@ USE_GMAKE= yes
USE_GCC= 3.4
USE_REINPLACE= yes
USE_GNOME= gnomehack libgnomeui
-USE_AUTOTOOLS= libtool:15:inc
+GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-static
@@ -43,13 +44,4 @@ post-patch:
@${REINPLACE_CMD} -e "s|\(-lglibmm\)|-L\$$(GMM_PROCDIR)/../.. \1|" \
${WRKSRC}/tools/extra_defs_gen/Makefile.in
-patch-autotools::
- @(cd ${PATCH_WRKSRC}; \
- for file in ${LIBTOOLFILES}; do \
- ${CP} $$file $$file.tmp; \
- ${SED} -e "/^ltmain=/s^\$$ac_aux_dir/ltmain.sh^${LTMAIN}^g" \
- $$file.tmp > $$file; \
- ${RM} $$file.tmp; \
- done);
-
.include <bsd.port.mk>
diff --git a/x11-toolkits/libgnomeuimm26/pkg-plist b/x11-toolkits/libgnomeuimm26/pkg-plist
index 0e42dd90b70c..44a43a572388 100644
--- a/x11-toolkits/libgnomeuimm26/pkg-plist
+++ b/x11-toolkits/libgnomeuimm26/pkg-plist
@@ -51,6 +51,7 @@ include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/ui-items-icon.h
include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/ui-items-stock.h
include/libgnomeuimm-%%API_VERSION%%/libgnomeuimm/wrap_init.h
lib/libgnomeuimm-%%VERSION%%.a
+lib/libgnomeuimm-%%VERSION%%.la
lib/libgnomeuimm-%%VERSION%%.so
lib/libgnomeuimm-%%VERSION%%.so.1
lib/libgnomeuimm-%%API_VERSION%%/include/libgnomeuimmconfig.h
diff --git a/x11-toolkits/libgtk-java/Makefile b/x11-toolkits/libgtk-java/Makefile
index 15e53fa14292..ccc0c1046e22 100644
--- a/x11-toolkits/libgtk-java/Makefile
+++ b/x11-toolkits/libgtk-java/Makefile
@@ -22,7 +22,7 @@ USE_BZIP2= yes
USE_XLIB= yes
USE_GMAKE= yes
INSTALLS_SHLIB= yes
-USE_AUTOTOOLS= libtool:15
+GNU_CONFIGURE= yes
USE_JAVA= yes
JAVA_VERSION= 1.2+
JAVA_OS= native
diff --git a/x11-toolkits/libgtkeditor/Makefile b/x11-toolkits/libgtkeditor/Makefile
index fb76c6e8b6dc..8f91e7a943ed 100644
--- a/x11-toolkits/libgtkeditor/Makefile
+++ b/x11-toolkits/libgtkeditor/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libgtkeditor
PORTVERSION= 0.1.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits editors
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME:S/lib//}
@@ -18,7 +18,7 @@ COMMENT= A source code editor widget for GTK+
LIB_DEPENDS= unicode.0:${PORTSDIR}/devel/libunicode
-USE_AUTOTOOLS= automake:15:env autoconf:253:env libtool:13:inc
+USE_AUTOTOOLS= automake:15:env autoconf:253:env libtool:15
USE_X_PREFIX= yes
USE_GNOME= gtk12
USE_GMAKE= yes
@@ -37,7 +37,19 @@ pre-configure:
@${RM} ${WRKSRC}/config.guess ${WRKSRC}/config.sub
@${TOUCH} ${WRKSRC}/config.sub
+# Crazy hacking to get around the fact that the tktext subdirectory
+# generates files ending in .lo that libtool 1.5.x is considerably
+# stricter on than libtool 1.3.x
+CRAZY_HACK_FILES= \
+ gtktextlayout.c gtktext.c gtktextdisplay.c gtktextbtree.c \
+ gtktextbuffer.c gtktexttag.c gtktextmark.c gtktexttypes.c \
+ gstring.c gbsearch.c gtktextchild.c gtktexttagtable.c \
+ gtktextiter.c gtktextsegment.c
+
post-configure:
+.for file in ${CRAZY_HACK_FILES}
+ @${LN} -sf tktext-port/${file} ${WRKSRC}/${file}
+.endfor
@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/scanner.c
pre-install:
diff --git a/x11-toolkits/libgtkeditor/files/patch-aa b/x11-toolkits/libgtkeditor/files/patch-aa
deleted file mode 100644
index 92a73e1ee97a..000000000000
--- a/x11-toolkits/libgtkeditor/files/patch-aa
+++ /dev/null
@@ -1,132 +0,0 @@
---- tktext-port/Makefile 2000/09/25 10:03:27 1.1
-+++ tktext-port/Makefile 2000/09/25 10:32:49
-@@ -21,99 +21,99 @@
- #EFENCE=-lefence
- EFENCE=
-
--DYN_LIBS= $(EFENCE) `gtk-config --libs` -lunicode $(EFENCE)
-+DYN_LIBS= $(EFENCE) $(GTK_LIBS) -lunicode
- STATIC_LIBS=-L/home/hp/local/lib -L/usr/X11R6/lib -L/home/hp/unstable/lib -rdynamic -lgmodule -ldl -lXext -lX11 -lm -lunicode ./libgtk.a ./libgdk.a ./libglib.a
- MANY_STATIC_LIBS=-lunicode -L/usr/X11R6/lib -L/opt/gnome/lib -rdynamic -lgmodule -ldl -lm ./libgtk.a ./libgdk.a ./libX11.a ./libXext.a ./libXi.a ./libglib.a
-
- # I know this shouldn't go here...but it's easier
--OPTIMIZE=-O2 -DG_DISABLE_ASSERT
-+OPTIMIZE=$(GTK_CFLAGS) -DG_DISABLE_ASSERT
- #OPTIMIZE=
-
- all: $(ALL_OBJECTS)
-
- gtktextlayout.lo:
-- cc -Wall -ggdb $(OPTIMIZE) $(PROFILE) -c `gtk-config --cflags` `gnome-config --cflags gnomeui` gtktextlayout.c -o gtktextlayout.lo
-+ cc $(OPTIMIZE) $(PROFILE) -c gtktextlayout.c -o gtktextlayout.lo
-
- gtktext.lo:
-- cc -Wall -ggdb $(OPTIMIZE) $(PROFILE) -c `gtk-config --cflags` `gnome-config --cflags gnomeui` gtktext.c -o gtktext.lo
-+ cc $(OPTIMIZE) $(PROFILE) -c gtktext.c -o gtktext.lo
-
- gtktextdisplay.lo:
-- cc -Wall -ggdb $(OPTIMIZE) $(PROFILE) -c `gtk-config --cflags` `gnome-config --cflags gnomeui` gtktextdisplay.c -o gtktextdisplay.lo
-+ cc $(OPTIMIZE) $(PROFILE) -c gtktextdisplay.c -o gtktextdisplay.lo
-
- gtktextbtree.lo:
-- cc -Wall -ggdb $(OPTIMIZE) $(PROFILE) -c `gtk-config --cflags` `gnome-config --cflags gnomeui` gtktextbtree.c -o gtktextbtree.lo
-+ cc $(OPTIMIZE) $(PROFILE) -c gtktextbtree.c -o gtktextbtree.lo
-
- gtktextbuffer.lo:
-- cc -Wall -ggdb $(OPTIMIZE) $(PROFILE) -c `gtk-config --cflags` `gnome-config --cflags gnomeui` gtktextbuffer.c -o gtktextbuffer.lo
-+ cc $(OPTIMIZE) $(PROFILE) -c gtktextbuffer.c -o gtktextbuffer.lo
-
- gtktexttag.lo:
-- cc -Wall -ggdb $(OPTIMIZE) $(PROFILE) -c `gtk-config --cflags` `gnome-config --cflags gnomeui` gtktexttag.c -o gtktexttag.lo
-+ cc $(OPTIMIZE) $(PROFILE) -c gtktexttag.c -o gtktexttag.lo
-
- gtktextmark.lo:
-- cc -Wall -ggdb $(OPTIMIZE) $(PROFILE) -c `gtk-config --cflags` `gnome-config --cflags gnomeui` gtktextmark.c -o gtktextmark.lo
-+ cc $(OPTIMIZE) $(PROFILE) -c gtktextmark.c -o gtktextmark.lo
-
- gtktexttypes.lo:
-- cc -Wall -ggdb $(OPTIMIZE) $(PROFILE) -c `gtk-config --cflags` `gnome-config --cflags gnomeui` gtktexttypes.c -o gtktexttypes.lo
-+ cc $(OPTIMIZE) $(PROFILE) -c gtktexttypes.c -o gtktexttypes.lo
-
- gstring.lo:
-- cc -Wall -ggdb $(OPTIMIZE) $(PROFILE) -c `gtk-config --cflags` `gnome-config --cflags gnomeui` gstring.c -o gstring.lo
-+ cc $(OPTIMIZE) $(PROFILE) -c gstring.c -o gstring.lo
-
- gbsearch.lo:
-- cc -Wall -ggdb $(OPTIMIZE) $(PROFILE) -c `gtk-config --cflags` `gnome-config --cflags gnomeui` gbsearch.c -o gbsearch.lo
-+ cc $(OPTIMIZE) $(PROFILE) -c gbsearch.c -o gbsearch.lo
-
- gtktextchild.lo:
-- cc -Wall -ggdb $(OPTIMIZE) $(PROFILE) -c `gtk-config --cflags` `gnome-config --cflags gnomeui` gtktextchild.c -o gtktextchild.lo
-+ cc $(OPTIMIZE) $(PROFILE) -c gtktextchild.c -o gtktextchild.lo
-
- gtktexttagtable.lo:
-- cc -Wall -ggdb $(OPTIMIZE) $(PROFILE) -c `gtk-config --cflags` `gnome-config --cflags gnomeui` gtktexttagtable.c -o gtktexttagtable.lo
-+ cc $(OPTIMIZE) $(PROFILE) -c gtktexttagtable.c -o gtktexttagtable.lo
-
- gtktextiter.lo:
-- cc -Wall -ggdb $(OPTIMIZE) $(PROFILE) -c `gtk-config --cflags` `gnome-config --cflags gnomeui` gtktextiter.c -o gtktextiter.lo
-+ cc $(OPTIMIZE) $(PROFILE) -c gtktextiter.c -o gtktextiter.lo
-
- gtktextsegment.lo:
-- cc -Wall -ggdb $(OPTIMIZE) $(PROFILE) -c `gtk-config --cflags` `gnome-config --cflags gnomeui` gtktextsegment.c -o gtktextsegment.lo
-+ cc $(OPTIMIZE) $(PROFILE) -c gtktextsegment.c -o gtktextsegment.lo
-
- gtktextlayout.o:
-- cc -Wall -ggdb $(OPTIMIZE) $(PROFILE) -c `gtk-config --cflags` `gnome-config --cflags gnomeui` gtktextlayout.c -o gtktextlayout.o
-+ cc $(OPTIMIZE) $(PROFILE) -c gtktextlayout.c -o gtktextlayout.o
-
- gtktext.o:
-- cc -Wall -ggdb $(OPTIMIZE) $(PROFILE) -c `gtk-config --cflags` `gnome-config --cflags gnomeui` gtktext.c -o gtktext.o
-+ cc $(OPTIMIZE) $(PROFILE) -c gtktext.c -o gtktext.o
-
- gtktextdisplay.o:
-- cc -Wall -ggdb $(OPTIMIZE) $(PROFILE) -c `gtk-config --cflags` `gnome-config --cflags gnomeui` gtktextdisplay.c -o gtktextdisplay.o
-+ cc $(OPTIMIZE) $(PROFILE) -c gtktextdisplay.c -o gtktextdisplay.o
-
- gtktextbtree.o:
-- cc -Wall -ggdb $(OPTIMIZE) $(PROFILE) -c `gtk-config --cflags` `gnome-config --cflags gnomeui` gtktextbtree.c -o gtktextbtree.o
-+ cc $(OPTIMIZE) $(PROFILE) -c gtktextbtree.c -o gtktextbtree.o
-
- gtktextbuffer.o:
-- cc -Wall -ggdb $(OPTIMIZE) $(PROFILE) -c `gtk-config --cflags` `gnome-config --cflags gnomeui` gtktextbuffer.c -o gtktextbuffer.o
-+ cc $(OPTIMIZE) $(PROFILE) -c gtktextbuffer.c -o gtktextbuffer.o
-
- gtktexttag.o:
-- cc -Wall -ggdb $(OPTIMIZE) $(PROFILE) -c `gtk-config --cflags` `gnome-config --cflags gnomeui` gtktexttag.c -o gtktexttag.o
-+ cc $(OPTIMIZE) $(PROFILE) -c gtktexttag.c -o gtktexttag.o
-
- gtktextmark.o:
-- cc -Wall -ggdb $(OPTIMIZE) $(PROFILE) -c `gtk-config --cflags` `gnome-config --cflags gnomeui` gtktextmark.c -o gtktextmark.o
-+ cc $(OPTIMIZE) $(PROFILE) -c gtktextmark.c -o gtktextmark.o
-
- gtktexttypes.o:
-- cc -Wall -ggdb $(OPTIMIZE) $(PROFILE) -c `gtk-config --cflags` `gnome-config --cflags gnomeui` gtktexttypes.c -o gtktexttypes.o
-+ cc $(OPTIMIZE) $(PROFILE) -c gtktexttypes.c -o gtktexttypes.o
-
- gstring.o:
-- cc -Wall -ggdb $(OPTIMIZE) $(PROFILE) -c `gtk-config --cflags` `gnome-config --cflags gnomeui` gstring.c -o gstring.o
-+ cc $(OPTIMIZE) $(PROFILE) -c gstring.c -o gstring.o
-
- gbsearch.o:
-- cc -Wall -ggdb $(OPTIMIZE) $(PROFILE) -c `gtk-config --cflags` `gnome-config --cflags gnomeui` gbsearch.c -o gbsearch.o
-+ cc $(OPTIMIZE) $(PROFILE) -c gbsearch.c -o gbsearch.o
-
- gtktextchild.o:
-- cc -Wall -ggdb $(OPTIMIZE) $(PROFILE) -c `gtk-config --cflags` `gnome-config --cflags gnomeui` gtktextchild.c -o gtktextchild.o
-+ cc $(OPTIMIZE) $(PROFILE) -c gtktextchild.c -o gtktextchild.o
-
- gtktexttagtable.o:
-- cc -Wall -ggdb $(OPTIMIZE) $(PROFILE) -c `gtk-config --cflags` `gnome-config --cflags gnomeui` gtktexttagtable.c -o gtktexttagtable.o
-+ cc $(OPTIMIZE) $(PROFILE) -c gtktexttagtable.c -o gtktexttagtable.o
-
- gtktextiter.o:
-- cc -Wall -ggdb $(OPTIMIZE) $(PROFILE) -c `gtk-config --cflags` `gnome-config --cflags gnomeui` gtktextiter.c -o gtktextiter.o
-+ cc $(OPTIMIZE) $(PROFILE) -c gtktextiter.c -o gtktextiter.o
-
- gtktextsegment.o:
-- cc -Wall -ggdb $(OPTIMIZE) $(PROFILE) -c `gtk-config --cflags` `gnome-config --cflags gnomeui` gtktextsegment.c -o gtktextsegment.o
-+ cc $(OPTIMIZE) $(PROFILE) -c gtktextsegment.c -o gtktextsegment.o
-
- clean:
- /bin/rm -f *.o *.lo *~ *.bak
diff --git a/x11-toolkits/libgtkeditor/files/patch-ab b/x11-toolkits/libgtkeditor/files/patch-ab
index 85bd24d4994d..1a08c06737a1 100644
--- a/x11-toolkits/libgtkeditor/files/patch-ab
+++ b/x11-toolkits/libgtkeditor/files/patch-ab
@@ -1,20 +1,44 @@
---- Makefile.in 2000/09/25 10:39:41 1.1
-+++ Makefile.in 2000/09/25 10:39:44
-@@ -77,6 +77,8 @@
- USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
- VERSION = @VERSION@
+--- Makefile.in.orig Thu Jun 1 16:51:56 2000
++++ Makefile.in Tue Jan 24 18:39:03 2006
+@@ -79,3 +79,5 @@
+-SUBDIRS = tools scanners tktext-port
+AM_MAKEFLAGS = GTK_CFLAGS="$(CFLAGS) $(GTK_CFLAGS)"
+
- SUBDIRS = tools scanners tktext-port
++SUBDIRS = tools scanners
- lib_LTLIBRARIES = libgtkeditor.la
-@@ -86,7 +88,7 @@
+@@ -86,5 +88,5 @@
- libgtkeditor_la_LIBADD = tktext-port/gtktextlayout.lo tktext-port/gtktext.lo tktext-port/gtktextdisplay.lo tktext-port/gtktextbtree.lo tktext-port/gtktextbuffer.lo tktext-port/gtktexttag.lo tktext-port/gtktextmark.lo tktext-port/gtktexttypes.lo tktext-port/gstring.lo tktext-port/gbsearch.lo tktext-port/gtktextchild.lo tktext-port/gtktexttagtable.lo tktext-port/gtktextiter.lo tktext-port/gtktextsegment.lo
+-libgtkeditor_la_LIBADD = tktext-port/gtktextlayout.lo tktext-port/gtktext.lo tktext-port/gtktextdisplay.lo tktext-port/gtktextbtree.lo tktext-port/gtktextbuffer.lo tktext-port/gtktexttag.lo tktext-port/gtktextmark.lo tktext-port/gtktexttypes.lo tktext-port/gstring.lo tktext-port/gbsearch.lo tktext-port/gtktextchild.lo tktext-port/gtktexttagtable.lo tktext-port/gtktextiter.lo tktext-port/gtktextsegment.lo
++libgtkeditor_la_LIBADD =
-libgtkeditor_la_LDFLAGS = `gtk-config --libs` -lunicode
+libgtkeditor_la_LDFLAGS = $(GTK_LIBS) -lunicode
testapp_LDADD = libgtkeditor.la
- static_testapp_LDADD = libgtkeditor.la scanners/c-scanner.so
- debugapp_LDADD = libgtkeditor.la
+@@ -103,3 +105,3 @@
+
+-libgtkeditor_la_SOURCES = gtkeditor.c highlight.c edit.c scanner.c
++libgtkeditor_la_SOURCES = gtkeditor.c highlight.c edit.c scanner.c gtktextlayout.c gtktext.c gtktextdisplay.c gtktextbtree.c gtktextbuffer.c gtktexttag.c gtktextmark.c gtktexttypes.c gstring.c gbsearch.c gtktextchild.c gtktexttagtable.c gtktextiter.c gtktextsegment.c
+
+@@ -115,3 +117,3 @@
+
+-DEFS = @DEFS@ -I. -I$(srcdir)
++DEFS = @DEFS@ -I. -I$(srcdir) -Itktext-port
+ CPPFLAGS = @CPPFLAGS@
+@@ -119,11 +121,7 @@
+ LIBS = @LIBS@
+-libgtkeditor_la_DEPENDENCIES = tktext-port/gtktextlayout.lo \
+-tktext-port/gtktext.lo tktext-port/gtktextdisplay.lo \
+-tktext-port/gtktextbtree.lo tktext-port/gtktextbuffer.lo \
+-tktext-port/gtktexttag.lo tktext-port/gtktextmark.lo \
+-tktext-port/gtktexttypes.lo tktext-port/gstring.lo \
+-tktext-port/gbsearch.lo tktext-port/gtktextchild.lo \
+-tktext-port/gtktexttagtable.lo tktext-port/gtktextiter.lo \
+-tktext-port/gtktextsegment.lo
+-libgtkeditor_la_OBJECTS = gtkeditor.lo highlight.lo edit.lo scanner.lo
++
++libgtkeditor_la_OBJECTS = gtkeditor.lo highlight.lo edit.lo scanner.lo \
++gtktextlayout.lo gtktext.lo gtktextdisplay.lo gtktextbtree.lo \
++gtktextbuffer.lo gtktexttag.lo gtktextmark.lo gtktexttypes.lo gstring.lo \
++gbsearch.lo gtktextchild.lo gtktexttagtable.lo gtktextiter.lo gtktextsegment.lo
+ PROGRAMS = $(noinst_PROGRAMS)
diff --git a/x11-toolkits/libgtkeditor/files/patch-configure b/x11-toolkits/libgtkeditor/files/patch-configure
new file mode 100644
index 000000000000..c99883408e8e
--- /dev/null
+++ b/x11-toolkits/libgtkeditor/files/patch-configure
@@ -0,0 +1,13 @@
+--- configure.orig Thu Jun 1 16:03:47 2000
++++ configure Tue Jan 24 17:58:50 2006
+@@ -1862,10 +1862,2 @@
+
+-# Actually configure libtool. ac_aux_dir is where install-sh is found.
+-CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+-LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \
+-DLLTOOL="$DLLTOOL" AS="$AS" \
+-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
+-|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+-
+ # Reload cache, that may have been modified by ltconfig
diff --git a/x11-toolkits/libgtkeditor/pkg-plist b/x11-toolkits/libgtkeditor/pkg-plist
index 016b85e37598..16653bfdb9e1 100644
--- a/x11-toolkits/libgtkeditor/pkg-plist
+++ b/x11-toolkits/libgtkeditor/pkg-plist
@@ -13,6 +13,7 @@ lib/gtkeditor/perl-scanner.so
lib/gtkeditor/scheme-scanner.so
lib/gtkeditor/sml-scanner.so
lib/libgtkeditor.a
+lib/libgtkeditor.la
lib/libgtkeditor.so
lib/libgtkeditor.so.0
@dirrm lib/gtkeditor
diff --git a/x11-toolkits/libpanelappletmm/Makefile b/x11-toolkits/libpanelappletmm/Makefile
index 76b543a6fcc9..7ea3b77dd362 100644
--- a/x11-toolkits/libpanelappletmm/Makefile
+++ b/x11-toolkits/libpanelappletmm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libpanelappletmm
PORTVERSION= 2.6.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R}
@@ -26,7 +26,7 @@ USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GCC= 3.4
USE_GNOME= gnomehack lthack gnomepanel
-USE_AUTOTOOLS= libtool:13:inc
+GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-static
diff --git a/x11-toolkits/libpanelappletmm/pkg-plist b/x11-toolkits/libpanelappletmm/pkg-plist
index 1aa3fdc3b81d..fd2d98455693 100644
--- a/x11-toolkits/libpanelappletmm/pkg-plist
+++ b/x11-toolkits/libpanelappletmm/pkg-plist
@@ -8,6 +8,7 @@ include/libpanelappletmm-%%API_VERSION%%/libpanelappletmm/private/applet_p.h
include/libpanelappletmm-%%API_VERSION%%/libpanelappletmm/private/enums_p.h
include/libpanelappletmm-%%API_VERSION%%/libpanelappletmm/wrap_init.h
lib/libpanelappletmm-%%VERSION%%.a
+lib/libpanelappletmm-%%VERSION%%.la
lib/libpanelappletmm-%%VERSION%%.so
lib/libpanelappletmm-%%VERSION%%.so.1
lib/libpanelappletmm-%%API_VERSION%%/include/libpanelappletmmconfig.h
diff --git a/x11-toolkits/libsexy/Makefile b/x11-toolkits/libsexy/Makefile
index 76ae19e3a37b..2d35f0c61819 100644
--- a/x11-toolkits/libsexy/Makefile
+++ b/x11-toolkits/libsexy/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libsexy
PORTVERSION= 0.1.5
+PORTREVISION= 1
CATEGORIES= x11-toolkits devel
MASTER_SITES= http://osiris.chipx86.com/projects/libsexy/releases/
@@ -18,10 +19,8 @@ LIB_DEPENDS= enchant:${PORTSDIR}/textproc/enchant
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
USE_GNOME= gnomehack lthack gtk20 libxml2
-USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
USE_X_PREFIX= yes
-
GNU_CONFIGURE= yes
.include <bsd.port.mk>
diff --git a/x11-toolkits/libsexy/pkg-plist b/x11-toolkits/libsexy/pkg-plist
index 25ed7fecfa08..04f375aba9fd 100644
--- a/x11-toolkits/libsexy/pkg-plist
+++ b/x11-toolkits/libsexy/pkg-plist
@@ -4,6 +4,7 @@ include/libsexy/sexy-spell-entry.h
include/libsexy/sexy-url-label.h
include/libsexy/sexy.h
lib/libsexy.a
+lib/libsexy.la
lib/libsexy.so
lib/libsexy.so.1
libdata/pkgconfig/libsexy.pc
diff --git a/x11-toolkits/libsexymm/Makefile b/x11-toolkits/libsexymm/Makefile
index b3a9d8329277..4f612a7ce042 100644
--- a/x11-toolkits/libsexymm/Makefile
+++ b/x11-toolkits/libsexymm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libsexymm
PORTVERSION= 0.1.5
+PORTREVISION= 1
CATEGORIES= x11-toolkits devel
MASTER_SITES= http://osiris.chipx86.com/projects/libsexy/releases/
@@ -17,20 +18,10 @@ LIB_DEPENDS= gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \
sexy:${PORTSDIR}/x11-toolkits/libsexy
USE_GNOME= gnomehack
-USE_AUTOTOOLS= libtool:15:inc
GNU_CONFIGURE= yes
USE_GMAKE= yes
INSTALLS_SHLIB= yes
USE_X_PREFIX= yes
USE_GCC= 3.4
-patch-autotools::
- @(cd ${PATCH_WRKSRC}; \
- for file in ${LIBTOOLFILES}; do \
- ${CP} $$file $$file.tmp; \
- ${SED} -e "/^ltmain=/s^\$$ac_aux_dir/ltmain.sh^${LTMAIN}^g" \
- $$file.tmp > $$file; \
- ${RM} $$file.tmp; \
- done);
-
.include <bsd.port.mk>
diff --git a/x11-toolkits/libsexymm/pkg-plist b/x11-toolkits/libsexymm/pkg-plist
index 0809d2f74c3f..4fc67df9ddea 100644
--- a/x11-toolkits/libsexymm/pkg-plist
+++ b/x11-toolkits/libsexymm/pkg-plist
@@ -7,6 +7,7 @@ include/libsexymm/libsexymm/spell-entry.h
include/libsexymm/libsexymm/url-label.h
include/libsexymm/libsexymm/wrap_init.h
lib/libsexymm.a
+lib/libsexymm.la
lib/libsexymm.so
lib/libsexymm.so.1
lib/libsexymm/include/libsexymmconfig.h
diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile
index 6d82a6c6a738..dac66f2316e9 100644
--- a/x11-toolkits/libwnck/Makefile
+++ b/x11-toolkits/libwnck/Makefile
@@ -8,6 +8,7 @@
PORTNAME= libwnck
PORTVERSION= 2.12.3
+PORTREVISION= 1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12
@@ -24,7 +25,7 @@ USE_GMAKE= yes
USE_GNOME= gnomehack gtk20 ltverhack intlhack
USE_BISON= yes
INSTALLS_SHLIB= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/libwnck/pkg-plist b/x11-toolkits/libwnck/pkg-plist
index 5d701f8c9235..b7ee3e730cde 100644
--- a/x11-toolkits/libwnck/pkg-plist
+++ b/x11-toolkits/libwnck/pkg-plist
@@ -11,6 +11,7 @@ include/libwnck-1.0/libwnck/window.h
include/libwnck-1.0/libwnck/wnck-enum-types.h
include/libwnck-1.0/libwnck/workspace.h
lib/libwnck-1.a
+lib/libwnck-1.la
lib/libwnck-1.so
lib/libwnck-1.so.18
libdata/pkgconfig/libwnck-1.0.pc
diff --git a/x11-toolkits/libxfce4gui/Makefile b/x11-toolkits/libxfce4gui/Makefile
index d200da9f96fb..f7c08efe8d3d 100644
--- a/x11-toolkits/libxfce4gui/Makefile
+++ b/x11-toolkits/libxfce4gui/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libxfce4gui
PORTVERSION= 4.2.3
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11-toolkits xfce
MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
@@ -25,7 +25,7 @@ LIB_DEPENDS= dbh-1.0.1:${PORTSDIR}/databases/dbh \
USE_GNOME= gtk20 gnomehack
USE_REINPLACE= yes
USE_X_PREFIX= yes
-USE_AUTOTOOLS= libtool:15
+GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --enable-xinerama
INSTALLS_SHLIB= yes
diff --git a/x11-toolkits/libxfce4gui/pkg-plist b/x11-toolkits/libxfce4gui/pkg-plist
index e0a959c6a830..955e67e9475f 100644
--- a/x11-toolkits/libxfce4gui/pkg-plist
+++ b/x11-toolkits/libxfce4gui/pkg-plist
@@ -45,16 +45,21 @@ include/xfce4/xfce4-modules/mime_icons.h
include/xfce4/xfce4-modules/combo.h
include/xfce4/xfce4-modules/mime.h
lib/libxfcegui4.a
+lib/libxfcegui4.la
lib/libxfcegui4.so
lib/libxfcegui4.so.3
-lib/xfce4/modules/libxfce4_combo.so.0
-lib/xfce4/modules/libxfce4_combo.so
lib/xfce4/modules/libxfce4_combo.a
-lib/xfce4/modules/libxfce4_mime.so.0
+lib/xfce4/modules/libxfce4_combo.la
+lib/xfce4/modules/libxfce4_combo.so
+lib/xfce4/modules/libxfce4_combo.so.0
+lib/xfce4/modules/libxfce4_mime.a
+lib/xfce4/modules/libxfce4_mime.la
lib/xfce4/modules/libxfce4_mime.so
-lib/xfce4/modules/libxfce4_mime_icons.so.0
-lib/xfce4/modules/libxfce4_mime_icons.so
+lib/xfce4/modules/libxfce4_mime.so.0
lib/xfce4/modules/libxfce4_mime_icons.a
+lib/xfce4/modules/libxfce4_mime_icons.la
+lib/xfce4/modules/libxfce4_mime_icons.so
+lib/xfce4/modules/libxfce4_mime_icons.so.0
libdata/pkgconfig/libxfcegui4-1.0.pc
share/xfce4/mime/applications.xml
share/xfce4/mime/freedesktop.org.xml
diff --git a/x11-toolkits/libzvt/Makefile b/x11-toolkits/libzvt/Makefile
index 615224d3c110..f45b02ca8435 100644
--- a/x11-toolkits/libzvt/Makefile
+++ b/x11-toolkits/libzvt/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libzvt
PORTVERSION= 2.0.1
-PORTREVISION= 11
+PORTREVISION= 13
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.0
@@ -22,7 +22,7 @@ USE_GMAKE= yes
USE_REINPLACE= yes
USE_BISON= yes
INSTALLS_SHLIB= yes
-USE_AUTOTOOLS= libtool:13:inc
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomeprefix gnomehack gtk20 libartlgpl2
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/libzvt/pkg-plist b/x11-toolkits/libzvt/pkg-plist
index c41927312f32..ca0cf6c7e679 100644
--- a/x11-toolkits/libzvt/pkg-plist
+++ b/x11-toolkits/libzvt/pkg-plist
@@ -4,6 +4,7 @@ include/libzvt-2.0/libzvt/lists.h
include/libzvt-2.0/libzvt/vt.h
include/libzvt-2.0/libzvt/vtx.h
lib/libzvt-2.0.a
+lib/libzvt-2.0.la
lib/libzvt-2.0.so
lib/libzvt-2.0.so.0
libdata/pkgconfig/libzvt-2.0.pc
diff --git a/x11-toolkits/movingmotif/Makefile b/x11-toolkits/movingmotif/Makefile
index b2a66f5b0cca..b4ac9d6d44ed 100644
--- a/x11-toolkits/movingmotif/Makefile
+++ b/x11-toolkits/movingmotif/Makefile
@@ -7,6 +7,7 @@
PORTNAME= movingmotif
PORTVERSION= 2.2.0
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/x11-toolkits/movingmotif/pkg-plist b/x11-toolkits/movingmotif/pkg-plist
index 222971185252..1e4e9676a767 100644
--- a/x11-toolkits/movingmotif/pkg-plist
+++ b/x11-toolkits/movingmotif/pkg-plist
@@ -3,8 +3,10 @@ bin/Rottest
bin/ezdrawtest
bin/histbar
lib/libmindsrc.a
+lib/libmindsrc.la
lib/libmindsrc.so
lib/libmindsrc.so.0
lib/libmovingmotif.a
+lib/libmovingmotif.la
lib/libmovingmotif.so
lib/libmovingmotif.so.0
diff --git a/x11-toolkits/neXtaw/Makefile b/x11-toolkits/neXtaw/Makefile
index 6e5482416181..712bea01b513 100644
--- a/x11-toolkits/neXtaw/Makefile
+++ b/x11-toolkits/neXtaw/Makefile
@@ -7,6 +7,7 @@
PORTNAME= neXtaw
PORTVERSION= 0.15.1
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= http://siag.nu/pub/neXtaw/
@@ -15,7 +16,7 @@ COMMENT= Athena Widgets with N*XTSTEP appearance
USE_X_PREFIX= yes
USE_REINPLACE= yes
-USE_AUTOTOOLS= libtool:15
+GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \
LDFLAGS="-L${X11BASE}/lib"
diff --git a/x11-toolkits/neXtaw/pkg-plist b/x11-toolkits/neXtaw/pkg-plist
index 545241bf4049..519ffcdc9e1e 100644
--- a/x11-toolkits/neXtaw/pkg-plist
+++ b/x11-toolkits/neXtaw/pkg-plist
@@ -80,6 +80,7 @@ include/X11/neXtaw/XawInit.h
include/X11/neXtaw/XawVersion.h
include/X11/neXtaw/laygram.h
lib/libneXtaw.a
+lib/libneXtaw.la
lib/libneXtaw.so
lib/libneXtaw.so.%%XAWVER%%
%%PORTDOCS%%%%DOCSDIR%%/CHANGES
diff --git a/x11-toolkits/p5-qt/Makefile b/x11-toolkits/p5-qt/Makefile
index f96e2a64e4a4..9f4378b6f2aa 100644
--- a/x11-toolkits/p5-qt/Makefile
+++ b/x11-toolkits/p5-qt/Makefile
@@ -8,6 +8,7 @@
PORTNAME= qt
PORTVERSION= 3.008
+PORTREVISION= 1
CATEGORIES= x11-toolkits perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:S/$/:cpan/} \
${MASTER_SITE_SOURCEFORGE:S/$/:sf/}
@@ -23,12 +24,11 @@ COMMENT= A set of Perl bindings for the Qt toolkit
USE_GL= yes
USE_QT_VER= 3
-USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
PLIST_FILES= bin/pqtapi bin/pqtsh bin/puic include/smoke.h \
- lib/libsmokeqt.a lib/libsmokeqt.so lib/libsmokeqt.so.3
+ lib/libsmokeqt.la lib/libsmokeqt.so lib/libsmokeqt.so.3
MAN1= puic.1
MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index 1ebf56c3d60d..03289e70b331 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -8,6 +8,7 @@
PORTNAME= pango
PORTVERSION= 1.10.3
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/1.10,} \
ftp://ftp.gtk.org/pub/gtk/v2.7/
@@ -28,7 +29,7 @@ USE_X_PREFIX= yes
USE_GMAKE= yes
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
-USE_AUTOTOOLS= libtool:15
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomehack glib20 ltverhack
CONFIGURE_ARGS= --with-qt=no \
--with-html-dir=${PREFIX}/share/doc \
diff --git a/x11-toolkits/pango/pkg-plist b/x11-toolkits/pango/pkg-plist
index 9eb6d24a8d7c..be3aa8e84b6c 100644
--- a/x11-toolkits/pango/pkg-plist
+++ b/x11-toolkits/pango/pkg-plist
@@ -31,29 +31,54 @@ include/pango-1.0/pango/pangox.h
include/pango-1.0/pango/pangoxft-render.h
include/pango-1.0/pango/pangoxft.h
lib/libpango-1.0.a
+lib/libpango-1.0.la
lib/libpango-1.0.so
lib/libpango-1.0.so.0
lib/libpangocairo-1.0.a
+lib/libpangocairo-1.0.la
lib/libpangocairo-1.0.so
lib/libpangocairo-1.0.so.0
lib/libpangoft2-1.0.a
+lib/libpangoft2-1.0.la
lib/libpangoft2-1.0.so
lib/libpangoft2-1.0.so.0
lib/libpangox-1.0.a
+lib/libpangox-1.0.la
lib/libpangox-1.0.so
lib/libpangox-1.0.so.0
lib/libpangoxft-1.0.a
+lib/libpangoxft-1.0.la
lib/libpangoxft-1.0.so
lib/libpangoxft-1.0.so.0
+lib/pango/%%VERSION%%/modules/pango-arabic-fc.a
+lib/pango/%%VERSION%%/modules/pango-arabic-fc.la
lib/pango/%%VERSION%%/modules/pango-arabic-fc.so
+lib/pango/%%VERSION%%/modules/pango-basic-fc.a
+lib/pango/%%VERSION%%/modules/pango-basic-fc.la
lib/pango/%%VERSION%%/modules/pango-basic-fc.so
+lib/pango/%%VERSION%%/modules/pango-basic-x.a
+lib/pango/%%VERSION%%/modules/pango-basic-x.la
lib/pango/%%VERSION%%/modules/pango-basic-x.so
+lib/pango/%%VERSION%%/modules/pango-hangul-fc.a
+lib/pango/%%VERSION%%/modules/pango-hangul-fc.la
lib/pango/%%VERSION%%/modules/pango-hangul-fc.so
+lib/pango/%%VERSION%%/modules/pango-hebrew-fc.a
+lib/pango/%%VERSION%%/modules/pango-hebrew-fc.la
lib/pango/%%VERSION%%/modules/pango-hebrew-fc.so
+lib/pango/%%VERSION%%/modules/pango-indic-fc.a
+lib/pango/%%VERSION%%/modules/pango-indic-fc.la
lib/pango/%%VERSION%%/modules/pango-indic-fc.so
+lib/pango/%%VERSION%%/modules/pango-khmer-fc.a
+lib/pango/%%VERSION%%/modules/pango-khmer-fc.la
lib/pango/%%VERSION%%/modules/pango-khmer-fc.so
+lib/pango/%%VERSION%%/modules/pango-syriac-fc.a
+lib/pango/%%VERSION%%/modules/pango-syriac-fc.la
lib/pango/%%VERSION%%/modules/pango-syriac-fc.so
+lib/pango/%%VERSION%%/modules/pango-thai-fc.a
+lib/pango/%%VERSION%%/modules/pango-thai-fc.la
lib/pango/%%VERSION%%/modules/pango-thai-fc.so
+lib/pango/%%VERSION%%/modules/pango-tibetan-fc.a
+lib/pango/%%VERSION%%/modules/pango-tibetan-fc.la
lib/pango/%%VERSION%%/modules/pango-tibetan-fc.so
libdata/pkgconfig/pango.pc
libdata/pkgconfig/pangocairo.pc
diff --git a/x11-toolkits/pangoxsl/Makefile b/x11-toolkits/pangoxsl/Makefile
index b5f58f70d850..60322d5eb6ec 100644
--- a/x11-toolkits/pangoxsl/Makefile
+++ b/x11-toolkits/pangoxsl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pangoxsl
PORTVERSION= 1.6.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= pangopdf
diff --git a/x11-toolkits/pangoxsl/pkg-plist b/x11-toolkits/pangoxsl/pkg-plist
index 9128ff517280..3e06bb0e7e2b 100644
--- a/x11-toolkits/pangoxsl/pkg-plist
+++ b/x11-toolkits/pangoxsl/pkg-plist
@@ -1,5 +1,6 @@
include/pangoxsl/pangoxsl/pango-xsl-attributes.h
lib/libpangoxsl-1.0.a
+lib/libpangoxsl-1.0.la
lib/libpangoxsl-1.0.so
lib/libpangoxsl-1.0.so.600
libdata/pkgconfig/pangoxsl.pc
diff --git a/x11-toolkits/paragui-devel/Makefile b/x11-toolkits/paragui-devel/Makefile
index a51dfb42e614..a4d6e5d7be3d 100644
--- a/x11-toolkits/paragui-devel/Makefile
+++ b/x11-toolkits/paragui-devel/Makefile
@@ -8,7 +8,7 @@
PORTNAME= paragui
PORTVERSION= 1.0.4
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= ${PORTNAME}/stable.pkg/${PORTVERSION}
@@ -23,7 +23,6 @@ USE_X_PREFIX= yes
USE_REINPLACE= yes
USE_AUTOTOOLS= libtool:15
USE_SDL= sdl image ttf
-LIBTOOLFLAGS= --disable-ltlibs --release-ignore
CONFIGURE_ENV= CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="-L${PREFIX}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
INSTALLS_SHLIB= yes
diff --git a/x11-toolkits/paragui-devel/pkg-plist b/x11-toolkits/paragui-devel/pkg-plist
index b3a29e82a481..a5167a4ff5e6 100644
--- a/x11-toolkits/paragui-devel/pkg-plist
+++ b/x11-toolkits/paragui-devel/pkg-plist
@@ -49,6 +49,7 @@ include/paragui/pgwidgetlist.h
include/paragui/pgwidgetlistex.h
include/paragui/pgwindow.h
lib/libparagui.a
+lib/libparagui.la
lib/libparagui.so
lib/libparagui.so.%%SHLIB_VER%%
libdata/pkgconfig/paragui.pc
diff --git a/x11-toolkits/paragui/Makefile b/x11-toolkits/paragui/Makefile
index a51dfb42e614..a4d6e5d7be3d 100644
--- a/x11-toolkits/paragui/Makefile
+++ b/x11-toolkits/paragui/Makefile
@@ -8,7 +8,7 @@
PORTNAME= paragui
PORTVERSION= 1.0.4
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= ${PORTNAME}/stable.pkg/${PORTVERSION}
@@ -23,7 +23,6 @@ USE_X_PREFIX= yes
USE_REINPLACE= yes
USE_AUTOTOOLS= libtool:15
USE_SDL= sdl image ttf
-LIBTOOLFLAGS= --disable-ltlibs --release-ignore
CONFIGURE_ENV= CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="-L${PREFIX}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
INSTALLS_SHLIB= yes
diff --git a/x11-toolkits/paragui/pkg-plist b/x11-toolkits/paragui/pkg-plist
index b3a29e82a481..a5167a4ff5e6 100644
--- a/x11-toolkits/paragui/pkg-plist
+++ b/x11-toolkits/paragui/pkg-plist
@@ -49,6 +49,7 @@ include/paragui/pgwidgetlist.h
include/paragui/pgwidgetlistex.h
include/paragui/pgwindow.h
lib/libparagui.a
+lib/libparagui.la
lib/libparagui.so
lib/libparagui.so.%%SHLIB_VER%%
libdata/pkgconfig/paragui.pc
diff --git a/x11-toolkits/py-gnome-extras/Makefile b/x11-toolkits/py-gnome-extras/Makefile
index 9b0777a3f7f9..4065d9338a95 100644
--- a/x11-toolkits/py-gnome-extras/Makefile
+++ b/x11-toolkits/py-gnome-extras/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnome
PORTVERSION= 2.12.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits python gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-python-extras/${PORTVERSION:C/..$//}
@@ -34,7 +34,7 @@ USE_GMAKE= yes
USE_PYTHON= yes
USE_GNOME= gnomehack libgnomeprintui libgtkhtml gnomepanel \
gtksourceview libwnck nautiluscdburner pygnome2
-USE_AUTOTOOLS= libtool:15
+GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-gtkmozembed=${GECKO}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/py-gnome-extras/pkg-plist b/x11-toolkits/py-gnome-extras/pkg-plist
index 5254d0526bb1..484a6bc85c03 100644
--- a/x11-toolkits/py-gnome-extras/pkg-plist
+++ b/x11-toolkits/py-gnome-extras/pkg-plist
@@ -1,33 +1,49 @@
%%PYTHON_SITELIBDIR%%/gtk-2.0/egg/__init__.py
%%PYTHON_SITELIBDIR%%/gtk-2.0/egg/__init__.pyc
%%PYTHON_SITELIBDIR%%/gtk-2.0/egg/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/egg/recent.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/egg/recent.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/egg/trayicon.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/egg/trayicon.so
%%PYTHON_SITELIBDIR%%/gtk-2.0/gksu/__init__.py
%%PYTHON_SITELIBDIR%%/gtk-2.0/gksu/__init__.pyc
%%PYTHON_SITELIBDIR%%/gtk-2.0/gksu/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gksu/_gksu.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/gksu/_gksu.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gksu/ui.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/gksu/ui.so
%%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/applet.py
%%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/applet.pyc
%%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/applet.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeapplet.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeapplet.so
%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/__init__.py
%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/__init__.pyc
%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/_print.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/_print.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/ui.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint/ui.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gtkhtml2.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtkhtml2.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gtkmozembed.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtkmozembed.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gtksourceview.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtksourceview.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gtkspell.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtkspell.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gtop.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtop.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/mediaprofiles.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/mediaprofiles.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/nautilusburn.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/nautilusburn.so
%%PYTHON_SITELIBDIR%%/gtk-2.0/totem/__init__.py
%%PYTHON_SITELIBDIR%%/gtk-2.0/totem/__init__.pyc
%%PYTHON_SITELIBDIR%%/gtk-2.0/totem/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/totem/plparser.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/totem/plparser.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/wnck.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/wnck.so
libdata/pkgconfig/gnome-python-extras-2.0.pc
%%PORTDOCS%%%%DOCSDIR%%/pygnomeprint/class-gnomeprintconfig.html
diff --git a/x11-toolkits/py-gnome/Makefile b/x11-toolkits/py-gnome/Makefile
index f03713011728..6cce9fce5fc2 100644
--- a/x11-toolkits/py-gnome/Makefile
+++ b/x11-toolkits/py-gnome/Makefile
@@ -7,7 +7,7 @@
PORTNAME= py-gnome
PORTVERSION= 1.4.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-toolkits python gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-python/1.4
@@ -24,8 +24,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_PYTHON= yes
USE_GNOME= gtkhtml gnometarget
-USE_AUTOTOOLS= libtool:13:inc
-LIBTOOLFILES= configure pygtk/configure
+GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-python=${PYTHON_CMD} \
--with-gnome-config=${X11BASE}/bin/gnome-config \
--with-gtkhtml
diff --git a/x11-toolkits/py-gnome/pkg-plist b/x11-toolkits/py-gnome/pkg-plist
index ecf6cc632498..423496175edd 100644
--- a/x11-toolkits/py-gnome/pkg-plist
+++ b/x11-toolkits/py-gnome/pkg-plist
@@ -1,9 +1,16 @@
+%%PYTHON_SITELIBDIR%%/gtk-1.2/_cappletmodule.la
%%PYTHON_SITELIBDIR%%/gtk-1.2/_cappletmodule.so
+%%PYTHON_SITELIBDIR%%/gtk-1.2/_gladegnomemodule.la
%%PYTHON_SITELIBDIR%%/gtk-1.2/_gladegnomemodule.so
+%%PYTHON_SITELIBDIR%%/gtk-1.2/_gnomemodule.la
%%PYTHON_SITELIBDIR%%/gtk-1.2/_gnomemodule.so
+%%PYTHON_SITELIBDIR%%/gtk-1.2/_gnomeuimodule.la
%%PYTHON_SITELIBDIR%%/gtk-1.2/_gnomeuimodule.so
+%%PYTHON_SITELIBDIR%%/gtk-1.2/_gtkhtmlmodule.la
%%PYTHON_SITELIBDIR%%/gtk-1.2/_gtkhtmlmodule.so
+%%PYTHON_SITELIBDIR%%/gtk-1.2/_gtkxmhtmlmodule.la
%%PYTHON_SITELIBDIR%%/gtk-1.2/_gtkxmhtmlmodule.so
+%%PYTHON_SITELIBDIR%%/gtk-1.2/_zvtmodule.la
%%PYTHON_SITELIBDIR%%/gtk-1.2/_zvtmodule.so
%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/__init__.py
%%PYTHON_SITELIBDIR%%/gtk-1.2/gnome/__init__.pyc
diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile
index 1e7224bc2a99..82778d999d96 100644
--- a/x11-toolkits/py-gnome2/Makefile
+++ b/x11-toolkits/py-gnome2/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gnome
PORTVERSION= 2.12.3
+PORTREVISION= 1
CATEGORIES= x11-toolkits python gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-python/${PORTVERSION:C/..$//}
@@ -26,7 +27,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_PYTHON= yes
USE_GNOME= gnomehack libgnomeui pygtk2
-USE_AUTOTOOLS= libtool:15
+GNU_CONFIGURE= yes
USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/x11-toolkits/py-gnome2/pkg-plist b/x11-toolkits/py-gnome2/pkg-plist
index 6b32aab4fa47..957118502fcb 100644
--- a/x11-toolkits/py-gnome2/pkg-plist
+++ b/x11-toolkits/py-gnome2/pkg-plist
@@ -2,22 +2,30 @@ include/gnome-python-2.0/pygnomevfs.h
%%PYTHON_SITELIBDIR%%/gtk-2.0/bonobo/__init__.py
%%PYTHON_SITELIBDIR%%/gtk-2.0/bonobo/__init__.pyc
%%PYTHON_SITELIBDIR%%/gtk-2.0/bonobo/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/bonobo/_bonobo.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/bonobo/_bonobo.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/bonobo/activation.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/bonobo/activation.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/bonobo/ui.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/bonobo/ui.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gconf.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/gconf.so
%%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/__init__.py
%%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/__init__.pyc
%%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/_gnome.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/_gnome.so
%%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/canvas.py
%%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/canvas.pyc
%%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/canvas.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/ui.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/ui.so
%%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/vfs.py
%%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/vfs.pyc
%%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/vfs.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomecanvas.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomecanvas.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomevfs.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomevfs.so
libdata/pkgconfig/gnome-python-2.0.pc
%%PORTDOCS%%share/examples/py-gnome/bonobo/bonobo-application.py
@@ -69,4 +77,5 @@ share/pygtk/2.0/defs/ui.defs
@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/bonobo
@dirrm include/gnome-python-2.0
@cwd %%X11BASE%%
+lib/gnome-vfs-2.0/modules/libpythonmethod.la
lib/gnome-vfs-2.0/modules/libpythonmethod.so
diff --git a/x11-toolkits/py-gtk/Makefile b/x11-toolkits/py-gtk/Makefile
index a53d46943136..f69ebbc93b48 100644
--- a/x11-toolkits/py-gtk/Makefile
+++ b/x11-toolkits/py-gtk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= py-gtk
PORTVERSION= 0.6.11
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits python
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-python/1.4
@@ -27,7 +27,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomelibs gdkpixbuf libglade
USE_PYTHON= yes
-USE_AUTOTOOLS= libtool:15
+GNU_CONFIGURE= yes
CONFIGURE_ENV= PYTHON=${PYTHON_CMD}
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
diff --git a/x11-toolkits/py-gtk/pkg-plist b/x11-toolkits/py-gtk/pkg-plist
index ca64c22a1d9d..4f570f8a2e2e 100644
--- a/x11-toolkits/py-gtk/pkg-plist
+++ b/x11-toolkits/py-gtk/pkg-plist
@@ -14,10 +14,15 @@ include/pygtk/pygtk.h
%%PYTHON_SITELIBDIR%%/gtk-1.2/GtkExtra.py
%%PYTHON_SITELIBDIR%%/gtk-1.2/GtkExtra.pyc
%%PYTHON_SITELIBDIR%%/gtk-1.2/GtkExtra.pyo
+%%PYTHON_SITELIBDIR%%/gtk-1.2/_gdkimlibmodule.la
%%PYTHON_SITELIBDIR%%/gtk-1.2/_gdkimlibmodule.so
+%%PYTHON_SITELIBDIR%%/gtk-1.2/_gtkglmodule.la
%%PYTHON_SITELIBDIR%%/gtk-1.2/_gtkglmodule.so
+%%PYTHON_SITELIBDIR%%/gtk-1.2/_gtkmodule.la
%%PYTHON_SITELIBDIR%%/gtk-1.2/_gtkmodule.so
+%%PYTHON_SITELIBDIR%%/gtk-1.2/_libglademodule.la
%%PYTHON_SITELIBDIR%%/gtk-1.2/_libglademodule.so
+%%PYTHON_SITELIBDIR%%/gtk-1.2/gdkpixbufmodule.la
%%PYTHON_SITELIBDIR%%/gtk-1.2/gdkpixbufmodule.so
%%PYTHON_SITELIBDIR%%/gtk-1.2/gtk.py
%%PYTHON_SITELIBDIR%%/gtk-1.2/gtk.pyc
diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile
index 5fef4bf4efe8..3d4f57fc57f5 100644
--- a/x11-toolkits/py-gtk2/Makefile
+++ b/x11-toolkits/py-gtk2/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gtk
PORTVERSION= 2.8.2
+PORTREVISION= 1
CATEGORIES= x11-toolkits python
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/pygtk/2.8
@@ -27,7 +28,7 @@ USE_GMAKE= yes
USE_GNOME= gnomehack gnometarget libglade2
USE_PYTHON= yes
USE_GETTEXT= yes
-USE_AUTOTOOLS= libtool:15
+GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-lintl"
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/x11-toolkits/py-gtk2/pkg-plist b/x11-toolkits/py-gtk2/pkg-plist
index dbc0bf03a446..37de690b7a74 100644
--- a/x11-toolkits/py-gtk2/pkg-plist
+++ b/x11-toolkits/py-gtk2/pkg-plist
@@ -86,23 +86,29 @@ lib/pygtk/2.0/demos/ui_manager.pyo
lib/pygtk/2.0/pygtk-demo.py
lib/pygtk/2.0/pygtk-demo.pyc
lib/pygtk/2.0/pygtk-demo.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/atk.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/atk.so
%%PYTHON_SITELIBDIR%%/gtk-2.0/dsextras.py
%%PYTHON_SITELIBDIR%%/gtk-2.0/dsextras.pyc
%%PYTHON_SITELIBDIR%%/gtk-2.0/dsextras.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject.so
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/__init__.py
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/__init__.pyc
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/_gtk.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/_gtk.so
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/compat.py
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/compat.pyc
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/compat.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/glade.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/glade.so
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/keysyms.py
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/keysyms.pyc
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/keysyms.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/pango.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/pango.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/pangocairo.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/pangocairo.so
%%PYTHON_SITELIBDIR%%/pygtk.pth
%%PYTHON_SITELIBDIR%%/pygtk.py
diff --git a/x11-toolkits/py-gtkglext/Makefile b/x11-toolkits/py-gtkglext/Makefile
index d984d34d0f0a..13375f50ea0b 100644
--- a/x11-toolkits/py-gtkglext/Makefile
+++ b/x11-toolkits/py-gtkglext/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkglext
PORTVERSION= 1.0.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gtkglext
@@ -25,7 +25,7 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
USE_BZIP2= yes
USE_PYTHON= yes
USE_GNOME= gnomehack
-USE_AUTOTOOLS= libtool:15
+GNU_CONFIGURE= yes
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/x11-toolkits/py-gtkglext/pkg-plist b/x11-toolkits/py-gtkglext/pkg-plist
index aa4fafc69027..141071df379a 100644
--- a/x11-toolkits/py-gtkglext/pkg-plist
+++ b/x11-toolkits/py-gtkglext/pkg-plist
@@ -2,6 +2,7 @@ libdata/pkgconfig/pygtkglext-1.0.pc
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/gdkgl/__init__.py
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/gdkgl/__init__.pyc
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/gdkgl/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/gdkgl/_gdkgl.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/gdkgl/_gdkgl.so
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/gdkgl/ext.py
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/gdkgl/ext.pyc
@@ -9,6 +10,7 @@ libdata/pkgconfig/pygtkglext-1.0.pc
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/gtkgl/__init__.py
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/gtkgl/__init__.pyc
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/gtkgl/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/gtkgl/_gtkgl.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/gtkgl/_gtkgl.so
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/gtkgl/apputils.py
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/gtkgl/apputils.pyc
diff --git a/x11-toolkits/qtpixmap/Makefile b/x11-toolkits/qtpixmap/Makefile
index 699674a6b2ba..d80b905e3462 100644
--- a/x11-toolkits/qtpixmap/Makefile
+++ b/x11-toolkits/qtpixmap/Makefile
@@ -6,7 +6,7 @@
PORTNAME= qtpixmap
PORTVERSION= 0.28
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-toolkits
MASTER_SITES= http://www.cpdrummond.freeuk.com/
DISTNAME= QtPixmap-${PORTVERSION}
@@ -16,7 +16,7 @@ COMMENT= Modifed GTK pixmap engine to obtain Theme information from Qt
USE_GNOME= gtk20
USE_X_PREFIX= yes
-USE_AUTOTOOLS= libtool:15
+GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}/${DISTNAME:S/7043-//}
.if !defined(WITHOUT_GTK1)
diff --git a/x11-toolkits/qtpixmap/pkg-plist b/x11-toolkits/qtpixmap/pkg-plist
index 1c9c885dc9ac..56d180510b38 100644
--- a/x11-toolkits/qtpixmap/pkg-plist
+++ b/x11-toolkits/qtpixmap/pkg-plist
@@ -1,2 +1,4 @@
+%%GTK1%%lib/gtk/themes/engines/libqtpixmap.la
%%GTK1%%lib/gtk/themes/engines/libqtpixmap.so
+lib/gtk-2.0/2.4.0/engines/libqtpixmap.la
lib/gtk-2.0/2.4.0/engines/libqtpixmap.so
diff --git a/x11-toolkits/sdl_gui/Makefile b/x11-toolkits/sdl_gui/Makefile
index a00fa863487b..e21e2a61efd6 100644
--- a/x11-toolkits/sdl_gui/Makefile
+++ b/x11-toolkits/sdl_gui/Makefile
@@ -8,7 +8,7 @@
PORTNAME= sdl_gui
PORTVERSION= 0.10.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-toolkits
MASTER_SITES= http://www.newimage.com/~rhk/SDL_gui/
DISTNAME= SDL_gui-${PORTVERSION}
@@ -18,8 +18,7 @@ COMMENT= A Graphical User Interface library for SDL
USE_SDL= sdl image ttf
USE_REINPLACE= yes
-USE_AUTOTOOLS= libtool:13:inc
-LIBTOOLFLAGS= --disable-ltlibs --release-ignore
+GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
post-configure:
diff --git a/x11-toolkits/sdl_gui/files/patch-src-Makefile.in b/x11-toolkits/sdl_gui/files/patch-src-Makefile.in
new file mode 100644
index 000000000000..ce467f62f5cc
--- /dev/null
+++ b/x11-toolkits/sdl_gui/files/patch-src-Makefile.in
@@ -0,0 +1,7 @@
+--- src/Makefile.in.orig Sun Sep 24 16:03:46 2000
++++ src/Makefile.in Sun Jan 22 20:12:48 2006
+@@ -88,3 +88,3 @@
+ DEFS = @DEFS@ -DBUILDING_SDLGUI_DLL
+-libSDL_gui_la_LDFLAGS = -release $(SDLGUI_VERSION)
++libSDL_gui_la_LDFLAGS =
+ libSDL_gui_la_LIBADD = -lSDL_ttf
diff --git a/x11-toolkits/sdl_gui/pkg-plist b/x11-toolkits/sdl_gui/pkg-plist
index 257a33d18c75..eea3128764a7 100644
--- a/x11-toolkits/sdl_gui/pkg-plist
+++ b/x11-toolkits/sdl_gui/pkg-plist
@@ -1,4 +1,5 @@
include/SDL11/SDL_gui.h
lib/libSDL_gui.a
+lib/libSDL_gui.la
lib/libSDL_gui.so
lib/libSDL_gui.so.0
diff --git a/x11-toolkits/soqt/Makefile b/x11-toolkits/soqt/Makefile
index 153e56b64ed9..67ecc3b0125a 100644
--- a/x11-toolkits/soqt/Makefile
+++ b/x11-toolkits/soqt/Makefile
@@ -7,7 +7,7 @@
PORTNAME= SoQt
PORTVERSION= 1.2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits
MASTER_SITES= http://ftp.coin3d.org/coin/src/ \
ftp://ftp.coin3d.org/pub/coin/src/
@@ -20,7 +20,7 @@ LIB_DEPENDS= Coin.44:${PORTSDIR}/graphics/Coin
USE_QT_VER= 3
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:15
+GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= QTDIR="${QT_PREFIX}"
CONFIGURE_ARGS= --with-pthread=yes --with-coin=${X11BASE}
diff --git a/x11-toolkits/soqt/pkg-plist b/x11-toolkits/soqt/pkg-plist
index f4212e5d5d12..64230a2042a1 100644
--- a/x11-toolkits/soqt/pkg-plist
+++ b/x11-toolkits/soqt/pkg-plist
@@ -23,7 +23,7 @@ include/Inventor/Qt/viewers/SoQtPlaneViewer.h
include/Inventor/Qt/viewers/SoQtViewer.h
include/Inventor/Qt/widgets/SoQtPopupMenu.h
include/Inventor/Qt/widgets/SoQtThumbWheel.h
-lib/libSoQt.a
+lib/libSoQt.la
lib/libSoQt.so
lib/libSoQt.so.22
share/Coin/conf/soqt-default.cfg
diff --git a/x11-toolkits/vdk/Makefile b/x11-toolkits/vdk/Makefile
index eebe8ad1c36a..603798e19ac5 100644
--- a/x11-toolkits/vdk/Makefile
+++ b/x11-toolkits/vdk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= vdk
PORTVERSION= 2.4.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= vdklib
@@ -18,7 +18,7 @@ COMMENT= C++ wrapper for GTK+ toolkit
USE_X_PREFIX= yes
USE_GNOME= gnomehack gnometarget gtk20
USE_REINPLACE= yes
-USE_AUTOTOOLS= libtool:15
+GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --enable-opt=no --enable-doc-html=no --enable-testvdk=no
INSTALLS_SHLIB= yes
diff --git a/x11-toolkits/vdk/pkg-plist b/x11-toolkits/vdk/pkg-plist
index 16a224cd4ffd..475841952b9f 100644
--- a/x11-toolkits/vdk/pkg-plist
+++ b/x11-toolkits/vdk/pkg-plist
@@ -96,6 +96,7 @@ include/vdk2/vdk/vdktypes.h
include/vdk2/vdk/vdkutils.h
include/vdk2/vdk/widcontain.h
lib/libvdk.a
+lib/libvdk.la
lib/libvdk.so
lib/libvdk.so.6
libdata/pkgconfig/vdk-2.x.pc
diff --git a/x11-toolkits/vdkbuilder/Makefile b/x11-toolkits/vdkbuilder/Makefile
index 4a451ab0acab..532d2cad384e 100644
--- a/x11-toolkits/vdkbuilder/Makefile
+++ b/x11-toolkits/vdkbuilder/Makefile
@@ -7,7 +7,7 @@
PORTNAME= vdkbuilder
PORTVERSION= 2.4.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/x11-toolkits/vdkbuilder/pkg-plist b/x11-toolkits/vdkbuilder/pkg-plist
index b1fbd7ef8d61..beaac5ea293b 100644
--- a/x11-toolkits/vdkbuilder/pkg-plist
+++ b/x11-toolkits/vdkbuilder/pkg-plist
@@ -102,17 +102,28 @@ include/vdkb2/vdkb_xtDlg.h
include/vdkb2/vdkdclock.h
include/vdkb2/vdkxpmbrowser.h
include/vdkb2/waitcursor.h
+lib/libvdkbcalendar.a
+lib/libvdkbcalendar.la
lib/libvdkbcalendar.so
lib/libvdkbcalendar.so.2
+lib/libvdkbcomboentry.a
+lib/libvdkbcomboentry.la
lib/libvdkbcomboentry.so
lib/libvdkbcomboentry.so.2
+lib/libvdkbdclock.a
+lib/libvdkbdclock.la
lib/libvdkbdclock.so
lib/libvdkbdclock.so.2
+lib/libvdkbdrawarea.a
+lib/libvdkbdrawarea.la
lib/libvdkbdrawarea.so
lib/libvdkbdrawarea.so.2
+lib/libvdkbtreeview.a
+lib/libvdkbtreeview.la
lib/libvdkbtreeview.so
lib/libvdkbtreeview.so.2
lib/libvdkdclock.a
+lib/libvdkdclock.la
lib/libvdkdclock.so
lib/libvdkdclock.so.2
share/locale/en/LC_MESSAGES/vdkbuilder2.mo
diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile
index 7ffbefe83784..1812e12577aa 100644
--- a/x11-toolkits/vte/Makefile
+++ b/x11-toolkits/vte/Makefile
@@ -7,6 +7,7 @@
PORTNAME= vte
PORTVERSION= 0.11.18
+PORTREVISION= 1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R}
@@ -20,7 +21,7 @@ USE_X_PREFIX= yes
USE_GMAKE= yes
USE_BISON= yes
INSTALLS_SHLIB= yes
-USE_AUTOTOOLS= libtool:15
+GNU_CONFIGURE= yes
USE_GNOME= gnomeprefix gnomehack gtk20
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
diff --git a/x11-toolkits/vte/pkg-plist b/x11-toolkits/vte/pkg-plist
index 470b8f9044a2..b76b08f345a6 100644
--- a/x11-toolkits/vte/pkg-plist
+++ b/x11-toolkits/vte/pkg-plist
@@ -4,6 +4,7 @@ include/vte/reaper.h
include/vte/vte.h
include/vte/vteaccess.h
lib/libvte.a
+lib/libvte.la
lib/libvte.so
lib/libvte.so.8
lib/vte/decset
diff --git a/x11-toolkits/wxmozilla/Makefile b/x11-toolkits/wxmozilla/Makefile
index dbe58b652569..09e12bd875f4 100644
--- a/x11-toolkits/wxmozilla/Makefile
+++ b/x11-toolkits/wxmozilla/Makefile
@@ -8,7 +8,7 @@
PORTNAME= wxmozilla
PORTVERSION= 0.5.3
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/x11-toolkits/wxmozilla/pkg-plist b/x11-toolkits/wxmozilla/pkg-plist
index 219400f50c03..9a86d6123d3c 100644
--- a/x11-toolkits/wxmozilla/pkg-plist
+++ b/x11-toolkits/wxmozilla/pkg-plist
@@ -1,4 +1,5 @@
lib/libwxmozilla_gtk2-2.4.a
+lib/libwxmozilla_gtk2-2.4.la
lib/libwxmozilla_gtk2-2.4.so
lib/libwxmozilla_gtk2-2.4.so.0
include/wxmozilla/wxMozilla.h
@@ -12,4 +13,6 @@ libdata/pkgconfig/wxmozilla.pc
%%PYTHON_SITELIBDIR%%/wxPython/mozilla.py
%%PYTHON_SITELIBDIR%%/wxPython/mozilla.pyc
%%PYTHON_SITELIBDIR%%/wxPython/mozilla.pyo
+%%PYTHON_SITELIBDIR%%/wxPython/mozillac.a
+%%PYTHON_SITELIBDIR%%/wxPython/mozillac.la
%%PYTHON_SITELIBDIR%%/wxPython/mozillac.so
diff --git a/x11-toolkits/xbae/Makefile b/x11-toolkits/xbae/Makefile
index 6f0dddb6fed8..ba32a1fbb8ad 100644
--- a/x11-toolkits/xbae/Makefile
+++ b/x11-toolkits/xbae/Makefile
@@ -17,14 +17,11 @@ DISTNAME= Xbae-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A Motif-based widget which displays a grid of cells as a spreadsheet
-USE_AUTOTOOLS= libtool:13
+USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-
USE_MOTIF= yes
USE_X_PREFIX= yes
-GNU_CONFIGURE= yes
-
+CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS=--enable-production
MAN3= XbaeCaption.3 XbaeInput.3 XbaeMatrix.3
diff --git a/x11-toolkits/xmhtml/Makefile b/x11-toolkits/xmhtml/Makefile
index 4a0781f82204..c16725569885 100644
--- a/x11-toolkits/xmhtml/Makefile
+++ b/x11-toolkits/xmhtml/Makefile
@@ -17,7 +17,7 @@ COMMENT= A Motif widget set for displaying HTML 3.2 documents
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg
-USE_AUTOTOOLS= libtool:13:env
+USE_AUTOTOOLS= libtool:15:env
USE_MOTIF= yes
USE_X_PREFIX= yes
USE_GMAKE= yes