- Update to 1.0.4;

- use REINPLACE_CMD.

9 files changed, 33 insertions, 33 deletions

diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile
index d6c5167..0cebe5d 100644
--- a/www/gtkhtml/Makefile
+++ b/www/gtkhtml/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gtkhtml
-PORTVERSION=	1.0.3
+PORTVERSION=	1.0.4
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/gtkhtml
@@ -32,10 +32,10 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
-		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
-		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
+	@find ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \
+		's|[(]datadir[)]/gnome/|(datadir)/|g ; \
+		 s|[(]datadir[)]/locale|(prefix)/share/locale|g'
 
 .include <bsd.port.mk>
diff --git a/www/gtkhtml/distinfo b/www/gtkhtml/distinfo
index 7a4e034..5be71ec 100644
--- a/www/gtkhtml/distinfo
+++ b/www/gtkhtml/distinfo
@@ -1 +1 @@
-MD5 (gnome/gtkhtml-1.0.3.tar.bz2) = d968748364b5fc9e2d2cf310043e44be
+MD5 (gnome/gtkhtml-1.0.4.tar.bz2) = 1ea977558c2daf9b7f9916800e933b00
diff --git a/www/gtkhtml/files/patch-af b/www/gtkhtml/files/patch-af
index fee4a53..d0a58d2 100644
--- a/www/gtkhtml/files/patch-af
+++ b/www/gtkhtml/files/patch-af
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- configure.orig	Mon Apr 15 19:37:22 2002
-+++ configure	Wed May  1 12:17:00 2002
-@@ -7025,6 +7025,7 @@
+--- configure.orig	Sun Jun 16 16:45:03 2002
++++ configure	Sun Jun 16 16:45:40 2002
+@@ -7012,6 +7012,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -11,12 +11,12 @@ $FreeBSD$
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -9334,7 +9335,7 @@
+@@ -9321,7 +9322,7 @@
  
  if test "x$enable_xim" = "xyes"; then
  	BACKUP_LDFLAGS=$LDFLAGS
 -	LDFLAGS="$LDFLAGS `gtk-config --libs`"
 +	LDFLAGS="$LDFLAGS `$GTK_CONFIG --libs`"
- 	echo "$as_me:9338: checking for gdk_im_begin" >&5
+ 	echo "$as_me:9325: checking for gdk_im_begin" >&5
  echo $ECHO_N "checking for gdk_im_begin... $ECHO_C" >&6
  if test "${ac_cv_func_gdk_im_begin+set}" = set; then
diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index d6c5167..0cebe5d 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gtkhtml
-PORTVERSION=	1.0.3
+PORTVERSION=	1.0.4
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/gtkhtml
@@ -32,10 +32,10 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
-		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
-		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
+	@find ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \
+		's|[(]datadir[)]/gnome/|(datadir)/|g ; \
+		 s|[(]datadir[)]/locale|(prefix)/share/locale|g'
 
 .include <bsd.port.mk>
diff --git a/www/gtkhtml3/distinfo b/www/gtkhtml3/distinfo
index 7a4e034..5be71ec 100644
--- a/www/gtkhtml3/distinfo
+++ b/www/gtkhtml3/distinfo
@@ -1 +1 @@
-MD5 (gnome/gtkhtml-1.0.3.tar.bz2) = d968748364b5fc9e2d2cf310043e44be
+MD5 (gnome/gtkhtml-1.0.4.tar.bz2) = 1ea977558c2daf9b7f9916800e933b00
diff --git a/www/gtkhtml3/files/patch-af b/www/gtkhtml3/files/patch-af
index fee4a53..d0a58d2 100644
--- a/www/gtkhtml3/files/patch-af
+++ b/www/gtkhtml3/files/patch-af
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- configure.orig	Mon Apr 15 19:37:22 2002
-+++ configure	Wed May  1 12:17:00 2002
-@@ -7025,6 +7025,7 @@
+--- configure.orig	Sun Jun 16 16:45:03 2002
++++ configure	Sun Jun 16 16:45:40 2002
+@@ -7012,6 +7012,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -11,12 +11,12 @@ $FreeBSD$
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -9334,7 +9335,7 @@
+@@ -9321,7 +9322,7 @@
  
  if test "x$enable_xim" = "xyes"; then
  	BACKUP_LDFLAGS=$LDFLAGS
 -	LDFLAGS="$LDFLAGS `gtk-config --libs`"
 +	LDFLAGS="$LDFLAGS `$GTK_CONFIG --libs`"
- 	echo "$as_me:9338: checking for gdk_im_begin" >&5
+ 	echo "$as_me:9325: checking for gdk_im_begin" >&5
  echo $ECHO_N "checking for gdk_im_begin... $ECHO_C" >&6
  if test "${ac_cv_func_gdk_im_begin+set}" = set; then
diff --git a/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile
index d6c5167..0cebe5d 100644
--- a/www/gtkhtml38/Makefile
+++ b/www/gtkhtml38/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gtkhtml
-PORTVERSION=	1.0.3
+PORTVERSION=	1.0.4
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/gtkhtml
@@ -32,10 +32,10 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
-		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
-		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
+	@find ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \
+		's|[(]datadir[)]/gnome/|(datadir)/|g ; \
+		 s|[(]datadir[)]/locale|(prefix)/share/locale|g'
 
 .include <bsd.port.mk>
diff --git a/www/gtkhtml38/distinfo b/www/gtkhtml38/distinfo
index 7a4e034..5be71ec 100644
--- a/www/gtkhtml38/distinfo
+++ b/www/gtkhtml38/distinfo
@@ -1 +1 @@
-MD5 (gnome/gtkhtml-1.0.3.tar.bz2) = d968748364b5fc9e2d2cf310043e44be
+MD5 (gnome/gtkhtml-1.0.4.tar.bz2) = 1ea977558c2daf9b7f9916800e933b00
diff --git a/www/gtkhtml38/files/patch-af b/www/gtkhtml38/files/patch-af
index fee4a53..d0a58d2 100644
--- a/www/gtkhtml38/files/patch-af
+++ b/www/gtkhtml38/files/patch-af
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- configure.orig	Mon Apr 15 19:37:22 2002
-+++ configure	Wed May  1 12:17:00 2002
-@@ -7025,6 +7025,7 @@
+--- configure.orig	Sun Jun 16 16:45:03 2002
++++ configure	Sun Jun 16 16:45:40 2002
+@@ -7012,6 +7012,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -11,12 +11,12 @@ $FreeBSD$
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -9334,7 +9335,7 @@
+@@ -9321,7 +9322,7 @@
  
  if test "x$enable_xim" = "xyes"; then
  	BACKUP_LDFLAGS=$LDFLAGS
 -	LDFLAGS="$LDFLAGS `gtk-config --libs`"
 +	LDFLAGS="$LDFLAGS `$GTK_CONFIG --libs`"
- 	echo "$as_me:9338: checking for gdk_im_begin" >&5
+ 	echo "$as_me:9325: checking for gdk_im_begin" >&5
  echo $ECHO_N "checking for gdk_im_begin... $ECHO_C" >&6
  if test "${ac_cv_func_gdk_im_begin+set}" = set; then