6 files changed, 77 insertions, 29 deletions

diff --git a/www/gurlchecker/Makefile b/www/gurlchecker/Makefile
index 86f4d1a22d41..1109a80f9fda 100644
--- a/www/gurlchecker/Makefile
+++ b/www/gurlchecker/Makefile
@@ -6,18 +6,18 @@
 #
 
 PORTNAME=	gurlchecker
-PORTVERSION=	0.6.3
-PORTREVISION=	3
+PORTVERSION=	0.8.0
 CATEGORIES=	www gnome
-MASTER_SITES=	${MASTER_SITE_SAVANNAH} \
-		http://labs.libre-entreprise.org/download.php/57/
-MASTER_SITE_SUBDIR=	${PORTNAME}/stable/0.6
+MASTER_SITES=	http://labs.libre-entreprise.org/download.php/${DOWNNUM}/
 
-MAINTAINER=	kwm@rainbow-runner.nl
+MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	A Gnome program to check a page/website for broken links
 
-USE_X_PREFIX=	yes
+LIB_DEPENDS=	gnutls.12:${PORTSDIR}/security/gnutls \
+		gnet-2.0.0:${PORTSDIR}/net/gnet2
 
+USE_X_PREFIX=	yes
+DOWNNUM=	335
 USE_GNOME=	gnomeprefix gnomehack libgnomeui
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/www/gurlchecker/distinfo b/www/gurlchecker/distinfo
index 28f71c7dcf33..17e54196967a 100644
--- a/www/gurlchecker/distinfo
+++ b/www/gurlchecker/distinfo
@@ -1,2 +1,2 @@
-MD5 (gurlchecker-0.6.3.tar.gz) = b2db7effe6a429f8b4435d24c88d5b3b
-SIZE (gurlchecker-0.6.3.tar.gz) = 326507
+MD5 (gurlchecker-0.8.0.tar.gz) = f5a7d937a7583715563b7764067dd224
+SIZE (gurlchecker-0.8.0.tar.gz) = 600821
diff --git a/www/gurlchecker/files/patch-Makefile.in b/www/gurlchecker/files/patch-Makefile.in
new file mode 100644
index 000000000000..a3771fc0a699
--- /dev/null
+++ b/www/gurlchecker/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Thu Feb  3 22:52:24 2005
++++ Makefile.in	Thu Feb  3 22:54:28 2005
+@@ -201,7 +201,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-SUBDIRS = m4 src po doc ui man debian
++SUBDIRS = m4 src po ui debian
+ DESKTOP_FILES = gurlchecker.desktop
+ MMdir = $(datadir)/applications
+ MM_DATA = $(DESKTOP_FILES)
diff --git a/www/gurlchecker/files/patch-src_Makefile.in b/www/gurlchecker/files/patch-src_Makefile.in
index be49da31e43d..f806867dd662 100644
--- a/www/gurlchecker/files/patch-src_Makefile.in
+++ b/www/gurlchecker/files/patch-src_Makefile.in
@@ -1,11 +1,11 @@
---- src/Makefile.in.orig	Sun Nov 30 16:46:29 2003
-+++ src/Makefile.in	Sun Nov 30 16:46:36 2003
-@@ -128,7 +128,7 @@
+--- src/Makefile.in.orig	Thu Feb  3 22:12:05 2005
++++ src/Makefile.in	Thu Feb  3 22:12:36 2005
+@@ -235,7 +235,7 @@
+ 	tooltips.c tooltips.h \
  	general.h
  
+-gurlchecker_LDADD = @PACKAGE_LIBS@ @GNUTLS_LIBS@ -lresolv
++gurlchecker_LDADD = @PACKAGE_LIBS@ @GNUTLS_LIBS@
+ all: all-am
  
