- update to 0.7.2

- PERL -> REINPLACE_CMD

PR:		51705
Submitted by:	Ports Fury

6 files changed, 39 insertions, 54 deletions

diff --git a/www/dillo-i18n/Makefile b/www/dillo-i18n/Makefile
index 84d51fd7f4db..129db937fc62 100644
--- a/www/dillo-i18n/Makefile
+++ b/www/dillo-i18n/Makefile
@@ -6,34 +6,29 @@
 #
 
 PORTNAME=       dillo
-PORTVERSION=	0.7.1
+PORTVERSION=	0.7.2
 CATEGORIES=     www
 MASTER_SITES=	http://dillo.auriga.wearlab.de/download/
-# hack to account for the bugfix version number
-DISTNAME=	${PORTNAME}-${PORTVERSION}.2
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A fast, small graphical Web browser built upon GTK+
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		png.5:${PORTSDIR}/graphics/png \
-		intl.4:${PORTSDIR}/devel/gettext
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+		png.5:${PORTSDIR}/graphics/png
 
+USE_BZIP2=	yes
 USE_GNOME=	gtk12
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--includedir="${LOCALBASE}/include" \
-			--libdir="${LOCALBASE}/lib" \
-			--with-jpeg-inc="${LOCALBASE}/include"
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 post-patch:
-	${PERL} -pi -e "s@-D_REENTRANT -D_THREAD_SAFE@@" ${WRKSRC}/configure
-	${PERL} -pi -e "s@dillorc@dillorc.sample@g" ${WRKSRC}/Makefile.in
-	${MV} ${WRKSRC}/dillorc ${WRKSRC}/dillorc.sample
-	${PERL} -pi -e "s@/usr/local/etc/dillorc@${PREFIX}/etc/dillorc@g" \
-		${WRKSRC}/src/prefs.c
+	@${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
 
 .include <bsd.port.mk>
diff --git a/www/dillo-i18n/distinfo b/www/dillo-i18n/distinfo
index 74c070a2c7ba..a11083312ecc 100644
--- a/www/dillo-i18n/distinfo
+++ b/www/dillo-i18n/distinfo
@@ -1 +1 @@
-MD5 (dillo-0.7.1.2.tar.gz) = b6b340d30657e51a48dc32f926be45c0
+MD5 (dillo-0.7.2.tar.bz2) = 8072ff85bde54f9e421ddadd642d6722
diff --git a/www/dillo/Makefile b/www/dillo/Makefile
index 84d51fd7f4db..129db937fc62 100644
--- a/www/dillo/Makefile
+++ b/www/dillo/Makefile
@@ -6,34 +6,29 @@
 #
 
 PORTNAME=       dillo
-PORTVERSION=	0.7.1
+PORTVERSION=	0.7.2
 CATEGORIES=     www
 MASTER_SITES=	http://dillo.auriga.wearlab.de/download/
-# hack to account for the bugfix version number
-DISTNAME=	${PORTNAME}-${PORTVERSION}.2
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A fast, small graphical Web browser built upon GTK+
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		png.5:${PORTSDIR}/graphics/png \
-		intl.4:${PORTSDIR}/devel/gettext
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+		png.5:${PORTSDIR}/graphics/png
 
+USE_BZIP2=	yes
 USE_GNOME=	gtk12
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--includedir="${LOCALBASE}/include" \
-			--libdir="${LOCALBASE}/lib" \
-			--with-jpeg-inc="${LOCALBASE}/include"
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 post-patch:
-	${PERL} -pi -e "s@-D_REENTRANT -D_THREAD_SAFE@@" ${WRKSRC}/configure
-	${PERL} -pi -e "s@dillorc@dillorc.sample@g" ${WRKSRC}/Makefile.in
-	${MV} ${WRKSRC}/dillorc ${WRKSRC}/dillorc.sample
-	${PERL} -pi -e "s@/usr/local/etc/dillorc@${PREFIX}/etc/dillorc@g" \
-		${WRKSRC}/src/prefs.c
+	@${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
 
 .include <bsd.port.mk>
diff --git a/www/dillo/distinfo b/www/dillo/distinfo
index 74c070a2c7ba..a11083312ecc 100644
--- a/www/dillo/distinfo
+++ b/www/dillo/distinfo
@@ -1 +1 @@
-MD5 (dillo-0.7.1.2.tar.gz) = b6b340d30657e51a48dc32f926be45c0
+MD5 (dillo-0.7.2.tar.bz2) = 8072ff85bde54f9e421ddadd642d6722
diff --git a/www/dillo2/Makefile b/www/dillo2/Makefile
index 84d51fd7f4db..129db937fc62 100644
--- a/www/dillo2/Makefile
+++ b/www/dillo2/Makefile
@@ -6,34 +6,29 @@
 #
 
 PORTNAME=       dillo
-PORTVERSION=	0.7.1
+PORTVERSION=	0.7.2
 CATEGORIES=     www
 MASTER_SITES=	http://dillo.auriga.wearlab.de/download/
-# hack to account for the bugfix version number
-DISTNAME=	${PORTNAME}-${PORTVERSION}.2
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A fast, small graphical Web browser built upon GTK+
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		png.5:${PORTSDIR}/graphics/png \
-		intl.4:${PORTSDIR}/devel/gettext
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+		png.5:${PORTSDIR}/graphics/png
 
+USE_BZIP2=	yes
 USE_GNOME=	gtk12
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--includedir="${LOCALBASE}/include" \
-			--libdir="${LOCALBASE}/lib" \
-			--with-jpeg-inc="${LOCALBASE}/include"
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 post-patch:
-	${PERL} -pi -e "s@-D_REENTRANT -D_THREAD_SAFE@@" ${WRKSRC}/configure
-	${PERL} -pi -e "s@dillorc@dillorc.sample@g" ${WRKSRC}/Makefile.in
-	${MV} ${WRKSRC}/dillorc ${WRKSRC}/dillorc.sample
-	${PERL} -pi -e "s@/usr/local/etc/dillorc@${PREFIX}/etc/dillorc@g" \
-		${WRKSRC}/src/prefs.c
+	@${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
 
 .include <bsd.port.mk>
diff --git a/www/dillo2/distinfo b/www/dillo2/distinfo
index 74c070a2c7ba..a11083312ecc 100644
--- a/www/dillo2/distinfo
+++ b/www/dillo2/distinfo
@@ -1 +1 @@
-MD5 (dillo-0.7.1.2.tar.gz) = b6b340d30657e51a48dc32f926be45c0
+MD5 (dillo-0.7.2.tar.bz2) = 8072ff85bde54f9e421ddadd642d6722