1 files changed, 11 insertions, 6 deletions

diff --git a/www/dillo/Makefile b/www/dillo/Makefile
index 03cf2cdaee88..ecb68c25e2a4 100644
--- a/www/dillo/Makefile
+++ b/www/dillo/Makefile
@@ -10,14 +10,14 @@
 
 PORTNAME=	dillo
 PORTVERSION=	0.8.5
-CATEGORIES=	www
+CATEGORIES=	www ipv6
 MASTER_SITES=	http://www.dillo.org/download/
 
-MAINTAINER=	tmseck@netcologne.de
-COMMENT=	A fast, small graphical Web browser built upon GTK+
+MAINTAINER?=	tmseck@netcologne.de
+COMMENT?=	A fast, small graphical Web browser built upon GTK+
 
-RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
+RUN_DEPENDS+=	wget:${PORTSDIR}/ftp/wget
+LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png
 
 USE_BZIP2=	yes
@@ -27,7 +27,7 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--enable-ipv6 --libdir=${PREFIX}/libexec
+CONFIGURE_ARGS+=	--enable-ipv6 --libdir=${PREFIX}/libexec
 
 .if defined(WITH_DILLO_SSL)
 CONFIGURE_ARGS+=	--enable-ssl
@@ -36,12 +36,16 @@ USE_OPENSSL=	yes
 CONFIGURE_ARGS+=	--disable-ssl
 .endif
 
+CONFLICTS?=	dillo-i18n-*[0-9]*
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g ; \
 		 s|-D_THREAD_SAFE|${PTHREAD_CFLAGS}|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|dillorc|dillorc.sample|g' ${WRKSRC}/Makefile.in
 	@${CP} ${WRKSRC}/dillorc ${WRKSRC}/dillorc.sample
 
+# let a slave port redefine this target if it needs to:
+.if !target(pre-configure)
 pre-configure:
 .if !defined(WITH_DILLO_SSL)
 	@${ECHO_CMD} ""
@@ -50,5 +54,6 @@ pre-configure:
 	@${ECHO_CMD} "   commandline."
 	@${ECHO_CMD} ""
 .endif
+.endif
 
 .include <bsd.port.mk>