3 files changed, 36 insertions, 42 deletions

diff --git a/www/gurlchecker/Makefile b/www/gurlchecker/Makefile
index 8009046dd93b..97bf2faffcbe 100644
--- a/www/gurlchecker/Makefile
+++ b/www/gurlchecker/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gurlchecker
 PORTVERSION=	0.10.1
+PORTREVISION=	1
 CATEGORIES=	www gnome
 MASTER_SITES=	http://labs.libre-entreprise.org/frs/download.php/%SUBDIR%/
 MASTER_SITE_SUBDIR=	547
@@ -14,17 +15,22 @@ MASTER_SITE_SUBDIR=	547
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	A Gnome program to check a page/website for broken links
 
-LIB_DEPENDS=	gnutls.15:${PORTSDIR}/security/gnutls \
-		gnet-2.0.0:${PORTSDIR}/net/gnet2
+LIB_DEPENDS=	gnet-2.0.0:${PORTSDIR}/net/gnet2 \
+		gnutls.15:${PORTSDIR}/security/gnutls
+
+OPTIONS=	CROCO "Use CROCO library for CSS2 validation" off \
+		TIDY "Use TIDY library for HTML w3c validation" off \
+		CLAMAV "Use CLAMAV library for virii scan" off \
+		GNUTLS "Use GNU TLS library for HTTPS check" on
 
-USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix intlhack libgnomeui
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
+.include <bsd.port.pre.mk>
+
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
@@ -32,6 +38,30 @@ PLIST_SUB+=	NLS=""
 PLIST_SUB+=	NLS="@comment "
 .endif
 
+.if defined(WITH_CROCO)
+LIB_DEPENDS+=	croco-0.6.3:${PORTSDIR}/textproc/libcroco
+.else
+CONFIGURE_ARGS+=	--disable-croco
+.endif
+
+.if defined(WITH_TIDY)
+LIB_DEPENDS+=	tidy-0.99.0:${PORTSDIR}/www/tidy-lib
+.else
+CONFIGURE_ARGS+=	--disable-tidy
+.endif
+
+.if defined(WITH_CLAMAV)
+LIB_DEPENDS+=	clamav.2:${PORTSDIR}/security/clamav
+.else
+CONFIGURE_ARGS+=	--disable-clamav
+.endif
+
+.if defined(WITHOUT_GNUTLS)
+CONFIGURE_ARGS+=	--disable-gnutls
+.else
+LIB_DEPENDS+=	gnutls.15:${PORTSDIR}/security/gnutls
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/^SUBDIRS/s|doc ui man|ui|g' ${WRKSRC}/Makefile.in
@@ -42,4 +72,4 @@ post-patch:
 		'/^SUBDIRS/s|po ui|ui|g' ${WRKSRC}/Makefile.in
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/gurlchecker/files/patch-src_check.c b/www/gurlchecker/files/patch-src_check.c
deleted file mode 100644
index 19919f87a366..000000000000
--- a/www/gurlchecker/files/patch-src_check.c
+++ /dev/null
@@ -1,36 +0,0 @@
---- 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-descr b/www/gurlchecker/pkg-descr
index a65a7e26a40f..106878a577fa 100644
--- a/www/gurlchecker/pkg-descr
+++ b/www/gurlchecker/pkg-descr
@@ -1,4 +1,4 @@
 gURLChecker is a C/GNOME2 tool that can check links on a single web page
 or on a whole web site in order to determine the validity of each page.
 
-WWW: http://labs.libre-entreprise.org/projects/gurlchecker/
+WWW: http://gurlchecker.labs.libre-entreprise.org/