5 files changed, 7 insertions, 95 deletions

diff --git a/x11-wm/fluxconf/Makefile b/x11-wm/fluxconf/Makefile
index c0fa6f1720fe..eb911166a4c0 100644
--- a/x11-wm/fluxconf/Makefile
+++ b/x11-wm/fluxconf/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fluxconf
-PORTVERSION=	0.6
+PORTVERSION=	0.9.2
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://devaux.fabien.free.fr/flux/
 
@@ -15,21 +15,6 @@ MAINTAINER=	hendrik@scholz.net
 USE_X_PREFIX=	yes
 USE_GNOMENG=	yes
 USE_GNOME=	gtk12
-USE_BZIP2=	yes
-
-.ifndef(WITHOUT_LOGO)
-pre-everything::
-	@${ECHO_CMD} ""
-	@${ECHO_CMD} "You can disable the spash logo when starting the"
-	@${ECHO_CMD} "program by defining WITHOUT_LOGO"
-	@${ECHO_CMD} ""
-.endif
-
-post-patch:
-	@${RM} ${WRKSRC}/fluxconf
-
-do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/fluxconf ${PREFIX}/bin
-	@${LN} -s ${PREFIX}/bin/fluxconf ${PREFIX}/bin/fluxkeys
+GNU_CONFIGURE=  yes
 
 .include <bsd.port.mk>
diff --git a/x11-wm/fluxconf/distinfo b/x11-wm/fluxconf/distinfo
index 2b83d778c6af..f1f8a005cb5a 100644
--- a/x11-wm/fluxconf/distinfo
+++ b/x11-wm/fluxconf/distinfo
@@ -1 +1 @@
-MD5 (fluxconf-0.6.tar.bz2) = 17099e2f6cb7206aac2a9f599b4c084b
+MD5 (fluxconf-0.9.2.tar.gz) = 64b980359a8ca244e5e703dfd914fdde
diff --git a/x11-wm/fluxconf/files/patch-Makefile b/x11-wm/fluxconf/files/patch-Makefile
deleted file mode 100644
index aed55619f4dd..000000000000
--- a/x11-wm/fluxconf/files/patch-Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
---- Makefile.orig	Fri Feb 15 16:45:52 2002
-+++ Makefile	Tue Apr 30 19:44:15 2002
-@@ -1,8 +1,11 @@
- .PHONY: clean install
- 
- EXE=fluxconf
--CC=gcc
--CFLAGS=`gtk-config --cflags --libs` -Wall -s -O
-+.ifdef(WITHOUT_LOGO)
-+FLAGS=	-DWITHOUT_LOGO
-+.endif
-+
-+CFLAGS+=`${GTK_CONFIG} --cflags --libs` -Wall -s -O $(FLAGS)
- 
- all: $(EXE) actions.h
- 	ln -sf fluxconf fluxkeys
diff --git a/x11-wm/fluxconf/files/patch-fluxconf.c b/x11-wm/fluxconf/files/patch-fluxconf.c
deleted file mode 100644
index 2c85501e4633..000000000000
--- a/x11-wm/fluxconf/files/patch-fluxconf.c
+++ /dev/null
@@ -1,61 +0,0 @@
---- fluxconf.c.orig	Tue Apr 30 12:28:32 2002
-+++ fluxconf.c	Tue Apr 30 12:39:53 2002
-@@ -160,8 +160,9 @@
- #define NB 16
- #define KEYLEN 30
- #define ACTLEN 30
--#define EXELEN 80
-+#define EXELEN 255
- #define MAXKEYCOUNT 100
-+#define MAXLINELEN 1024
- 
- /* STRUCTURE ABOUT WIDGETS :
- 
-@@ -369,10 +370,10 @@
- 		g_print("Can't open %s\n",initpath);
- 		exit(1);
- 	}
--	buf=(char*) malloc(100*sizeof(char));
-+	buf=(char*) malloc(MAXLINELEN*sizeof(char)+1);
- 	checkptr(buf);
- /* get all lines */
--	while(fgets(buf,100,file)) {
-+	while(fgets(buf,MAXLINELEN,file)) {
- 		config=realloc(config,1+i*sizeof(char*));
- 		checkptr(config);
- 		config[i-1]=(char*)malloc(15+strlen(buf)*sizeof(char)); /* I get some unused space for bigger numbers, etc...*/
-@@ -535,8 +536,10 @@
- 	gtk_button_set_relief(GTK_BUTTON(but),GTK_RELIEF_NONE);
- 
- 	gtk_widget_show_all(win);
-+#ifndef WITHOUT_LOGO
- 	gtk_timeout_add(100,(GtkFunction) show,logowin); /* show the logo */
- 	gtk_timeout_add(3500,(GtkFunction) hide,logowin); /* hide the logo */
-+#endif
- 	gtk_main();
- 	return 0;
- }
-@@ -692,10 +695,10 @@
- 		g_print("Can't open %s\n",initpath);
- 		exit(1);
- 	}
--	buf=(char*) malloc(KEYLEN+ACTLEN+EXELEN*sizeof(char));
-+	buf=(char*) malloc(KEYLEN+ACTLEN+EXELEN*sizeof(char)+1);
- 	checkptr(buf);
- 	/* read the config */
--	while(fgets(buf,100,file)) {
-+	while(fgets(buf,KEYLEN+ACTLEN+EXELEN,file)) {
- 		config=realloc(config,1+i*sizeof(char*));
- 		checkptr(config);
- 		config[i-1]=(char*)malloc(10+strlen(buf)*sizeof(char)); 
-@@ -770,8 +773,10 @@
-     gtk_signal_connect(GTK_OBJECT(win), "destroy", GTK_SIGNAL_FUNC(gtk_main_quit), NULL);
- 
- 	gtk_widget_show_all(win);
-+#ifndef WITHOUT_LOGO
- 	gtk_timeout_add(100,(GtkFunction) show,logowin); /* show the logo */
- 	gtk_timeout_add(3500,(GtkFunction) hide,logowin); /* hide the logo */
-+#endif
- 	gtk_main();
- 
- 
diff --git a/x11-wm/fluxconf/pkg-plist b/x11-wm/fluxconf/pkg-plist
index 153927cf2558..d2c20078c86d 100644
--- a/x11-wm/fluxconf/pkg-plist
+++ b/x11-wm/fluxconf/pkg-plist
@@ -1,2 +1,6 @@
+bin/fluxbare
 bin/fluxconf
 bin/fluxkeys
+bin/fluxmenu
+share/locale/fi/LC_MESSAGES/fluxconf.mo
+share/locale/fr/LC_MESSAGES/fluxconf.mo