--gurlchecker_LDADD = @PACKAGE_LIBS@ -lresolv
-+gurlchecker_LDADD = @PACKAGE_LIBS@
- subdir = src
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
+ .SUFFIXES:
diff --git a/www/gurlchecker/files/patch-src_check.c b/www/gurlchecker/files/patch-src_check.c
new file mode 100644
index 000000000000..19919f87a366
--- /dev/null
+++ b/www/gurlchecker/files/patch-src_check.c
@@ -0,0 +1,36 @@
+--- src/check.c.orig	Thu Feb  3 17:10:35 2005
++++ src/check.c	Thu Feb  3 17:27:11 2005
+@@ -1121,8 +1121,8 @@
+ uc_check_link_already_checked_with_insert (UCLinkProperties * prop,
+ 					   gchar * url)
+ {
+-  UCLinkProperties *prop_tmp = NULL;
+   gboolean already_checked = FALSE;
++  UCLinkProperties *prop_tmp = NULL;
+ 
+   prop_tmp = uc_check_link_already_checked (url);
+ 
+@@ -2107,16 +2107,18 @@
+ 			      UCHTMLTag * tag, UCLinkProperties * old_prop,
+ 			      gboolean * accept, guint retry)
+ {
++  gboolean already_checked = FALSE;
++  gboolean cancel = FALSE;
++  gboolean blocked_domain = FALSE;
++  gboolean no_check = FALSE;
+   UCLinkProperties *prop = NULL;
++  UCHTTPCheckReturn ret;
+   UCStatusCode *sc = NULL;
+   gchar *protocol = NULL;
+   gchar *hostname = NULL;
+   protocol = NULL;
+-  gboolean cancel = FALSE;
+-  gboolean blocked_domain = FALSE;
+-  gboolean already_checked = FALSE;
+-  gboolean no_check = FALSE;
+-  UCHTTPCheckReturn ret = UC_HTTP_CHECK_RETURN_OK;
++
++  ret = UC_HTTP_CHECK_RETURN_OK;
+ 
+   protocol = uc_url_get_protocol (tag->value);
+   if (uc_check_protocol_accepted (protocol))
diff --git a/www/gurlchecker/pkg-plist b/www/gurlchecker/pkg-plist
index efae716033db..8bb805b1d17d 100644
--- a/www/gurlchecker/pkg-plist
+++ b/www/gurlchecker/pkg-plist
@@ -1,7 +1,8 @@
 bin/gurlchecker
-share/gnome/gurlchecker/ui/gURLChecker.png
-share/gnome/gurlchecker/ui/gURLChecker_icon.png
+share/gnome/applications/gurlchecker.desktop
 share/gnome/gurlchecker/ui/gurlchecker.glade
+share/gnome/gurlchecker/ui/gurlchecker.png
+share/gnome/gurlchecker/ui/gurlchecker_icon.png
 share/gnome/gurlchecker/ui/link_status_bad.png
 share/gnome/gurlchecker/ui/link_status_file_error.png
 share/gnome/gurlchecker/ui/link_status_good.png
@@ -12,32 +13,32 @@ share/gnome/gurlchecker/ui/link_status_malformed.png
 share/gnome/gurlchecker/ui/link_status_nodata.png
 share/gnome/gurlchecker/ui/link_status_restricted.png
 share/gnome/gurlchecker/ui/link_status_timeout.png
+share/gnome/gurlchecker/ui/link_type_css.png
+share/gnome/gurlchecker/ui/link_type_css_ssl.png
 share/gnome/gurlchecker/ui/link_type_folder.png
 share/gnome/gurlchecker/ui/link_type_frame.png
+share/gnome/gurlchecker/ui/link_type_frame_ssl.png
 share/gnome/gurlchecker/ui/link_type_href.png
+share/gnome/gurlchecker/ui/link_type_href_ftp.png
 share/gnome/gurlchecker/ui/link_type_href_local.png
+share/gnome/gurlchecker/ui/link_type_href_ssl.png
 share/gnome/gurlchecker/ui/link_type_image.png
 share/gnome/gurlchecker/ui/link_type_image_local.png
+share/gnome/gurlchecker/ui/link_type_image_ssl.png
 share/gnome/gurlchecker/ui/link_type_mail.png
 share/gnome/gurlchecker/ui/link_type_unknown.png
 share/gnome/gurlchecker/ui/menu_new_bookmarks_file.png
 share/gnome/gurlchecker/ui/menu_new_local_file.png
 share/gnome/gurlchecker/ui/menu_new_web_site.png
+share/gnome/gurlchecker/ui/menu_protocol_ftp.png
+share/gnome/gurlchecker/ui/menu_protocol_https.png
+share/gnome/pixmaps/gurlchecker.png
 share/locale/da/LC_MESSAGES/gurlchecker.mo
 share/locale/de/LC_MESSAGES/gurlchecker.mo
 share/locale/eo/LC_MESSAGES/gurlchecker.mo
 share/locale/es/LC_MESSAGES/gurlchecker.mo
 share/locale/fr/LC_MESSAGES/gurlchecker.mo
+share/locale/it/LC_MESSAGES/gurlchecker.mo
 share/locale/ja/LC_MESSAGES/gurlchecker.mo
-@unexec rmdir %D/share/locale/ja/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ja 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr 2>/dev/null || true
-@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/es 2>/dev/null || true
-@unexec rmdir %D/share/locale/eo/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/eo 2>/dev/null || true
-@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/de 2>/dev/null || true
 @dirrm share/gnome/gurlchecker/ui
 @dirrm share/gnome/gurlchecker