Update to 2.0.1.

4 files changed, 32 insertions, 90 deletions

diff --git a/x11-wm/obconf/Makefile b/x11-wm/obconf/Makefile
index f4123c6f4ba5..559092f8be9d 100644
--- a/x11-wm/obconf/Makefile
+++ b/x11-wm/obconf/Makefile
@@ -6,36 +6,35 @@
 #
 
 PORTNAME=	obconf
-PORTVERSION=	1.6
-PORTREVISION=	2
+PORTVERSION=	2.0.1
 CATEGORIES=	x11-wm
-MASTER_SITES=	http://tr.openmonkey.com/files/obconf/
+MASTER_SITES=	http://offload1.icculus.org/openbox/obconf/
 
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	Preferences manager for the Openbox window manager
 
 LIB_DEPENDS=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
-		obparser.4:${PORTSDIR}/x11-wm/openbox
+		obparser.15:${PORTSDIR}/x11-wm/openbox
 
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GNOME=	gnomehier gnometarget libglade2
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/openbox
+MAKE_ARGS=	mkdir_p='${MKDIR}'
 
 CPPFLAGS=	-I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib
 
 PORTDOCS=	ABOUT-NLS AUTHORS README TODO
-PLIST_FILES=	bin/obconf \
-		share/applications/obconf.desktop \
-		%%DATADIR%%/obconf.glade
-PLIST_DIRS=	%%DATADIR%%
-PLIST=		${WRKDIR}/pkg-plist
-
-pre-install:
-	@${ECHO_CMD} "@dirrmtry share/applications" > ${PLIST}
+
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=		NLS="@comment "
+.else
+USE_GETTEXT=		yes
+PLIST_SUB+=		NLS=""
+.endif
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/x11-wm/obconf/distinfo b/x11-wm/obconf/distinfo
index 4433432fed52..9a3c73f17a21 100644
--- a/x11-wm/obconf/distinfo
+++ b/x11-wm/obconf/distinfo
@@ -1,3 +1,3 @@
-MD5 (obconf-1.6.tar.gz) = aaf62498b11d52dfce7a0b6060867a19
-SHA256 (obconf-1.6.tar.gz) = b491a3dd38185e187a61fef86a3382af684e6bd4fbf07b1704cfc9b0c7579a4b
-SIZE (obconf-1.6.tar.gz) = 166214
+MD5 (obconf-2.0.1.tar.gz) = 1ea52c7deb8f56928470fbe7471d9ddc
+SHA256 (obconf-2.0.1.tar.gz) = 983aabc482f9e140e475fea5d51e173fb2adbbb02d6a66ab2c599dfba5e4cc1c
+SIZE (obconf-2.0.1.tar.gz) = 204780
diff --git a/x11-wm/obconf/files/patch-src_handlers.c b/x11-wm/obconf/files/patch-src_handlers.c
deleted file mode 100644
index 86bde7750a6c..000000000000
--- a/x11-wm/obconf/files/patch-src_handlers.c
+++ /dev/null
@@ -1,73 +0,0 @@
-Enable compilation with GCC 2.X.
-author:  Volker Stolz
-
---- src/handlers.c.orig	Wed Mar 24 09:36:08 2004
-+++ src/handlers.c	Wed Mar 24 09:36:16 2004
-@@ -41,6 +41,10 @@
- 
- void setup_behavior_tab()
- {
-+  GtkWidget *winresist_l;
-+  GtkWidget *edgeresist_l;
-+  GtkSizeGroup *group2;
-+
-   GtkWidget *winresist  = glade_xml_get_widget(glade, "resist_window");
-   GtkWidget *edgeresist = glade_xml_get_widget(glade, "resist_edge");
-   GtkSizeGroup *group1  = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
-@@ -48,9 +52,9 @@
-   gtk_size_group_add_widget(group1, winresist);
-   gtk_size_group_add_widget(group1, edgeresist);
- 
--  GtkWidget *winresist_l  = glade_xml_get_widget(glade, "resist_window_label");
--  GtkWidget *edgeresist_l = glade_xml_get_widget(glade, "resist_edge_label");
--  GtkSizeGroup *group2    = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
-+  winresist_l  = glade_xml_get_widget(glade, "resist_window_label");
-+  edgeresist_l = glade_xml_get_widget(glade, "resist_edge_label");
-+  group2    = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
- 
-   gtk_size_group_add_widget(group2, winresist_l);
-   gtk_size_group_add_widget(group2, edgeresist_l);
-@@ -58,6 +62,10 @@
- 
- void setup_dock_tab()
- {
-+    GtkWidget *posi_l;
-+    GtkWidget *dir_l;
-+    GtkSizeGroup *group2;
-+
-     GtkWidget *posi = glade_xml_get_widget(glade, "dock_position");
-     GtkWidget *dir  = glade_xml_get_widget(glade, "dock_direction");
-     GtkSizeGroup *group1 = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
-@@ -65,9 +73,9 @@
-     gtk_size_group_add_widget(group1, posi);
-     gtk_size_group_add_widget(group1, dir);
- 
--    GtkWidget *posi_l = glade_xml_get_widget(glade, "dock_position_label");
--    GtkWidget *dir_l  = glade_xml_get_widget(glade, "dock_direction_label");
--    GtkSizeGroup *group2 = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
-+    posi_l = glade_xml_get_widget(glade, "dock_position_label");
-+    dir_l  = glade_xml_get_widget(glade, "dock_direction_label");
-+    group2 = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
- 
-     gtk_size_group_add_widget(group2, posi_l);
-     gtk_size_group_add_widget(group2, dir_l);
-@@ -979,15 +987,16 @@
-                                          const gchar *new_text,
-                                          gpointer data)
- {
--    if (mapping) return;
--
--    GtkTreePath *path = gtk_tree_path_new_from_string (path_string);
-+    GtkTreePath *path;
-     GtkTreeIter it;
-     gchar *old_text;
-     GList *lit;
-     gint i;
-     xmlNodePtr n, c;
- 
-+    if (mapping) return;
-+
-+    path = gtk_tree_path_new_from_string (path_string);
-     gtk_tree_model_get_iter(GTK_TREE_MODEL(desktop_store), &it, path);
- 
-     gtk_tree_model_get(GTK_TREE_MODEL(desktop_store), &it, 0, &old_text, -1);
diff --git a/x11-wm/obconf/pkg-plist b/x11-wm/obconf/pkg-plist
new file mode 100644
index 000000000000..35a992052aac
--- /dev/null
+++ b/x11-wm/obconf/pkg-plist
@@ -0,0 +1,16 @@
+bin/obconf
+share/applications/obconf.desktop
+share/mimelnk/application/x-openbox-theme.desktop
+share/mime/packages/obconf.xml
+%%DATADIR%%/obconf.glade
+%%NLS%%share/locale/en@boldquot/LC_MESSAGES/obconf.mo
+%%NLS%%share/locale/en@quot/LC_MESSAGES/obconf.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/obconf.mo
+%%NLS%%@dirrmtry share/locale/en@boldquot/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/en@boldquot
+%%NLS%%@dirrmtry share/locale/en@quot/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/en@quot
+@dirrm %%DATADIR%%
+@dirrmtry share/applications
+@dirrmtry share/mimelnk/application
+@dirrmtry share/mimelnk