5 files changed, 130 insertions, 225 deletions

diff --git a/x11-wm/openbox/Makefile b/x11-wm/openbox/Makefile
index 849b325dd362..d16b3d93e4f9 100644
--- a/x11-wm/openbox/Makefile
+++ b/x11-wm/openbox/Makefile
@@ -7,130 +7,29 @@
 #
 
 PORTNAME=	openbox
-PORTVERSION=	3.2
-PORTREVISION=	3
+PORTVERSION=	3.3
 CATEGORIES=	x11-wm
-MASTER_SITES=	http://icculus.org/openbox/releases/
+MASTER_SITES=	http://offload1.icculus.org/openbox/releases/
 
 MAINTAINER=	redchrom@gmail.com
-COMMENT=	Derived from, and similar to, Blackbox
+COMMENT=	A standards compliant, fast, light-weight, extensible window manager
 
 LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 
-CONFIGURE_ARGS=	--datadir=${PREFIX}/share/openbox --prefix=${PREFIX} \
-		--sysconfdir=${PREFIX}/etc/openbox
-DOCS=		ABOUT-NLS AUTHORS CHANGELOG COPYING README TODO
 GNU_CONFIGURE=	yes
-PKGMESSAGE=	${WRKDIR}/pkg-message
-PLIST=		${WRKDIR}/pkg-plist
 USE_GMAKE=	yes
 USE_GNOME=	glib20 libxml2
 USE_X_PREFIX=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
-.if defined(WITH_SPLITGRADIENT)
-post-patch::
-	@${ECHO} "===>  Applying split gradient patch"
-	cd ${BUILD_WRKSRC}; ${PATCH} -p1 < ${PATCHDIR}/extra-patch-gradient
+.if !defined(WITHOUT_PANGO)
+USE_GNOME+=	pango
+.else
+CONFIGURE_ARGS+=	--disable-pango
 .endif
 
