5 files changed, 53 insertions, 58 deletions

diff --git a/ftp/pureadmin/Makefile b/ftp/pureadmin/Makefile
index 4f60928107a2..5145db2de7ad 100644
--- a/ftp/pureadmin/Makefile
+++ b/ftp/pureadmin/Makefile
@@ -7,26 +7,35 @@
 #
 
 PORTNAME=	pureadmin
-PORTVERSION=	0.3
-PORTREVISION=	2
+PORTVERSION=	0.4
 CATEGORIES=	ftp
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	purify
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Management utility for the PureFTPd
 
-USE_X_PREFIX=	yes
-USE_GNOME=	gnomehack gnomeprefix libglade2
+USE_GNOME=	pkgconfig gnomehack gnometarget libglade2
 USE_FAM=	yes
-INSTALLS_ICONS=	yes
+USE_GETTEXT=	yes
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+INSTALLS_ICONS=	yes
 
 CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-std=gnu99||g' ${WRKSRC}/src/Makefile.in
+PORTDOCS=	index.txt introduction.txt main_window.txt \
+		preferences.txt user_manager.txt
+
+pre-configure:
+	@${REINPLACE_CMD} -e '/install-data-local:/s|install-docs||' ${WRKSRC}/Makefile.in
+
+post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	@cd ${WRKSRC}/docs/ && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/
+.endif
 
 .include <bsd.port.mk>
diff --git a/ftp/pureadmin/distinfo b/ftp/pureadmin/distinfo
index 780075629e73..db0d32984225 100644
--- a/ftp/pureadmin/distinfo
+++ b/ftp/pureadmin/distinfo
@@ -1,3 +1,3 @@
-MD5 (pureadmin-0.3.tar.gz) = f7dc9fc7163b957bbcec1d4b2eec196d
-SHA256 (pureadmin-0.3.tar.gz) = cec867194ee8c2e647dedf0d3d152c033a1bcdfaf3b1e83869b3ada8d9d3e866
-SIZE (pureadmin-0.3.tar.gz) = 298177
+MD5 (pureadmin-0.4.tar.gz) = 9600f192a66001d441b1e42e9102419e
+SHA256 (pureadmin-0.4.tar.gz) = d7a43da0eb16ad5d57ac4ffe045004977186b2bacb244cb8c5239e2e0b3a2112
+SIZE (pureadmin-0.4.tar.gz) = 386739
diff --git a/ftp/pureadmin/files/patch-src-main.c b/ftp/pureadmin/files/patch-src-main.c
new file mode 100644
index 000000000000..e4eba060fefb
--- /dev/null
+++ b/ftp/pureadmin/files/patch-src-main.c
@@ -0,0 +1,11 @@
+Index: src/main.c
+@@ -126,7 +126,8 @@
+ 	gtk_init (&argc, &argv);
+ 	/* Restore DESKTOP_STARTUP_ID since, appearently, gtk_init() sometimes clears it */
+ 	// FIXME: Do we need to check if setenv() is available?
+-	setenv ("DESKTOP_STARTUP_ID", startup_id, TRUE);
++	if (startup_id)
++		setenv ("DESKTOP_STARTUP_ID", startup_id, TRUE);
+ 	
+ 	if (getuid() != 0)
+ 	{
diff --git a/ftp/pureadmin/files/patch-src__mainwin_cb.c b/ftp/pureadmin/files/patch-src__mainwin_cb.c
deleted file mode 100644
index 47c7e1e2c069..000000000000
--- a/ftp/pureadmin/files/patch-src__mainwin_cb.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- 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 d3a00979ede1..5efd4e288984 100644
--- a/ftp/pureadmin/pkg-plist
+++ b/ftp/pureadmin/pkg-plist
@@ -1,32 +1,30 @@
 bin/pureadmin
-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/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/applications/pureadmin.desktop
 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/bg/LC_MESSAGES/pureadmin.mo
+share/locale/cs/LC_MESSAGES/pureadmin.mo
 share/locale/fr/LC_MESSAGES/pureadmin.mo
 share/locale/it/LC_MESSAGES/pureadmin.mo
+share/locale/ru/LC_MESSAGES/pureadmin.mo
 share/locale/sv/LC_MESSAGES/pureadmin.mo
-@dirrm share/gnome/pureadmin/docs
-@dirrm share/gnome/pureadmin
+share/locale/tr/LC_MESSAGES/pureadmin.mo
+share/pixmaps/pureadmin.png
+%%DATADIR%%/dialogs.glade
+%%DATADIR%%/down.png
+%%DATADIR%%/logo.png
+%%DATADIR%%/mainwindow.glade
+%%DATADIR%%/prefwin.glade
+%%DATADIR%%/pureadmin-16x16.png
+%%DATADIR%%/pureadmin-24x24.png
+%%DATADIR%%/pureadmin-32x32.png
+%%DATADIR%%/pureadmin-48x48.png
+%%DATADIR%%/up.png
+%%DATADIR%%/user.png
+%%DATADIR%%/user_identity.png
+%%DATADIR%%/userconfig.png
+%%DATADIR%%/usericon.png
+%%DATADIR%%/usermanager.glade
+@dirrm %%DATADIR%%