4 files changed, 56 insertions, 21 deletions

diff --git a/ftp/pureadmin/Makefile b/ftp/pureadmin/Makefile
index d9b9d090d74d..6e8b169fe078 100644
--- a/ftp/pureadmin/Makefile
+++ b/ftp/pureadmin/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	pureadmin
-PORTVERSION=	0.2.2
-PORTREVISION=	1
+PORTVERSION=	0.3
 CATEGORIES=	ftp
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	purify
@@ -16,16 +15,18 @@ MASTER_SITE_SUBDIR=	purify
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Management utility for the PureFTPd
 
-LIB_DEPENDS=	fam.0:${PORTSDIR}/devel/fam
-
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomehack gnomeprefix gtk20
+USE_GNOME=	gnomehack gnomeprefix libglade2
+USE_FAM=	yes
 USE_REINPLACE=	yes
+INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+
+CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 post-patch:
-	@${REINPLACE_CMD} -e '/-g -Wall/d' ${WRKSRC}/src/Makefile.in
+	@${REINPLACE_CMD} -e 's|-std=gnu99||g' ${WRKSRC}/src/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/ftp/pureadmin/distinfo b/ftp/pureadmin/distinfo
index 2226e2fedb29..780075629e73 100644
--- a/ftp/pureadmin/distinfo
+++ b/ftp/pureadmin/distinfo
@@ -1,3 +1,3 @@
-MD5 (pureadmin-0.2.2.tar.gz) = 7549ae9278b2dd629058848c86859b4e
-SHA256 (pureadmin-0.2.2.tar.gz) = 518db8c0805657fa955bdcc74d7d42887d73dba5c36187927e6495a987ab9de1
-SIZE (pureadmin-0.2.2.tar.gz) = 274465
+MD5 (pureadmin-0.3.tar.gz) = f7dc9fc7163b957bbcec1d4b2eec196d
+SHA256 (pureadmin-0.3.tar.gz) = cec867194ee8c2e647dedf0d3d152c033a1bcdfaf3b1e83869b3ada8d9d3e866
+SIZE (pureadmin-0.3.tar.gz) = 298177
diff --git a/ftp/pureadmin/files/patch-src__mainwin_cb.c b/ftp/pureadmin/files/patch-src__mainwin_cb.c
new file mode 100644
index 000000000000..47c7e1e2c069
--- /dev/null
+++ b/ftp/pureadmin/files/patch-src__mainwin_cb.c
@@ -0,0 +1,23 @@
+--- src/mainwin_cb.c.orig	Tue Nov 15 20:21:22 2005
++++ src/mainwin_cb.c	Sat Nov 26 20:32:20 2005
+@@ -357,6 +357,9 @@
+ {
+ 	gchar *browser = misc_find_webbrowser();
+ 	GError *err = NULL;
++	gchar *quoted_url = g_shell_quote (url);
++	gchar *cmd = g_strdup_printf (browser, quoted_url);
++	gboolean success;
+ 	if (!browser) {
+ 		gchar *msg = g_strdup_printf (_("The default browser could not be located. You can solve this "
+ 					      "by either:\n"
+@@ -369,10 +372,7 @@
+ 		g_free (msg);
+ 		return;
+ 	}
+-	gchar *quoted_url = g_shell_quote (url);
+-	gchar *cmd = g_strdup_printf (browser, quoted_url);
+ 	pur_log_dbg ("Running: %s", cmd);
+-	gboolean success;
+ 	
+ 	success = g_spawn_command_line_async (cmd, &err);
+ 	//success = FALSE;
diff --git a/ftp/pureadmin/pkg-plist b/ftp/pureadmin/pkg-plist
index 5a768486f52b..00a5cdf2b6f1 100644
--- a/ftp/pureadmin/pkg-plist
+++ b/ftp/pureadmin/pkg-plist
@@ -1,23 +1,34 @@
 bin/pureadmin
-bin/pureadminsearch
 share/gnome/applications/pureadmin.desktop
 share/gnome/pixmaps/pureadmin.png
+share/gnome/pureadmin/dialogs.glade
 share/gnome/pureadmin/docs/index.txt
 share/gnome/pureadmin/docs/introduction.txt
 share/gnome/pureadmin/docs/main_window.txt
 share/gnome/pureadmin/docs/preferences.txt
 share/gnome/pureadmin/docs/user_manager.txt
-share/gnome/pureadmin/pixmaps/down.png
-share/gnome/pureadmin/pixmaps/logo.png
-share/gnome/pureadmin/pixmaps/main-icon.png
-share/gnome/pureadmin/pixmaps/up.png
-share/gnome/pureadmin/pixmaps/user.png
-share/gnome/pureadmin/pixmaps/user_identity.png
-share/gnome/pureadmin/pixmaps/userconfig.png
-share/gnome/pureadmin/pixmaps/usericon.png
+share/gnome/pureadmin/down.png
+share/gnome/pureadmin/logo.png
+share/gnome/pureadmin/mainwindow.glade
+share/gnome/pureadmin/prefwin.glade
+share/gnome/pureadmin/pureadmin-16x16.png
+share/gnome/pureadmin/pureadmin-24x24.png
+share/gnome/pureadmin/pureadmin-32x32.png
+share/gnome/pureadmin/pureadmin-48x48.png
+share/gnome/pureadmin/up.png
+share/gnome/pureadmin/user.png
+share/gnome/pureadmin/user_identity.png
+share/gnome/pureadmin/userconfig.png
+share/gnome/pureadmin/usericon.png
+share/gnome/pureadmin/usermanager.glade
+share/icons/hicolor/16x16/apps/pureadmin.png
+share/icons/hicolor/24x24/apps/pureadmin.png
+share/icons/hicolor/32x32/apps/pureadmin.png
+share/icons/hicolor/48x48/apps/pureadmin.png
 share/locale/fr/LC_MESSAGES/pureadmin.mo
 share/locale/it/LC_MESSAGES/pureadmin.mo
 share/locale/sv/LC_MESSAGES/pureadmin.mo
-@dirrm share/gnome/pureadmin/pixmaps
 @dirrm share/gnome/pureadmin/docs
 @dirrm share/gnome/pureadmin
+@unexec rmdir %D/share/icons/hicolor/24x24/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/24x24 2>/dev/null || true