-post-build:
-	cd ${WRKSRC}/po && ${LOCALBASE}/bin/msgfmt -c -o ja.mo ja.po
-	${CP} -P ${WRKSRC}/data/rc.xml ${WRKSRC}/data/rc.xml.orig
-	${CP} -P ${WRKSRC}/data/menu.xml ${WRKSRC}/data/openbox-menu.xml
-	${SED} -E "s:/etc/X11/openbox/:${PREFIX}/share/openbox/:g" \
-		< ${WRKSRC}/data/rc.xml.orig > ${WRKSRC}/data/rc.xml
-	${RM} ${WRKSRC}/data/rc.xml.orig
-
-pre-configure:
-	${MKDIR} ${WRKDIR}
-	${ECHO_CMD} \
-	"Warning:  source code for this version has not been reviewed!" \
-		> ${PKGMESSAGE}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_CMD} 
-	@${ECHO_CMD} Waiting ten seconds--press control-C to cancel build.
-	@sleep 10
-
-pre-install:
-	${RM} -f ${PLIST}
-.for ii in gnome-panel-control openbox kdetrayproxy themeupdate.py
-	${ECHO_CMD} bin/${ii} >> ${PLIST}
-.endfor
-.for ii in parser render
-	${ECHO_CMD} libdata/pkgconfig/ob${ii}-3.0.pc >> ${PLIST}
-.endfor
-	cd ${WRKSRC} && ${FIND} -s data themes -type f \
-		| ${SED} -e 's:^:share/openbox/:' >> ${PLIST} \
-		&& ${FIND} data themes -type d | ${SORT} -r \
-		| ${SED} -e 's:^:@dirrm share/openbox/:' >> ${PLIST}
-	cd ${WRKSRC}/data && ${FIND} -s * -type f \
-		| ${SED} -e 's:^:share/openbox/:' >> ${PLIST}
-	${ECHO_CMD} share/gnome/wm-properties/openbox.desktop >> ${PLIST}
-	${ECHO_CMD} share/locale/ja/LC_MESSAGES/openbox.mo >> ${PLIST}
-.for ii in menu rc
-	${ECHO_CMD} etc/openbox/xdg/openbox/${ii}.xml >> ${PLIST}
-.endfor
-.for ii in parse.h render.h theme.h version.h
-	${ECHO_CMD} include/openbox/${ii} >> ${PLIST}
-.endfor
-.for ii in openbox/xdg/openbox openbox/xdg openbox
-	${ECHO_CMD} @dirrm etc/${ii} >> ${PLIST}
-.endfor
-.for ii in la lai so so.2
-	${ECHO_CMD} lib/libobparser.${ii} >> ${PLIST}
-	${ECHO_CMD} lib/libobrender.${ii} >> ${PLIST}
-.endfor
-.for ii in gnome/wm-properties gnome
-	${ECHO_CMD} "@dirrmtry share/${ii}" >> ${PLIST}
-.endfor
-.if !defined(NOPORTDOCS)
-.for ii in ${DOCS}
-	${ECHO_CMD} share/doc/openbox/${ii} >> ${PLIST}
-.endfor
-	${ECHO_CMD} @dirrm share/doc/openbox >> ${PLIST}
-.endif
-.for ii in include share
-	${ECHO_CMD} @dirrm ${ii}/openbox >> ${PLIST}
-.endfor
-
-do-install:
-	${MKDIR} ${DATADIR} ${PREFIX}/share/gnome/wm-properties \
-		${PREFIX}/etc/openbox/xdg/openbox ${PREFIX}/include/openbox \
-		${PREFIX}/share/locale/ja/LC_MESSAGES
-	${INSTALL_DATA} ${WRKSRC}/po/ja.mo \
-		${PREFIX}/share/locale/ja/LC_MESSAGES/openbox.mo
-.for ii in parser/parse render/theme render/render version
-	${INSTALL_DATA} ${WRKSRC}/${ii}.h ${PREFIX}/include/openbox/
-.endfor
-.for ii in parser render
-	${INSTALL_DATA} ${WRKSRC}/${ii}/ob${ii}-3.0.pc \
-		${PREFIX}/libdata/pkgconfig/
-.endfor
-.for ii in menu rc
-	${INSTALL_DATA} ${WRKSRC}/data/${ii}.xml \
-		${PREFIX}/etc/openbox/xdg/openbox
-.endfor
-.for ii in openbox/.libs/openbox tools/kdetrayproxy/kdetrayproxy \
-	tools/gnome-panel-control/gnome-panel-control
-	${INSTALL_PROGRAM} ${WRKSRC}/${ii} ${PREFIX}/bin
-.endfor
-	${INSTALL_SCRIPT} ${WRKSRC}/tools/themeupdate/themeupdate.py \
-		${PREFIX}/bin
-	cd ${WRKSRC} && ${PAX} -r -w data themes ${PREFIX}/share/openbox/
-	cd ${WRKSRC} && ${INSTALL_DATA} data/* ${PREFIX}/share/openbox/
-	cd ${WRKSRC} && ${INSTALL_DATA} data/openbox.desktop \
-		${PREFIX}/share/gnome/wm-properties/
-.for ii in la lai so so.2
-	cd ${WRKSRC} && \
-		${INSTALL_DATA} parser/.libs/libobparser.${ii} ${PREFIX}/lib \
-		&& ${INSTALL_DATA} render/.libs/libobrender.${ii} ${PREFIX}/lib
-.endfor
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-.for ii in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${ii} ${DOCSDIR}
-.endfor
-.endif
+post-patch:
+	@${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|g' \
+		${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/x11-wm/openbox/distinfo b/x11-wm/openbox/distinfo
index 434683907560..f677cd3c96a2 100644
--- a/x11-wm/openbox/distinfo
+++ b/x11-wm/openbox/distinfo
@@ -1,3 +1,3 @@
-MD5 (openbox-3.2.tar.gz) = 96b6393839883c4b260388879154d294
-SHA256 (openbox-3.2.tar.gz) = 1b21ae976ca84217aa34ee72c4dda81df5eff57bade5e0fd9f1910c92e56b647
-SIZE (openbox-3.2.tar.gz) = 561115
+MD5 (openbox-3.3.tar.gz) = 35e228b33ab7d5d0995b5beb9c127808
+SHA256 (openbox-3.3.tar.gz) = d43cf28ee1a99ff8458b338574e59a1f807a8024f7308a6fcb1d747bfc9c57d8
+SIZE (openbox-3.3.tar.gz) = 603678
diff --git a/x11-wm/openbox/files/extra-patch-gradient b/x11-wm/openbox/files/extra-patch-gradient
deleted file mode 100644
index f78feef514b5..000000000000
--- a/x11-wm/openbox/files/extra-patch-gradient
+++ /dev/null
@@ -1,109 +0,0 @@
-diff -urN openbox-3.2.orig/render/gradient.c openbox-3.2/render/gradient.c
---- openbox-3.2.orig/render/gradient.c	Tue Aug  8 12:39:59 2006
-+++ openbox-3.2/render/gradient.c	Tue Aug  8 12:40:14 2006
-@@ -24,6 +24,7 @@
- 
- static void highlight(RrPixel32 *x, RrPixel32 *y, gboolean raised);
- static void gradient_solid(RrAppearance *l, gint w, gint h);
-+static void gradient_split(RrAppearance *a, gint w, gint h);
- static void gradient_vertical(RrSurface *sf, gint w, gint h);
- static void gradient_horizontal(RrSurface *sf, gint w, gint h);
- static void gradient_diagonal(RrSurface *sf, gint w, gint h);
-@@ -41,6 +42,9 @@
-     case RR_SURFACE_SOLID:
-         gradient_solid(a, w, h);
-         break;
-+    case RR_SURFACE_SPLIT:
-+        gradient_split(a, w, h);
-+        break;
-     case RR_SURFACE_VERTICAL:
-         gradient_vertical(&a->surface, w, h);
-         break;
-@@ -357,6 +361,64 @@
-             }                                             \
-         }                                                 \
-     }                                                     \
-+}
-+
-+static void gradient_split(RrAppearance *a, gint w, gint h)
-+{
-+    gint x, y1, y3, r, g, b;
-+    RrSurface *sf = &a->surface;
-+    RrPixel32 *data = sf->pixel_data;
-+    RrPixel32 current;
-+    RrColor *primary_light, *secondary_light;
-+
-+    r = sf->primary->r;
-+    r += r >> 2;
-+    g = sf->primary->g;
-+    g += g >> 2;
-+    b = sf->primary->b;
-+    b += b >> 2;
-+    if (r > 0xFF) r = 0xFF;
-+    if (g > 0xFF) g = 0xFF;
-+    if (b > 0xFF) b = 0xFF;
-+      primary_light = RrColorNew(a->inst, r, g, b);
-+
-+    r = sf->secondary->r;
-+    r += r >> 4;
-+    g = sf->secondary->g;
-+    g += g >> 4;
-+    b = sf->secondary->b;
-+    b += b >> 4;
-+    if (r > 0xFF) r = 0xFF;
-+    if (g > 0xFF) g = 0xFF;
-+    if (b > 0xFF) b = 0xFF;
-+    secondary_light = RrColorNew(a->inst, r, g, b);
-+
-+    VARS(y1);
-+    SETUP(y1, primary_light, sf->primary, (h / 2) -1);
-+  
-+    VARS(y3);
-+    SETUP(y3, sf->secondary, secondary_light,  (h / 2) -1);
-+
-+    for (y1 = h - 1; y1 > (h / 2) -1; --y1) {  /* 0 -> h-1 */
-+        current = COLOR(y1);
-+        for (x = w - 1; x >= 0; --x)  /* 0 -> w */
-+            *(data++) = current;
-+
-+        NEXT(y1);
-+    }
-+
-+    
-+    for (y3 = (h / 2) - 1; y3 > 0; --y3) {
-+        current = COLOR(y3);
-+        for (x = w - 1; x >= 0; --x)
-+            *(data++) = current;
-+
-+        NEXT(y3);
-+    }
-+
-+    current = COLOR(y3);
-+    for (x = w - 1; x >= 0; --x)  /* 0 -> w */
-+        *(data++) = current;
- }
- 
- static void gradient_horizontal(RrSurface *sf, gint w, gint h)
-diff -urN openbox-3.2.orig/render/render.h openbox-3.2/render/render.h
---- openbox-3.2.orig/render/render.h	Tue Aug  8 12:39:59 2006
-+++ openbox-3.2/render/render.h	Tue Aug  8 12:40:14 2006
-@@ -60,6 +60,7 @@
-     RR_SURFACE_NONE,
-     RR_SURFACE_PARENTREL,
-     RR_SURFACE_SOLID,
-+    RR_SURFACE_SPLIT,
-     RR_SURFACE_HORIZONTAL,
-     RR_SURFACE_VERTICAL,
-     RR_SURFACE_DIAGONAL,
-diff -urN openbox-3.2.orig/render/theme.c openbox-3.2/render/theme.c
---- openbox-3.2.orig/render/theme.c	Tue Aug  8 12:39:59 2006
-+++ openbox-3.2/render/theme.c	Tue Aug  8 12:40:14 2006
-@@ -1200,6 +1200,8 @@
-                 *grad = RR_SURFACE_HORIZONTAL;
-             else if (strstr(tex, "vertical") != NULL)
-                 *grad = RR_SURFACE_VERTICAL;
-+            else if (strstr(tex, "split") != NULL)
-+                *grad = RR_SURFACE_SPLIT;
-             else
-                 *grad = RR_SURFACE_DIAGONAL;
-         } else {
diff --git a/x11-wm/openbox/pkg-descr b/x11-wm/openbox/pkg-descr
index 00f8b2e8888c..e63070e7e930 100644
--- a/x11-wm/openbox/pkg-descr
+++ b/x11-wm/openbox/pkg-descr
@@ -1,3 +1,11 @@
-Openbox is based on, and similar to, blackbox.
+Openbox works with your applications, and makes your desktop easier to manage.
+This is because the approach to its development was the opposite of what seems
+to be the general case for window managers. Openbox was written first to comply
+with standards and to work properly. Only when that was in place did the team
+turn to the visual interface.
+
+Openbox is fully functional as a stand-alone working environment, or can be used
+as a drop-in replacement for the default window manager in the GNOME or KDE
+desktop environments. 
 
 WWW: http://icculus.org/openbox/
diff --git a/x11-wm/openbox/pkg-plist b/x11-wm/openbox/pkg-plist
new file mode 100644
index 000000000000..0de1add24e48
--- /dev/null
+++ b/x11-wm/openbox/pkg-plist
@@ -0,0 +1,107 @@
+bin/gnome-panel-control
+bin/kdetrayproxy
+bin/openbox
+etc/xdg/openbox/menu.xml
+etc/xdg/openbox/rc.xml
+include/openbox/3.3/openbox/color.h
+include/openbox/3.3/openbox/font.h
+include/openbox/3.3/openbox/geom.h
+include/openbox/3.3/openbox/gradient.h
+include/openbox/3.3/openbox/image.h
+include/openbox/3.3/openbox/instance.h
+include/openbox/3.3/openbox/mask.h
+include/openbox/3.3/openbox/parse.h
+include/openbox/3.3/openbox/render.h
+include/openbox/3.3/openbox/theme.h
+include/openbox/3.3/openbox/version.h
+lib/libobparser.a
+lib/libobparser.la
+lib/libobparser.so
+lib/libobparser.so.4
+lib/libobrender.a
+lib/libobrender.la
+lib/libobrender.so
+lib/libobrender.so.4
+libdata/pkgconfig/obparser-3.0.pc
+libdata/pkgconfig/obrender-3.0.pc
+share/gnome/wm-properties/openbox.desktop
+%%DATADIR%%/menu.xsd
+%%DATADIR%%/rc.xsd
+%%DATADIR%%/themeupdate.py
+share/pixmaps/openbox.png
+share/themes/Mikachu/openbox-3/bullet.xbm
+share/themes/Mikachu/openbox-3/close.xbm
+share/themes/Mikachu/openbox-3/desk.xbm
+share/themes/Mikachu/openbox-3/iconify.xbm
+share/themes/Mikachu/openbox-3/max.xbm
+share/themes/Mikachu/openbox-3/themerc
+share/themes/Natura/openbox-3/close.xbm
+share/themes/Natura/openbox-3/close_hover.xbm
+share/themes/Natura/openbox-3/desk.xbm
+share/themes/Natura/openbox-3/desk_toggled.xbm
+share/themes/Natura/openbox-3/iconify.xbm
+share/themes/Natura/openbox-3/iconify_disabled.xbm
+share/themes/Natura/openbox-3/iconify_hover.xbm
+share/themes/Natura/openbox-3/max.xbm
+share/themes/Natura/openbox-3/max_disabled.xbm
+share/themes/Natura/openbox-3/max_hover.xbm
+share/themes/Natura/openbox-3/max_toggled.xbm
+share/themes/Natura/openbox-3/shade.xbm
+share/themes/Natura/openbox-3/themerc
+share/themes/artwiz-boxed/openbox-3/bullet.xbm
+share/themes/artwiz-boxed/openbox-3/close.xbm
+share/themes/artwiz-boxed/openbox-3/desk.xbm
+share/themes/artwiz-boxed/openbox-3/desk_toggled.xbm
+share/themes/artwiz-boxed/openbox-3/iconify.xbm
+share/themes/artwiz-boxed/openbox-3/max.xbm
+share/themes/artwiz-boxed/openbox-3/max_toggled.xbm
+share/themes/artwiz-boxed/openbox-3/themerc
+share/themes/bear2/openbox-3/close.xbm
+share/themes/bear2/openbox-3/close_pressed.xbm
+share/themes/bear2/openbox-3/desk.xbm
+share/themes/bear2/openbox-3/desk_toggled.xbm
+share/themes/bear2/openbox-3/iconify.xbm
+share/themes/bear2/openbox-3/iconify_disabled.xbm
+share/themes/bear2/openbox-3/iconify_pressed.xbm
+share/themes/bear2/openbox-3/max.xbm
+share/themes/bear2/openbox-3/max_disabled.xbm
+share/themes/bear2/openbox-3/max_pressed.xbm
+share/themes/bear2/openbox-3/max_toggled.xbm
+share/themes/bear2/openbox-3/shade.xbm
+share/themes/bear2/openbox-3/shade_pressed.xbm
+share/themes/bear2/openbox-3/themerc
+share/themes/orang/openbox-3/themerc
+share/themes/syscrash/openbox-3/bullet.xbm
+share/themes/syscrash/openbox-3/close.xbm
+share/themes/syscrash/openbox-3/close_disabled.xbm
+share/themes/syscrash/openbox-3/desk.xbm
+share/themes/syscrash/openbox-3/desk_toggled.xbm
+share/themes/syscrash/openbox-3/iconify.xbm
+share/themes/syscrash/openbox-3/max.xbm
+share/themes/syscrash/openbox-3/max_disabled.xbm
+share/themes/syscrash/openbox-3/max_pressed.xbm
+share/themes/syscrash/openbox-3/max_toggled.xbm
+share/themes/syscrash/openbox-3/shade.xbm
+share/themes/syscrash/openbox-3/themerc
+@dirrm share/themes/syscrash/openbox-3
+@dirrm share/themes/syscrash
+@dirrm share/themes/orang/openbox-3
+@dirrm share/themes/orang
+@dirrm share/themes/bear2/openbox-3
+@dirrm share/themes/bear2
+@dirrm share/themes/artwiz-boxed/openbox-3
+@dirrm share/themes/artwiz-boxed
+@dirrm share/themes/Natura/openbox-3
+@dirrm share/themes/Natura
+@dirrm share/themes/Mikachu/openbox-3
+@dirrm share/themes/Mikachu
+@dirrmtry share/themes
+@dirrm %%DATADIR%%
+@dirrmtry share/gnome/wm-properties
+@dirrmtry share/gnome
+@dirrmtry libdata/pkgconfig
+@dirrm include/openbox/3.3/openbox
+@dirrm include/openbox/3.3
+@dirrm include/openbox
+@dirrm etc/xdg/openbox
+@dirrmtry etc/xdg