6 files changed, 60 insertions, 105 deletions
diff --git a/wm/openbox/Makefile b/wm/openbox/Makefile
index d5abecbc138..674719da027 100644
--- a/wm/openbox/Makefile
+++ b/wm/openbox/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.86 2013/10/10 14:42:34 ryoon Exp $
+# $NetBSD: Makefile,v 1.87 2013/12/08 07:56:31 obache Exp $
 
-DISTNAME=	openbox-3.5.0
-PKGREVISION=	16
+DISTNAME=	openbox-3.5.2
 CATEGORIES=	wm x11
 MASTER_SITES=	http://openbox.org/dist/openbox/
 
@@ -21,26 +20,21 @@ USE_FEATURES+=		setenv
 PKGCONFIG_OVERRIDE=	obrender/obrender-3.5.pc.in
 PKGCONFIG_OVERRIDE+=	obt/obt-3.5.pc.in
 
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE:Q}
 LDFLAGS+=		${BUILDLINK_LDADD.libsetenv}
-PKG_SYSCONFSUBDIR=	xdg
-OWN_DIRS=		${PKG_SYSCONFDIR}
-OWN_DIRS+=		${PKG_SYSCONFDIR}/openbox
+PKG_SYSCONFSUBDIR=	xdg/openbox
 
 EGDIR=			${PREFIX}/share/examples/openbox
-CONF_FILES=		${EGDIR}/autostart ${PKG_SYSCONFDIR}/openbox/autostart
-CONF_FILES+=		${EGDIR}/environment ${PKG_SYSCONFDIR}/openbox/environment
-CONF_FILES+=		${EGDIR}/menu.xml ${PKG_SYSCONFDIR}/openbox/menu.xml
-CONF_FILES+=		${EGDIR}/rc.xml ${PKG_SYSCONFDIR}/openbox/rc.xml
-
-SUBST_CLASSES+=		python
-SUBST_STAGE.python=	pre-build
-SUBST_FILES.python+=	data/autostart/openbox-xdg-autostart
-# Best we can do without pulling in a python dependency.
-# Update when PYTHON_VERSION_DEFAULT changes!
-SUBST_SED.python+=      -e 's,/usr/bin/env.*python,${PREFIX}/bin/python2.7,'
-SUBST_MESSAGE.python=	Fixing path to python.
-CHECK_INTERPRETER_SKIP=	libexec/openbox-xdg-autostart
+CONF_FILES=		${EGDIR}/autostart ${PKG_SYSCONFDIR}/autostart
+CONF_FILES+=		${EGDIR}/environment ${PKG_SYSCONFDIR}/environment
+CONF_FILES+=		${EGDIR}/menu.xml ${PKG_SYSCONFDIR}/menu.xml
+CONF_FILES+=		${EGDIR}/rc.xml ${PKG_SYSCONFDIR}/rc.xml
+
+INSTALL_MAKE_FLAGS+=	rcdir=${EGDIR}
+
+REPLACE_PYTHON+=	data/autostart/openbox-xdg-autostart
+
+.include "options.mk"
 
 BUILDLINK_DEPMETHOD.libXt?=	build
 
@@ -57,5 +51,5 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../x11/libXrandr/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
-
+.include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/openbox/PLIST b/wm/openbox/PLIST
index 69958dc78f2..8a84ce12296 100644
--- a/wm/openbox/PLIST
+++ b/wm/openbox/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2011/08/06 17:09:03 wiz Exp $
+@comment $NetBSD: PLIST,v 1.25 2013/12/08 07:56:31 obache Exp $
 bin/gdm-control
 bin/gnome-panel-control
 bin/obxprop
@@ -59,8 +59,12 @@ share/examples/openbox/autostart
 share/examples/openbox/environment
 share/examples/openbox/menu.xml
 share/examples/openbox/rc.xml
+share/gnome-session/sessions/openbox-gnome-fallback.session
+share/gnome-session/sessions/openbox-gnome.session
 share/gnome/wm-properties/openbox.desktop
+share/locale/af/LC_MESSAGES/openbox.mo
 share/locale/ar/LC_MESSAGES/openbox.mo
+share/locale/be/LC_MESSAGES/openbox.mo
 share/locale/bn_IN/LC_MESSAGES/openbox.mo
 share/locale/ca/LC_MESSAGES/openbox.mo
 share/locale/cs/LC_MESSAGES/openbox.mo
