8 files changed, 128 insertions, 0 deletions

diff --git a/x11-wm/Makefile b/x11-wm/Makefile
index 8086d3f6d3c3..a048be773b62 100644
--- a/x11-wm/Makefile
+++ b/x11-wm/Makefile
@@ -26,6 +26,7 @@
     SUBDIR += epplets
     SUBDIR += evilwm
     SUBDIR += fluxbox
+    SUBDIR += fluxconf
     SUBDIR += flwm
     SUBDIR += fvwm
     SUBDIR += fvwm-themes
diff --git a/x11-wm/fluxconf/Makefile b/x11-wm/fluxconf/Makefile
new file mode 100644
index 000000000000..260e6581f35f
--- /dev/null
+++ b/x11-wm/fluxconf/Makefile
@@ -0,0 +1,34 @@
+# Ports collection Makefile for:	fluxconf
+# Date created:				29/04/2002
+# Whom:					hendrik@scholz.net
+#
+# $FreeBSD$
+#
+
+PORTNAME=	fluxconf
+PORTVERSION=	0.6
+CATEGORIES=	x11-wm
+MASTER_SITES=	http://devaux.fabien.free.fr/flux/
+
+MAINTAINER=	hendrik@scholz.net
+
+USE_X_PREFIX=	yes
+USE_GTK=	yes
+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
+
+.include <bsd.port.mk>
diff --git a/x11-wm/fluxconf/distinfo b/x11-wm/fluxconf/distinfo
new file mode 100644
index 000000000000..2b83d778c6af
--- /dev/null
+++ b/x11-wm/fluxconf/distinfo
@@ -0,0 +1 @@
+MD5 (fluxconf-0.6.tar.bz2) = 17099e2f6cb7206aac2a9f599b4c084b
diff --git a/x11-wm/fluxconf/files/patch-Makefile b/x11-wm/fluxconf/files/patch-Makefile
new file mode 100644
index 000000000000..aed55619f4dd
--- /dev/null
+++ b/x11-wm/fluxconf/files/patch-Makefile
@@ -0,0 +1,16 @@
+--- 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
new file mode 100644
index 000000000000..2c85501e4633
--- /dev/null
+++ b/x11-wm/fluxconf/files/patch-fluxconf.c
@@ -0,0 +1,61 @@
+--- 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-comment b/x11-wm/fluxconf/pkg-comment
new file mode 100644
index 000000000000..690721f4138c
--- /dev/null
+++ b/x11-wm/fluxconf/pkg-comment
@@ -0,0 +1 @@
+Fluxconf is a configuration program for the fluxbox window manager
diff --git a/x11-wm/fluxconf/pkg-descr b/x11-wm/fluxconf/pkg-descr
new file mode 100644
index 000000000000..182c88a7212c
--- /dev/null
+++ b/x11-wm/fluxconf/pkg-descr
@@ -0,0 +1,12 @@
+fluxconf is a tiny GTK based configuration tool for the fluxbox window manager.
+It allows basic manipulation of the window manager behaviour:
+
+    o Slit configuration
+    o Window placement
+    o Focus model
+    o Workspace configuration
+
+WWW: http://devaux.fabien.free.fr/flux/
+
+- Hendrik Scholz
+<hendrik@scholz.net>
diff --git a/x11-wm/fluxconf/pkg-plist b/x11-wm/fluxconf/pkg-plist
new file mode 100644
index 000000000000..153927cf2558
--- /dev/null
+++ b/x11-wm/fluxconf/pkg-plist
@@ -0,0 +1,2 @@
+bin/fluxconf
+bin/fluxkeys