6 files changed, 73 insertions, 13 deletions

diff --git a/x11-wm/fluxconf/Makefile b/x11-wm/fluxconf/Makefile
index 26abf03f7fe3..244c42ea5f63 100644
--- a/x11-wm/fluxconf/Makefile
+++ b/x11-wm/fluxconf/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	fluxconf
-PORTVERSION=	0.9.7
-PORTREVISION=	2
+PORTVERSION=	0.9.8
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://devaux.fabien.free.fr/flux/
 
@@ -19,12 +18,15 @@ USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
 
 PORTDOCS=	fluxconf.png fluxkeys.png fluxmenu.png index.html
+PLIST_FILES=	bin/fluxbare bin/fluxconf bin/fluxkeys bin/fluxmenu \
+		share/locale/fi/LC_MESSAGES/fluxconf.mo \
+		share/locale/fr/LC_MESSAGES/fluxconf.mo
 
 post-install:
-.ifndef (NOPORTDOCS)
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for i in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/docs/${i} ${DOCSDIR}
+.for file in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/docs/${file} ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/x11-wm/fluxconf/distinfo b/x11-wm/fluxconf/distinfo
index 0b9f23e981dd..e0658eef713f 100644
--- a/x11-wm/fluxconf/distinfo
+++ b/x11-wm/fluxconf/distinfo
@@ -1,2 +1,2 @@
-MD5 (fluxconf-0.9.7.tar.gz) = 207faf932e07642c779e54aba549c804
-SIZE (fluxconf-0.9.7.tar.gz) = 197481
+MD5 (fluxconf-0.9.8.tar.gz) = b4e17b45fcec48d04c1c16e75836b6b7
+SIZE (fluxconf-0.9.8.tar.gz) = 235490
diff --git a/x11-wm/fluxconf/files/patch-src-fluxconf.c b/x11-wm/fluxconf/files/patch-src-fluxconf.c
new file mode 100644
index 000000000000..282587ae4a04
--- /dev/null
+++ b/x11-wm/fluxconf/files/patch-src-fluxconf.c
@@ -0,0 +1,21 @@
+--- src/fluxconf.c.orig	Thu Dec  9 01:58:37 2004
++++ src/fluxconf.c	Mon Mar 21 18:10:27 2005
+@@ -146,7 +146,9 @@
+ void sauver(GtkButton * button, char **laliste) /* FIXME without first parameter function hangs ... */
+ {
+     int n, x;
++    int source_fd, dest_fd, rdlen;
+     char *fullpath = NULL;
++    char tmp_buff[BUFSIZ + 1], * ptr = NULL;
+     FILE *file = NULL;
+     GList *widlist = NULL;
+     GtkWidget *tmpwid, *smallwin;
+@@ -166,8 +168,6 @@
+     /*
+     * try to make a backup 
+     */
+-    char tmp_buff[BUFSIZ + 1], * ptr = NULL;
+-    int source_fd, dest_fd, rdlen;
+ 
+     memset(tmp_buff, 0, BUFSIZ + 1);
+ 
diff --git a/x11-wm/fluxconf/files/patch-src-fluxkeys.c b/x11-wm/fluxconf/files/patch-src-fluxkeys.c
new file mode 100644
index 000000000000..3414b867fbfa
--- /dev/null
+++ b/x11-wm/fluxconf/files/patch-src-fluxkeys.c
@@ -0,0 +1,21 @@
+--- src/fluxkeys.c.orig	Fri Dec 10 23:47:14 2004
++++ src/fluxkeys.c	Mon Mar 21 18:10:27 2005
+@@ -265,7 +265,9 @@
+     GtkBoxChild *child;
+     GtkWidget *wid;
+     int mod, n;
++    int source_fd, dest_fd, rdlen;
+     char *initpath, *buf;
++    char tmp_buff[BUFSIZ + 1], *ptr;
+ 
+ #ifdef GTK2
+     G_CONST_RETURN gchar *key, *action, *execact;
+@@ -305,8 +307,6 @@
+     /*
+     * FIXME: this is highly redundant 
+     */
+-    char tmp_buff[BUFSIZ + 1], *ptr;
+-    int source_fd, dest_fd, rdlen;
+ 
+     memset(tmp_buff, 0, BUFSIZ + 1);
+ 
diff --git a/x11-wm/fluxconf/files/patch-src-fluxmenu.c b/x11-wm/fluxconf/files/patch-src-fluxmenu.c
new file mode 100644
index 000000000000..b3c6286fcedd
--- /dev/null
+++ b/x11-wm/fluxconf/files/patch-src-fluxmenu.c
@@ -0,0 +1,22 @@
+--- src/fluxmenu.c.orig	Fri Dec 10 23:47:14 2004
++++ src/fluxmenu.c	Mon Mar 21 18:10:27 2005
+@@ -408,8 +408,10 @@
+ void savemenu(void)
+ {
+     char *initpath, *buf;
++    char tmp_buff[BUFSIZ+1],*ptr;
+     FILE *file;
+     int n;
++    int source_fd, dest_fd, rdlen;
+     initpath = malloc(sizeof(char) * 200);
+     buf = malloc(sizeof(char)*200);
+ 
+@@ -432,8 +434,6 @@
+     /*
+     * try to make a backup
+     */
+-    char tmp_buff[BUFSIZ+1],*ptr;
+-    int source_fd, dest_fd, rdlen;
+ 
+     memset(tmp_buff,0,BUFSIZ+1);
+ 
diff --git a/x11-wm/fluxconf/pkg-plist b/x11-wm/fluxconf/pkg-plist
deleted file mode 100644
index d2c20078c86d..000000000000
--- a/x11-wm/fluxconf/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-bin/fluxbare
-bin/fluxconf
-bin/fluxkeys
-bin/fluxmenu
-share/locale/fi/LC_MESSAGES/fluxconf.mo
-share/locale/fr/LC_MESSAGES/fluxconf.mo