aboutsummaryrefslogtreecommitdiffstats
path: root/x11-wm
diff options
context:
space:
mode:
authorade <ade@FreeBSD.org>2006-02-23 18:40:44 +0800
committerade <ade@FreeBSD.org>2006-02-23 18:40:44 +0800
commitda880765886f48c0ac8fd253e5601d04ea853215 (patch)
tree55155f50e8a40ea2e2a16e2331e8cbb919b7d04f /x11-wm
parentba4beb1ea11e6147a9b30969be42685d1c709e56 (diff)
downloadfreebsd-ports-graphics-da880765886f48c0ac8fd253e5601d04ea853215.tar.gz
freebsd-ports-graphics-da880765886f48c0ac8fd253e5601d04ea853215.tar.zst
freebsd-ports-graphics-da880765886f48c0ac8fd253e5601d04ea853215.zip
Conversion to a single libtool environment.
Approved by: portmgr (kris)
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/bbconf/Makefile7
-rw-r--r--x11-wm/enlightenment-devel/Makefile4
-rw-r--r--x11-wm/enlightenment-devel/pkg-plist27
-rw-r--r--x11-wm/epplets/Makefile2
-rw-r--r--x11-wm/expocity/Makefile4
-rw-r--r--x11-wm/expocity/pkg-plist1
-rw-r--r--x11-wm/fluxbox-devel/Makefile2
-rw-r--r--x11-wm/ion-2/Makefile4
-rw-r--r--x11-wm/ion-2/files/patch-system.mk2
-rw-r--r--x11-wm/ion-2/pkg-plist6
-rw-r--r--x11-wm/ion3/Makefile4
-rw-r--r--x11-wm/ion3/files/patch-system.mk2
-rw-r--r--x11-wm/ion3/pkg-plist6
-rw-r--r--x11-wm/kahakai/Makefile2
-rw-r--r--x11-wm/kappdock/Makefile2
-rw-r--r--x11-wm/kompmgr/Makefile2
-rw-r--r--x11-wm/libdockapp/Makefile3
-rw-r--r--x11-wm/libdockapp/pkg-plist1
-rw-r--r--x11-wm/libepplet/Makefile4
-rw-r--r--x11-wm/libepplet/pkg-plist1
-rw-r--r--x11-wm/metacity/Makefile3
-rw-r--r--x11-wm/metacity/pkg-plist1
-rw-r--r--x11-wm/windowmaker/Makefile4
-rw-r--r--x11-wm/windowmaker/pkg-plist1
-rw-r--r--x11-wm/wmg/Makefile2
-rw-r--r--x11-wm/xfce4-desktop/Makefile4
-rw-r--r--x11-wm/xfce4-desktop/pkg-plist6
-rw-r--r--x11-wm/xfce4-panel/Makefile4
-rw-r--r--x11-wm/xfce4-panel/pkg-plist7
-rw-r--r--x11-wm/xfce4-session/Makefile3
-rw-r--r--x11-wm/xfce4-session/pkg-plist11
-rw-r--r--x11-wm/xfce4-systray/Makefile4
-rw-r--r--x11-wm/xfce4-systray/pkg-plist2
-rw-r--r--x11-wm/xfce4-wm/Makefile4
-rw-r--r--x11-wm/xfce4-wm/pkg-plist4
35 files changed, 115 insertions, 31 deletions
diff --git a/x11-wm/bbconf/Makefile b/x11-wm/bbconf/Makefile
index 483c4d3302a..4068fb5538b 100644
--- a/x11-wm/bbconf/Makefile
+++ b/x11-wm/bbconf/Makefile
@@ -7,6 +7,7 @@
PORTNAME= bbconf
PORTVERSION= 1.10
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -17,15 +18,19 @@ COMMENT= Configurator for the Blackbox window manager
USE_X_PREFIX= yes
USE_QT_VER= 3
USE_PERL5_BUILD= yes
-USE_AUTOTOOLS= libtool:15
+GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
MAN1= bbconf.1
PORTDOCS= AUTHORS ChangeLog README README.html TODO
PLIST_FILES= bin/bbconf \
+ lib/bbconf/plugins/libbbconf.la \
lib/bbconf/plugins/libbbconf.so \
+ lib/bbconf/plugins/libkeybindings.la \
lib/bbconf/plugins/libkeybindings.so \
+ lib/bbconf/plugins/libmenu.la \
lib/bbconf/plugins/libmenu.so \
+ lib/bbconf/plugins/libthemes.la \
lib/bbconf/plugins/libthemes.so
PLIST_DIRS= lib/bbconf/plugins lib/bbconf
diff --git a/x11-wm/enlightenment-devel/Makefile b/x11-wm/enlightenment-devel/Makefile
index 7b6e410802b..68c5400b88b 100644
--- a/x11-wm/enlightenment-devel/Makefile
+++ b/x11-wm/enlightenment-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= enlightenment
PORTVERSION= 0.16.999.023
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= http://enlightenment.freedesktop.org/files/
@@ -28,7 +28,7 @@ USE_GNOME= gnomehack gnometarget
USE_ICONV= yes
USE_GETTEXT= yes
NO_LATEST_LINK= yes
-USE_AUTOTOOLS= libtool:15
+GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
diff --git a/x11-wm/enlightenment-devel/pkg-plist b/x11-wm/enlightenment-devel/pkg-plist
index e58e334ae8d..bc8fd8dfb41 100644
--- a/x11-wm/enlightenment-devel/pkg-plist
+++ b/x11-wm/enlightenment-devel/pkg-plist
@@ -119,11 +119,17 @@ include/enlightenment/e_win.h
include/enlightenment/e_winlist.h
include/enlightenment/e_xinerama.h
include/enlightenment/e_zone.h
+lib/enlightenment/modules/battery/module.a
+lib/enlightenment/modules/battery/module.la
lib/enlightenment/modules/battery/module.so
lib/enlightenment/modules/battery/module_icon.png
+lib/enlightenment/modules/clock/module.a
+lib/enlightenment/modules/clock/module.la
lib/enlightenment/modules/clock/module.so
lib/enlightenment/modules/clock/module_icon.png
lib/enlightenment/modules/cpufreq/freqset
+lib/enlightenment/modules/cpufreq/module.a
+lib/enlightenment/modules/cpufreq/module.la
lib/enlightenment/modules/cpufreq/module.so
lib/enlightenment/modules/cpufreq/module_icon.png
lib/enlightenment/modules/dropshadow/menu_icon_close.png
@@ -139,23 +145,44 @@ lib/enlightenment/modules/dropshadow/menu_icon_very_far.png
lib/enlightenment/modules/dropshadow/menu_icon_very_fuzzy.png
lib/enlightenment/modules/dropshadow/menu_icon_very_light.png
lib/enlightenment/modules/dropshadow/menu_icon_very_sharp.png
+lib/enlightenment/modules/dropshadow/module.a
+lib/enlightenment/modules/dropshadow/module.la
lib/enlightenment/modules/dropshadow/module.so
lib/enlightenment/modules/dropshadow/module_icon.png
+lib/enlightenment/modules/gadget_test/module.a
+lib/enlightenment/modules/gadget_test/module.la
lib/enlightenment/modules/gadget_test/module.so
+lib/enlightenment/modules/ibar/module.a
+lib/enlightenment/modules/ibar/module.la
lib/enlightenment/modules/ibar/module.so
lib/enlightenment/modules/ibar/module_icon.png
+lib/enlightenment/modules/ibox/module.a
+lib/enlightenment/modules/ibox/module.la
lib/enlightenment/modules/ibox/module.so
lib/enlightenment/modules/ibox/module_icon.png
+lib/enlightenment/modules/randr/module.a
+lib/enlightenment/modules/randr/module.la
lib/enlightenment/modules/randr/module.so
+lib/enlightenment/modules/pager/module.a
+lib/enlightenment/modules/pager/module.la
lib/enlightenment/modules/pager/module.so
lib/enlightenment/modules/pager/module_icon.png
+lib/enlightenment/modules/start/module.a
+lib/enlightenment/modules/start/module.la
lib/enlightenment/modules/start/module.so
lib/enlightenment/modules/start/module_icon.png
+lib/enlightenment/modules/temperature/module.a
+lib/enlightenment/modules/temperature/module.la
lib/enlightenment/modules/temperature/module.so
lib/enlightenment/modules/temperature/module_icon.png
+lib/enlightenment/modules/test/module.a
+lib/enlightenment/modules/test/module.la
lib/enlightenment/modules/test/module.so
+lib/enlightenment/preload/e_hack.a
+lib/enlightenment/preload/e_hack.la
lib/enlightenment/preload/e_hack.so
lib/libe.a
+lib/libe.la
lib/libe.so
lib/libe.so.0
%%DATADIR%%/AUTHORS
diff --git a/x11-wm/epplets/Makefile b/x11-wm/epplets/Makefile
index b7ed511d02b..b3b12b982f3 100644
--- a/x11-wm/epplets/Makefile
+++ b/x11-wm/epplets/Makefile
@@ -26,7 +26,7 @@ USE_GNOME= esound lthack
USE_GL= yes
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:15
+GNU_CONFIGURE= yes
CONFIGURE_ENV= EROOT="${X11BASE}/share/enlightenment" \
EBIN="${X11BASE}/bin" \
CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
diff --git a/x11-wm/expocity/Makefile b/x11-wm/expocity/Makefile
index 4e136a723f3..0e9e8d60fad 100644
--- a/x11-wm/expocity/Makefile
+++ b/x11-wm/expocity/Makefile
@@ -7,7 +7,7 @@
PORTNAME= expocity
PORTVERSION= 2.6.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-wm
MASTER_SITES= http://www.pycage.de/download/
DISTNAME= ${PORTNAME}-${PORTVERSION}-1
@@ -22,7 +22,7 @@ CONFLICTS= metacity*
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:13:inc
+USE_AUTOTOOLS= libtool:15
USE_GNOME= gnomeprefix gnomehack gnomehier gconf2 libglade2
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
diff --git a/x11-wm/expocity/pkg-plist b/x11-wm/expocity/pkg-plist
index d292cd03dc7..cce343d8a9d 100644
--- a/x11-wm/expocity/pkg-plist
+++ b/x11-wm/expocity/pkg-plist
@@ -12,6 +12,7 @@ include/metacity-1/metacity-private/theme-parser.h
include/metacity-1/metacity-private/theme.h
include/metacity-1/metacity-private/util.h
lib/libmetacity-private.a
+lib/libmetacity-private.la
lib/libmetacity-private.so
lib/libmetacity-private.so.0
libdata/pkgconfig/libmetacity-private.pc
diff --git a/x11-wm/fluxbox-devel/Makefile b/x11-wm/fluxbox-devel/Makefile
index 08f195c363a..fad55577f94 100644
--- a/x11-wm/fluxbox-devel/Makefile
+++ b/x11-wm/fluxbox-devel/Makefile
@@ -27,7 +27,7 @@ USE_GNOME= gnometarget
WANT_GNOME= yes
USE_X_PREFIX= yes
USE_REINPLACE= yes
-USE_AUTOTOOLS= libtool:15
+GNU_CONFIGURE= yes
DOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
MAN1= fbrun.1 fbsetbg.1 fbsetroot.1 fluxbox.1 fluxstyle.1 \
diff --git a/x11-wm/ion-2/Makefile b/x11-wm/ion-2/Makefile
index 53c711dff5f..4d7fad126cd 100644
--- a/x11-wm/ion-2/Makefile
+++ b/x11-wm/ion-2/Makefile
@@ -8,6 +8,7 @@
PORTNAME= ion-2
PORTVERSION= 20040729
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= http://modeemi.fi/~tuomov/ion/dl/
@@ -18,7 +19,8 @@ LIB_DEPENDS= lua.5:${PORTSDIR}/lang/lua
CONFLICTS= ion-2002* ion-devel-* pwm-*
-USE_AUTOTOOLS= libltdl:15 libtool:15
+GNU_CONFIGURE= yes
+USE_AUTOTOOLS= libtool:15 libltdl:15
USE_X_PREFIX= yes
USE_GMAKE= yes
MAKE_ENV= DEFINES="${IONDEFINES}"
diff --git a/x11-wm/ion-2/files/patch-system.mk b/x11-wm/ion-2/files/patch-system.mk
index a3770bb2bf1..37e33a105ee 100644
--- a/x11-wm/ion-2/files/patch-system.mk
+++ b/x11-wm/ion-2/files/patch-system.mk
@@ -23,7 +23,7 @@
# OSes only have an _ancient_ 1.3.x libtool that _will_ _not_ _work even
# though a lot of libltdl-using apps require 1.4.3.
-LIBTOOL=libtool
-+LIBTOOL=$(LOCALBASE)/bin/libtool15 --tag=CC
++LIBTOOL=$(LOCALBASE)/bin/libtool --tag=CC
# Settings for compiling and linking to ltdl
-LTDL_INCLUDES=
diff --git a/x11-wm/ion-2/pkg-plist b/x11-wm/ion-2/pkg-plist
index 79117a851ee..beaa7ec4b33 100644
--- a/x11-wm/ion-2/pkg-plist
+++ b/x11-wm/ion-2/pkg-plist
@@ -23,17 +23,23 @@ etc/ion/pwm-bindings.lua
etc/ion/pwm-menus.lua
etc/ion/pwm.lua
etc/ion/query.lua
+lib/ion/de.a
lib/ion/de.la
lib/ion/de.so
+lib/ion/dock.a
lib/ion/dock.la
lib/ion/dock.so
+lib/ion/floatws.a
lib/ion/floatws.la
lib/ion/floatws.so
lib/ion/ion-completefile
+lib/ion/ionws.a
lib/ion/ionws.la
lib/ion/ionws.so
+lib/ion/menu.a
lib/ion/menu.la
lib/ion/menu.so
+lib/ion/query.a
lib/ion/query.la
lib/ion/query.so
lib/ion/lc/ioncore-efbb.lc
diff --git a/x11-wm/ion3/Makefile b/x11-wm/ion3/Makefile
index 53c711dff5f..4d7fad126cd 100644
--- a/x11-wm/ion3/Makefile
+++ b/x11-wm/ion3/Makefile
@@ -8,6 +8,7 @@
PORTNAME= ion-2
PORTVERSION= 20040729
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= http://modeemi.fi/~tuomov/ion/dl/
@@ -18,7 +19,8 @@ LIB_DEPENDS= lua.5:${PORTSDIR}/lang/lua
CONFLICTS= ion-2002* ion-devel-* pwm-*
-USE_AUTOTOOLS= libltdl:15 libtool:15
+GNU_CONFIGURE= yes
+USE_AUTOTOOLS= libtool:15 libltdl:15
USE_X_PREFIX= yes
USE_GMAKE= yes
MAKE_ENV= DEFINES="${IONDEFINES}"
diff --git a/x11-wm/ion3/files/patch-system.mk b/x11-wm/ion3/files/patch-system.mk
index a3770bb2bf1..37e33a105ee 100644
--- a/x11-wm/ion3/files/patch-system.mk
+++ b/x11-wm/ion3/files/patch-system.mk
@@ -23,7 +23,7 @@
# OSes only have an _ancient_ 1.3.x libtool that _will_ _not_ _work even
# though a lot of libltdl-using apps require 1.4.3.
-LIBTOOL=libtool
-+LIBTOOL=$(LOCALBASE)/bin/libtool15 --tag=CC
++LIBTOOL=$(LOCALBASE)/bin/libtool --tag=CC
# Settings for compiling and linking to ltdl
-LTDL_INCLUDES=
diff --git a/x11-wm/ion3/pkg-plist b/x11-wm/ion3/pkg-plist
index 79117a851ee..beaa7ec4b33 100644
--- a/x11-wm/ion3/pkg-plist
+++ b/x11-wm/ion3/pkg-plist
@@ -23,17 +23,23 @@ etc/ion/pwm-bindings.lua
etc/ion/pwm-menus.lua
etc/ion/pwm.lua
etc/ion/query.lua
+lib/ion/de.a
lib/ion/de.la
lib/ion/de.so
+lib/ion/dock.a
lib/ion/dock.la
lib/ion/dock.so
+lib/ion/floatws.a
lib/ion/floatws.la
lib/ion/floatws.so
lib/ion/ion-completefile
+lib/ion/ionws.a
lib/ion/ionws.la
lib/ion/ionws.so
+lib/ion/menu.a
lib/ion/menu.la
lib/ion/menu.so
+lib/ion/query.a
lib/ion/query.la
lib/ion/query.so
lib/ion/lc/ioncore-efbb.lc
diff --git a/x11-wm/kahakai/Makefile b/x11-wm/kahakai/Makefile
index e3081306412..b07e8a6e2de 100644
--- a/x11-wm/kahakai/Makefile
+++ b/x11-wm/kahakai/Makefile
@@ -26,7 +26,7 @@ DEPRECATED= "Development ceased"
USE_BZIP2= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:13:inc
+GNU_CONFIGURE= yes
USE_PYTHON= yes
USE_REINPLACE= yes
USE_X_PREFIX= yes
diff --git a/x11-wm/kappdock/Makefile b/x11-wm/kappdock/Makefile
index 75870f3ab58..f053db21ad9 100644
--- a/x11-wm/kappdock/Makefile
+++ b/x11-wm/kappdock/Makefile
@@ -18,7 +18,7 @@ COMMENT= A dock-like applet for KDE3
USE_GETTEXT= yes
USE_KDELIBS_VER=3
-GNU_CONFIGURE= yes
+USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET=
CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include \
--enable-threads \
diff --git a/x11-wm/kompmgr/Makefile b/x11-wm/kompmgr/Makefile
index 002362af26b..2a1ab4fb529 100644
--- a/x11-wm/kompmgr/Makefile
+++ b/x11-wm/kompmgr/Makefile
@@ -21,7 +21,7 @@ USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
USE_BZIP2= yes
-GNU_CONFIGURE= yes
+USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
WRKSRC= ${WRKDIR}/kdebase-${PORTVERSION}
INSTALLS_SHLIB= yes
diff --git a/x11-wm/libdockapp/Makefile b/x11-wm/libdockapp/Makefile
index 61b2700241b..c5c711fcfab 100644
--- a/x11-wm/libdockapp/Makefile
+++ b/x11-wm/libdockapp/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libdockapp
PORTVERSION= 0.6.1
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= http://solfertje.student.utwente.nl/~dalroi/libdockapp/files/
@@ -19,7 +20,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_XPM= yes
USE_REINPLACE= yes
-USE_AUTOTOOLS= libtool:15
+GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --without-font --without-examples
INSTALLS_SHLIB= yes
diff --git a/x11-wm/libdockapp/pkg-plist b/x11-wm/libdockapp/pkg-plist
index 72e6d20f2c2..db077379c19 100644
--- a/x11-wm/libdockapp/pkg-plist
+++ b/x11-wm/libdockapp/pkg-plist
@@ -1,5 +1,6 @@
include/dockapp.h
lib/libdockapp.a
+lib/libdockapp.la
lib/libdockapp.so
lib/libdockapp.so.2
lib/X11/fonts/dockapp/fonts.alias
diff --git a/x11-wm/libepplet/Makefile b/x11-wm/libepplet/Makefile
index 0daef64f5d6..d06287fc454 100644
--- a/x11-wm/libepplet/Makefile
+++ b/x11-wm/libepplet/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libepplet
PORTVERSION= 0.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= enlightenment
@@ -20,7 +20,7 @@ USE_X_PREFIX= yes
USE_GNOME= imlib
USE_GL= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:15
+GNU_CONFIGURE= yes
CONFIGURE_ENV= EROOT="${X11BASE}/share/enlightenment" \
EBIN="${X11BASE}/bin" \
CPPFLAGS="${CPPFLAGS}" \
diff --git a/x11-wm/libepplet/pkg-plist b/x11-wm/libepplet/pkg-plist
index 367a9a2cc1a..a2dc768fa62 100644
--- a/x11-wm/libepplet/pkg-plist
+++ b/x11-wm/libepplet/pkg-plist
@@ -1,4 +1,5 @@
include/epplet.h
lib/libepplet.a
+lib/libepplet.la
lib/libepplet.so
lib/libepplet.so.1
diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile
index 5eb12140e9d..7b8c5de5c59 100644
--- a/x11-wm/metacity/Makefile
+++ b/x11-wm/metacity/Makefile
@@ -8,6 +8,7 @@
PORTNAME= metacity
PORTVERSION= 2.12.3
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R}
@@ -22,7 +23,7 @@ CONFLICTS= expocity-[0-9]*
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:15
+GNU_CONFIGURE= yes
USE_GNOME= gnomeprefix intlhack gnomehack gconf2
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-render
diff --git a/x11-wm/metacity/pkg-plist b/x11-wm/metacity/pkg-plist
index 1bb70d45a73..a0362fafbe5 100644
--- a/x11-wm/metacity/pkg-plist
+++ b/x11-wm/metacity/pkg-plist
@@ -9,6 +9,7 @@ include/metacity-1/metacity-private/theme-parser.h
include/metacity-1/metacity-private/theme.h
include/metacity-1/metacity-private/util.h
lib/libmetacity-private.a
+lib/libmetacity-private.la
lib/libmetacity-private.so
lib/libmetacity-private.so.0
libdata/pkgconfig/libmetacity-private.pc
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index ed060773849..b7f002a7959 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -7,7 +7,7 @@
PORTNAME= windowmaker
PORTVERSION= 0.92.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm windowmaker
MASTER_SITES= ${MASTER_SITE_WINDOWMAKER}
MASTER_SITE_SUBDIR= source/release
@@ -29,7 +29,7 @@ USE_XPM= yes
USE_PERL5= yes
USE_GETTEXT= yes
USE_REINPLACE= yes
-USE_AUTOTOOLS= libtool:15
+GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --with-pixmapdir=${PREFIX}/include/X11/pixmaps \
diff --git a/x11-wm/windowmaker/pkg-plist b/x11-wm/windowmaker/pkg-plist
index d16149add48..c45549b7d5e 100644
--- a/x11-wm/windowmaker/pkg-plist
+++ b/x11-wm/windowmaker/pkg-plist
@@ -102,6 +102,7 @@ lib/libWINGs.a
lib/libWMaker.a
lib/libWUtil.a
lib/libwraster.a
+lib/libwraster.la
lib/libwraster.so
lib/libwraster.so.4
libdata/pkgconfig/WINGs.pc
diff --git a/x11-wm/wmg/Makefile b/x11-wm/wmg/Makefile
index 27c9eda7904..94efbe51c87 100644
--- a/x11-wm/wmg/Makefile
+++ b/x11-wm/wmg/Makefile
@@ -19,7 +19,7 @@ USE_X_PREFIX= yes
USE_XPM= yes
USE_GNOME= gnomehack gnomelibs gnomeprefix
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:15
+GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
diff --git a/x11-wm/xfce4-desktop/Makefile b/x11-wm/xfce4-desktop/Makefile
index 7845d111a25..61c2226a6dd 100644
--- a/x11-wm/xfce4-desktop/Makefile
+++ b/x11-wm/xfce4-desktop/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-desktop
PORTVERSION= 4.2.3
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11-wm xfce
MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
@@ -30,7 +30,7 @@ RUN_DEPENDS= xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager \
USE_GETTEXT= yes
USE_GNOME= gtk20
USE_X_PREFIX= yes
-USE_AUTOTOOLS= libtool:15
+GNU_CONFIGURE= yes
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/x11-wm/xfce4-desktop/pkg-plist b/x11-wm/xfce4-desktop/pkg-plist
index f236d1f40ad..dcc0d341196 100644
--- a/x11-wm/xfce4-desktop/pkg-plist
+++ b/x11-wm/xfce4-desktop/pkg-plist
@@ -40,8 +40,14 @@ etc/xdg/xfce4/desktop/menu.xml.sv
etc/xdg/xfce4/desktop/menu.xml.uk
etc/xdg/xfce4/desktop/menu.xml.vi
etc/xdg/xfce4/desktop/menu.xml.zh_TW
+lib/xfce4/mcs-plugins/backdrop_settings.a
+lib/xfce4/mcs-plugins/backdrop_settings.la
lib/xfce4/mcs-plugins/backdrop_settings.so
+lib/xfce4/modules/xfce4_desktop_menu.a
+lib/xfce4/modules/xfce4_desktop_menu.la
lib/xfce4/modules/xfce4_desktop_menu.so
+lib/xfce4/panel-plugins/libdesktopmenu.a
+lib/xfce4/panel-plugins/libdesktopmenu.la
lib/xfce4/panel-plugins/libdesktopmenu.so
share/applications/xfce-backdrop-settings.desktop
share/applications/xfce-menueditor.desktop
diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile
index ffce0827816..383051d657e 100644
--- a/x11-wm/xfce4-panel/Makefile
+++ b/x11-wm/xfce4-panel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-panel
PORTVERSION= 4.2.3
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11-wm xfce
MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
@@ -28,7 +28,7 @@ USE_GETTEXT= yes
USE_GNOME= gtk20 gnomehack
USE_REINPLACE= yes
USE_X_PREFIX= yes
-USE_AUTOTOOLS= libtool:15
+GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CFLAGS=-I${LOCALBASE}/include \
diff --git a/x11-wm/xfce4-panel/pkg-plist b/x11-wm/xfce4-panel/pkg-plist
index 861f1f309ca..dca9a880b15 100644
--- a/x11-wm/xfce4-panel/pkg-plist
+++ b/x11-wm/xfce4-panel/pkg-plist
@@ -36,12 +36,19 @@ include/xfce4/panel/item_dialog.h
include/xfce4/panel/plugins.h
include/xfce4/panel/xfce_support.h
include/xfce4/panel/xfce.h
+lib/xfce4/mcs-plugins/libxfce4settings.la
lib/xfce4/mcs-plugins/libxfce4settings.so
+lib/xfce4/panel-plugins/libclock.la
lib/xfce4/panel-plugins/libclock.so
+lib/xfce4/panel-plugins/libmailcheck.la
lib/xfce4/panel-plugins/libmailcheck.so
+lib/xfce4/panel-plugins/libpager.la
lib/xfce4/panel-plugins/libpager.so
+lib/xfce4/panel-plugins/libseparator.la
lib/xfce4/panel-plugins/libseparator.so
+lib/xfce4/panel-plugins/libswitcher.la
lib/xfce4/panel-plugins/libswitcher.so
+lib/xfce4/panel-plugins/libsystembuttons.la
lib/xfce4/panel-plugins/libsystembuttons.so
libdata/pkgconfig/xfce4-panel-1.0.pc
share/icons/hicolor/16x16/apps/xfce-system-exit.png
diff --git a/x11-wm/xfce4-session/Makefile b/x11-wm/xfce4-session/Makefile
index 0c800b97a7e..138896ae584 100644
--- a/x11-wm/xfce4-session/Makefile
+++ b/x11-wm/xfce4-session/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-session
PORTVERSION= 4.2.3
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11-wm xfce
MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
@@ -30,7 +30,6 @@ USE_GNOME= gnomehack
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
-USE_AUTOTOOLS= libtool:15
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib"
diff --git a/x11-wm/xfce4-session/pkg-plist b/x11-wm/xfce4-session/pkg-plist
index bba889fbb20..83095fa3d67 100644
--- a/x11-wm/xfce4-session/pkg-plist
+++ b/x11-wm/xfce4-session/pkg-plist
@@ -4,13 +4,24 @@ etc/xdg/xfce4-session/xfce4-session.rc
include/xfce4/xfce4-session-4.2/libxfsm/xfsm-splash-engine.h
include/xfce4/xfce4-session-4.2/libxfsm/xfsm-splash-rc.h
lib/libxfsm-4.2.a
+lib/libxfsm-4.2.la
lib/libxfsm-4.2.so
lib/libxfsm-4.2.so.0
libdata/pkgconfig/xfce4-session-1.0.pc
+lib/xfce4/mcs-plugins/session_settings.a
+lib/xfce4/mcs-plugins/session_settings.la
lib/xfce4/mcs-plugins/session_settings.so
+lib/xfce4/mcs-plugins/splash_settings.a
+lib/xfce4/mcs-plugins/splash_settings.la
lib/xfce4/mcs-plugins/splash_settings.so
+lib/xfce4/splash/engines/libbalou.a
+lib/xfce4/splash/engines/libbalou.la
lib/xfce4/splash/engines/libbalou.so
+lib/xfce4/splash/engines/libmice.a
+lib/xfce4/splash/engines/libmice.la
lib/xfce4/splash/engines/libmice.so
+lib/xfce4/splash/engines/libsimple.a
+lib/xfce4/splash/engines/libsimple.la
lib/xfce4/splash/engines/libsimple.so
libexec/balou-export-theme
libexec/balou-install-theme
diff --git a/x11-wm/xfce4-systray/Makefile b/x11-wm/xfce4-systray/Makefile
index 47af341ae67..20c2b4444d6 100644
--- a/x11-wm/xfce4-systray/Makefile
+++ b/x11-wm/xfce4-systray/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-systray
PORTVERSION= 4.2.3
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11-wm xfce
MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
@@ -27,7 +27,7 @@ RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
USE_GNOME= gtk20
USE_X_PREFIX= yes
-USE_AUTOTOOLS= libtool:15
+GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/x11-wm/xfce4-systray/pkg-plist b/x11-wm/xfce4-systray/pkg-plist
index 476a11784d0..f9cf3d39e60 100644
--- a/x11-wm/xfce4-systray/pkg-plist
+++ b/x11-wm/xfce4-systray/pkg-plist
@@ -1,3 +1,5 @@
+lib/xfce4/panel-plugins/libsystray.a
+lib/xfce4/panel-plugins/libsystray.la
lib/xfce4/panel-plugins/libsystray.so
@dirrmtry lib/xfce4/panel-plugins
@dirrmtry lib/xfce4
diff --git a/x11-wm/xfce4-wm/Makefile b/x11-wm/xfce4-wm/Makefile
index c97b0699f5e..33e50e61116 100644
--- a/x11-wm/xfce4-wm/Makefile
+++ b/x11-wm/xfce4-wm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-wm
PORTVERSION= 4.2.3.2
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11-wm xfce
MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
@@ -29,7 +29,7 @@ USE_GETTEXT= yes
USE_GNOME= gtk20
USE_X_PREFIX= yes
USE_XPM= yes
-USE_AUTOTOOLS= libtool:15
+GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --enable-xinerama
diff --git a/x11-wm/xfce4-wm/pkg-plist b/x11-wm/xfce4-wm/pkg-plist
index a2ee360efb1..2e27d7f7fb9 100644
--- a/x11-wm/xfce4-wm/pkg-plist
+++ b/x11-wm/xfce4-wm/pkg-plist
@@ -1,5 +1,9 @@
bin/xfwm4
+lib/xfce4/mcs-plugins/workspaces_plugin.a
+lib/xfce4/mcs-plugins/workspaces_plugin.la
lib/xfce4/mcs-plugins/workspaces_plugin.so
+lib/xfce4/mcs-plugins/xfwm4_plugin.a
+lib/xfce4/mcs-plugins/xfwm4_plugin.la
lib/xfce4/mcs-plugins/xfwm4_plugin.so
share/applications/xfce-wm-settings.desktop
share/applications/xfce-workspaces-settings.desktop