@@ -73,8 +77,10 @@ share/locale/et/LC_MESSAGES/openbox.mo
 share/locale/eu/LC_MESSAGES/openbox.mo
 share/locale/fi/LC_MESSAGES/openbox.mo
 share/locale/fr/LC_MESSAGES/openbox.mo
+share/locale/he/LC_MESSAGES/openbox.mo
 share/locale/hr/LC_MESSAGES/openbox.mo
 share/locale/hu/LC_MESSAGES/openbox.mo
+share/locale/ia/LC_MESSAGES/openbox.mo
 share/locale/it/LC_MESSAGES/openbox.mo
 share/locale/ja/LC_MESSAGES/openbox.mo
 share/locale/lt/LC_MESSAGES/openbox.mo
@@ -84,6 +90,7 @@ share/locale/no/LC_MESSAGES/openbox.mo
 share/locale/pl/LC_MESSAGES/openbox.mo
 share/locale/pt/LC_MESSAGES/openbox.mo
 share/locale/pt_BR/LC_MESSAGES/openbox.mo
+share/locale/ro/LC_MESSAGES/openbox.mo
 share/locale/ru/LC_MESSAGES/openbox.mo
 share/locale/sk/LC_MESSAGES/openbox.mo
 share/locale/sr/LC_MESSAGES/openbox.mo
diff --git a/wm/openbox/buildlink3.mk b/wm/openbox/buildlink3.mk
index 6691a5aaa46..9ec6136d7c1 100644
--- a/wm/openbox/buildlink3.mk
+++ b/wm/openbox/buildlink3.mk
@@ -1,14 +1,23 @@
-# $NetBSD: buildlink3.mk,v 1.21 2013/06/06 12:53:40 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2013/12/08 07:56:31 obache Exp $
 
 BUILDLINK_TREE+=	openbox
 
 .if !defined(OPENBOX_BUILDLINK3_MK)
 OPENBOX_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.openbox+=	openbox>=3.1
-BUILDLINK_ABI_DEPENDS.openbox+=	openbox>=3.5.0nb14
+BUILDLINK_API_DEPENDS.openbox+=	openbox>=3.5
 BUILDLINK_PKGSRCDIR.openbox?=	../../wm/openbox
 
+pkgbase := openbox
+.include "../../mk/pkg-build-options.mk"
+
+.if !empty(PKG_BUILD_OPTIONS.openbox:Mimlib2)
+.include "../../graphics/imlib2/buildlink3.mk"
+.endif
+.if !empty(PKG_BUILD_OPTIONS.openbox:Msvg)
+.include "../../graphics/librsvg/buildlink3.mk"
+.endif
+
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
diff --git a/wm/openbox/distinfo b/wm/openbox/distinfo
index 44bdbf4c00a..50bf0efd7c0 100644
--- a/wm/openbox/distinfo
+++ b/wm/openbox/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.28 2011/08/06 17:09:03 wiz Exp $
+$NetBSD: distinfo,v 1.29 2013/12/08 07:56:31 obache Exp $
 
-SHA1 (openbox-3.5.0.tar.gz) = 3c3b8d2bc4f4e229871254e92d6b18639be00302
-RMD160 (openbox-3.5.0.tar.gz) = af79a5e8b11f3605a9d3906ed6256ce4102effd5
-Size (openbox-3.5.0.tar.gz) = 911834 bytes
-SHA1 (patch-aa) = 72aa51ec36cd740d5b2d8a9f173442c5bd8312ba
+SHA1 (openbox-3.5.2.tar.gz) = 6573516107f8cdb83842aac25a430e3f9f966bad
+RMD160 (openbox-3.5.2.tar.gz) = 0f5abc8445469b112129fe874a6fbbf80c951434
+Size (openbox-3.5.2.tar.gz) = 972751 bytes
 SHA1 (patch-ab) = e6d837a3f74deacdb9ebbf813b7f86497fa34fa9
