[Midnightbsd-cvs] mports: x11-wm/obconf: Update to 2.0.3

[laffer1 at midnightbsd.org]

Log Message:
-----------
Update to 2.0.3

Modified Files:
--------------
    mports/x11-wm/obconf:
        Makefile (r1.2 -> r1.3)
        distinfo (r1.1 -> r1.2)

Removed Files:
-------------
    mports/x11-wm/obconf/files:
        patch-src_handlers.c

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/x11-wm/obconf/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L x11-wm/obconf/Makefile -L x11-wm/obconf/Makefile -u -r1.2 -r1.3
--- x11-wm/obconf/Makefile
+++ x11-wm/obconf/Makefile
@@ -7,16 +7,15 @@
 #
 
 PORTNAME=	obconf
-PORTVERSION=	1.6
-PORTREVISION=	2
+PORTVERSION=	2.0.3
 CATEGORIES=	x11-wm
-MASTER_SITES=	http://tr.openmonkey.com/files/obconf/
+MASTER_SITES=	http://offload1.icculus.org/openbox/obconf/
 
 MAINTAINER=	ports at MidnightBSD.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.16:${PORTSDIR}/x11-wm/openbox
 
 USE_XLIB=	yes
 USE_GNOME=	gnomehier gnometarget libglade2
@@ -35,6 +34,14 @@
 PLIST_DIRS=	%%DATADIR%%
 PLIST=		${WRKDIR}/pkg-plist
 
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.else
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.endif
+
 pre-install:
 	@${ECHO_CMD} "@dirrmtry share/applications" > ${PLIST}
 
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/x11-wm/obconf/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -L x11-wm/obconf/distinfo -L x11-wm/obconf/distinfo -u -r1.1 -r1.2
--- x11-wm/obconf/distinfo
+++ 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.3.tar.gz) = b22e273721851dedad72acbc77eefb68
+SHA256 (obconf-2.0.3.tar.gz) = f6c1cdac2667fc8b49513b7f21ef935851b594b9d8577aa86da105cce8fc3c1c
+SIZE (obconf-2.0.3.tar.gz) = 267589
--- 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);