svn commit: r311696 - in head/www: dillo dillo-i18n

[Baptiste Daroussin]

Author: bapt
Date: Tue Feb  5 11:15:24 2013
New Revision: 311696
URL: http://svnweb.freebsd.org/changeset/ports/311696

Log:
  Remove DLGUI option as it depends on fltk2 which is not more supported upstream
  and has expired in the ports tree

Modified:
  head/www/dillo-i18n/Makefile
  head/www/dillo/Makefile

Modified: head/www/dillo-i18n/Makefile
==============================================================================
--- head/www/dillo-i18n/Makefile	Tue Feb  5 11:15:20 2013	(r311695)
+++ head/www/dillo-i18n/Makefile	Tue Feb  5 11:15:24 2013	(r311696)
@@ -1,7 +1,4 @@
-# New ports collection makefile for:	dillo-i18n
-# Date created:			2005-12-11
-# Whom:               		Thomas-Martin Seck <tmseck at netcologne.de>
-#
+# Created by: Thomas-Martin Seck <tmseck at netcologne.de>
 # $FreeBSD$
 #
 # Tunables:
@@ -9,8 +6,6 @@
 # WITH_DILLO_META-REFRESH:	make Dillo accept the meta-refresh tag
 # WITHOUT_DILLO_TABS:		disable support for tabbed browsing
 # WITHOUT_DILLO_ANTIALIAS:	disable support for antialiased display
-# WITH_DILLO_DLGUI:		enable experimental FLTK2 based gui for file
-# 				downloads
 # WITHOUT_DILLO_IPV6:		disable IPv6 support
 #
 
@@ -79,14 +74,7 @@ CONFIGURE_ARGS+=	--enable-anti-alias
 CONFIGURE_ARGS+=	--disable-anti-alias
 .endif
 
-.if defined(WITH_DILLO_DLGUI)
-CONFIGURE_ARGS+=	--enable-dlgui
-BUILD_DEPENDS+=	fltk>=2.0.r4825:${PORTSDIR}/x11-toolkits/fltk2
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-.else
 CONFIGURE_ARGS+=	--disable-dlgui
-.endif
 
 .if !defined(WITHOUT_DILLO_IPV6) && !defined(WITHOUT_IPV6)
 CONFIGURE_ARGS+=	--enable-ipv6
@@ -119,11 +107,6 @@ pre-configure:
 	@${ECHO_CMD} "   Set WITHOUT_DILLO_ANTIALIAS=yes in your make environment or on the"
 	@${ECHO_CMD} "   commandline to disable support for antialiased fonts."
 .endif
-.if !defined(WITH_DILLO_DLGUI)
-	@${ECHO_CMD} ""
-	@${ECHO_CMD} "   Set WITH_DILLO_DLGUI=yes in your make environment or on the"
-	@${ECHO_CMD} "   commandline to enable a FLTK2 based gui for download operations."
-.endif
 .if !defined(WITHOUT_DILLO_IPV6) && !defined(WITHOUT_IPV6)
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "   Set WITHOUT_DILLO_IPV6=yes (or WITHOUT_IPV6=yes) in your make"

Modified: head/www/dillo/Makefile
==============================================================================
--- head/www/dillo/Makefile	Tue Feb  5 11:15:20 2013	(r311695)
+++ head/www/dillo/Makefile	Tue Feb  5 11:15:24 2013	(r311696)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:   dillo
-# Date created:        23 February 2001
-# Whom:                George Reid <greid at ukug.uk.freebsd.org>
-#
+# Created by: George Reid <greid at ukug.uk.freebsd.org>
 # $FreeBSD$
 #
 # Tunables:
 # WITH_DILLO_SSL: enable experimental SSL support
-# WITH_DILLO_DLGUI: enable experimental FLTK2 based gui for file downloads
 #
 
 PORTNAME=	dillo
@@ -29,7 +25,8 @@ GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--enable-cookies --enable-threaded-dns \
-		--libdir=${PREFIX}/libexec
+		--libdir=${PREFIX}/libexec \
+		--disable-dlgui
 .if !defined(WITHOUT_DILLO_IPV6) && !defined(WITHOUT_IPV6)
 CONFIGURE_ARGS+=	--enable-ipv6
 .else
@@ -44,15 +41,6 @@ USE_OPENSSL=	yes
 CONFIGURE_ARGS+=	--disable-ssl
 .endif
 
-.if defined(WITH_DILLO_DLGUI)
-CONFIGURE_ARGS+=	--enable-dlgui
-BUILD_DEPENDS+=	fltk>=2.0.r4825:${PORTSDIR}/x11-toolkits/fltk2
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-.else
-CONFIGURE_ARGS+=	--disable-dlgui
-.endif
-
 CONFLICTS=	dillo-i18n-*[0-9]* \
 		dillo-[2-9]*
 
@@ -68,11 +56,6 @@ pre-configure:
 	@${ECHO_CMD} "   Set WITH_DILLO_SSL=yes in your make environment or on the"
 	@${ECHO_CMD} "   commandline to enable experimental SSL support."
 .endif
-.if !defined(WITH_DILLO_DLGUI)
-	@${ECHO_CMD} ""
-	@${ECHO_CMD} "   Set WITH_DILLO_DLGUI=yes in your make environment or on the"
-	@${ECHO_CMD} "   commandline to enable a FLTK2 based gui for download operations."
-.endif
 .if !defined(WITHOUT_DILLO_IPV6) && !defined(WITHOUT_IPV6)
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "   Set WITHOUT_DILLO_IPV6=yes (or WITHOUT_IPV6=yes) in your make"