aboutsummaryrefslogtreecommitdiffstats
path: root/x11-wm
diff options
context:
space:
mode:
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/9wm/Makefile1
-rw-r--r--x11-wm/Makefile10
-rw-r--r--x11-wm/aewm/Makefile1
-rw-r--r--x11-wm/afterstep-i18n/Makefile2
-rw-r--r--x11-wm/afterstep-stable/Makefile3
-rw-r--r--x11-wm/afterstep-stable/pkg-plist1
-rw-r--r--x11-wm/afterstep/Makefile2
-rw-r--r--x11-wm/ahwm/Makefile1
-rw-r--r--x11-wm/alloywm/Makefile2
-rw-r--r--x11-wm/amaterus/Makefile2
-rw-r--r--x11-wm/amiwm/Makefile1
-rw-r--r--x11-wm/badwm/Makefile1
-rw-r--r--x11-wm/bbconf/Makefile2
-rw-r--r--x11-wm/bbkeys/Makefile2
-rw-r--r--x11-wm/bbpager/Makefile1
-rw-r--r--x11-wm/beryl-core/Makefile132
-rw-r--r--x11-wm/beryl-core/distinfo3
-rw-r--r--x11-wm/beryl-core/pkg-descr8
-rw-r--r--x11-wm/beryl-core/pkg-plist76
-rw-r--r--x11-wm/beryl-manager/Makefile34
-rw-r--r--x11-wm/beryl-manager/distinfo3
-rw-r--r--x11-wm/beryl-manager/pkg-descr8
-rw-r--r--x11-wm/beryl-manager/pkg-plist75
-rw-r--r--x11-wm/beryl-plugins/Makefile38
-rw-r--r--x11-wm/beryl-plugins/distinfo3
-rw-r--r--x11-wm/beryl-plugins/files/patch-src-thumbnail.c26
-rw-r--r--x11-wm/beryl-plugins/pkg-descr8
-rw-r--r--x11-wm/beryl-plugins/pkg-plist150
-rw-r--r--x11-wm/beryl-settings-bindings/Makefile31
-rw-r--r--x11-wm/beryl-settings-bindings/distinfo3
-rw-r--r--x11-wm/beryl-settings-bindings/pkg-descr6
-rw-r--r--x11-wm/beryl-settings-bindings/pkg-plist4
-rw-r--r--x11-wm/beryl-settings/Makefile38
-rw-r--r--x11-wm/beryl-settings/distinfo3
-rw-r--r--x11-wm/beryl-settings/pkg-descr7
-rw-r--r--x11-wm/beryl-settings/pkg-plist88
-rw-r--r--x11-wm/beryl/Makefile30
-rw-r--r--x11-wm/beryl/pkg-descr7
-rw-r--r--x11-wm/blackbox/Makefile1
-rw-r--r--x11-wm/blwm/Makefile16
-rw-r--r--x11-wm/blwm/files/patch-Makefile.std31
-rw-r--r--x11-wm/boxtools/Makefile1
-rw-r--r--x11-wm/clementine/Makefile2
-rw-r--r--x11-wm/compiz/Makefile109
-rw-r--r--x11-wm/compiz/distinfo3
-rw-r--r--x11-wm/compiz/files/patch-plugins_fuse.c11
-rw-r--r--x11-wm/compiz/pkg-descr8
-rw-r--r--x11-wm/compiz/pkg-plist166
-rw-r--r--x11-wm/ctwm/Makefile2
-rw-r--r--x11-wm/devilspie/Makefile1
-rw-r--r--x11-wm/dwm/Makefile1
-rw-r--r--x11-wm/e16/Makefile2
-rw-r--r--x11-wm/e16utils/Makefile2
-rw-r--r--x11-wm/e17-module-calendar/Makefile2
-rw-r--r--x11-wm/e17-module-cpu/Makefile2
-rw-r--r--x11-wm/e17-module-deskshow/Makefile2
-rw-r--r--x11-wm/e17-module-flame/Makefile2
-rw-r--r--x11-wm/e17-module-flame/pkg-plist2
-rw-r--r--x11-wm/e17-module-language/Makefile2
-rw-r--r--x11-wm/e17-module-mail/Makefile2
-rw-r--r--x11-wm/e17-module-mem/Makefile2
-rw-r--r--x11-wm/e17-module-mem/pkg-plist2
-rw-r--r--x11-wm/e17-module-mixer/Makefile1
-rw-r--r--x11-wm/e17-module-moon/Makefile2
-rw-r--r--x11-wm/e17-module-rain/Makefile2
-rw-r--r--x11-wm/e17-module-rain/pkg-plist2
-rw-r--r--x11-wm/e17-module-screenshot/Makefile2
-rw-r--r--x11-wm/e17-module-screenshot/pkg-plist2
-rw-r--r--x11-wm/e17-module-slideshow/Makefile2
-rw-r--r--x11-wm/e17-module-slideshow/pkg-plist2
-rw-r--r--x11-wm/e17-module-snow/Makefile2
-rw-r--r--x11-wm/e17-module-snow/pkg-plist2
-rw-r--r--x11-wm/e17-module-uptime/Makefile2
-rw-r--r--x11-wm/e17-module-uptime/pkg-plist2
-rw-r--r--x11-wm/e17-module-weather/Makefile2
-rw-r--r--x11-wm/e17-module-winselector/Makefile1
-rw-r--r--x11-wm/e17-utils/Makefile1
-rw-r--r--x11-wm/ede/Makefile1
-rw-r--r--x11-wm/emerald/Makefile44
-rw-r--r--x11-wm/emerald/distinfo3
-rw-r--r--x11-wm/emerald/files/patch-themer_main.c106
-rw-r--r--x11-wm/emerald/pkg-descr8
-rw-r--r--x11-wm/emerald/pkg-plist106
-rw-r--r--x11-wm/enlightenment-devel/Makefile2
-rw-r--r--x11-wm/enlightenment-devel/pkg-plist18
-rw-r--r--x11-wm/enlightenment-docs/Makefile2
-rw-r--r--x11-wm/enlightenment/Makefile2
-rw-r--r--x11-wm/epiwm/Makefile46
-rw-r--r--x11-wm/epiwm/pkg-plist21
-rw-r--r--x11-wm/epplets/Makefile2
-rw-r--r--x11-wm/etoile-azalea/Makefile1
-rw-r--r--x11-wm/etoile-azdock/Makefile1
-rw-r--r--x11-wm/evilwm/Makefile1
-rw-r--r--x11-wm/expocity/Makefile2
-rw-r--r--x11-wm/fbcmd/Makefile1
-rw-r--r--x11-wm/fbpager/Makefile1
-rw-r--r--x11-wm/fluxbox/Makefile2
-rw-r--r--x11-wm/fluxconf/Makefile2
-rw-r--r--x11-wm/fluxspace/Makefile2
-rw-r--r--x11-wm/fluxter/Makefile2
-rw-r--r--x11-wm/flwm/Makefile1
-rw-r--r--x11-wm/fvwm/Makefile3
-rw-r--r--x11-wm/fvwm2-devel/Makefile1
-rw-r--r--x11-wm/fvwm2/Makefile1
-rw-r--r--x11-wm/fvwm24/Makefile1
-rw-r--r--x11-wm/fvwm95-i18n/Makefile3
-rw-r--r--x11-wm/fvwm95/Makefile3
-rw-r--r--x11-wm/gcompmgr/Makefile2
-rw-r--r--x11-wm/golem/Makefile1
-rw-r--r--x11-wm/gwm/Makefile1
-rw-r--r--x11-wm/hackedbox/Makefile1
-rw-r--r--x11-wm/heliodor/Makefile34
-rw-r--r--x11-wm/heliodor/distinfo3
-rw-r--r--x11-wm/heliodor/pkg-descr5
-rw-r--r--x11-wm/heliodor/pkg-plist8
-rw-r--r--x11-wm/icewm/Makefile2
-rw-r--r--x11-wm/ion-2/Makefile2
-rw-r--r--x11-wm/ion-3/Makefile1
-rw-r--r--x11-wm/ion-3ds/Makefile1
-rw-r--r--x11-wm/ion/Makefile2
-rw-r--r--x11-wm/ion3/Makefile2
-rw-r--r--x11-wm/jewel/Makefile1
-rw-r--r--x11-wm/jwm/Makefile1
-rw-r--r--x11-wm/kahakai/Makefile2
-rw-r--r--x11-wm/kappdock/Makefile2
-rw-r--r--x11-wm/kompmgr/Makefile1
-rw-r--r--x11-wm/larswm/Makefile1
-rw-r--r--x11-wm/libdockapp/Makefile2
-rw-r--r--x11-wm/lwm/Makefile1
-rw-r--r--x11-wm/matchbox/Makefile1
-rw-r--r--x11-wm/metacity/Makefile1
-rw-r--r--x11-wm/metacity/pkg-plist38
-rw-r--r--x11-wm/mlvwm/Makefile1
-rw-r--r--x11-wm/novawm/Makefile2
-rw-r--r--x11-wm/obconf/Makefile2
-rw-r--r--x11-wm/obtuner/Makefile2
-rw-r--r--x11-wm/olvwm/Makefile1
-rw-r--r--x11-wm/openbox/Makefile1
-rw-r--r--x11-wm/orion/Makefile1
-rw-r--r--x11-wm/oroborus/Makefile2
-rw-r--r--x11-wm/pager/Makefile2
-rw-r--r--x11-wm/pawm/Makefile1
-rw-r--r--x11-wm/peksystray/Makefile1
-rw-r--r--x11-wm/pekwm/Makefile1
-rw-r--r--x11-wm/phluid/Makefile2
-rw-r--r--x11-wm/piewm/Makefile2
-rw-r--r--x11-wm/pwm/Makefile1
-rw-r--r--x11-wm/qlwm/Makefile1
-rw-r--r--x11-wm/qvwm/Makefile2
-rw-r--r--x11-wm/ratmenu/Makefile1
-rw-r--r--x11-wm/ratpoison/Makefile1
-rw-r--r--x11-wm/sapphire/Makefile2
-rw-r--r--x11-wm/sawfish/Makefile2
-rw-r--r--x11-wm/sawfish/pkg-plist34
-rw-r--r--x11-wm/selectwm/Makefile2
-rw-r--r--x11-wm/skippy-xd/Makefile4
-rw-r--r--x11-wm/skippy/Makefile2
-rw-r--r--x11-wm/swm/Makefile2
-rw-r--r--x11-wm/tinywm/Makefile1
-rw-r--r--x11-wm/transset-df/Makefile1
-rw-r--r--x11-wm/treewm/Makefile2
-rw-r--r--x11-wm/tvtwm/Makefile2
-rw-r--r--x11-wm/twm/Makefile21
-rw-r--r--x11-wm/twm/distinfo3
-rw-r--r--x11-wm/twm/pkg-descr4
-rw-r--r--x11-wm/twm/pkg-plist3
-rw-r--r--x11-wm/ude/Makefile1
-rw-r--r--x11-wm/uwm/Makefile1
-rw-r--r--x11-wm/vtwm/Makefile1
-rw-r--r--x11-wm/w9wm/Makefile1
-rw-r--r--x11-wm/waimea-devel/Makefile1
-rw-r--r--x11-wm/waimea/Makefile2
-rw-r--r--x11-wm/wampager/Makefile1
-rw-r--r--x11-wm/weewm/Makefile1
-rw-r--r--x11-wm/windowlab/Makefile1
-rw-r--r--x11-wm/windowmaker/Makefile2
-rw-r--r--x11-wm/wm2/Makefile1
-rw-r--r--x11-wm/wmDeskGuide/Makefile2
-rw-r--r--x11-wm/wmakerconf/Makefile2
-rw-r--r--x11-wm/wmanager/Makefile2
-rw-r--r--x11-wm/wmcp/Makefile1
-rw-r--r--x11-wm/wmg/Makefile2
-rw-r--r--x11-wm/wmii-devel/Makefile1
-rw-r--r--x11-wm/wmii/Makefile1
-rw-r--r--x11-wm/wmthemeinstall/Makefile2
-rw-r--r--x11-wm/xcompmgr/Makefile1
-rw-r--r--x11-wm/xfce/Makefile2
-rw-r--r--x11-wm/xfce/pkg-plist20
-rw-r--r--x11-wm/xfce4-desktop/Makefile2
-rw-r--r--x11-wm/xfce4-panel/Makefile1
-rw-r--r--x11-wm/xfce4-session/Makefile1
-rw-r--r--x11-wm/xfce4-wm/Makefile1
-rw-r--r--x11-wm/xfce4/Makefile1
-rw-r--r--x11-wm/yawm/Makefile1
194 files changed, 1644 insertions, 243 deletions
diff --git a/x11-wm/9wm/Makefile b/x11-wm/9wm/Makefile
index d2a9ca4fc1b1..e6b25ea6c996 100644
--- a/x11-wm/9wm/Makefile
+++ b/x11-wm/9wm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= 9wm
PORTVERSION= 1.1
+PORTREVISION= 1
CATEGORIES= x11-wm plan9
MASTER_SITES= http://www.isc.org/sources/X/window-managers/
diff --git a/x11-wm/Makefile b/x11-wm/Makefile
index 3187780c9b0d..fbcf2dc4bac2 100644
--- a/x11-wm/Makefile
+++ b/x11-wm/Makefile
@@ -16,16 +16,24 @@
SUBDIR += bbconf
SUBDIR += bbkeys
SUBDIR += bbpager
+ SUBDIR += beryl
+ SUBDIR += beryl-core
+ SUBDIR += beryl-manager
+ SUBDIR += beryl-plugins
+ SUBDIR += beryl-settings
+ SUBDIR += beryl-settings-bindings
SUBDIR += blackbox
SUBDIR += blwm
SUBDIR += boxtools
SUBDIR += clementine
+ SUBDIR += compiz
SUBDIR += ctwm
SUBDIR += devilspie
SUBDIR += dwm
SUBDIR += e16utils
SUBDIR += e17-utils
SUBDIR += ede
+ SUBDIR += emerald
SUBDIR += enlightenment
SUBDIR += enlightenment-devel
SUBDIR += enlightenment-docs
@@ -53,6 +61,7 @@
SUBDIR += golem
SUBDIR += gwm
SUBDIR += hackedbox
+ SUBDIR += heliodor
SUBDIR += icewm
SUBDIR += ion
SUBDIR += ion-2
@@ -97,6 +106,7 @@
SUBDIR += transset-df
SUBDIR += treewm
SUBDIR += tvtwm
+ SUBDIR += twm
SUBDIR += ude
SUBDIR += uwm
SUBDIR += vtwm
diff --git a/x11-wm/aewm/Makefile b/x11-wm/aewm/Makefile
index da034bd20607..ca44b13a3c05 100644
--- a/x11-wm/aewm/Makefile
+++ b/x11-wm/aewm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= aewm
PORTVERSION= 1.2.7
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= http://www.red-bean.com/~decklin/software/aewm/
diff --git a/x11-wm/afterstep-i18n/Makefile b/x11-wm/afterstep-i18n/Makefile
index e54224ff2fc6..aec0e3d45a51 100644
--- a/x11-wm/afterstep-i18n/Makefile
+++ b/x11-wm/afterstep-i18n/Makefile
@@ -7,7 +7,7 @@
PORTNAME= afterstep-i18n
PORTVERSION= 1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm afterstep
MASTER_SITES= ${MASTER_SITE_AFTERSTEP:S/$/:afterstep/} \
${MASTER_SITE_LOCAL:S/$/:local/} \
diff --git a/x11-wm/afterstep-stable/Makefile b/x11-wm/afterstep-stable/Makefile
index d7ec03d61833..740931a07ddd 100644
--- a/x11-wm/afterstep-stable/Makefile
+++ b/x11-wm/afterstep-stable/Makefile
@@ -7,6 +7,7 @@
PORTNAME= afterstep
PORTVERSION= 2.2.4
+PORTREVISION= 2
CATEGORIES= x11-wm afterstep
MASTER_SITES= ftp://ftp.afterstep.org/stable/ \
${MASTER_SITE_SOURCEFORGE}
@@ -29,7 +30,7 @@ RUN_DEPENDS= ${X11BASE}/bin/xli:${PORTSDIR}/graphics/xli
USE_BZIP2= yes
USE_GNOME= gtk20
USE_XPM= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS+=--disable-ascp \
diff --git a/x11-wm/afterstep-stable/pkg-plist b/x11-wm/afterstep-stable/pkg-plist
index 6d3f34891ecc..7d87488e23b4 100644
--- a/x11-wm/afterstep-stable/pkg-plist
+++ b/x11-wm/afterstep-stable/pkg-plist
@@ -1303,6 +1303,7 @@ lib/libAfterStep.a
%%DATADIR%%/themes/Default
%%DATADIR%%/wharf
%%DATADIR%%/winlist
+share/gnome/wm-properties/AfterStep.desktop
share/xsessions/AfterStep.desktop
@dirrm share/xsessions
@dirrm %%DATADIR%%_old
diff --git a/x11-wm/afterstep/Makefile b/x11-wm/afterstep/Makefile
index c04cd61d138b..1e8389571bf6 100644
--- a/x11-wm/afterstep/Makefile
+++ b/x11-wm/afterstep/Makefile
@@ -7,7 +7,7 @@
PORTNAME= afterstep
PORTVERSION= 1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm afterstep
MASTER_SITES= ${MASTER_SITE_AFTERSTEP}
MASTER_SITE_SUBDIR= archives/${PORTVERSION}
diff --git a/x11-wm/ahwm/Makefile b/x11-wm/ahwm/Makefile
index af51418db887..80a1822e9188 100644
--- a/x11-wm/ahwm/Makefile
+++ b/x11-wm/ahwm/Makefile
@@ -8,6 +8,7 @@
PORTNAME= ahwm
PORTVERSION= 0.90
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= http://people.cs.uchicago.edu/~ahiorean/ahwm/
diff --git a/x11-wm/alloywm/Makefile b/x11-wm/alloywm/Makefile
index 33fb4fc301fc..c138ffd43236 100644
--- a/x11-wm/alloywm/Makefile
+++ b/x11-wm/alloywm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= alloywm
PORTVERSION= 0.4.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-wm
MASTER_SITES= http://www.phatboydesigns.net/devel/
diff --git a/x11-wm/amaterus/Makefile b/x11-wm/amaterus/Makefile
index 7f0b90a164bb..0ec444140e66 100644
--- a/x11-wm/amaterus/Makefile
+++ b/x11-wm/amaterus/Makefile
@@ -7,7 +7,7 @@
PORTNAME= amaterus
PORTVERSION= 0.34.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-wm
MASTER_SITES= http://www.taiyaki.org/amaterus/src/
diff --git a/x11-wm/amiwm/Makefile b/x11-wm/amiwm/Makefile
index b0895bf354b9..6c7f3e861900 100644
--- a/x11-wm/amiwm/Makefile
+++ b/x11-wm/amiwm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= amiwm
PORTVERSION= 0.20.p48
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= ftp://ftp.lysator.liu.se/pub/X11/wm/amiwm/ \
http://www.plig.org/xwinman/archive/amiwm/
diff --git a/x11-wm/badwm/Makefile b/x11-wm/badwm/Makefile
index 869cd057637c..54cb257a42c5 100644
--- a/x11-wm/badwm/Makefile
+++ b/x11-wm/badwm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= badwm
PORTVERSION= 0.1.1
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
diff --git a/x11-wm/bbconf/Makefile b/x11-wm/bbconf/Makefile
index d072dae8642d..2f782e4267d0 100644
--- a/x11-wm/bbconf/Makefile
+++ b/x11-wm/bbconf/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bbconf
PORTVERSION= 1.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/x11-wm/bbkeys/Makefile b/x11-wm/bbkeys/Makefile
index 9b1d554a043e..2321e53964fa 100644
--- a/x11-wm/bbkeys/Makefile
+++ b/x11-wm/bbkeys/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bbkeys
PORTVERSION= 0.9.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/x11-wm/bbpager/Makefile b/x11-wm/bbpager/Makefile
index 0bd9b09728da..e7334ee59eb1 100644
--- a/x11-wm/bbpager/Makefile
+++ b/x11-wm/bbpager/Makefile
@@ -7,6 +7,7 @@
PORTNAME= bbpager
DISTVERSION= 0.4.3
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= bbtools
diff --git a/x11-wm/beryl-core/Makefile b/x11-wm/beryl-core/Makefile
new file mode 100644
index 000000000000..89729140662f
--- /dev/null
+++ b/x11-wm/beryl-core/Makefile
@@ -0,0 +1,132 @@
+# New ports collection makefile for: beryl-core
+# Date created: Oct 29 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= beryl-core
+PORTVERSION= 0.2.1
+PORTREVISION= 1
+CATEGORIES= x11-wm
+MASTER_SITES= http://releases.beryl-project.org/${PORTVERSION}/ \
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= flz/beryl/
+
+MAINTAINER= rnoland@2hip.net
+COMMENT= Beryl Composite/Window Manager
+
+LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
+ startup-notification-1.0:${PORTSDIR}/x11/startup-notification
+RUN_DEPENDS= bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
+
+GNU_CONFIGURE= yes
+USE_GL= gl
+USE_BZIP2= yes
+USE_GMAKE= yes
+USE_GNOME= gnomehack glib20 gconf2
+USE_GETTEXT= yes
+USE_LDCONFIG= yes
+
+CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS+= --mandir="${PREFIX}/man/" --disable-berylmesa
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
+
+USE_XORG= xcomposite xfixes xdamage xrandr ice sm xinerama glproto
+
+MAN1= beryl.1 \
+ beryl-xgl.1 \
+ beryl-settings-dump.1
+
+MAN3= beryl_settings_context_new.3 \
+ beryl_settings_context_destroy.3 \
+ beryl_settings_context_find_plugin.3 \
+ beryl_settings_context_find_setting.3 \
+ beryl_settings_context_read.3 \
+ beryl_settings_context_write.3 \
+ beryl_settings_context_comp_new.3 \
+ beryl_settings_context_comp_add_plugin.3 \
+ beryl_settings_context_comp_add_option.3 \
+ beryl_settings_context_comp_get_option_value.3 \
+ beryl_settings_context_comp_set_option_value.3 \
+ beryl_settings_send_reload_signal.3 \
+ beryl_setting_reset_to_default.3 \
+ beryl_setting_list_clear.3 \
+ beryl_setting_list_append.3 \
+ beryl_setting_list_length.3 \
+ beryl_setting_list_value_index.3 \
+ beryl_setting_list_value_swap_with.3 \
+ beryl_setting_list_value_move_before.3 \
+ beryl_setting_list_value_remove.3 \
+ beryl_setting_get_primary_value.3 \
+ beryl_setting_value_get_int.3 \
+ beryl_setting_value_get_float.3 \
+ beryl_setting_value_get_bool.3 \
+ beryl_setting_value_get_string.3 \
+ beryl_setting_value_get_keysym.3 \
+ beryl_setting_value_get_keymods.3 \
+ beryl_setting_value_get_button.3 \
+ beryl_setting_value_get_buttonmods.3 \
+ beryl_setting_value_get_bell.3 \
+ beryl_setting_value_get_edgemask.3 \
+ beryl_setting_value_get_key_enabled.3 \
+ beryl_setting_get_int_min.3 \
+ beryl_setting_value_get_button_enabled.3 \
+ beryl_setting_value_get_color.3 \
+ beryl_setting_value_get_value_list.3 \
+ beryl_setting_value_set_int.3 \
+ beryl_setting_value_set_float.3 \
+ beryl_setting_value_set_bool.3 \
+ beryl_setting_value_set_string.3 \
+ beryl_setting_value_set_keysym.3 \
+ beryl_setting_value_set_keymods.3 \
+ beryl_setting_value_set_button.3 \
+ beryl_setting_value_set_buttonmods.3 \
+ beryl_setting_value_set_bell.3 \
+ beryl_setting_value_set_edgemask.3 \
+ beryl_setting_value_set_key_enabled.3 \
+ beryl_setting_value_set_button_enabled.3 \
+ beryl_setting_value_set_color.3 \
+ beryl_setting_get_can_set_key.3 \
+ beryl_setting_get_can_set_button.3 \
+ beryl_setting_get_can_set_edgemask.3 \
+ beryl_setting_get_can_set_bell.3 \
+ beryl_setting_get_allowed_strings.3 \
+ beryl_setting_get_int_max.3 \
+ beryl_setting_get_float_min.3 \
+ beryl_setting_get_float_max.3 \
+ beryl_setting_get_float_precision.3 \
+ beryl_setting_get_list_type.3 \
+ beryl_setting_get_type.3 \
+ beryl_setting_get_short_desc.3 \
+ beryl_setting_get_long_desc.3 \
+ beryl_setting_get_name.3 \
+ beryl_settings_plugin_get_short_desc.3 \
+ beryl_settings_plugin_get_long_desc.3 \
+ beryl_settings_plugin_get_name.3 \
+ beryl_settings_context_get_plugins.3 \
+ beryl_settings_plugin_get_settings.3 \
+ beryl_settings_context_get_private.3 \
+ beryl_settings_plugin_get_private.3 \
+ beryl_setting_get_private.3 \
+ beryl_settings_context_set_private.3 \
+ beryl_settings_plugin_set_private.3 \
+ beryl_setting_set_private.3 \
+ beryl_settings_set_codeset.3
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|libpng|libpng12|' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's|.[(]top_srcdir[)]/mesa/lib/libGL.a |-lGL |' \
+ -e 's|.[(]top_srcdir[)]/mesa/lib/libGL.a|-lGL|' \
+ ${WRKSRC}/src/Makefile.in
+ @${REINPLACE_CMD} -e 's|\(Libs.*\)|\1 -lGL|' ${WRKSRC}/beryl.pc.in
+ @${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' \
+ ${WRKSRC}/libberylsettings/main.c \
+ ${WRKSRC}/src/plugin.c \
+ ${WRKSRC}/src/display_options.c \
+ ${WRKSRC}/settings-backends/ini.c \
+ ${WRKSRC}/settings-backends/gconf.c
+
+.include <bsd.port.mk>
diff --git a/x11-wm/beryl-core/distinfo b/x11-wm/beryl-core/distinfo
new file mode 100644
index 000000000000..6dee1bed24cf
--- /dev/null
+++ b/x11-wm/beryl-core/distinfo
@@ -0,0 +1,3 @@
+MD5 (beryl-core-0.2.1.tar.bz2) = 895fe727d4396f6d51ffaf73cf8460d0
+SHA256 (beryl-core-0.2.1.tar.bz2) = f59556762f7a83cb3934c9fa1b02efe4e55f954862c2769ecce5a8b7618ce6b2
+SIZE (beryl-core-0.2.1.tar.bz2) = 470173
diff --git a/x11-wm/beryl-core/pkg-descr b/x11-wm/beryl-core/pkg-descr
new file mode 100644
index 000000000000..30ce69b16cda
--- /dev/null
+++ b/x11-wm/beryl-core/pkg-descr
@@ -0,0 +1,8 @@
+This is the core package that contains all the important files
+required for running beryl. Including headers and files required
+for development of beryl-plugins.
+
+WWW: http://www.beryl-project.org/
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-wm/beryl-core/pkg-plist b/x11-wm/beryl-core/pkg-plist
new file mode 100644
index 000000000000..94be8cd8e7a5
--- /dev/null
+++ b/x11-wm/beryl-core/pkg-plist
@@ -0,0 +1,76 @@
+bin/beryl
+include/beryl/beryl.h
+include/beryl/beryl_helpers.h
+include/beryl/beryl_ipcs.h
+include/beryl/beryl-decoration.h
+include/beryl/beryl-settings.h
+include/beryl/beryl-settings-backend.h
+include/beryl/beryl-text.h
+lib/libberyldecoration.so.0
+lib/libberyldecoration.so
+lib/libberyldecoration.la
+lib/libberyldecoration.a
+lib/libberylsettings.so.0
+lib/libberylsettings.so
+lib/libberylsettings.la
+lib/libberylsettings.a
+lib/beryl/backends/libgconf.so
+lib/beryl/backends/libgconf.la
+lib/beryl/backends/libgconf.a
+lib/beryl/backends/libini.so
+lib/beryl/backends/libini.la
+lib/beryl/backends/libini.a
+libdata/pkgconfig/beryl.pc
+libdata/pkgconfig/berylsettings.pc
+libdata/pkgconfig/libberyldecoration.pc
+share/beryl/background.png
+share/beryl/icon.png
+@dirrmtry share/beryl
+@dirrm lib/beryl/backends
+@dirrmtry lib/beryl
+@dirrmtry include/beryl
+share/locale/ca/LC_MESSAGES/beryl-core.mo
+share/locale/cs/LC_MESSAGES/beryl-core.mo
+share/locale/de_DE/LC_MESSAGES/beryl-core.mo
+share/locale/es_AR/LC_MESSAGES/beryl-core.mo
+share/locale/es/LC_MESSAGES/beryl-core.mo
+share/locale/fr/LC_MESSAGES/beryl-core.mo
+share/locale/hu_HU/LC_MESSAGES/beryl-core.mo
+share/locale/it/LC_MESSAGES/beryl-core.mo
+share/locale/ja/LC_MESSAGES/beryl-core.mo
+share/locale/ko/LC_MESSAGES/beryl-core.mo
+share/locale/nl/LC_MESSAGES/beryl-core.mo
+share/locale/pl/LC_MESSAGES/beryl-core.mo
+share/locale/pt_BR/LC_MESSAGES/beryl-core.mo
+share/locale/pt_PT/LC_MESSAGES/beryl-core.mo
+share/locale/ru/LC_MESSAGES/beryl-core.mo
+share/locale/sv_FI/LC_MESSAGES/beryl-core.mo
+share/locale/sv_SE/LC_MESSAGES/beryl-core.mo
+share/locale/uk_UA/LC_MESSAGES/beryl-core.mo
+share/locale/zh_CN/LC_MESSAGES/beryl-core.mo
+share/locale/zh_HK/LC_MESSAGES/beryl-core.mo
+share/locale/zh_TW/LC_MESSAGES/beryl-core.mo
+@dirrmtry share/locale/ca_ES/LC_MESSAGES
+@dirrmtry share/locale/ca_ES
+@dirrmtry share/locale/de_DE/LC_MESSAGES
+@dirrmtry share/locale/de_DE
+@dirrmtry share/locale/es_AR/LC_MESSAGES
+@dirrmtry share/locale/es_AR
+@dirrmtry share/locale/hu_HU/LC_MESSAGES
+@dirrmtry share/locale/hu_HU
+@dirrmtry share/locale/it_IT/LC_MESSAGES
+@dirrmtry share/locale/it_IT
+@dirrmtry share/locale/ja_JP/LC_MESSAGES
+@dirrmtry share/locale/ja_JP
+@dirrmtry share/locale/ko_KR/LC_MESSAGES
+@dirrmtry share/locale/ko_KR
+@dirrmtry share/locale/ru_RU/LC_MESSAGES
+@dirrmtry share/locale/ru_RU
+@dirrmtry share/locale/sv_FI/LC_MESSAGES
+@dirrmtry share/locale/sv_FI
+@dirrmtry share/locale/sv_SE/LC_MESSAGES
+@dirrmtry share/locale/sv_SE
+@dirrmtry share/locale/uk_UA/LC_MESSAGES
+@dirrmtry share/locale/uk_UA
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
diff --git a/x11-wm/beryl-manager/Makefile b/x11-wm/beryl-manager/Makefile
new file mode 100644
index 000000000000..6c7c6188ae30
--- /dev/null
+++ b/x11-wm/beryl-manager/Makefile
@@ -0,0 +1,34 @@
+# New ports collection makefile for: beryl-manager
+# Date created: Oct 29 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= beryl-manager
+PORTVERSION= 0.2.1
+PORTREVISION= 1
+CATEGORIES= x11-wm
+MASTER_SITES= http://releases.beryl-project.org/${PORTVERSION}/ \
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= flz/beryl/
+
+MAINTAINER= rnoland@2hip.net
+COMMENT= Manager for Beryl Composite/Window Manager
+
+GNU_CONFIGURE= yes
+USE_GETTEXT= yes
+USE_BZIP2= yes
+USE_GMAKE= yes
+USE_PERL5_BUILD= yes
+USE_GNOME= glib20 gtk20
+INSTALLS_ICONS= yes
+
+CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS+= --mandir="${PREFIX}/man"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
+
+MAN1= beryl-manager.1
+
+.include <bsd.port.mk>
diff --git a/x11-wm/beryl-manager/distinfo b/x11-wm/beryl-manager/distinfo
new file mode 100644
index 000000000000..156e212b3d30
--- /dev/null
+++ b/x11-wm/beryl-manager/distinfo
@@ -0,0 +1,3 @@
+MD5 (beryl-manager-0.2.1.tar.bz2) = cd2b81f5af7a6438d495334d797eb088
+SHA256 (beryl-manager-0.2.1.tar.bz2) = 521439505468b2a00937bc67da8a131b3d8b8750f3df5cac9b2dcfbc2305bb2c
+SIZE (beryl-manager-0.2.1.tar.bz2) = 177433
diff --git a/x11-wm/beryl-manager/pkg-descr b/x11-wm/beryl-manager/pkg-descr
new file mode 100644
index 000000000000..2eadd05c1e4e
--- /dev/null
+++ b/x11-wm/beryl-manager/pkg-descr
@@ -0,0 +1,8 @@
+This is the manager package for beryl. It requires beryl-core
+beryl-plugins, beryl-settings and your choice of window
+decorator such as emerald or gtk-window-decorator.
+
+WWW: http://www.beryl-project.org/
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-wm/beryl-manager/pkg-plist b/x11-wm/beryl-manager/pkg-plist
new file mode 100644
index 000000000000..e5abd06f2577
--- /dev/null
+++ b/x11-wm/beryl-manager/pkg-plist
@@ -0,0 +1,75 @@
+bin/beryl-manager
+share/applications/beryl-manager.desktop
+share/icons/hicolor/22x22/apps/beryl-manager.png
+share/icons/hicolor/24x24/apps/beryl-manager.png
+share/icons/hicolor/scalable/apps/beryl-manager.svg
+share/locale/ar_AR/LC_MESSAGES/beryl-manager.mo
+share/locale/ca/LC_MESSAGES/beryl-manager.mo
+share/locale/de_DE/LC_MESSAGES/beryl-manager.mo
+share/locale/es_AR/LC_MESSAGES/beryl-manager.mo
+share/locale/es_ES/LC_MESSAGES/beryl-manager.mo
+share/locale/fr/LC_MESSAGES/beryl-manager.mo
+share/locale/gl_ES/LC_MESSAGES/beryl-manager.mo
+share/locale/gl_GL/LC_MESSAGES/beryl-manager.mo
+share/locale/hu_HU/LC_MESSAGES/beryl-manager.mo
+share/locale/it_IT/LC_MESSAGES/beryl-manager.mo
+share/locale/ja/LC_MESSAGES/beryl-manager.mo
+share/locale/ko/LC_MESSAGES/beryl-manager.mo
+share/locale/my_MY/LC_MESSAGES/beryl-manager.mo
+share/locale/nb_NO/LC_MESSAGES/beryl-manager.mo
+share/locale/nl/LC_MESSAGES/beryl-manager.mo
+share/locale/pl/LC_MESSAGES/beryl-manager.mo
+share/locale/pt_BR/LC_MESSAGES/beryl-manager.mo
+share/locale/pt_PT/LC_MESSAGES/beryl-manager.mo
+share/locale/ru_RU/LC_MESSAGES/beryl-manager.mo
+share/locale/sk_SK/LC_MESSAGES/beryl-manager.mo
+share/locale/sv_FI/LC_MESSAGES/beryl-manager.mo
+share/locale/sv_SE/LC_MESSAGES/beryl-manager.mo
+share/locale/tr_TR/LC_MESSAGES/beryl-manager.mo
+share/locale/uk_UA/LC_MESSAGES/beryl-manager.mo
+share/locale/zh_CN/LC_MESSAGES/beryl-manager.mo
+share/locale/zh_HK/LC_MESSAGES/beryl-manager.mo
+share/locale/zh_TW/LC_MESSAGES/beryl-manager.mo
+share/pixmaps/beryl-manager.png
+share/pixmaps/fall-back-wm-select.png
+share/pixmaps/wd-select.png
+share/pixmaps/wm-select.png
+@dirrmtry share/applications
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/uk_UA/LC_MESSAGES
+@dirrmtry share/locale/uk_UA
+@dirrmtry share/locale/tr_TR/LC_MESSAGES
+@dirrmtry share/locale/tr_TR
+@dirrmtry share/locale/sv_SE/LC_MESSAGES
+@dirrmtry share/locale/sv_SE
+@dirrmtry share/locale/sv_FI/LC_MESSAGES
+@dirrmtry share/locale/sv_FI
+@dirrmtry share/locale/sk_SK/LC_MESSAGES
+@dirrmtry share/locale/sk_SK
+@dirrmtry share/locale/ru_RU/LC_MESSAGES
+@dirrmtry share/locale/ru_RU
+@dirrmtry share/locale/nb_NO/LC_MESSAGES
+@dirrmtry share/locale/nb_NO
+@dirrmtry share/locale/my_MY/LC_MESSAGES
+@dirrmtry share/locale/my_MY
+@dirrmtry share/locale/ko_KR/LC_MESSAGES
+@dirrmtry share/locale/ko_KR
+@dirrmtry share/locale/ja_JP/LC_MESSAGES
+@dirrmtry share/locale/ja_JP
+@dirrmtry share/locale/it_IT/LC_MESSAGES
+@dirrmtry share/locale/it_IT
+@dirrmtry share/locale/hu_HU/LC_MESSAGES
+@dirrmtry share/locale/hu_HU
+@dirrmtry share/locale/gl_GL/LC_MESSAGES
+@dirrmtry share/locale/gl_GL
+@dirrmtry share/locale/gl_ES/LC_MESSAGES
+@dirrmtry share/locale/gl_ES
+@dirrmtry share/locale/es_AR/LC_MESSAGES
+@dirrmtry share/locale/es_AR
+@dirrmtry share/locale/de_DE/LC_MESSAGES
+@dirrmtry share/locale/de_DE
+@dirrmtry share/locale/ca_ES/LC_MESSAGES
+@dirrmtry share/locale/ca_ES
+@dirrmtry share/locale/ar_AR/LC_MESSAGES
+@dirrmtry share/locale/ar_AR
diff --git a/x11-wm/beryl-plugins/Makefile b/x11-wm/beryl-plugins/Makefile
new file mode 100644
index 000000000000..fdfc9e713a16
--- /dev/null
+++ b/x11-wm/beryl-plugins/Makefile
@@ -0,0 +1,38 @@
+# New ports collection makefile for: beryl-plugins
+# Date created: Oct 29 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= beryl-plugins
+PORTVERSION= 0.2.1
+PORTREVISION= 1
+CATEGORIES= x11-wm
+MASTER_SITES= http://releases.beryl-project.org/${PORTVERSION}/ \
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= flz/beryl/
+
+MAINTAINER= rnoland@2hip.net
+COMMENT= Plugins for Beryl Composite/Window Manager
+
+# XXX - Might depends on graphics/libsvg-cairo instead.
+LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo
+BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/beryl.pc:${PORTSDIR}/x11-wm/beryl-core \
+ ${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:${PORTSDIR}/devel/dbus
+RUN_DEPENDS= ${BUILD_DEPENDS}
+
+GNU_CONFIGURE= yes
+USE_GL= yes
+USE_BZIP2= yes
+USE_GMAKE= yes
+USE_GNOME= glib20 librsvg2
+USE_XORG= glproto
+USE_GETTEXT= yes
+USE_LDCONFIG= yes
+
+CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+
+.include <bsd.port.mk>
diff --git a/x11-wm/beryl-plugins/distinfo b/x11-wm/beryl-plugins/distinfo
new file mode 100644
index 000000000000..45699fd2e9de
--- /dev/null
+++ b/x11-wm/beryl-plugins/distinfo
@@ -0,0 +1,3 @@
+MD5 (beryl-plugins-0.2.1.tar.bz2) = 3d7d13dd42aea48bba5be7cfe6c7f371
+SHA256 (beryl-plugins-0.2.1.tar.bz2) = 8dcbc086db511695f29951536dfbd6d3b586f56d56027c9df6b0c53664373451
+SIZE (beryl-plugins-0.2.1.tar.bz2) = 2603366
diff --git a/x11-wm/beryl-plugins/files/patch-src-thumbnail.c b/x11-wm/beryl-plugins/files/patch-src-thumbnail.c
new file mode 100644
index 000000000000..bb5591e0eaa7
--- /dev/null
+++ b/x11-wm/beryl-plugins/files/patch-src-thumbnail.c
@@ -0,0 +1,26 @@
+--- src/thumbnail.c.orig Wed Jan 31 18:22:05 2007
++++ src/thumbnail.c Sat Feb 10 11:46:43 2007
+@@ -219,7 +219,10 @@
+ return NULL;
+ }
+
+- retval = strndup (val, nitems);
++ if ((retval = (char *) malloc(nitems + 1)) != NULL) {
++ bzero (retval, nitems + 1);
++ strncpy (retval, val, nitems);
++ }
+
+ XFree (val);
+
+@@ -234,7 +237,10 @@
+ text.nitems = 0;
+ if (XGetTextProperty (d->display, id, &text, atom))
+ {
+- retval = strndup ((char *)text.value,text.nitems);
++ if ((retval = (char *) malloc(text.nitems + 1)) != NULL) {
++ bzero (retval, text.nitems + 1);
++ strncpy (retval, (char *)text.value, text.nitems);
++ }
+ if (text.value)
+ XFree (text.value);
+ }
diff --git a/x11-wm/beryl-plugins/pkg-descr b/x11-wm/beryl-plugins/pkg-descr
new file mode 100644
index 000000000000..7c8ccf304de0
--- /dev/null
+++ b/x11-wm/beryl-plugins/pkg-descr
@@ -0,0 +1,8 @@
+This is the plugins package for beryl. Requires beryl-core
+package to run and beryl-core development package if you
+want to build/hack plugins.
+
+WWW: http://www.beryl-project.org/
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-wm/beryl-plugins/pkg-plist b/x11-wm/beryl-plugins/pkg-plist
new file mode 100644
index 000000000000..b4f28a41e62c
--- /dev/null
+++ b/x11-wm/beryl-plugins/pkg-plist
@@ -0,0 +1,150 @@
+lib/beryl/libcrashhandler.so
+lib/beryl/libcrashhandler.la
+lib/beryl/libcrashhandler.a
+lib/beryl/libdecoration.so
+lib/beryl/libdecoration.la
+lib/beryl/libdecoration.a
+lib/beryl/libwobbly.so
+lib/beryl/libwobbly.la
+lib/beryl/libwobbly.a
+lib/beryl/libanimation.so
+lib/beryl/libanimation.la
+lib/beryl/libanimation.a
+lib/beryl/libfade.so
+lib/beryl/libfade.la
+lib/beryl/libfade.a
+lib/beryl/libcube.so
+lib/beryl/libcube.la
+lib/beryl/libcube.a
+lib/beryl/librotate.so
+lib/beryl/librotate.la
+lib/beryl/lib3d.a
+lib/beryl/librotate.a
+lib/beryl/libinputzoom.so
+lib/beryl/libinputzoom.la
+lib/beryl/libinputzoom.a
+lib/beryl/libscale.so
+lib/beryl/libscale.la
+lib/beryl/libscale.a
+lib/beryl/libmove.so
+lib/beryl/libmove.la
+lib/beryl/libmove.a
+lib/beryl/libresize.so
+lib/beryl/libresize.la
+lib/beryl/libresize.a
+lib/beryl/libplace.so
+lib/beryl/libplace.la
+lib/beryl/libplace.a
+lib/beryl/libswitcher.so
+lib/beryl/libswitcher.la
+lib/beryl/libswitcher.a
+lib/beryl/libtext.so
+lib/beryl/libtext.la
+lib/beryl/libtext.a
+lib/beryl/libwater.so
+lib/beryl/libwater.la
+lib/beryl/libwater.a
+lib/beryl/libtrailfocus2.so
+lib/beryl/libtrailfocus2.la
+lib/beryl/libtrailfocus2.a
+lib/beryl/libneg.so
+lib/beryl/libneg.la
+lib/beryl/libneg.a
+lib/beryl/libput.so
+lib/beryl/libput.la
+lib/beryl/libput.a
+lib/beryl/libscreenshot.so
+lib/beryl/libscreenshot.la
+lib/beryl/libscreenshot.a
+lib/beryl/libstate.so
+lib/beryl/libstate.la
+lib/beryl/libstate.a
+lib/beryl/libblurfx.so
+lib/beryl/libblurfx.la
+lib/beryl/libblurfx.a
+lib/beryl/libsplash.so
+lib/beryl/libsplash.la
+lib/beryl/libsplash.a
+lib/beryl/libbench.so
+lib/beryl/libbench.la
+lib/beryl/libbench.a
+lib/beryl/libclone.so
+lib/beryl/libclone.la
+lib/beryl/libclone.a
+lib/beryl/lib3d.so
+lib/beryl/lib3d.la
+lib/beryl/libsvg.so
+lib/beryl/libsvg.la
+lib/beryl/libsvg.a
+lib/beryl/libpng.so
+lib/beryl/libpng.la
+lib/beryl/libpng.a
+lib/beryl/libopacify.so
+lib/beryl/libopacify.la
+lib/beryl/libopacify.a
+lib/beryl/libthumbnail.so
+lib/beryl/libthumbnail.la
+lib/beryl/libthumbnail.a
+lib/beryl/libsnap.so
+lib/beryl/libsnap.la
+lib/beryl/libsnap.a
+lib/beryl/libfadedesktop.so
+lib/beryl/libfadedesktop.la
+lib/beryl/libfadedesktop.a
+lib/beryl/libimgjpeg.so
+lib/beryl/libimgjpeg.la
+lib/beryl/libimgjpeg.a
+lib/beryl/libannotate.so
+lib/beryl/libannotate.la
+lib/beryl/libannotate.a
+lib/beryl/libdbus.so
+lib/beryl/libdbus.la
+lib/beryl/libdbus.a
+share/locale/es/LC_MESSAGES/beryl-plugins.mo
+share/locale/fr/LC_MESSAGES/beryl-plugins.mo
+share/locale/nl/LC_MESSAGES/beryl-plugins.mo
+share/locale/pt_BR/LC_MESSAGES/beryl-plugins.mo
+share/locale/pt_PT/LC_MESSAGES/beryl-plugins.mo
+share/locale/zh_CN/LC_MESSAGES/beryl-plugins.mo
+share/locale/zh_TW/LC_MESSAGES/beryl-plugins.mo
+share/locale/ca/LC_MESSAGES/beryl-plugins.mo
+share/locale/es_AR/LC_MESSAGES/beryl-plugins.mo
+share/locale/hu_HU/LC_MESSAGES/beryl-plugins.mo
+share/locale/it_IT/LC_MESSAGES/beryl-plugins.mo
+share/locale/ja/LC_MESSAGES/beryl-plugins.mo
+share/locale/ko/LC_MESSAGES/beryl-plugins.mo
+share/locale/nb_NO/LC_MESSAGES/beryl-plugins.mo
+share/locale/pl_PL/LC_MESSAGES/beryl-plugins.mo
+share/locale/sv_FI/LC_MESSAGES/beryl-plugins.mo
+share/locale/sv_SE/LC_MESSAGES/beryl-plugins.mo
+share/locale/zh_HK/LC_MESSAGES/beryl-plugins.mo
+share/beryl/cubecaps.png
+share/beryl/emboss.png
+share/beryl/reflection_default.png
+share/beryl/splash_background.png
+share/beryl/splash_logo.png
+share/beryl/snowflake2.png
+@dirrmtry lib/beryl
+@dirrmtry share/beryl
+@dirrmtry share/locale/ca_ES/LC_MESSAGES
+@dirrmtry share/locale/ca_ES
+@dirrmtry share/locale/es_AR/LC_MESSAGES
+@dirrmtry share/locale/es_AR
+@dirrmtry share/locale/hu_HU/LC_MESSAGES
+@dirrmtry share/locale/hu_HU
+@dirrmtry share/locale/it_IT/LC_MESSAGES
+@dirrmtry share/locale/it_IT
+@dirrmtry share/locale/ja_JP/LC_MESSAGES
+@dirrmtry share/locale/ja_JP
+@dirrmtry share/locale/ko_KR/LC_MESSAGES
+@dirrmtry share/locale/ko_KR
+@dirrmtry share/locale/nb_NO/LC_MESSAGES
+@dirrmtry share/locale/nb_NO
+@dirrmtry share/locale/pl_PL/LC_MESSAGES
+@dirrmtry share/locale/pl_PL
+@dirrmtry share/locale/sv_FI/LC_MESSAGES
+@dirrmtry share/locale/sv_FI
+@dirrmtry share/locale/sv_SE/LC_MESSAGES
+@dirrmtry share/locale/sv_SE
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
diff --git a/x11-wm/beryl-settings-bindings/Makefile b/x11-wm/beryl-settings-bindings/Makefile
new file mode 100644
index 000000000000..d8e295d0797a
--- /dev/null
+++ b/x11-wm/beryl-settings-bindings/Makefile
@@ -0,0 +1,31 @@
+# New ports collection makefile for: beryl-settings-bindings
+# Date created: Jan 29 2007
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= beryl-settings-bindings
+PORTVERSION= 0.2.1
+CATEGORIES= x11-wm
+MASTER_SITES= http://releases.beryl-project.org/${PORTVERSION}/ \
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= flz/beryl/
+
+MAINTAINER= rnoland@2hip.net
+COMMENT= Beryl Settings Bindings
+
+BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/berylsettings.pc:${PORTSDIR}/x11-wm/beryl-core \
+ ${PYTHON_SITELIBDIR}/Pyrex/Distutils/__init__.py:${PORTSDIR}/devel/pyrex
+RUN_DEPENDS= ${BUILD_DEPENDS}
+
+GNU_CONFIGURE= yes
+USE_BZIP2= yes
+USE_GMAKE= yes
+USE_XORG= x11
+USE_GNOME= glib20 gnomehack
+USE_PYTHON= 2.4+
+
+CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
+
+.include <bsd.port.mk>
diff --git a/x11-wm/beryl-settings-bindings/distinfo b/x11-wm/beryl-settings-bindings/distinfo
new file mode 100644
index 000000000000..c248b87633bb
--- /dev/null
+++ b/x11-wm/beryl-settings-bindings/distinfo
@@ -0,0 +1,3 @@
+MD5 (beryl-settings-bindings-0.2.1.tar.bz2) = dc3d35b7d2e53cc5fa6905e26ff194f3
+SHA256 (beryl-settings-bindings-0.2.1.tar.bz2) = 13aefa74cb04bf5a8c2c8c3cb8a62e9d0f7249f66423fa008012326b219e9379
+SIZE (beryl-settings-bindings-0.2.1.tar.bz2) = 240132
diff --git a/x11-wm/beryl-settings-bindings/pkg-descr b/x11-wm/beryl-settings-bindings/pkg-descr
new file mode 100644
index 000000000000..a2508817423c
--- /dev/null
+++ b/x11-wm/beryl-settings-bindings/pkg-descr
@@ -0,0 +1,6 @@
+This is the settings bindings package for beryl.
+
+WWW: http://wiki.beryl-project.org/
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-wm/beryl-settings-bindings/pkg-plist b/x11-wm/beryl-settings-bindings/pkg-plist
new file mode 100644
index 000000000000..491834f99de2
--- /dev/null
+++ b/x11-wm/beryl-settings-bindings/pkg-plist
@@ -0,0 +1,4 @@
+%%PYTHON_SITELIBDIR%%/berylsettings.so
+%%PYTHON_SITELIBDIR%%/berylsettings.la
+%%PYTHON_SITELIBDIR%%/berylsettings.a
+libdata/pkgconfig/beryl-settings-bindings.pc
diff --git a/x11-wm/beryl-settings/Makefile b/x11-wm/beryl-settings/Makefile
new file mode 100644
index 000000000000..621631c4800a
--- /dev/null
+++ b/x11-wm/beryl-settings/Makefile
@@ -0,0 +1,38 @@
+# New ports collection makefile for: beryl-settings
+# Date created: Oct 29 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= beryl-settings
+PORTVERSION= 0.2.1
+CATEGORIES= x11-wm
+MASTER_SITES= http://releases.beryl-project.org/${PORTVERSION}/ \
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= flz/beryl/
+
+MAINTAINER= rnoland@2hip.net
+COMMENT= Beryl Settings Manager
+
+BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/beryl.pc:${PORTSDIR}/x11-wm/beryl-core \
+ ${LOCALBASE}/libdata/pkgconfig/beryl-settings-bindings.pc:${PORTSDIR}/x11-wm/beryl-settings-bindings
+RUN_DEPENDS= ${BUILD_DEPENDS}
+
+GNU_CONFIGURE= yes
+USE_GL= gl
+USE_BZIP2= yes
+USE_GMAKE= yes
+USE_GNOME= pygtk2
+USE_GETTEXT= yes
+USE_XORG= glproto
+USE_PYTHON= 2.4+
+
+INSTALLS_ICONS= yes
+
+CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS+= --mandir="${PREFIX}/man"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
+
+.include <bsd.port.mk>
diff --git a/x11-wm/beryl-settings/distinfo b/x11-wm/beryl-settings/distinfo
new file mode 100644
index 000000000000..cea5c05d4e31
--- /dev/null
+++ b/x11-wm/beryl-settings/distinfo
@@ -0,0 +1,3 @@
+MD5 (beryl-settings-0.2.1.tar.bz2) = 5058cf048be41998da8ddbe55c7babb6
+SHA256 (beryl-settings-0.2.1.tar.bz2) = 0601af085c4628af1aa7a6a0dafaedeff04f51475112a7a1e9c4d8508bfeb75b
+SIZE (beryl-settings-0.2.1.tar.bz2) = 355352
diff --git a/x11-wm/beryl-settings/pkg-descr b/x11-wm/beryl-settings/pkg-descr
new file mode 100644
index 000000000000..57b017e775b1
--- /dev/null
+++ b/x11-wm/beryl-settings/pkg-descr
@@ -0,0 +1,7 @@
+This is the settings package for beryl. It requires beryl-core
+and beryl-plugins so you can configure Beryl.
+
+WWW: http://wiki.beryl-project.org/
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-wm/beryl-settings/pkg-plist b/x11-wm/beryl-settings/pkg-plist
new file mode 100644
index 000000000000..a52299b4628c
--- /dev/null
+++ b/x11-wm/beryl-settings/pkg-plist
@@ -0,0 +1,88 @@
+bin/beryl-settings
+share/applications/beryl-settings.desktop
+share/bsm/images/accessibility.svg
+share/bsm/images/beryl-settings-section-_.svg
+share/bsm/images/beryl-settings-section-3d.svg
+share/bsm/images/beryl-settings-section-addhelper.svg
+share/bsm/images/beryl-settings-section-animation.svg
+share/bsm/images/beryl-settings-section-annotate.svg
+share/bsm/images/beryl-settings-section-bench.svg
+share/bsm/images/beryl-settings-section-blurfx.svg
+share/bsm/images/beryl-settings-section-blur.svg
+share/bsm/images/beryl-settings-section-bs.svg
+share/bsm/images/beryl-settings-section-capture.svg
+share/bsm/images/beryl-settings-section-clone.svg
+share/bsm/images/beryl-settings-section-crashhandler.svg
+share/bsm/images/beryl-settings-section-cube.svg
+share/bsm/images/beryl-settings-section-dbus.svg
+share/bsm/images/beryl-settings-section-debug.svg
+share/bsm/images/beryl-settings-section-decoration.svg
+share/bsm/images/beryl-settings-section-fade.svg
+share/bsm/images/beryl-settings-section-fadeDesktop.svg
+share/bsm/images/beryl-settings-section-group.svg
+share/bsm/images/beryl-settings-section-inputzoom.svg
+share/bsm/images/beryl-settings-section-jpeg.svg
+share/bsm/images/beryl-settings-section-minimize.svg
+share/bsm/images/beryl-settings-section-miniview.svg
+share/bsm/images/beryl-settings-section-move.svg
+share/bsm/images/beryl-settings-section-neg.svg
+share/bsm/images/beryl-settings-section-opacify.svg
+share/bsm/images/beryl-settings-section-place.svg
+share/bsm/images/beryl-settings-section-plane.svg
+share/bsm/images/beryl-settings-section-png.svg
+share/bsm/images/beryl-settings-section-put.svg
+share/bsm/images/beryl-settings-section-reflection.svg
+share/bsm/images/beryl-settings-section-resize.svg
+share/bsm/images/beryl-settings-section-rotate.svg
+share/bsm/images/beryl-settings-section-scale.svg
+share/bsm/images/beryl-settings-section-screenshot.svg
+share/bsm/images/beryl-settings-section-showdesktop.svg
+share/bsm/images/beryl-settings-section-snap.svg
+share/bsm/images/beryl-settings-section-snow.svg
+share/bsm/images/beryl-settings-section-splash.svg
+share/bsm/images/beryl-settings-section-state.svg
+share/bsm/images/beryl-settings-section-svg.svg
+share/bsm/images/beryl-settings-section-switcher.svg
+share/bsm/images/beryl-settings-section-text.svg
+share/bsm/images/beryl-settings-section-thumbnail.svg
+share/bsm/images/beryl-settings-section-tile.svg
+share/bsm/images/beryl-settings-section-trailfocus2.svg
+share/bsm/images/beryl-settings-section-wall.svg
+share/bsm/images/beryl-settings-section-water.svg
+share/bsm/images/beryl-settings-section-wobbly.svg
+share/bsm/images/beryl-settings-section-zoom.svg
+share/bsm/images/desktop.svg
+share/bsm/images/development.svg
+share/bsm/images/extras.svg
+share/bsm/images/general-settings.svg
+share/bsm/images/images.svg
+share/bsm/images/profile-backends.svg
+share/bsm/images/shortcuts.svg
+share/bsm/images/visual-effects.svg
+share/bsm/images/window-management.svg
+share/icons/hicolor/scalable/apps/beryl-settings.svg
+share/locale/ca/LC_MESSAGES/beryl-settings.mo
+share/locale/es/LC_MESSAGES/beryl-settings.mo
+share/locale/es_AR/LC_MESSAGES/beryl-settings.mo
+share/locale/fr/LC_MESSAGES/beryl-settings.mo
+share/locale/hu_HU/LC_MESSAGES/beryl-settings.mo
+share/locale/it/LC_MESSAGES/beryl-settings.mo
+share/locale/ja/LC_MESSAGES/beryl-settings.mo
+share/locale/ko/LC_MESSAGES/beryl-settings.mo
+share/locale/pl/LC_MESSAGES/beryl-settings.mo
+share/locale/pt_PT/LC_MESSAGES/beryl-settings.mo
+share/locale/nl/LC_MESSAGES/beryl-settings.mo
+share/locale/zh_CN/LC_MESSAGES/beryl-settings.mo
+share/locale/zh_HK/LC_MESSAGES/beryl-settings.mo
+share/locale/zh_TW/LC_MESSAGES/beryl-settings.mo
+@dirrm share/bsm/images
+@dirrm share/bsm
+@dirrm share/applications
+@dirrm share/locale/es/LC_MESSAGES
+@dirrm share/locale/es
+@dirrm share/locale/nl/LC_MESSAGES
+@dirrm share/locale/nl
+@dirrm share/locale/pl/LC_MESSAGES
+@dirrm share/locale/pl
+@dirrm share/locale/ca_ES/LC_MESSAGES
+@dirrm share/locale/ca_ES
diff --git a/x11-wm/beryl/Makefile b/x11-wm/beryl/Makefile
new file mode 100644
index 000000000000..c9ecbfc0a8ec
--- /dev/null
+++ b/x11-wm/beryl/Makefile
@@ -0,0 +1,30 @@
+# New ports collection makefile for: beryl
+# Date created: Nov 27 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= beryl
+PORTVERSION= 0.2.1
+CATEGORIES= x11-wm
+MASTER_SITES= # none
+DISTFILES= # none
+EXTRACT_ONLY= # none
+
+MAINTAINER= rnoland@2hip.net
+COMMENT= Beryl Composite/Window Manager meta-port
+
+NO_BUILD= yes
+
+BUILD_DEPENDS= ${LOCALBASE}/bin/beryl:${PORTSDIR}/x11-wm/beryl-core \
+ ${LOCALBASE}/bin/beryl-manager:${PORTSDIR}/x11-wm/beryl-manager \
+ ${LOCALBASE}/lib/beryl/libanimation.so:${PORTSDIR}/x11-wm/beryl-plugins \
+ ${LOCALBASE}/bin/beryl-settings:${PORTSDIR}/x11-wm/beryl-settings \
+ ${LOCALBASE}/bin/emerald:${PORTSDIR}/x11-wm/emerald \
+ ${LOCALBASE}/share/emerald/themes/Adonis_Mod/theme.screenshot.png:${PORTSDIR}/x11-themes/emerald-themes
+RUN_DEPENDS= ${BUILD_DEPENDS}
+
+do-install: # empty
+
+.include <bsd.port.mk>
diff --git a/x11-wm/beryl/pkg-descr b/x11-wm/beryl/pkg-descr
new file mode 100644
index 000000000000..496d12bdfe4d
--- /dev/null
+++ b/x11-wm/beryl/pkg-descr
@@ -0,0 +1,7 @@
+This is the beryl meta-port. It installs all beryl components
+(plugins, settings manager, window decorator, themes, ...).
+
+WWW: http://www.beryl-project.org/
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-wm/blackbox/Makefile b/x11-wm/blackbox/Makefile
index d707117f1ffb..a4c2cce14de7 100644
--- a/x11-wm/blackbox/Makefile
+++ b/x11-wm/blackbox/Makefile
@@ -7,6 +7,7 @@
PORTNAME= blackbox
PORTVERSION= 0.70.1
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= blackboxwm
diff --git a/x11-wm/blwm/Makefile b/x11-wm/blwm/Makefile
index eea6477ab494..f921330c1582 100644
--- a/x11-wm/blwm/Makefile
+++ b/x11-wm/blwm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= blwm
PORTVERSION= 1.0.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm portuguese
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= trevor
@@ -17,30 +17,20 @@ COMMENT= Portuguese derivative of qvwm, simplified to conserve resources
RUN_DEPENDS= xsetbg:${PORTSDIR}/x11/xloadimage
-USE_AUTOTOOLS= automake:14 autoconf:213
USE_PERL5_BUILD=yes
-GNU_CONFIGURE= yes
MAN1= blwm.1x
PLIST= ${WRKDIR}/pkg-plist
USE_GMAKE= yes
+MAKEFILE= Makefile.std
USE_X_PREFIX= yes
USE_XPM= yes
DOCS= AUTHORS BUGS COPYING CREDITS FreeBSD INSTALAR LEIAME TODO
-CONFIGURE_ARGS= --prefix=${PREFIX}
-
-do-patch:
+post-patch:
${PERL} -pi -e "s:wmsetbg:xsetbg:g ; \
s:/usr/local/lib/blwm:${PREFIX}/lib/blwm:g" \
${WRKSRC}/rc/*
-pre-configure:
- cd ${WRKSRC} && \
- ${ACLOCAL} && \
- ${AUTOHEADER} && \
- ${AUTOCONF} && \
- ${AUTOMAKE}
-
pre-install:
${ECHO_CMD} bin/blwm > ${PLIST}
.if !defined(NOPORTDOCS)
diff --git a/x11-wm/blwm/files/patch-Makefile.std b/x11-wm/blwm/files/patch-Makefile.std
new file mode 100644
index 000000000000..93729e357be3
--- /dev/null
+++ b/x11-wm/blwm/files/patch-Makefile.std
@@ -0,0 +1,31 @@
+--- Makefile.std.orig Thu Mar 22 15:16:18 2007
++++ Makefile.std Thu Mar 22 15:21:47 2007
+@@ -9,7 +9,7 @@
+ #
+ # Directory of X Window System
+ #
+-XDIR = /usr/X11R6
++XDIR = $(X11BASE)
+
+ #
+ # Directory where you install blwm binary
+@@ -127,7 +127,7 @@
+ #
+ INSTALL = install -c
+ #INSTALL = cp
+-MKDIRHIER = mkdirhier
++MKDIRHIER = $(MKDIR)
+ #MKDIRHIER = make -p
+ MV = mv
+ RM = rm -f
+@@ -138,7 +138,9 @@
+ SUBDIRS = src images man rc themes
+
+ MAKE = make
+-MFLAGS = BINDIR=$(BINDIR) CONFDIR=$(CONFDIR) MANDIR=$(MANDIR) MANSUFFIX=$(MANSUFFIX) INCDIR=$(INCDIR) LIBDIR=$(LIBDIR) BLWMDIR=$(BLWMDIR) IMGDIR=$(IMGDIR) PATH_RM=$(PATH_RM) CXX="$(CXX)" CXXDEFINES="$(CXXDEFINES)" YACC="$(YACC)" YFLAGS="$(YFLAGS)" LEX="$(LEX)" LEXLIB="$(LEXLIB)" XPG4_LIB=$(XPG4_LIB) IMAGE_LIBS=$(IMAGE_LIBS) INSTALL="$(INSTALL)" MKDIRHIER="$(MKDIRHIER)" MV="$(MV)" RM="$(RM)" -f Makefile.std
++MFLAGS = BINDIR=$(BINDIR) CONFDIR=$(CONFDIR) MANDIR=$(MANDIR) MANSUFFIX=$(MANSUFFIX) INCDIR=$(INCDIR) LIBDIR=$(LIBDIR) BLWMDIR=$(BLWMDIR) IMGDIR=$(IMGDIR) THEMEDIR=$(THEMEDIR) PATH_RM=$(PATH_RM) CXX="$(CXX)" CXXDEFINES="$(CXXDEFINES)" YACC="$(YACC)" YFLAGS="$(YFLAGS)" LEX="$(LEX)" LEXLIB="$(LEXLIB)" XPG4_LIB=$(XPG4_LIB) IMAGE_LIBS=$(IMAGE_LIBS) INSTALL="$(INSTALL)" MKDIRHIER="$(MKDIRHIER)" MV="$(MV)" RM="$(RM)" -f Makefile.std
++
++.PHONY: install
+
+ all:
+ @for flag in ${MAKEFLAGS} ''; do \
diff --git a/x11-wm/boxtools/Makefile b/x11-wm/boxtools/Makefile
index d4235389447a..7bc9577c8f8e 100644
--- a/x11-wm/boxtools/Makefile
+++ b/x11-wm/boxtools/Makefile
@@ -7,6 +7,7 @@
PORTNAME= boxtools
PORTVERSION= 0.70.1
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= blackboxwm
diff --git a/x11-wm/clementine/Makefile b/x11-wm/clementine/Makefile
index cdf7411e7a89..eb008cf03b90 100644
--- a/x11-wm/clementine/Makefile
+++ b/x11-wm/clementine/Makefile
@@ -7,7 +7,7 @@
PORTNAME= clementine
PORTVERSION= 0.0.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/x11-wm/compiz/Makefile b/x11-wm/compiz/Makefile
new file mode 100644
index 000000000000..7f0e5a755582
--- /dev/null
+++ b/x11-wm/compiz/Makefile
@@ -0,0 +1,109 @@
+# New ports collection makefile for: compiz
+# Date created: Dec 20 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= compiz
+PORTVERSION= 0.5.0
+#PORTREVISION= 1
+CATEGORIES= x11-wm
+
+MAINTAINER= rnoland@2hip.net
+COMMENT= Compiz Composite/Window Manager
+
+LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
+ startup-notification-1.0:${PORTSDIR}/x11/startup-notification
+RUN_DEPENDS= ${BUILD_DEPENDS}
+
+XORG_CAT= app
+GNU_CONFIGURE= yes
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GL= glu
+USE_GNOME= gnomehack gnomeprefix gconf2
+USE_XORG= xcomposite xfixes xdamage xrandr xrender ice sm xinerama glproto
+USE_LDCONFIG= yes
+GCONF_SCHEMAS= compiz.schemas gwd.schemas
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
+
+OPTIONS= RSVG "Enable librsvg2 support" on \
+ GTK "Enable gtk2 support" on \
+ METACITY "Enable Metacity support" on \
+ GNOME "Enable Gnome support" on \
+ DBUS "Enable DBUS support" on \
+ FUSEFS "Enable fusefs support" off
+
+# No KDE support for now...
+CONFIGURE_ARGS= --disable-kde
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|libpng|libpng12|' ${WRKSRC}/configure
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_RSVG)
+CONFIGURE_ARGS+= --enable-librsvg
+USE_GNOME+= librsvg2
+PLIST_SUB+= RSVG=""
+.else
+CONFIGURE_ARGS+= --disable-librsvg
+PLIST_SUB+= RSVG="@comment "
+.endif
+
+.if defined(WITH_METACITY) || defined(WITH_GTK) || defined(WITH_GNOME)
+CONFIGURE_ARGS+= --enable-gtk
+USE_GNOME+= glib20 libwnck
+PLIST_SUB+= GTK=""
+.else
+CONFIGURE_ARGS+= --disable-gtk
+PLIST_SUB+= GTK="@comment "
+.endif
+
+.if defined(WITH_METACITY) || defined(WITH_GNOME)
+CONFIGURE_ARGS+= --enable-metacity
+USE_GNOME+= metacity
+.else
+CONFIGURE_ARGS+= --disable-metacity
+.endif
+
+.if defined(WITH_GNOME)
+CONFIGURE_ARGS+= --enable-gnome
+USE_GNOME+= gnomecontrolcenter2
+WINDOWSETTINGSDATADIR= \
+ `pkg-config --variable=prefix gnome-window-settings-2.0`
+WINDOWSETTINGSLIBDIR= \
+ `pkg-config --variable=libdir gnome-window-settings-2.0`
+PLIST_SUB+= GNOME="" \
+ WINDOWSETTINGSDATADIR="${WINDOWSETTINGSDATADIR}" \
+ WINDOWSETTINGSLIBDIR="${WINDOWSETTINGSLIBDIR}"
+.else
+CONFIGURE_ARGS+= --disable-gnome
+PLIST_SUB+= GNOME="@comment "
+.endif
+
+.if defined(WITH_DBUS)
+CONFIGURE_ARGS+= --enable-dbus
+BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:${PORTSDIR}/devel/dbus
+.if defined(WITH_GTK) || defined(WITH_GNOME)
+CONFIGURE_ARGS+= --enable-dbus-glib
+BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/dbus-glib-1.pc:${PORTSDIR}/devel/dbus-glib
+.endif
+PLIST_SUB+= DBUS=""
+.else
+CONFIGURE_ARGS+= --disable-dbus --disable-dbus-glib
+PLIST_SUB+= DBUS="@comment "
+.endif
+
+.if defined(WITH_FUSEFS)
+CONFIGURE_ARGS+= --enable-fuse
+BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/fuse.pc:${PORTSDIR}/sysutils/fusefs-libs
+PLIST_SUB+= FUSEFS=""
+.else
+CONFIGURE_ARGS+= --disable-fuse
+PLIST_SUB+= FUSEFS="@comment "
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/x11-wm/compiz/distinfo b/x11-wm/compiz/distinfo
new file mode 100644
index 000000000000..965c0099259d
--- /dev/null
+++ b/x11-wm/compiz/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/compiz-0.5.0.tar.bz2) = 7a35a9f52155b945aa195f826d3d607a
+SHA256 (xorg/app/compiz-0.5.0.tar.bz2) = 4191745d86bec37de4cdc79bf0031afde1d28079eac2e3fc29aed18cd7a2a4e6
+SIZE (xorg/app/compiz-0.5.0.tar.bz2) = 926090
diff --git a/x11-wm/compiz/files/patch-plugins_fuse.c b/x11-wm/compiz/files/patch-plugins_fuse.c
new file mode 100644
index 000000000000..48a0a68b9287
--- /dev/null
+++ b/x11-wm/compiz/files/patch-plugins_fuse.c
@@ -0,0 +1,11 @@
+--- plugins/fuse.c.orig Mon Apr 2 14:15:28 2007
++++ plugins/fuse.c Mon May 7 20:07:09 2007
+@@ -28,6 +28,8 @@
+ #include <errno.h>
+ #include <poll.h>
+ #include <signal.h>
++#include <sys/types.h>
++#include <sys/param.h>
+ #include <sys/mount.h>
+ #include <fuse.h>
+ #include <fuse_lowlevel.h>
diff --git a/x11-wm/compiz/pkg-descr b/x11-wm/compiz/pkg-descr
new file mode 100644
index 000000000000..d654cfa1b0e1
--- /dev/null
+++ b/x11-wm/compiz/pkg-descr
@@ -0,0 +1,8 @@
+Compiz is an OpenGL compositing manager that use GLX_EXT_texture_from_pixmap
+for binding redirected top-level windows to texture objects. It has a flexible
+plug-in system and it is designed to run well on most graphics hardware.
+
+WWW: http://www.go-compiz.org/
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-wm/compiz/pkg-plist b/x11-wm/compiz/pkg-plist
new file mode 100644
index 000000000000..866e7bd38ed2
--- /dev/null
+++ b/x11-wm/compiz/pkg-plist
@@ -0,0 +1,166 @@
+@comment $FreeBSD$
+bin/compiz
+%%GTK%%bin/gtk-window-decorator
+include/compiz/compiz.h
+include/compiz/decoration.h
+lib/libdecoration.so.0
+lib/libdecoration.so
+lib/libdecoration.la
+lib/libdecoration.a
+lib/compiz/libgconf.so
+lib/compiz/libgconf.la
+lib/compiz/libgconf.a
+lib/compiz/libdecoration.so
+lib/compiz/libdecoration.la
+lib/compiz/libdecoration.a
+lib/compiz/libwobbly.so
+lib/compiz/libwobbly.la
+lib/compiz/libwobbly.a
+lib/compiz/libfade.so
+lib/compiz/libfade.la
+lib/compiz/libfade.a
+%%FUSEFS%%lib/compiz/libfs.so
+%%FUSEFS%%lib/compiz/libfs.la
+%%FUSEFS%%lib/compiz/libfs.a
+lib/compiz/libminimize.so
+lib/compiz/libminimize.la
+lib/compiz/libminimize.a
+lib/compiz/libcube.so
+lib/compiz/libcube.la
+lib/compiz/libcube.a
+lib/compiz/librotate.so
+lib/compiz/librotate.la
+lib/compiz/librotate.a
+lib/compiz/libzoom.so
+lib/compiz/libzoom.la
+lib/compiz/libzoom.a
+lib/compiz/libscale.so
+lib/compiz/libscale.la
+lib/compiz/libscale.a
+lib/compiz/libmove.so
+lib/compiz/libmove.la
+lib/compiz/libmove.a
+lib/compiz/libresize.so
+lib/compiz/libresize.la
+lib/compiz/libresize.a
+lib/compiz/libplace.so
+lib/compiz/libplace.la
+lib/compiz/libplace.a
+%%DBUS%%lib/compiz/libdbus.so
+%%DBUS%%lib/compiz/libdbus.la
+%%DBUS%%lib/compiz/libdbus.a
+lib/compiz/libswitcher.so
+lib/compiz/libswitcher.la
+lib/compiz/libswitcher.a
+lib/compiz/libwater.so
+lib/compiz/libwater.la
+lib/compiz/libwater.a
+lib/compiz/libscreenshot.so
+lib/compiz/libscreenshot.la
+lib/compiz/libscreenshot.a
+lib/compiz/libplane.so
+lib/compiz/libplane.la
+lib/compiz/libplane.a
+lib/compiz/libclone.so
+lib/compiz/libclone.la
+lib/compiz/libclone.a
+lib/compiz/libpng.so
+lib/compiz/libpng.la
+lib/compiz/libpng.a
+lib/compiz/libblur.so
+lib/compiz/libblur.la
+lib/compiz/libblur.a
+lib/compiz/libregex.so
+lib/compiz/libregex.la
+lib/compiz/libregex.a
+lib/compiz/libvideo.so
+lib/compiz/libvideo.la
+lib/compiz/libvideo.a
+lib/compiz/libini.so
+lib/compiz/libini.la
+lib/compiz/libini.a
+%%RSVG%%lib/compiz/libsvg.so
+%%RSVG%%lib/compiz/libsvg.la
+%%RSVG%%lib/compiz/libsvg.a
+lib/compiz/libannotate.so
+lib/compiz/libannotate.la
+lib/compiz/libannotate.a
+libdata/pkgconfig/libdecoration.pc
+libdata/pkgconfig/compiz.pc
+share/gnome/compiz/icon.png
+share/gnome/compiz/freedesktop.png
+%%GNOME%%@cwd %%WINDOWSETTINGSDATADIR%%
+%%GNOME%%share/gnome/wm-properties/compiz.desktop
+%%GNOME%%@cwd %%WINDOWSETTINGSLIBDIR%%
+%%GNOME%%window-manager-settings/libcompiz.so
+%%GNOME%%window-manager-settings/libcompiz.la
+%%GNOME%%window-manager-settings/libcompiz.a
+%%GNOME%%@cwd
+share/locale/af/LC_MESSAGES/compiz.mo
+share/locale/ar/LC_MESSAGES/compiz.mo
+share/locale/bg/LC_MESSAGES/compiz.mo
+share/locale/bn/LC_MESSAGES/compiz.mo
+share/locale/bs/LC_MESSAGES/compiz.mo
+share/locale/ca/LC_MESSAGES/compiz.mo
+share/locale/cs/LC_MESSAGES/compiz.mo
+share/locale/cy/LC_MESSAGES/compiz.mo
+share/locale/da/LC_MESSAGES/compiz.mo
+share/locale/de/LC_MESSAGES/compiz.mo
+share/locale/el/LC_MESSAGES/compiz.mo
+share/locale/en_GB/LC_MESSAGES/compiz.mo
+share/locale/es/LC_MESSAGES/compiz.mo
+share/locale/et/LC_MESSAGES/compiz.mo
+share/locale/fi/LC_MESSAGES/compiz.mo
+share/locale/fr/LC_MESSAGES/compiz.mo
+share/locale/gl/LC_MESSAGES/compiz.mo
+share/locale/gu/LC_MESSAGES/compiz.mo
+share/locale/he/LC_MESSAGES/compiz.mo
+share/locale/hi/LC_MESSAGES/compiz.mo
+share/locale/hr/LC_MESSAGES/compiz.mo
+share/locale/hu/LC_MESSAGES/compiz.mo
+share/locale/id/LC_MESSAGES/compiz.mo
+share/locale/it/LC_MESSAGES/compiz.mo
+share/locale/ja/LC_MESSAGES/compiz.mo
+share/locale/ka/LC_MESSAGES/compiz.mo
+share/locale/ko/LC_MESSAGES/compiz.mo
+share/locale/lt/LC_MESSAGES/compiz.mo
+share/locale/mk/LC_MESSAGES/compiz.mo
+share/locale/nb/LC_MESSAGES/compiz.mo
+share/locale/nl/LC_MESSAGES/compiz.mo
+share/locale/pa/LC_MESSAGES/compiz.mo
+share/locale/pl/LC_MESSAGES/compiz.mo
+share/locale/pt/LC_MESSAGES/compiz.mo
+share/locale/pt_BR/LC_MESSAGES/compiz.mo
+share/locale/ro/LC_MESSAGES/compiz.mo
+share/locale/ru/LC_MESSAGES/compiz.mo
+share/locale/sk/LC_MESSAGES/compiz.mo
+share/locale/sl/LC_MESSAGES/compiz.mo
+share/locale/sr/LC_MESSAGES/compiz.mo
+share/locale/sv/LC_MESSAGES/compiz.mo
+share/locale/ta/LC_MESSAGES/compiz.mo
+share/locale/tr/LC_MESSAGES/compiz.mo
+share/locale/uk/LC_MESSAGES/compiz.mo
+share/locale/vi/LC_MESSAGES/compiz.mo
+share/locale/zh_CN/LC_MESSAGES/compiz.mo
+share/locale/zh_TW/LC_MESSAGES/compiz.mo
+share/locale/en_US/LC_MESSAGES/compiz.mo
+share/locale/km/LC_MESSAGES/compiz.mo
+share/locale/lo/LC_MESSAGES/compiz.mo
+share/locale/mr/LC_MESSAGES/compiz.mo
+share/locale/xh/LC_MESSAGES/compiz.mo
+share/locale/zu/LC_MESSAGES/compiz.mo
+@dirrmtry share/locale/lo/LC_MESSAGES
+@dirrmtry share/locale/lo
+@dirrmtry share/locale/en_US/LC_MESSAGES
+@dirrmtry share/locale/en_US
+@dirrmtry share/locale/km/LC_MESSAGES
+@dirrmtry share/locale/km
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/zu/LC_MESSAGES
+@dirrmtry share/locale/zu
+@dirrmtry share/gnome/compiz
+@dirrmtry lib/compiz
+@dirrmtry include/compiz
diff --git a/x11-wm/ctwm/Makefile b/x11-wm/ctwm/Makefile
index f39b9a777b1f..1cbedcbce56d 100644
--- a/x11-wm/ctwm/Makefile
+++ b/x11-wm/ctwm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ctwm
PORTVERSION= 3.8a
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm
MASTER_SITES= http://ctwm.free.lp.se/dist/ \
http://www.centralmiss.com/~matt/distfiles/
diff --git a/x11-wm/devilspie/Makefile b/x11-wm/devilspie/Makefile
index 6d43578206b1..f768de275e8d 100644
--- a/x11-wm/devilspie/Makefile
+++ b/x11-wm/devilspie/Makefile
@@ -7,6 +7,7 @@
PORTNAME= devilspie
PORTVERSION= 0.20.2
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= http://www.burtonini.com/computing/
diff --git a/x11-wm/dwm/Makefile b/x11-wm/dwm/Makefile
index 6b36e2e7f54d..b1a5b1f6a7d6 100644
--- a/x11-wm/dwm/Makefile
+++ b/x11-wm/dwm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= dwm
PORTVERSION= 4.0
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= http://www.suckless.org/download/ \
http://schot.a-eskwadraat.nl/files/
diff --git a/x11-wm/e16/Makefile b/x11-wm/e16/Makefile
index df07fb92fa82..3e3df59e71f1 100644
--- a/x11-wm/e16/Makefile
+++ b/x11-wm/e16/Makefile
@@ -7,6 +7,7 @@
PORTNAME= enlightenment
PORTVERSION= 0.16.8.6
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -21,6 +22,7 @@ LIB_DEPENDS= Imlib2.4:${PORTSDIR}/graphics/imlib2 \
DATADIR= ${PREFIX}/share/e16
USE_X_PREFIX= yes
+USE_XORG= xbitmaps
USE_ICONV= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/x11-wm/e16utils/Makefile b/x11-wm/e16utils/Makefile
index 0f11274c2aac..acd7677dac11 100644
--- a/x11-wm/e16utils/Makefile
+++ b/x11-wm/e16utils/Makefile
@@ -7,7 +7,7 @@
PORTNAME= e16utils
PORTVERSION= 0.16
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://public.planetmirror.com/pub/enlightenment/e16utils/
diff --git a/x11-wm/e17-module-calendar/Makefile b/x11-wm/e17-module-calendar/Makefile
index 0b0dfcbc44c0..72323396da12 100644
--- a/x11-wm/e17-module-calendar/Makefile
+++ b/x11-wm/e17-module-calendar/Makefile
@@ -7,7 +7,7 @@
PORTNAME= calendar
PORTVERSION= 20060926
-PORTREVISION= 0
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11
MASTER_SITES= http://sunner.elcomnet.ru/~stas/
diff --git a/x11-wm/e17-module-cpu/Makefile b/x11-wm/e17-module-cpu/Makefile
index e8d1947ec084..f6e16b1af42b 100644
--- a/x11-wm/e17-module-cpu/Makefile
+++ b/x11-wm/e17-module-cpu/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cpu
PORTVERSION= 20070223
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-deskshow/Makefile b/x11-wm/e17-module-deskshow/Makefile
index 6737fb2fa962..dae67ad0b679 100644
--- a/x11-wm/e17-module-deskshow/Makefile
+++ b/x11-wm/e17-module-deskshow/Makefile
@@ -7,7 +7,7 @@
PORTNAME= deskshow
PORTVERSION= 20070223
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-flame/Makefile b/x11-wm/e17-module-flame/Makefile
index d519978d532c..278fe318b88c 100644
--- a/x11-wm/e17-module-flame/Makefile
+++ b/x11-wm/e17-module-flame/Makefile
@@ -7,7 +7,7 @@
PORTNAME= flame
PORTVERSION= 20070223
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-flame/pkg-plist b/x11-wm/e17-module-flame/pkg-plist
index 81497b3558fb..6651443c6b32 100644
--- a/x11-wm/e17-module-flame/pkg-plist
+++ b/x11-wm/e17-module-flame/pkg-plist
@@ -7,8 +7,6 @@ lib/enlightenment/modules/flame/module.edj
%%NLS%%share/locale/fi/LC_MESSAGES/flame.mo
%%NLS%%share/locale/it/LC_MESSAGES/flame.mo
%%NLS%%share/locale/ja/LC_MESSAGES/flame.mo
-%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fi
@dirrm lib/enlightenment/modules/flame/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/flame
@dirrmtry lib/enlightenment/modules
diff --git a/x11-wm/e17-module-language/Makefile b/x11-wm/e17-module-language/Makefile
index 8aa1a785a725..8107c559daaf 100644
--- a/x11-wm/e17-module-language/Makefile
+++ b/x11-wm/e17-module-language/Makefile
@@ -7,7 +7,7 @@
PORTNAME= language
PORTVERSION= 20070223
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-mail/Makefile b/x11-wm/e17-module-mail/Makefile
index 80231798718e..2e61a02d11ef 100644
--- a/x11-wm/e17-module-mail/Makefile
+++ b/x11-wm/e17-module-mail/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mail
PORTVERSION= 20070223
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-mem/Makefile b/x11-wm/e17-module-mem/Makefile
index e4429d12de3a..e2c7d3e74d4b 100644
--- a/x11-wm/e17-module-mem/Makefile
+++ b/x11-wm/e17-module-mem/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mem
PORTVERSION= 20070223
-PORTREVISION= 0
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
diff --git a/x11-wm/e17-module-mem/pkg-plist b/x11-wm/e17-module-mem/pkg-plist
index aae66c519dca..e6d9793970a2 100644
--- a/x11-wm/e17-module-mem/pkg-plist
+++ b/x11-wm/e17-module-mem/pkg-plist
@@ -11,8 +11,6 @@ lib/enlightenment/modules/mem/module_icon.png
%%NLS%%share/locale/ja/LC_MESSAGES/mem.mo
%%NLS%%share/locale/ru/LC_MESSAGES/mem.mo
%%NLS%%share/locale/sv/LC_MESSAGES/mem.mo
-%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fi
@dirrm lib/enlightenment/modules/mem/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/mem
@dirrmtry lib/enlightenment/modules
diff --git a/x11-wm/e17-module-mixer/Makefile b/x11-wm/e17-module-mixer/Makefile
index 383d88e5b9ec..f18221d40a69 100644
--- a/x11-wm/e17-module-mixer/Makefile
+++ b/x11-wm/e17-module-mixer/Makefile
@@ -7,6 +7,7 @@
PORTNAME= mixer
PORTVERSION= 20070223
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-moon/Makefile b/x11-wm/e17-module-moon/Makefile
index afd824050568..01eee6b51d99 100644
--- a/x11-wm/e17-module-moon/Makefile
+++ b/x11-wm/e17-module-moon/Makefile
@@ -7,7 +7,7 @@
PORTNAME= moon
PORTVERSION= 20070223
-PORTREVISION= 0
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
diff --git a/x11-wm/e17-module-rain/Makefile b/x11-wm/e17-module-rain/Makefile
index 749f7c611194..155c65f629b1 100644
--- a/x11-wm/e17-module-rain/Makefile
+++ b/x11-wm/e17-module-rain/Makefile
@@ -7,7 +7,7 @@
PORTNAME= rain
PORTVERSION= 20070223
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-rain/pkg-plist b/x11-wm/e17-module-rain/pkg-plist
index f9c08552a331..3b4f45a09cfc 100644
--- a/x11-wm/e17-module-rain/pkg-plist
+++ b/x11-wm/e17-module-rain/pkg-plist
@@ -13,8 +13,6 @@ lib/enlightenment/modules/rain/module.edj
%%NLS%%share/locale/it/LC_MESSAGES/rain.mo
%%NLS%%share/locale/ja/LC_MESSAGES/rain.mo
%%NLS%%share/locale/sv/LC_MESSAGES/rain.mo
-%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fi
@dirrm lib/enlightenment/modules/rain/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/rain
@dirrmtry lib/enlightenment/modules
diff --git a/x11-wm/e17-module-screenshot/Makefile b/x11-wm/e17-module-screenshot/Makefile
index e81eef644530..405edd0fda9f 100644
--- a/x11-wm/e17-module-screenshot/Makefile
+++ b/x11-wm/e17-module-screenshot/Makefile
@@ -7,7 +7,7 @@
PORTNAME= screenshot
PORTVERSION= 20070223
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-screenshot/pkg-plist b/x11-wm/e17-module-screenshot/pkg-plist
index 190a2187bff1..bf1d4b69764d 100644
--- a/x11-wm/e17-module-screenshot/pkg-plist
+++ b/x11-wm/e17-module-screenshot/pkg-plist
@@ -12,8 +12,6 @@ lib/enlightenment/modules/screenshot/screenshot.edj
%%NLS%%share/locale/ja/LC_MESSAGES/screenshot.mo
%%NLS%%share/locale/ru/LC_MESSAGES/screenshot.mo
%%NLS%%share/locale/sv/LC_MESSAGES/screenshot.mo
-%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fi
@dirrm lib/enlightenment/modules/screenshot/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/screenshot
@dirrmtry lib/enlightenment/modules
diff --git a/x11-wm/e17-module-slideshow/Makefile b/x11-wm/e17-module-slideshow/Makefile
index 7689744ff0e3..ad25dcef43df 100644
--- a/x11-wm/e17-module-slideshow/Makefile
+++ b/x11-wm/e17-module-slideshow/Makefile
@@ -7,7 +7,7 @@
PORTNAME= slideshow
PORTVERSION= 20070223
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-slideshow/pkg-plist b/x11-wm/e17-module-slideshow/pkg-plist
index de126aa1c465..fb0ceadcb818 100644
--- a/x11-wm/e17-module-slideshow/pkg-plist
+++ b/x11-wm/e17-module-slideshow/pkg-plist
@@ -11,8 +11,6 @@ lib/enlightenment/modules/slideshow/slideshow.edj
%%NLS%%share/locale/it/LC_MESSAGES/slideshow.mo
%%NLS%%share/locale/ja/LC_MESSAGES/slideshow.mo
%%NLS%%share/locale/sv/LC_MESSAGES/slideshow.mo
-%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fi
@dirrm lib/enlightenment/modules/slideshow/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/slideshow
@dirrmtry lib/enlightenment/modules
diff --git a/x11-wm/e17-module-snow/Makefile b/x11-wm/e17-module-snow/Makefile
index 5ac1467b5ce1..b79c8a7dd8c2 100644
--- a/x11-wm/e17-module-snow/Makefile
+++ b/x11-wm/e17-module-snow/Makefile
@@ -7,7 +7,7 @@
PORTNAME= snow
PORTVERSION= 20070223
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-snow/pkg-plist b/x11-wm/e17-module-snow/pkg-plist
index c1752aa10628..31ad449eeda5 100644
--- a/x11-wm/e17-module-snow/pkg-plist
+++ b/x11-wm/e17-module-snow/pkg-plist
@@ -13,8 +13,6 @@ lib/enlightenment/modules/snow/tree.png
%%NLS%%share/locale/it/LC_MESSAGES/snow.mo
%%NLS%%share/locale/ja/LC_MESSAGES/snow.mo
%%NLS%%share/locale/sv/LC_MESSAGES/snow.mo
-%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fi
@dirrm lib/enlightenment/modules/snow/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/snow
@dirrmtry lib/enlightenment/modules
diff --git a/x11-wm/e17-module-uptime/Makefile b/x11-wm/e17-module-uptime/Makefile
index 1cb0635f052f..41f7cb1d2e4e 100644
--- a/x11-wm/e17-module-uptime/Makefile
+++ b/x11-wm/e17-module-uptime/Makefile
@@ -7,7 +7,7 @@
PORTNAME= uptime
PORTVERSION= 20070223
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-uptime/pkg-plist b/x11-wm/e17-module-uptime/pkg-plist
index 2d2960917bac..37f9e851da0e 100644
--- a/x11-wm/e17-module-uptime/pkg-plist
+++ b/x11-wm/e17-module-uptime/pkg-plist
@@ -13,8 +13,6 @@ share/locale/ja/LC_MESSAGES/uptime.mo
share/locale/sv/LC_MESSAGES/uptime.mo
share/nls/POSIX
share/nls/en_US.US-ASCII
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
@dirrmtry lib/enlightenment/modules/uptime/%%E17_ARCH%%
@dirrmtry lib/enlightenment/modules/uptime
@dirrmtry lib/enlightenment/modules
diff --git a/x11-wm/e17-module-weather/Makefile b/x11-wm/e17-module-weather/Makefile
index 600f766a78b0..376696b84436 100644
--- a/x11-wm/e17-module-weather/Makefile
+++ b/x11-wm/e17-module-weather/Makefile
@@ -7,7 +7,7 @@
PORTNAME= weather
PORTVERSION= 20070223
-PORTREVISION= 0
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
diff --git a/x11-wm/e17-module-winselector/Makefile b/x11-wm/e17-module-winselector/Makefile
index 60053eb75610..485bf032a019 100644
--- a/x11-wm/e17-module-winselector/Makefile
+++ b/x11-wm/e17-module-winselector/Makefile
@@ -8,6 +8,7 @@
PORTNAME= winselector
PORTVERSION= 20070223
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-utils/Makefile b/x11-wm/e17-utils/Makefile
index 6ac2e659b61e..297e3b60d87e 100644
--- a/x11-wm/e17-utils/Makefile
+++ b/x11-wm/e17-utils/Makefile
@@ -8,6 +8,7 @@
PORTNAME= utils
PORTVERSION= 20070223
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-
diff --git a/x11-wm/ede/Makefile b/x11-wm/ede/Makefile
index 2fec5cc28460..bfbe8bdd47ca 100644
--- a/x11-wm/ede/Makefile
+++ b/x11-wm/ede/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ede
PORTVERSION= 1.1
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ede
diff --git a/x11-wm/emerald/Makefile b/x11-wm/emerald/Makefile
new file mode 100644
index 000000000000..0aa06b018402
--- /dev/null
+++ b/x11-wm/emerald/Makefile
@@ -0,0 +1,44 @@
+# New ports collection makefile for: emerald
+# Date created: Oct 29 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= emerald
+PORTVERSION= 0.2.1
+PORTREVISION= 1
+CATEGORIES= x11-wm
+MASTER_SITES= http://releases.beryl-project.org/${PORTVERSION}/ \
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= flz/beryl/
+
+MAINTAINER= rnoland@2hip.net
+COMMENT= Emerald Window Decorator
+
+BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/beryl.pc:${PORTSDIR}/x11-wm/beryl-core
+RUN_DEPENDS+= ${BUILD_DEPENDS}
+
+INSTALLS_ICONS= yes
+GNU_CONFIGURE= yes
+USE_GL= gl
+USE_BZIP2= yes
+USE_GMAKE= yes
+USE_GNOME= gtk20 libwnck pango gnomehack
+USE_XORG= xrender
+USE_GETTEXT= yes
+USE_LDCONFIG= yes
+
+MAN1= emerald.1 \
+ emerald-theme-manager.1
+
+CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS+= --mandir="${PREFIX}/man"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
+
+# XXX - might want to change that
+post-patch:
+ @${REINPLACE_CMD} 's|icons/gnome|icons/hicolor|' ${WRKSRC}/misc/Makefile.in
+
+.include <bsd.port.mk>
diff --git a/x11-wm/emerald/distinfo b/x11-wm/emerald/distinfo
new file mode 100644
index 000000000000..873bbb8f0a47
--- /dev/null
+++ b/x11-wm/emerald/distinfo
@@ -0,0 +1,3 @@
+MD5 (emerald-0.2.1.tar.bz2) = dde0e2b5cbe405961a350e6d47d2445f
+SHA256 (emerald-0.2.1.tar.bz2) = 43e4fb81fa1bcada42058c9aa8a27c6e09ed7b3cbf0ed1b65578ccb958b64cba
+SIZE (emerald-0.2.1.tar.bz2) = 502243
diff --git a/x11-wm/emerald/files/patch-themer_main.c b/x11-wm/emerald/files/patch-themer_main.c
new file mode 100644
index 000000000000..3a434eb47adc
--- /dev/null
+++ b/x11-wm/emerald/files/patch-themer_main.c
@@ -0,0 +1,106 @@
+--- themer/main.c.orig Sun Oct 29 18:57:14 2006
++++ themer/main.c Sun Oct 29 23:09:37 2006
+@@ -7,6 +7,103 @@
+ #include <emerald.h>
+ #include <engine.h>
+
++/* states: S_N: normal, S_I: comparing integral part, S_F: comparing
++ fractional parts, S_Z: idem but with leading Zeroes only */
++#define S_N 0x0
++#define S_I 0x4
++#define S_F 0x8
++#define S_Z 0xC
++
++/* result_type: CMP: return diff; LEN: compare using len_diff/diff */
++#define CMP 2
++#define LEN 3
++
++
++/* ISDIGIT differs from isdigit, as follows:
++ - Its arg may be any int or unsigned int; it need not be an unsigned char.
++ - It's guaranteed to evaluate its argument exactly once.
++ - It's typically faster.
++ Posix 1003.2-1992 section 2.5.2.1 page 50 lines 1556-1558 says that
++ only '0' through '9' are digits. Prefer ISDIGIT to isdigit unless
++ it's important to use the locale's definition of `digit' even when the
++ host does not conform to Posix. */
++#define ISDIGIT(c) ((unsigned) (c) - '0' <= 9)
++
++/* Compare S1 and S2 as strings holding indices/version numbers,
++ returning less than, equal to or greater than zero if S1 is less than,
++ equal to or greater than S2 (for more info, see the texinfo doc).
++*/
++
++int
++strverscmp (const char *s1, const char *s2)
++{
++ const unsigned char *p1 = (const unsigned char *) s1;
++ const unsigned char *p2 = (const unsigned char *) s2;
++ unsigned char c1, c2;
++ int state;
++ int diff;
++
++ /* Symbol(s) 0 [1-9] others (padding)
++ Transition (10) 0 (01) d (00) x (11) - */
++ static const unsigned int next_state[] =
++ {
++ /* state x d 0 - */
++ /* S_N */ S_N, S_I, S_Z, S_N,
++ /* S_I */ S_N, S_I, S_I, S_I,
++ /* S_F */ S_N, S_F, S_F, S_F,
++ /* S_Z */ S_N, S_F, S_Z, S_Z
++ };
++
++ static const int result_type[] =
++ {
++ /* state x/x x/d x/0 x/- d/x d/d d/0 d/-
++ 0/x 0/d 0/0 0/- -/x -/d -/0 -/- */
++
++ /* S_N */ CMP, CMP, CMP, CMP, CMP, LEN, CMP, CMP,
++ CMP, CMP, CMP, CMP, CMP, CMP, CMP, CMP,
++ /* S_I */ CMP, -1, -1, CMP, 1, LEN, LEN, CMP,
++ 1, LEN, LEN, CMP, CMP, CMP, CMP, CMP,
++ /* S_F */ CMP, CMP, CMP, CMP, CMP, LEN, CMP, CMP,
++ CMP, CMP, CMP, CMP, CMP, CMP, CMP, CMP,
++ /* S_Z */ CMP, 1, 1, CMP, -1, CMP, CMP, CMP,
++ -1, CMP, CMP, CMP
++ };
++
++ if (p1 == p2)
++ return 0;
++
++ c1 = *p1++;
++ c2 = *p2++;
++ /* Hint: '0' is a digit too. */
++ state = S_N | ((c1 == '0') + (ISDIGIT (c1) != 0));
++
++ while ((diff = c1 - c2) == 0 && c1 != '\0')
++ {
++ state = next_state[state];
++ c1 = *p1++;
++ c2 = *p2++;
++ state |= (c1 == '0') + (ISDIGIT (c1) != 0);
++ }
++
++ state = result_type[state << 2 | ((c2 == '0') + (ISDIGIT (c2) != 0))];
++
++ switch (state)
++ {
++ case CMP:
++ return diff;
++
++ case LEN:
++ while (ISDIGIT (*p1++))
++ if (!ISDIGIT (*p2++))
++ return 1;
++
++ return ISDIGIT (*p2) ? -1 : diff;
++
++ default:
++ return state;
++ }
++}
++
+ #define LAST_COMPAT_VER "0.1.0"
+
+ typedef struct _FetcherInfo
diff --git a/x11-wm/emerald/pkg-descr b/x11-wm/emerald/pkg-descr
new file mode 100644
index 000000000000..c9d35bf6ae83
--- /dev/null
+++ b/x11-wm/emerald/pkg-descr
@@ -0,0 +1,8 @@
+Emerald is a window decorator for beryl. It comes with a
+themes editor called emerald-theme-manager and the decorator.
+You need beryl to use emerald.
+
+WWW: http://www.beryl-project.org/
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-wm/emerald/pkg-plist b/x11-wm/emerald/pkg-plist
new file mode 100644
index 000000000000..37cc50ec208a
--- /dev/null
+++ b/x11-wm/emerald/pkg-plist
@@ -0,0 +1,106 @@
+bin/emerald
+bin/emerald-theme-manager
+include/emerald/emerald.h
+include/emerald/engine.h
+include/emerald/libengine.h
+include/emerald/titlebar.h
+lib/libemeraldengine.a
+lib/libemeraldengine.la
+lib/libemeraldengine.so
+lib/libemeraldengine.so.0
+lib/emerald/engines/liblegacy.so
+lib/emerald/engines/liblegacy.la
+lib/emerald/engines/liblegacy.a
+lib/emerald/engines/libvrunner.so
+lib/emerald/engines/libvrunner.la
+lib/emerald/engines/libvrunner.a
+lib/emerald/engines/libtruglass.so
+lib/emerald/engines/libtruglass.la
+lib/emerald/engines/libtruglass.a
+lib/emerald/engines/liboxygen.so
+lib/emerald/engines/liboxygen.la
+lib/emerald/engines/liboxygen.a
+lib/emerald/engines/libpixmap.so
+lib/emerald/engines/libpixmap.la
+lib/emerald/engines/libpixmap.a
+lib/emerald/engines/libzootreeves.so
+lib/emerald/engines/libzootreeves.la
+lib/emerald/engines/libzootreeves.a
+libdata/pkgconfig/emeraldengine.pc
+share/applications/emerald-theme-manager.desktop
+share/icons/hicolor/48x48/mimetypes/application-x-emerald-theme.png
+share/mime/packages/emerald.xml
+share/mime-info/emerald.mime
+%%DATADIR%%/settings.ini
+%%DATADIR%%/theme/buttons.above.png
+%%DATADIR%%/theme/buttons.close.png
+%%DATADIR%%/theme/buttons.glow.png
+%%DATADIR%%/theme/buttons.help.png
+%%DATADIR%%/theme/buttons.inactive_glow.png
+%%DATADIR%%/theme/buttons.max.png
+%%DATADIR%%/theme/buttons.menu.png
+%%DATADIR%%/theme/buttons.min.png
+%%DATADIR%%/theme/buttons.restore.png
+%%DATADIR%%/theme/buttons.shade.png
+%%DATADIR%%/theme/buttons.sticky.png
+%%DATADIR%%/theme/buttons.unabove.png
+%%DATADIR%%/theme/buttons.unshade.png
+%%DATADIR%%/theme/buttons.unsticky.png
+%%DATADIR%%/theme/theme.screenshot.png
+%%DATADIR%%/theme/theme.ini
+share/locale/ca/LC_MESSAGES/emerald.mo
+share/locale/cs/LC_MESSAGES/emerald.mo
+share/locale/de_DE/LC_MESSAGES/emerald.mo
+share/locale/en_GB/LC_MESSAGES/emerald.mo
+share/locale/es_AR/LC_MESSAGES/emerald.mo
+share/locale/es_ES/LC_MESSAGES/emerald.mo
+share/locale/fr_FR/LC_MESSAGES/emerald.mo
+share/locale/gu_IN/LC_MESSAGES/emerald.mo
+share/locale/hu_HU/LC_MESSAGES/emerald.mo
+share/locale/it/LC_MESSAGES/emerald.mo
+share/locale/ja/LC_MESSAGES/emerald.mo
+share/locale/ko_KR/LC_MESSAGES/emerald.mo
+share/locale/nb_NO/LC_MESSAGES/emerald.mo
+share/locale/nl/LC_MESSAGES/emerald.mo
+share/locale/pt_BR/LC_MESSAGES/emerald.mo
+share/locale/pt_PT/LC_MESSAGES/emerald.mo
+share/locale/sv_FI/LC_MESSAGES/emerald.mo
+share/locale/sv_SE/LC_MESSAGES/emerald.mo
+share/locale/tr_TR/LC_MESSAGES/emerald.mo
+share/locale/zh_CN/LC_MESSAGES/emerald.mo
+share/locale/zh_HK/LC_MESSAGES/emerald.mo
+share/locale/zh_TW/LC_MESSAGES/emerald.mo
+share/pixmaps/emerald-theme-manager-icon.png
+@dirrmtry share/mime-info
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/tr_TR/LC_MESSAGES
+@dirrmtry share/locale/tr_TR
+@dirrmtry share/locale/sv_SE/LC_MESSAGES
+@dirrmtry share/locale/sv_SE
+@dirrmtry share/locale/sv_FI/LC_MESSAGES
+@dirrmtry share/locale/sv_FI
+@dirrmtry share/locale/nb_NO/LC_MESSAGES
+@dirrmtry share/locale/nb_NO
+@dirrmtry share/locale/ko_KR/LC_MESSAGES
+@dirrmtry share/locale/ko_KR
+@dirrmtry share/locale/ja_JP/LC_MESSAGES
+@dirrmtry share/locale/ja_JP
+@dirrmtry share/locale/it_IT/LC_MESSAGES
+@dirrmtry share/locale/it_IT
+@dirrmtry share/locale/hu_HU/LC_MESSAGES
+@dirrmtry share/locale/hu_HU
+@dirrmtry share/locale/gu_IN/LC_MESSAGES
+@dirrmtry share/locale/gu_IN
+@dirrmtry share/locale/es_AR/LC_MESSAGES
+@dirrmtry share/locale/es_AR
+@dirrmtry share/locale/de_DE/LC_MESSAGES
+@dirrmtry share/locale/de_DE
+@dirrmtry share/locale/ca_ES/LC_MESSAGES
+@dirrmtry share/locale/ca_ES
+@dirrmtry %%DATADIR%%/theme
+@dirrmtry %%DATADIR%%
+@dirrmtry share/applications
+@dirrmtry lib/emerald/engines
+@dirrmtry lib/emerald
+@dirrmtry include/emerald
diff --git a/x11-wm/enlightenment-devel/Makefile b/x11-wm/enlightenment-devel/Makefile
index a1434fdd68b1..4f1fc0300d1e 100644
--- a/x11-wm/enlightenment-devel/Makefile
+++ b/x11-wm/enlightenment-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= enlightenment
PORTVERSION= 20070223
-PORTREVISION= 0
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11-wm
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
diff --git a/x11-wm/enlightenment-devel/pkg-plist b/x11-wm/enlightenment-devel/pkg-plist
index ce5703e3181e..da82d2defcaf 100644
--- a/x11-wm/enlightenment-devel/pkg-plist
+++ b/x11-wm/enlightenment-devel/pkg-plist
@@ -274,24 +274,6 @@ share/locale/ru/LC_MESSAGES/enlightenment.mo
share/locale/sl/LC_MESSAGES/enlightenment.mo
share/xsessions/enlightenment.desktop
@dirrmtry share/xsessions
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
@dirrm %%DATADIR%%/doc
@dirrm %%DATADIR%%/data/themes
@dirrm %%DATADIR%%/data/other
diff --git a/x11-wm/enlightenment-docs/Makefile b/x11-wm/enlightenment-docs/Makefile
index 6499d8d09d7c..c1d98985a806 100644
--- a/x11-wm/enlightenment-docs/Makefile
+++ b/x11-wm/enlightenment-docs/Makefile
@@ -7,7 +7,7 @@
PORTNAME= enlightenment-docs
PORTVERSION= 0.16.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= enlightenment
diff --git a/x11-wm/enlightenment/Makefile b/x11-wm/enlightenment/Makefile
index df07fb92fa82..3e3df59e71f1 100644
--- a/x11-wm/enlightenment/Makefile
+++ b/x11-wm/enlightenment/Makefile
@@ -7,6 +7,7 @@
PORTNAME= enlightenment
PORTVERSION= 0.16.8.6
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -21,6 +22,7 @@ LIB_DEPENDS= Imlib2.4:${PORTSDIR}/graphics/imlib2 \
DATADIR= ${PREFIX}/share/e16
USE_X_PREFIX= yes
+USE_XORG= xbitmaps
USE_ICONV= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/x11-wm/epiwm/Makefile b/x11-wm/epiwm/Makefile
index 78b03c8f1b92..edccfc39f832 100644
--- a/x11-wm/epiwm/Makefile
+++ b/x11-wm/epiwm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= epiwm
PORTVERSION= 0.5.6
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-wm
MASTER_SITES= http://www.nongnu.org/epiwm/download/
@@ -23,48 +23,14 @@ LIB_DEPENDS= Imlib.5:${PORTSDIR}/graphics/imlib \
CONFIG= icons key menu start style window workspace
DOCS= AUTHORS BUGS COPYING ChangeLog EPIwm-0.5.6.lsm INSTALL NEWS \
README TODO
-PLIST= ${WRKDIR}/pkg-plist
-USE_AUTOTOOLS= automake:14:env autoconf:213
+GNU_CONFIGURE= yes
USE_X_PREFIX= yes
-post-extract:
-# Avoid having to read this file.
- ${RM} ${WRKSRC}/configure
-
-do-patch:
- ${CP} -p ${WRKSRC}/configure.in ${WRKSRC}/configure.in.orig
- ${SED} -e 's|/etc/X11/epiwm|${PREFIX}/etc/epiwm|' \
- < ${WRKSRC}/configure.in.orig > ${WRKSRC}/configure.in
-
-pre-configure:
- cd ${WRKSRC} && automake14 -i && autoconf213
-
-pre-install:
- ${RM} -f ${PLIST}
-.for ii in epiwm logoepiwm epiwm.inst
- ${ECHO_CMD} bin/${ii} >> ${PLIST}
-.endfor
-.for ii in ${CONFIG}
- ${ECHO_CMD} etc/epiwm/${ii} >> ${PLIST}
-.endfor
-.if !defined(NOPORTDOCS)
-.for ii in ${DOCS}
- ${ECHO_CMD} share/doc/epiwm/${ii} >> ${PLIST}
-.endfor
-.for ii in etc share/doc
- ${ECHO_CMD} @dirrm ${ii}/epiwm >> ${PLIST}
-.endfor
-.endif
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/src/epiwm \
- ${WRKSRC}/modules/logoepiwm/logoepiwm ${PREFIX}/bin
- ${INSTALL_SCRIPT} ${WRKSRC}/bin/epiwm.inst ${PREFIX}/bin
- ${MKDIR} ${PREFIX}/etc/epiwm
-.for ii in ${CONFIG}
- ${INSTALL_DATA} ${WRKSRC}/config/${ii} ${PREFIX}/etc/epiwm
-.endfor
+post-patch:
+ ${REINPLACE_CMD} 's|/etc/X11/epiwm|${PREFIX}/etc/epiwm|' \
+ ${WRKSRC}/configure
+post-install:
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}
.for ii in ${DOCS}
diff --git a/x11-wm/epiwm/pkg-plist b/x11-wm/epiwm/pkg-plist
new file mode 100644
index 000000000000..65f676598055
--- /dev/null
+++ b/x11-wm/epiwm/pkg-plist
@@ -0,0 +1,21 @@
+bin/epiwm
+bin/epiwm.inst
+bin/logoepiwm
+etc/epiwm/icons
+etc/epiwm/key
+etc/epiwm/menu
+etc/epiwm/start
+etc/epiwm/style
+etc/epiwm/window
+etc/epiwm/workspace
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/BUGS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/EPIwm-0.5.6.lsm
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm etc/epiwm
diff --git a/x11-wm/epplets/Makefile b/x11-wm/epplets/Makefile
index 9178fba7595a..c48ab3bd957b 100644
--- a/x11-wm/epplets/Makefile
+++ b/x11-wm/epplets/Makefile
@@ -7,7 +7,7 @@
PORTNAME= epplets
PORTVERSION= 0.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= enlightenment
diff --git a/x11-wm/etoile-azalea/Makefile b/x11-wm/etoile-azalea/Makefile
index 7971d51090da..a318ff39165e 100644
--- a/x11-wm/etoile-azalea/Makefile
+++ b/x11-wm/etoile-azalea/Makefile
@@ -7,6 +7,7 @@
PORTNAME= azalea
PORTVERSION= 0.1.${SNAPSHOT}
+PORTREVISION= 1
CATEGORIES= x11-wm gnustep
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= dinoex
diff --git a/x11-wm/etoile-azdock/Makefile b/x11-wm/etoile-azdock/Makefile
index a8e241289024..1e315aa10765 100644
--- a/x11-wm/etoile-azdock/Makefile
+++ b/x11-wm/etoile-azdock/Makefile
@@ -7,6 +7,7 @@
PORTNAME= azdock
PORTVERSION= 0.1.${SNAPSHOT}
+PORTREVISION= 1
CATEGORIES= x11-wm gnustep
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= dinoex
diff --git a/x11-wm/evilwm/Makefile b/x11-wm/evilwm/Makefile
index 03d2ea404752..565f0373c42d 100644
--- a/x11-wm/evilwm/Makefile
+++ b/x11-wm/evilwm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= evilwm
PORTVERSION= 0.99.25
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= http://www.6809.org.uk/evilwm/
diff --git a/x11-wm/expocity/Makefile b/x11-wm/expocity/Makefile
index 54c65a736a6e..8ec35c2f3dfb 100644
--- a/x11-wm/expocity/Makefile
+++ b/x11-wm/expocity/Makefile
@@ -7,7 +7,7 @@
PORTNAME= expocity
PORTVERSION= 2.6.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-wm
MASTER_SITES= http://www.pycage.de/download/
DISTNAME= ${PORTNAME}-${PORTVERSION}-1
diff --git a/x11-wm/fbcmd/Makefile b/x11-wm/fbcmd/Makefile
index 5148071d6f8c..176eab416cf5 100644
--- a/x11-wm/fbcmd/Makefile
+++ b/x11-wm/fbcmd/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fbcmd
PORTVERSION= 0.5.1
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= http://darkshed.feuersenger.net/files/c_cpp/fbcmd/
diff --git a/x11-wm/fbpager/Makefile b/x11-wm/fbpager/Makefile
index 27da828b22da..59c584ead4b3 100644
--- a/x11-wm/fbpager/Makefile
+++ b/x11-wm/fbpager/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fbpager
PORTVERSION= 0.1.4
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= http://www.fluxbox.org/download/
diff --git a/x11-wm/fluxbox/Makefile b/x11-wm/fluxbox/Makefile
index 76f82e485341..896a4fceea07 100644
--- a/x11-wm/fluxbox/Makefile
+++ b/x11-wm/fluxbox/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fluxbox
PORTVERSION= 1.0rc3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/x11-wm/fluxconf/Makefile b/x11-wm/fluxconf/Makefile
index 8ab2d1162958..6f5acb5b3e13 100644
--- a/x11-wm/fluxconf/Makefile
+++ b/x11-wm/fluxconf/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fluxconf
PORTVERSION= 0.9.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm
MASTER_SITES= http://devaux.fabien.free.fr/flux/
diff --git a/x11-wm/fluxspace/Makefile b/x11-wm/fluxspace/Makefile
index 145df29143fd..a5dab4b52705 100644
--- a/x11-wm/fluxspace/Makefile
+++ b/x11-wm/fluxspace/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fluxspace
PORTVERSION= 0.0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-wm
MASTER_SITES= http://www.isomedia.com/homes/stevencooper/files/
diff --git a/x11-wm/fluxter/Makefile b/x11-wm/fluxter/Makefile
index b97f88cf752d..ac39ccfbb569 100644
--- a/x11-wm/fluxter/Makefile
+++ b/x11-wm/fluxter/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fluxter
PORTVERSION= 0.1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm
MASTER_SITES= http://benedict.isomedia.com/homes/stevencooper/files/
diff --git a/x11-wm/flwm/Makefile b/x11-wm/flwm/Makefile
index b8626c7ac87d..66e10bf8c113 100644
--- a/x11-wm/flwm/Makefile
+++ b/x11-wm/flwm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= flwm
PORTVERSION= 1.00
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= gj
diff --git a/x11-wm/fvwm/Makefile b/x11-wm/fvwm/Makefile
index 9a95231ee1aa..797085e206b6 100644
--- a/x11-wm/fvwm/Makefile
+++ b/x11-wm/fvwm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fvwm
PORTVERSION= 1.24r
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm
MASTER_SITES= ftp://ftp.fvwm.org/pub/fvwm/version-1/ \
ftp://ftp.ics.es.osaka-u.ac.jp/pub/CFAN/sources/1.x/
@@ -18,6 +18,7 @@ COMMENT= The fvwm window manager
NO_LATEST_LINK= yes
USE_IMAKE= yes
USE_XPM= yes
+USE_XORG= xbitmaps
# must overwrite the default from bsd.port.mk
XMKMF= xmkmf
ALL_TARGET= Makefiles all
diff --git a/x11-wm/fvwm2-devel/Makefile b/x11-wm/fvwm2-devel/Makefile
index 19a1242c06d5..f4411d92abad 100644
--- a/x11-wm/fvwm2-devel/Makefile
+++ b/x11-wm/fvwm2-devel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fvwm
PORTVERSION= 2.5.21
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
http://www.fvwm.org/generated/icon_download/
diff --git a/x11-wm/fvwm2/Makefile b/x11-wm/fvwm2/Makefile
index 02ba8287f413..f9a72c9faa6a 100644
--- a/x11-wm/fvwm2/Makefile
+++ b/x11-wm/fvwm2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fvwm
PORTVERSION= 2.4.20
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
http://www.fvwm.org/generated/icon_download/
diff --git a/x11-wm/fvwm24/Makefile b/x11-wm/fvwm24/Makefile
index 02ba8287f413..f9a72c9faa6a 100644
--- a/x11-wm/fvwm24/Makefile
+++ b/x11-wm/fvwm24/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fvwm
PORTVERSION= 2.4.20
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
http://www.fvwm.org/generated/icon_download/
diff --git a/x11-wm/fvwm95-i18n/Makefile b/x11-wm/fvwm95-i18n/Makefile
index a8447979b6c7..0616af300155 100644
--- a/x11-wm/fvwm95-i18n/Makefile
+++ b/x11-wm/fvwm95-i18n/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fvwm95-i18n
PORTVERSION= 2.0.43a
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= fvwm95
@@ -28,6 +28,7 @@ RUN_DEPENDS= ${X11BASE}/icons/chuck.xpm:${PORTSDIR}/x11/fbsd-icons
EXTRACT_ONLY= ${DISTNAME}.tgz ${PORTNAME}-${PORTVERSION}-portKit-19981123.tgz
USE_X_PREFIX= yes
USE_XPM= yes
+USE_XORG= xbitmaps
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --x-includes=${X11BASE}/include \
--mandir=${MANPREFIX}/man \
diff --git a/x11-wm/fvwm95/Makefile b/x11-wm/fvwm95/Makefile
index c7fa24ba0118..a42f17b1e446 100644
--- a/x11-wm/fvwm95/Makefile
+++ b/x11-wm/fvwm95/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fvwm95
PORTVERSION= 2.0.43a
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -22,6 +22,7 @@ RUN_DEPENDS= ${X11BASE}/icons/chuck.xpm:${PORTSDIR}/x11/fbsd-icons
USE_X_PREFIX= yes
USE_XPM= yes
+USE_XORG= xbitmaps
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --includedir=${LOCALBASE}/include \
--libdir=${LOCALBASE}/lib
diff --git a/x11-wm/gcompmgr/Makefile b/x11-wm/gcompmgr/Makefile
index b6e6924df247..494d81f2825c 100644
--- a/x11-wm/gcompmgr/Makefile
+++ b/x11-wm/gcompmgr/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gcompmgr
PORTVERSION= 0.21
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gcompmgr
diff --git a/x11-wm/golem/Makefile b/x11-wm/golem/Makefile
index d84be9f7124a..bd42ec6a2beb 100644
--- a/x11-wm/golem/Makefile
+++ b/x11-wm/golem/Makefile
@@ -7,6 +7,7 @@
PORTNAME= golem
PORTVERSION= 0.0.5
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/x11-wm/gwm/Makefile b/x11-wm/gwm/Makefile
index e52d11296782..63a0f4218165 100644
--- a/x11-wm/gwm/Makefile
+++ b/x11-wm/gwm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gwm
PORTVERSION= 1.8d
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= http://koala.ilog.fr/ftp/pub/gwm/
EXTRACT_SUFX= .tgz
diff --git a/x11-wm/hackedbox/Makefile b/x11-wm/hackedbox/Makefile
index 0b2531a8cdfa..3dfc2f907491 100644
--- a/x11-wm/hackedbox/Makefile
+++ b/x11-wm/hackedbox/Makefile
@@ -8,6 +8,7 @@
PORTNAME= hackedbox
PORTVERSION= 0.8.4
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= http://scrudgeware.org/downloads/hackedbox/
diff --git a/x11-wm/heliodor/Makefile b/x11-wm/heliodor/Makefile
new file mode 100644
index 000000000000..f7cf79e9fed8
--- /dev/null
+++ b/x11-wm/heliodor/Makefile
@@ -0,0 +1,34 @@
+# New ports collection makefile for: heliodor
+# Date created: 2007-02-05
+# Whom: Robert Noland <rnoland@2hip.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME= heliodor
+PORTVERSION= 0.2.1
+#PORTREVISION= 0
+CATEGORIES= x11-wm
+MASTER_SITES= http://releases.beryl-project.org/${PORTVERSION}/
+
+MAINTAINER= rnoland@2hip.net
+COMMENT= Heliodor Window Decorator
+
+BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/beryl.pc:${PORTSDIR}/x11-wm/beryl-core
+RUN_DEPENDS+= ${BUILD_DEPENDS}
+
+GNU_CONFIGURE= yes
+USE_BZIP2= yes
+USE_LDCONFIG= yes
+USE_GNOME= gnomehack gnomecontrolcenter2 libwnck
+
+WINDOWSETTINGSDATADIR= \
+ `pkg-config --variable=prefix gnome-window-settings-2.0`
+WINDOWSETTINGSLIBDIR= \
+ `pkg-config --variable=libdir gnome-window-settings-2.0`
+
+PLIST_SUB+= WINDOWSETTINGSDATADIR="${WINDOWSETTINGSDATADIR}" \
+ WINDOWSETTINGSLIBDIR="${WINDOWSETTINGSLIBDIR}"
+
+.include <bsd.port.pre.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-wm/heliodor/distinfo b/x11-wm/heliodor/distinfo
new file mode 100644
index 000000000000..bd485caa8a07
--- /dev/null
+++ b/x11-wm/heliodor/distinfo
@@ -0,0 +1,3 @@
+MD5 (heliodor-0.2.1.tar.bz2) = 7bd2538a16994b81eabc44b362ebda8c
+SHA256 (heliodor-0.2.1.tar.bz2) = 0dc1cd70bbb2213c616a38a11dd8d11336a4625f9af1d0db139cdf3be43535ef
+SIZE (heliodor-0.2.1.tar.bz2) = 252950
diff --git a/x11-wm/heliodor/pkg-descr b/x11-wm/heliodor/pkg-descr
new file mode 100644
index 000000000000..18f426db725e
--- /dev/null
+++ b/x11-wm/heliodor/pkg-descr
@@ -0,0 +1,5 @@
+Heliodor is a window decorator for Beryl that uses the native Metacity window
+decorations. This way, users can keep their native window decorations that they
+use in GNOME with Beryl.
+
+WWW: http://www.beryl-project.org/
diff --git a/x11-wm/heliodor/pkg-plist b/x11-wm/heliodor/pkg-plist
new file mode 100644
index 000000000000..a6cb89e18a3a
--- /dev/null
+++ b/x11-wm/heliodor/pkg-plist
@@ -0,0 +1,8 @@
+@comment $FreeBSD$
+bin/heliodor
+@cwd %%WINDOWSETTINGSDATADIR%%
+share/gnome/wm-properties/beryl.desktop
+@cwd %%WINDOWSETTINGSLIBDIR%%
+window-manager-settings/libberyl.a
+window-manager-settings/libberyl.la
+window-manager-settings/libberyl.so
diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index 3d6022907938..e4968f624049 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= icewm
PORTVERSION= 1.2.30
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm
MASTER_SITES= SF
diff --git a/x11-wm/ion-2/Makefile b/x11-wm/ion-2/Makefile
index 78c347efdb97..7f140e932064 100644
--- a/x11-wm/ion-2/Makefile
+++ b/x11-wm/ion-2/Makefile
@@ -8,7 +8,7 @@
PORTNAME= ion-2
PORTVERSION= 20040729
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm
MASTER_SITES= http://modeemi.fi/~tuomov/dl/
diff --git a/x11-wm/ion-3/Makefile b/x11-wm/ion-3/Makefile
index 846b06e1bc14..e41d9ff08e5e 100644
--- a/x11-wm/ion-3/Makefile
+++ b/x11-wm/ion-3/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ion-3ds
PORTVERSION= 20070318
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= http://modeemi.fi/~tuomov/dl/
diff --git a/x11-wm/ion-3ds/Makefile b/x11-wm/ion-3ds/Makefile
index 846b06e1bc14..e41d9ff08e5e 100644
--- a/x11-wm/ion-3ds/Makefile
+++ b/x11-wm/ion-3ds/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ion-3ds
PORTVERSION= 20070318
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= http://modeemi.fi/~tuomov/dl/
diff --git a/x11-wm/ion/Makefile b/x11-wm/ion/Makefile
index 56b1e561fad0..e1b6e19eea67 100644
--- a/x11-wm/ion/Makefile
+++ b/x11-wm/ion/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ion
PORTVERSION= 20020207
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm
MASTER_SITES= http://modeemi.cs.tut.fi/~tuomov/dl/
diff --git a/x11-wm/ion3/Makefile b/x11-wm/ion3/Makefile
index 78c347efdb97..7f140e932064 100644
--- a/x11-wm/ion3/Makefile
+++ b/x11-wm/ion3/Makefile
@@ -8,7 +8,7 @@
PORTNAME= ion-2
PORTVERSION= 20040729
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm
MASTER_SITES= http://modeemi.fi/~tuomov/dl/
diff --git a/x11-wm/jewel/Makefile b/x11-wm/jewel/Makefile
index 624d41a6fced..26dacbd6f286 100644
--- a/x11-wm/jewel/Makefile
+++ b/x11-wm/jewel/Makefile
@@ -8,6 +8,7 @@
PORTNAME= jewel
PORTVERSION= 0.12.41
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= http://mjr.towers.org.uk/comp/
diff --git a/x11-wm/jwm/Makefile b/x11-wm/jwm/Makefile
index 33fd40c6c722..c41deb285706 100644
--- a/x11-wm/jwm/Makefile
+++ b/x11-wm/jwm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= jwm
PORTVERSION= 1.8
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://joewing.net/programs/
diff --git a/x11-wm/kahakai/Makefile b/x11-wm/kahakai/Makefile
index 5c57ef8821d8..3cfe2003d8e0 100644
--- a/x11-wm/kahakai/Makefile
+++ b/x11-wm/kahakai/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kahakai
PORTVERSION= 0.6.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/x11-wm/kappdock/Makefile b/x11-wm/kappdock/Makefile
index 11bdb2626830..cd9791dda42b 100644
--- a/x11-wm/kappdock/Makefile
+++ b/x11-wm/kappdock/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kappdock
PORTVERSION= 0.46.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-wm kde
MASTER_SITES= http://www.Informatik.Uni-Oldenburg.DE/~bigboss/kappdock/
DISTNAME= ${PORTNAME}-0.46-1
diff --git a/x11-wm/kompmgr/Makefile b/x11-wm/kompmgr/Makefile
index d2fae3ee85c8..5ced34db32bf 100644
--- a/x11-wm/kompmgr/Makefile
+++ b/x11-wm/kompmgr/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kompmgr
PORTVERSION= ${KDE_VERSION}
+PORTREVISION= 1
CATEGORIES= x11-wm kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/x11-wm/larswm/Makefile b/x11-wm/larswm/Makefile
index 2f14342e386c..a2dfa1cb2eb5 100644
--- a/x11-wm/larswm/Makefile
+++ b/x11-wm/larswm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= larswm
PORTVERSION= 7.5.3
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= http://home.earthlink.net/~lab1701/larswm/
diff --git a/x11-wm/libdockapp/Makefile b/x11-wm/libdockapp/Makefile
index 938cea0ff49c..6d32099ae804 100644
--- a/x11-wm/libdockapp/Makefile
+++ b/x11-wm/libdockapp/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libdockapp
PORTVERSION= 0.6.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm
MASTER_SITES= http://solfertje.student.utwente.nl/~dalroi/libdockapp/files/
diff --git a/x11-wm/lwm/Makefile b/x11-wm/lwm/Makefile
index 0247a3c3e891..07f70069b02f 100644
--- a/x11-wm/lwm/Makefile
+++ b/x11-wm/lwm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= lwm
PORTVERSION= 1.2.1
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= http://www.jfc.org.uk/files/lwm/
diff --git a/x11-wm/matchbox/Makefile b/x11-wm/matchbox/Makefile
index f1a1e095d6cf..d0dc9eac368b 100644
--- a/x11-wm/matchbox/Makefile
+++ b/x11-wm/matchbox/Makefile
@@ -7,6 +7,7 @@
PORTNAME= matchbox
PORTVERSION= 1.1
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/%SUBDIR%/
MASTER_SITE_SUBDIR= ${PORTVERSION}
diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile
index 3979144705da..0aceb7400b7f 100644
--- a/x11-wm/metacity/Makefile
+++ b/x11-wm/metacity/Makefile
@@ -8,6 +8,7 @@
PORTNAME= metacity
PORTVERSION= 2.18.2
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-wm/metacity/pkg-plist b/x11-wm/metacity/pkg-plist
index 4a2c523cdd7d..d24bd8719dec 100644
--- a/x11-wm/metacity/pkg-plist
+++ b/x11-wm/metacity/pkg-plist
@@ -213,61 +213,23 @@ share/locale/zh_TW/LC_MESSAGES/metacity.mo
@dirrm share/gnome/metacity
@dirrm include/metacity-1/metacity-private
@dirrm include/metacity-1
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/tk/LC_MESSAGES
-@dirrmtry share/locale/tk
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
@dirrmtry share/locale/mg/LC_MESSAGES
@dirrmtry share/locale/mg
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
@dirrmtry share/locale/hy/LC_MESSAGES
@dirrmtry share/locale/hy
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
@dirrmtry share/locale/be@latin
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
diff --git a/x11-wm/mlvwm/Makefile b/x11-wm/mlvwm/Makefile
index bce560d06e07..14ca8f7dc59f 100644
--- a/x11-wm/mlvwm/Makefile
+++ b/x11-wm/mlvwm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= mlvwm
PORTVERSION= 0.9.1
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= http://www2u.biglobe.ne.jp/~y-miyata/mlvwm/
DISTNAME= mlvwm091
diff --git a/x11-wm/novawm/Makefile b/x11-wm/novawm/Makefile
index ae8b74f902cd..9b5a737103f6 100644
--- a/x11-wm/novawm/Makefile
+++ b/x11-wm/novawm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= novawm
PORTVERSION= 0.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/x11-wm/obconf/Makefile b/x11-wm/obconf/Makefile
index b6d44ef8f08d..f4123c6f4ba5 100644
--- a/x11-wm/obconf/Makefile
+++ b/x11-wm/obconf/Makefile
@@ -7,7 +7,7 @@
PORTNAME= obconf
PORTVERSION= 1.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm
MASTER_SITES= http://tr.openmonkey.com/files/obconf/
diff --git a/x11-wm/obtuner/Makefile b/x11-wm/obtuner/Makefile
index 8fcd643f1b80..92ff2130666c 100644
--- a/x11-wm/obtuner/Makefile
+++ b/x11-wm/obtuner/Makefile
@@ -7,7 +7,7 @@
PORTNAME= obtuner
PORTVERSION= 0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/x11-wm/olvwm/Makefile b/x11-wm/olvwm/Makefile
index edd556f1356e..96ece32dc424 100644
--- a/x11-wm/olvwm/Makefile
+++ b/x11-wm/olvwm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= olvwm
PORTVERSION= 4.2
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= ftp://ftp.x.org/R5contrib/ \
${MASTER_SITE_XCONTRIB}
diff --git a/x11-wm/openbox/Makefile b/x11-wm/openbox/Makefile
index df125bd95f36..70e7f58a6c32 100644
--- a/x11-wm/openbox/Makefile
+++ b/x11-wm/openbox/Makefile
@@ -8,6 +8,7 @@
PORTNAME= openbox
PORTVERSION= 3.3.1
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= http://offload1.icculus.org/openbox/releases/
diff --git a/x11-wm/orion/Makefile b/x11-wm/orion/Makefile
index 7ecd62ca226f..0206b624d3ad 100644
--- a/x11-wm/orion/Makefile
+++ b/x11-wm/orion/Makefile
@@ -7,6 +7,7 @@
PORTNAME= orion
PORTVERSION= 0.2
+PORTREVISION= 1
CATEGORIES= x11-wm scheme
MASTER_SITES= ftp://ftp.scsh.net/pub/scsh/packages/orion-wm/
diff --git a/x11-wm/oroborus/Makefile b/x11-wm/oroborus/Makefile
index cf80c56e31fb..7f480915d50b 100644
--- a/x11-wm/oroborus/Makefile
+++ b/x11-wm/oroborus/Makefile
@@ -7,7 +7,7 @@
PORTNAME= oroborus
PORTVERSION= 2.0.12
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm
MASTER_SITES= http://www.oroborus.org/debian/dists/sid/main/source/x11/ \
http://matt.peterson.org/FreeBSD/ports/
diff --git a/x11-wm/pager/Makefile b/x11-wm/pager/Makefile
index 05624ea18b8b..5a20c65442d2 100644
--- a/x11-wm/pager/Makefile
+++ b/x11-wm/pager/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pager
PORTVERSION= 0.6
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11-wm
MASTER_SITES= http://freebsd.unixfreunde.de/sources/ \
http://mirror2.unixfreunde.de/
diff --git a/x11-wm/pawm/Makefile b/x11-wm/pawm/Makefile
index d26b2861f33b..a432c9ad73e2 100644
--- a/x11-wm/pawm/Makefile
+++ b/x11-wm/pawm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pawm
PORTVERSION= 2.2.9
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= http://www.pleyades.net/pawm/files/
diff --git a/x11-wm/peksystray/Makefile b/x11-wm/peksystray/Makefile
index 1a09eb410362..07297689d306 100644
--- a/x11-wm/peksystray/Makefile
+++ b/x11-wm/peksystray/Makefile
@@ -7,6 +7,7 @@
PORTNAME= peksystray
PORTVERSION= 0.4.0
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/x11-wm/pekwm/Makefile b/x11-wm/pekwm/Makefile
index 04bf848a5cd3..902a574b31ee 100644
--- a/x11-wm/pekwm/Makefile
+++ b/x11-wm/pekwm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pekwm
PORTVERSION= 20060417
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= http://bsd-unix.org/downloads/ \
http://pekwm.org/files/
diff --git a/x11-wm/phluid/Makefile b/x11-wm/phluid/Makefile
index 7e5703e3cb5c..4da060145c22 100644
--- a/x11-wm/phluid/Makefile
+++ b/x11-wm/phluid/Makefile
@@ -7,7 +7,7 @@
PORTNAME= phluid
PORTVERSION= 0.0.3
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= phluid
diff --git a/x11-wm/piewm/Makefile b/x11-wm/piewm/Makefile
index 9a213846e871..0110cfdedcf4 100644
--- a/x11-wm/piewm/Makefile
+++ b/x11-wm/piewm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= piewm
PORTVERSION= 1.04
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= http://www.crynwr.com/piewm/
@@ -16,6 +17,7 @@ COMMENT= A tvtwm with pie (circular) menus
DISABLE_SIZE= yes
USE_IMAKE= yes
USE_XPM= yes
+USE_XORG= xbitmaps
MAN1= piewm.1
.include <bsd.port.mk>
diff --git a/x11-wm/pwm/Makefile b/x11-wm/pwm/Makefile
index 48e1cb33873e..7a3423b70731 100644
--- a/x11-wm/pwm/Makefile
+++ b/x11-wm/pwm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pwm
PORTVERSION= 2006.05.17
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= http://modeemi.fi/~tuomov/dl/
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.//g}
diff --git a/x11-wm/qlwm/Makefile b/x11-wm/qlwm/Makefile
index b851b69ad3ad..185d8242733b 100644
--- a/x11-wm/qlwm/Makefile
+++ b/x11-wm/qlwm/Makefile
@@ -9,6 +9,7 @@
PORTNAME= qlwm
PORTVERSION= 3.1
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= http://www.alinden.mynetcologne.de/qlwm/
diff --git a/x11-wm/qvwm/Makefile b/x11-wm/qvwm/Makefile
index 9d60d6c7a348..36750c02c204 100644
--- a/x11-wm/qvwm/Makefile
+++ b/x11-wm/qvwm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qvwm
PORTVERSION= 1.1.12
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-wm
MASTER_SITES= http://www.csg.is.titech.ac.jp/~kourai/qvwm/archive/qvwm/ \
ftp://ftp.chg.ru/pub/X11/windowmanagers/qvwm/
diff --git a/x11-wm/ratmenu/Makefile b/x11-wm/ratmenu/Makefile
index d91a858cb340..3a0c64f6bd54 100644
--- a/x11-wm/ratmenu/Makefile
+++ b/x11-wm/ratmenu/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ratmenu
PORTVERSION= 1.4
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= http://www.mired.org/downloads/
diff --git a/x11-wm/ratpoison/Makefile b/x11-wm/ratpoison/Makefile
index 8e677891a6fd..98095b4370ca 100644
--- a/x11-wm/ratpoison/Makefile
+++ b/x11-wm/ratpoison/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ratpoison
PORTVERSION= 1.4.1
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/x11-wm/sapphire/Makefile b/x11-wm/sapphire/Makefile
index 60727ec6fa60..a30994be9dec 100644
--- a/x11-wm/sapphire/Makefile
+++ b/x11-wm/sapphire/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sapphire
PORTVERSION= 0.15.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/x11-wm/sawfish/Makefile b/x11-wm/sawfish/Makefile
index 5f82052270d5..3a24404c0ad1 100644
--- a/x11-wm/sawfish/Makefile
+++ b/x11-wm/sawfish/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sawfish
PORTVERSION= 1.3
-PORTREVISION= 13
+PORTREVISION= 14
PORTEPOCH= 2
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
diff --git a/x11-wm/sawfish/pkg-plist b/x11-wm/sawfish/pkg-plist
index 49a6645e91aa..5dfcd8ffc5df 100644
--- a/x11-wm/sawfish/pkg-plist
+++ b/x11-wm/sawfish/pkg-plist
@@ -680,37 +680,3 @@ share/locale/zh_TW/LC_MESSAGES/sawfish.mo
@dirrm libexec/sawfish/%%VERSION%%
@dirrm libexec/sawfish
@dirrm libexec/rep/%%GNUHOST%%/sawfish
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
diff --git a/x11-wm/selectwm/Makefile b/x11-wm/selectwm/Makefile
index f171d13b95e6..b5e853a47141 100644
--- a/x11-wm/selectwm/Makefile
+++ b/x11-wm/selectwm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= selectwm
PORTVERSION= 0.4.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-wm
MASTER_SITES= http://ordiluc.net/selectwm/
diff --git a/x11-wm/skippy-xd/Makefile b/x11-wm/skippy-xd/Makefile
index f88eb593b931..f35616804fcf 100644
--- a/x11-wm/skippy-xd/Makefile
+++ b/x11-wm/skippy-xd/Makefile
@@ -7,16 +7,18 @@
PORTNAME= skippy-xd
PORTVERSION= 0.5.0
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= http://thegraveyard.org/files/
MAINTAINER= ports@FreeBSD.org
COMMENT= A full-screen X11 task-switcher like Apple's Expose
-LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft
+BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2
USE_BZIP2= yes
USE_GNOME= pkgconfig
+USE_XORG= x11 xft xcomposite xdamage xfixes xrender xinerama xext xmu
PLIST_FILES= bin/skippy-xd \
%%DATADIR%%/skippy-xd.rc-default
PLIST_DIRS= %%DATADIR%%
diff --git a/x11-wm/skippy/Makefile b/x11-wm/skippy/Makefile
index fc9c837a80a9..b86acf9abd7e 100644
--- a/x11-wm/skippy/Makefile
+++ b/x11-wm/skippy/Makefile
@@ -7,7 +7,7 @@
PORTNAME= skippy
PORTVERSION= 0.5.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-wm
MASTER_SITES= http://thegraveyard.org/files/
diff --git a/x11-wm/swm/Makefile b/x11-wm/swm/Makefile
index 9cba929b34cc..1a880d23b425 100644
--- a/x11-wm/swm/Makefile
+++ b/x11-wm/swm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= swm
PORTVERSION= 1.3.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-wm
MASTER_SITES= http://www2.informatik.hu-berlin.de/~sperling/prog/
EXTRACT_SUFX= c-src.tgz
diff --git a/x11-wm/tinywm/Makefile b/x11-wm/tinywm/Makefile
index 1d8ae3eb485e..2bac671b5951 100644
--- a/x11-wm/tinywm/Makefile
+++ b/x11-wm/tinywm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= tinywm
PORTVERSION= 1.3
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= http://incise.org/files/dev/
EXTRACT_SUFX= .tgz
diff --git a/x11-wm/transset-df/Makefile b/x11-wm/transset-df/Makefile
index 9df0efa700e9..b9398704b5ec 100644
--- a/x11-wm/transset-df/Makefile
+++ b/x11-wm/transset-df/Makefile
@@ -7,6 +7,7 @@
PORTNAME= transset-df
PORTVERSION= 5
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= http://forchheimer.se/transset-df/
diff --git a/x11-wm/treewm/Makefile b/x11-wm/treewm/Makefile
index 977be8a8fb6e..b6952647cb49 100644
--- a/x11-wm/treewm/Makefile
+++ b/x11-wm/treewm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= treewm
PORTVERSION= 0.4.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/x11-wm/tvtwm/Makefile b/x11-wm/tvtwm/Makefile
index f4db55a0ae8b..48732b78a7a5 100644
--- a/x11-wm/tvtwm/Makefile
+++ b/x11-wm/tvtwm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= tvtwm
PORTVERSION= pl11
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= window_managers
@@ -18,6 +19,7 @@ COMMENT= Twm with a virtual desktop
WRKSRC= ${WRKDIR}/tvtwm
USE_IMAKE= yes
USE_XPM= yes
+USE_XORG= xbitmaps
MAN1= tvtwm.1
MANCOMPRESSED= no
PLIST_FILES= bin/tvtwm
diff --git a/x11-wm/twm/Makefile b/x11-wm/twm/Makefile
new file mode 100644
index 000000000000..764a923d533a
--- /dev/null
+++ b/x11-wm/twm/Makefile
@@ -0,0 +1,21 @@
+# New ports collection makefile for: twm
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= twm
+PORTVERSION= 1.0.3
+PORTREVISION= 3
+CATEGORIES= x11-wm
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Tab Window Manager for the X Window System
+
+XORG_CAT= app
+USE_XORG= x11 xext xt xmu
+
+MAN1= twm.1
+
+.include <bsd.port.mk>
diff --git a/x11-wm/twm/distinfo b/x11-wm/twm/distinfo
new file mode 100644
index 000000000000..a6184713af64
--- /dev/null
+++ b/x11-wm/twm/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/twm-1.0.3.tar.bz2) = a56b71dc40249195b32b304633c28a3e
+SHA256 (xorg/app/twm-1.0.3.tar.bz2) = 5b41550477a893bf2b82ab73fc7fb6c839ba52d0deac059be1a473dd7bb92a4e
+SIZE (xorg/app/twm-1.0.3.tar.bz2) = 238448
diff --git a/x11-wm/twm/pkg-descr b/x11-wm/twm/pkg-descr
new file mode 100644
index 000000000000..1d43548efaa1
--- /dev/null
+++ b/x11-wm/twm/pkg-descr
@@ -0,0 +1,4 @@
+This package contains twm, a Window Manager for the X Window System.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-wm/twm/pkg-plist b/x11-wm/twm/pkg-plist
new file mode 100644
index 000000000000..4a6d628373c1
--- /dev/null
+++ b/x11-wm/twm/pkg-plist
@@ -0,0 +1,3 @@
+bin/twm
+share/X11/twm/system.twmrc
+@dirrm share/X11/twm
diff --git a/x11-wm/ude/Makefile b/x11-wm/ude/Makefile
index 866e91d7a5b9..0d0fc78243ee 100644
--- a/x11-wm/ude/Makefile
+++ b/x11-wm/ude/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ude
PORTVERSION= 0.2.9b
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= udeproject
diff --git a/x11-wm/uwm/Makefile b/x11-wm/uwm/Makefile
index a092518c75e8..f6908f014158 100644
--- a/x11-wm/uwm/Makefile
+++ b/x11-wm/uwm/Makefile
@@ -9,6 +9,7 @@
PORTNAME= uwm
PORTVERSION= 19881027
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_NETBSD}
DISTNAME= X.V11R3uwm
diff --git a/x11-wm/vtwm/Makefile b/x11-wm/vtwm/Makefile
index 23c767924513..7ec054066dfb 100644
--- a/x11-wm/vtwm/Makefile
+++ b/x11-wm/vtwm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= vtwm
PORTVERSION= 5.4.7
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= http://www.vtwm.org/downloads/
diff --git a/x11-wm/w9wm/Makefile b/x11-wm/w9wm/Makefile
index 1038abf9caef..eb9d4f89536a 100644
--- a/x11-wm/w9wm/Makefile
+++ b/x11-wm/w9wm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= w9wm
PORTVERSION= 0.4.2
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= http://www.grassouille.org/code/w9wm/src/
diff --git a/x11-wm/waimea-devel/Makefile b/x11-wm/waimea-devel/Makefile
index 3f44fbb26863..93e376e86f49 100644
--- a/x11-wm/waimea-devel/Makefile
+++ b/x11-wm/waimea-devel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= waimea
PORTVERSION= 0.5.1
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= http://dev.gentoo.org/~nixphoeni/ \
${MASTER_SITE_LOCAL}
diff --git a/x11-wm/waimea/Makefile b/x11-wm/waimea/Makefile
index 489ce87800f7..d41ebe97b984 100644
--- a/x11-wm/waimea/Makefile
+++ b/x11-wm/waimea/Makefile
@@ -7,7 +7,7 @@
PORTNAME= waimea
PORTVERSION= 0.4.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= waimea
diff --git a/x11-wm/wampager/Makefile b/x11-wm/wampager/Makefile
index 2ebf477b562d..416e64cf70b5 100644
--- a/x11-wm/wampager/Makefile
+++ b/x11-wm/wampager/Makefile
@@ -7,6 +7,7 @@
PORTNAME= wampager
PORTVERSION= 0.9.3.20041204
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= http://www.ijs.si/~lesi/waimea/ \
http://www.daemon.li/distfiles/
diff --git a/x11-wm/weewm/Makefile b/x11-wm/weewm/Makefile
index 938b97944d2a..0dd4ee00bbb3 100644
--- a/x11-wm/weewm/Makefile
+++ b/x11-wm/weewm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= weewm
PORTVERSION= 0.0.2
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11-wm
MASTER_SITES= http://weewm.flashtux.org/download/
diff --git a/x11-wm/windowlab/Makefile b/x11-wm/windowlab/Makefile
index 0ba8b014d4a6..2bcde91cd4d0 100644
--- a/x11-wm/windowlab/Makefile
+++ b/x11-wm/windowlab/Makefile
@@ -7,6 +7,7 @@
PORTNAME= windowlab
PORTVERSION= 1.33
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= http://www.nickgravgaard.com/windowlab/
EXTRACT_SUFX= .tar
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index e07861801413..9fa3e753274f 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -7,7 +7,7 @@
PORTNAME= windowmaker
PORTVERSION= 0.92.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-wm windowmaker
MASTER_SITES= ${MASTER_SITE_WINDOWMAKER} \
http://dougbarton.us/Downloads/
diff --git a/x11-wm/wm2/Makefile b/x11-wm/wm2/Makefile
index 1d581e18895c..8ad102ee0c3b 100644
--- a/x11-wm/wm2/Makefile
+++ b/x11-wm/wm2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= wm2
PORTVERSION= 4.0
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= http://www.all-day-breakfast.com/wm2/
DISTNAME= ${PORTNAME}-${PORTVERSION:R}
diff --git a/x11-wm/wmDeskGuide/Makefile b/x11-wm/wmDeskGuide/Makefile
index ba67fcb6047a..3bcc0ccc5a0a 100644
--- a/x11-wm/wmDeskGuide/Makefile
+++ b/x11-wm/wmDeskGuide/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wmDeskGuide
PORTVERSION= 0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm windowmaker
MASTER_SITES= http://charybda.icm.edu.pl/~jarwyp/data/own/wmDeskGuide/build/
diff --git a/x11-wm/wmakerconf/Makefile b/x11-wm/wmakerconf/Makefile
index e49d432c0d58..d1da84747e76 100644
--- a/x11-wm/wmakerconf/Makefile
+++ b/x11-wm/wmakerconf/Makefile
@@ -8,7 +8,7 @@
PORTNAME= wmakerconf
PORTVERSION= 2.11
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-wm
MASTER_SITES= http://www.starplot.org/wmakerconf/
diff --git a/x11-wm/wmanager/Makefile b/x11-wm/wmanager/Makefile
index c0be3080b1eb..d910165c2b01 100644
--- a/x11-wm/wmanager/Makefile
+++ b/x11-wm/wmanager/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wmanager
PORTVERSION= 0.2.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
diff --git a/x11-wm/wmcp/Makefile b/x11-wm/wmcp/Makefile
index ac4d7cd802c8..e5a1a30e001c 100644
--- a/x11-wm/wmcp/Makefile
+++ b/x11-wm/wmcp/Makefile
@@ -7,6 +7,7 @@
PORTNAME= wmcp
PORTVERSION= 1.2.8
+PORTREVISION= 1
CATEGORIES= x11-wm windowmaker
MASTER_SITES= http://web.cs.mun.ca/~gstarkes/wmaker/dockapps/files/
diff --git a/x11-wm/wmg/Makefile b/x11-wm/wmg/Makefile
index 944ef131ecb3..3635142cd74a 100644
--- a/x11-wm/wmg/Makefile
+++ b/x11-wm/wmg/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wmg
PORTVERSION= 0.15.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-wm gnome
MASTER_SITES= http://ductape.net/~reeve/downloads/
DISTNAME= wmG-${PORTVERSION}
diff --git a/x11-wm/wmii-devel/Makefile b/x11-wm/wmii-devel/Makefile
index 892a543764e6..f119374d9237 100644
--- a/x11-wm/wmii-devel/Makefile
+++ b/x11-wm/wmii-devel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= wmii
PORTVERSION= 3.5.${CHANGESET}
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= CENKES
diff --git a/x11-wm/wmii/Makefile b/x11-wm/wmii/Makefile
index 1ea973662a3c..b102d163d19c 100644
--- a/x11-wm/wmii/Makefile
+++ b/x11-wm/wmii/Makefile
@@ -7,6 +7,7 @@
PORTNAME= wmii
DISTVERSION= 3.1
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= http://www.suckless.org/download/ CENKES
diff --git a/x11-wm/wmthemeinstall/Makefile b/x11-wm/wmthemeinstall/Makefile
index 46f587965be8..d88f52f230dc 100644
--- a/x11-wm/wmthemeinstall/Makefile
+++ b/x11-wm/wmthemeinstall/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wmthemeinstall
PORTVERSION= 0.62
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-wm
MASTER_SITES= http://www.jeremias.net/wmthemeinstall/download/
diff --git a/x11-wm/xcompmgr/Makefile b/x11-wm/xcompmgr/Makefile
index 5badea72e61a..255f3d6b6320 100644
--- a/x11-wm/xcompmgr/Makefile
+++ b/x11-wm/xcompmgr/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xcompmgr
PORTVERSION= 1.1.3
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= http://xapps.freedesktop.org/release/
diff --git a/x11-wm/xfce/Makefile b/x11-wm/xfce/Makefile
index aa5dcc4d4946..92351b092260 100644
--- a/x11-wm/xfce/Makefile
+++ b/x11-wm/xfce/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce
PORTVERSION= 3.8.18
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-wm xfce
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/x11-wm/xfce/pkg-plist b/x11-wm/xfce/pkg-plist
index 6852e129079b..2aa984e566b7 100644
--- a/x11-wm/xfce/pkg-plist
+++ b/x11-wm/xfce/pkg-plist
@@ -659,23 +659,3 @@ share/xfce/textures/stripe.xpm
@dirrm share/xfce/backdrops
@dirrm share/xfce
@dirrm etc/xfce
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
diff --git a/x11-wm/xfce4-desktop/Makefile b/x11-wm/xfce4-desktop/Makefile
index 0e3459c7d77c..1b9974dcaff7 100644
--- a/x11-wm/xfce4-desktop/Makefile
+++ b/x11-wm/xfce4-desktop/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-desktop
PORTVERSION= 4.4.1
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11-wm xfce
MASTER_SITES= ${MASTER_SITES_XFCE}
DISTNAME= xfdesktop-${PORTVERSION}
diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile
index a25e4c9556e3..8279b0fa3bbc 100644
--- a/x11-wm/xfce4-panel/Makefile
+++ b/x11-wm/xfce4-panel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xfce4-panel
PORTVERSION= 4.4.1
+PORTREVISION= 1
CATEGORIES= x11-wm xfce
MASTER_SITES= ${MASTER_SITES_XFCE}
DIST_SUBDIR= xfce4
diff --git a/x11-wm/xfce4-session/Makefile b/x11-wm/xfce4-session/Makefile
index b85b5d3e2ada..d757d709f449 100644
--- a/x11-wm/xfce4-session/Makefile
+++ b/x11-wm/xfce4-session/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xfce4-session
PORTVERSION= 4.4.1
+PORTREVISION= 1
CATEGORIES= x11-wm xfce
MASTER_SITES= ${MASTER_SITES_XFCE}
DIST_SUBDIR= xfce4
diff --git a/x11-wm/xfce4-wm/Makefile b/x11-wm/xfce4-wm/Makefile
index f7258e11673c..d1d3b482d546 100644
--- a/x11-wm/xfce4-wm/Makefile
+++ b/x11-wm/xfce4-wm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xfce4-wm
PORTVERSION= 4.4.1
+PORTREVISION= 1
CATEGORIES= x11-wm xfce
MASTER_SITES= ${MASTER_SITES_XFCE}
DISTNAME= xfwm4-${PORTVERSION}
diff --git a/x11-wm/xfce4/Makefile b/x11-wm/xfce4/Makefile
index d21df53e535c..8d315acf6753 100644
--- a/x11-wm/xfce4/Makefile
+++ b/x11-wm/xfce4/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xfce
PORTVERSION= 4.4.1
+PORTREVISION= 1
CATEGORIES= x11-wm xfce
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/x11-wm/yawm/Makefile b/x11-wm/yawm/Makefile
index 46caa04dfadf..85e1f89bc687 100644
--- a/x11-wm/yawm/Makefile
+++ b/x11-wm/yawm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= yawm
PORTVERSION= 0.0.1
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= ftp://ftp.sai.msu.su/pub/X11/win_man/
DISTNAME= yawm-0.0.1-a4