4 files changed, 40 insertions, 25 deletions

diff --git a/devel/regexxer/Makefile b/devel/regexxer/Makefile
index 44ecb4c3e2cc..d2af28e0dfa5 100644
--- a/devel/regexxer/Makefile
+++ b/devel/regexxer/Makefile
@@ -6,38 +6,42 @@
 #
 
 PORTNAME=		regexxer
-PORTVERSION=		0.7
+PORTVERSION=		0.8
 CATEGORIES=		devel textproc gnome
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE} \
-			${MASTER_SITE_SOURCEFORGE:S/$/:pcre/} \
-			ftp://ftp.csx.cam.ac.uk/pub/software/programming/%SUBDIR%/:pcre
+			ftp://ftp.csx.cam.ac.uk/pub/software/programming/%SUBDIR%/:pcre \
+			ftp://ftp.fu-berlin.de/unix/misc/%SUBDIR%/:pcre \
+			ftp://ftp.tin.org/pub/libs/%SUBDIR%/:pcre
 MASTER_SITE_SUBDIR=	${PORTNAME} \
 			${PCRE_NAME}/:pcre
 DISTFILES=		${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
-			$(PCRE_NAME)-${PCRE_VERSION}${EXTRACT_SUFX}:pcre
+			${PCRE_NAME}-${PCRE_VERSION}${EXTRACT_SUFX}:pcre
 
 MAINTAINER=		rui@ruilopes.com
 COMMENT=		An interactive tool for performing search and replace operations
 
-LIB_DEPENDS=		gconfmm-2.0:${PORTSDIR}/devel/gconfmm
+LIB_DEPENDS=		gconfmm-2.6:${PORTSDIR}/devel/gconfmm26 \
+			glademm-2.4:${PORTSDIR}/devel/libglademm24
 
+USE_BZIP2=		yes
 USE_X_PREFIX=		yes
 USE_REINPLACE=		yes
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
-USE_GNOME=		gnomehack gnomeprefix gnometarget
+USE_GNOME=		gnomehack gnomeprefix gnometarget intltool intlhack
 CONFIGURE_ARGS=		PCRE_CONFIG="${PCRE_WRKDIR}/.install/bin/pcre-config"
+CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 
 PCRE_NAME=		pcre
 PCRE_VERSION=		4.5
 PCRE_WRKDIR=		${WRKDIR}/${PCRE_NAME}-${PCRE_VERSION}
 
 post-patch:
-	@${REINPLACE_CMD} -E 's,^(pcre_.+ sed )-n (.*),\1\2,' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -E 's,(\$$\(PKG_(CFLAGS|LIBS)\)) (\$$\(PCRE_(CFLAGS|LIBS)\)),\3 \1,' ${WRKSRC}/src/Makefile.in
 
 pre-configure:
 	@(cd ${PCRE_WRKDIR} && \
-		$(ECHO_CMD) "Configuring PCRE... " && \
+		${ECHO_CMD} "Configuring PCRE... " && \
 		${SETENV} CC="${CC}" CXX="${CXX}" \
 		CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
 		INSTALL="/usr/bin/install" \
@@ -45,12 +49,16 @@ pre-configure:
 		INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
 		./configure --enable-utf8 --disable-shared --prefix="${PCRE_WRKDIR}/.install" && \
-		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} $(INSTALL_TARGET))
+		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
+
+# This target is only meant to be used by the port maintainer.
+x-generate-plist:
+	(${PORTSDIR}/Tools/scripts/plist -d -m ${MTREE_FILE} ${PREFIX}|${GREP} regexxer) > temp-pkg-plist
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500000
-EXTRA_PATCHES=	${PATCHDIR}/extra-patch-old_stl
+USE_GCC=	3.3
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/regexxer/distinfo b/devel/regexxer/distinfo
index 534d7360a5f3..688d5be1e0c0 100644
--- a/devel/regexxer/distinfo
+++ b/devel/regexxer/distinfo
@@ -1,4 +1,4 @@
-MD5 (regexxer-0.7.tar.gz) = 523ded5b26c6a3d34f4bc1c34187ff06
-SIZE (regexxer-0.7.tar.gz) = 240784
-MD5 (pcre-4.5.tar.gz) = a58971177114a3b7a5da0e5a89a43c96
-SIZE (pcre-4.5.tar.gz) = 476057
+MD5 (regexxer-0.8.tar.bz2) = f84782bd5e3dd4e83e4034a4ad3f2f8a
+SIZE (regexxer-0.8.tar.bz2) = 224966
+MD5 (pcre-4.5.tar.bz2) = c51bd34197008b128046f0799d2242e4
+SIZE (pcre-4.5.tar.bz2) = 349536
diff --git a/devel/regexxer/files/extra-patch-old_stl b/devel/regexxer/files/extra-patch-old_stl
deleted file mode 100644
index e5d95927021a..000000000000
--- a/devel/regexxer/files/extra-patch-old_stl
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/stringutils.cc.orig	Thu Jul  8 01:07:57 2004
-+++ src/stringutils.cc	Thu Jul  8 01:08:18 2004
-@@ -650,7 +650,7 @@
- 
-   if (path.bytes() >= len
-       && (path.bytes() == len || path.raw()[len] == G_DIR_SEPARATOR)
--      && path.raw().compare(0, len, homedir.raw()) == 0)
-+      && path.raw().compare(homedir.raw(), 0, len) == 0)
-   {
-     std::string result (1, '~');
-     result.append(path.raw(), len, std::string::npos);
diff --git a/devel/regexxer/pkg-plist b/devel/regexxer/pkg-plist
index 8ed107af5483..def9d28900c2 100644
--- a/devel/regexxer/pkg-plist
+++ b/devel/regexxer/pkg-plist
@@ -1,3 +1,21 @@
 bin/regexxer
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/regexxer.schemas > /dev/null || /usr/bin/true
+etc/gconf/schemas/regexxer.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/regexxer.schemas > /dev/null || /usr/bin/true
 share/gnome/applications/regexxer.desktop
 share/gnome/pixmaps/regexxer.png
+share/gnome/regexxer/aboutdialog.glade
+share/gnome/regexxer/mainwindow.glade
+share/gnome/regexxer/prefdialog.glade
+share/locale/cs/LC_MESSAGES/regexxer.mo
+share/locale/de/LC_MESSAGES/regexxer.mo
+share/locale/en/LC_MESSAGES/regexxer.mo
+share/locale/en_CA/LC_MESSAGES/regexxer.mo
+share/locale/en_GB/LC_MESSAGES/regexxer.mo
+share/locale/it/LC_MESSAGES/regexxer.mo
+share/locale/ja/LC_MESSAGES/regexxer.mo
+share/locale/nl/LC_MESSAGES/regexxer.mo
+share/locale/pt/LC_MESSAGES/regexxer.mo
+share/locale/pt_BR/LC_MESSAGES/regexxer.mo
+share/locale/sv/LC_MESSAGES/regexxer.mo
+@dirrm share/gnome/regexxer