diff --git a/wm/openbox/options.mk b/wm/openbox/options.mk
new file mode 100644
index 00000000000..715af81c810
--- /dev/null
+++ b/wm/openbox/options.mk
@@ -0,0 +1,21 @@
+# $NetBSD: options.mk,v 1.1 2013/12/08 07:56:31 obache Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.openbox
+PKG_SUPPORTED_OPTIONS=	imlib2 svg
+PKG_SUGGESTED_OPTIONS=	imlib2
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mimlib2)
+.include "../../graphics/imlib2/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-imlib2
+.else
+CONFIGURE_ARGS+=	--disable-imlib2
+.endif
+
+.if !empty(PKG_OPTIONS:Msvg)
+.include "../../graphics/librsvg/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-librsvg
+.else
+CONFIGURE_ARGS+=	--disable-librsvg
+.endif
diff --git a/wm/openbox/patches/patch-aa b/wm/openbox/patches/patch-aa
deleted file mode 100644
index 0c5b148554d..00000000000
--- a/wm/openbox/patches/patch-aa
+++ /dev/null
@@ -1,75 +0,0 @@
-$NetBSD: patch-aa,v 1.11 2011/08/06 17:09:04 wiz Exp $
-
-Install config files into examples directory (and use CONF_FILES
-to handle them).
-
---- Makefile.in.orig	2011-08-01 20:15:35.000000000 +0000
-+++ Makefile.in
-@@ -542,7 +542,7 @@ top_srcdir = @top_srcdir@
- SUBDIRS = m4 po
- docxbmdir = $(docdir)/xbm
- themedir = $(datadir)/themes
--configdir = $(sysconfdir)/xdg
-+configdir = $(sysconfdir)
- rcdir = $(configdir)/openbox
- xsessionsdir = $(datadir)/xsessions
- gnomewmfilesdir = $(datadir)/gnome/wm-properties
-@@ -1534,7 +1534,7 @@ uninstall-dist_libexecSCRIPTS:
- 	cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
- install-dist_rcSCRIPTS: $(dist_rc_SCRIPTS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(rcdir)" || $(MKDIR_P) "$(DESTDIR)$(rcdir)"
-+	$(mkinstalldirs) $(DESTDIR)$(datadir)/examples/openbox
- 	@list='$(dist_rc_SCRIPTS)'; test -n "$(rcdir)" || list=; \
- 	for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-@@ -1553,8 +1553,8 @@ install-dist_rcSCRIPTS: $(dist_rc_SCRIPT
- 	while read type dir files; do \
- 	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
- 	     test -z "$$files" || { \
--	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(rcdir)$$dir'"; \
--	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(rcdir)$$dir" || exit $$?; \
-+	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(datadir)/examples/openbox/$$dir'"; \
-+	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(datadir)/examples/openbox/$$dir" || exit $$?; \
- 	     } \
- 	; done
- 
-@@ -1636,7 +1636,7 @@ uninstall-nodist_libexecSCRIPTS:
- 	cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
- install-nodist_rcSCRIPTS: $(nodist_rc_SCRIPTS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(rcdir)" || $(MKDIR_P) "$(DESTDIR)$(rcdir)"
-+	$(mkinstalldirs) $(DESTDIR)$(datadir)/examples/openbox
- 	@list='$(nodist_rc_SCRIPTS)'; test -n "$(rcdir)" || list=; \
- 	for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-@@ -1655,8 +1655,8 @@ install-nodist_rcSCRIPTS: $(nodist_rc_SC
- 	while read type dir files; do \
- 	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
- 	     test -z "$$files" || { \
--	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(rcdir)$$dir'"; \
--	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(rcdir)$$dir" || exit $$?; \
-+	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(datadir)/examples/openbox/$$dir'"; \
-+	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(datadir)/examples/openbox/$$dir" || exit $$?; \
- 	     } \
- 	; done
- 
-@@ -3482,15 +3482,15 @@ uninstall-dist_pixmapDATA:
- 	cd "$(DESTDIR)$(pixmapdir)" && rm -f $$files
- install-dist_rcDATA: $(dist_rc_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(rcdir)" || $(MKDIR_P) "$(DESTDIR)$(rcdir)"
-+	$(mkinstalldirs) $(DESTDIR)$(datadir)/examples/openbox
- 	@list='$(dist_rc_DATA)'; test -n "$(rcdir)" || list=; \
- 	for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  echo "$$d$$p"; \
- 	done | $(am__base_list) | \
- 	while read files; do \
--	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(rcdir)'"; \
--	  $(INSTALL_DATA) $$files "$(DESTDIR)$(rcdir)" || exit $$?; \
-+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(datadir)/examples/openbox'"; \
-+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(datadir)/examples/openbox" || exit $$?; \
- 	done
- 
- uninstall-dist_rcDATA: