3 files changed, 51 insertions, 45 deletions

diff --git a/devel/regexxer/Makefile b/devel/regexxer/Makefile
index 41badc15f016..2b6519864845 100644
--- a/devel/regexxer/Makefile
+++ b/devel/regexxer/Makefile
@@ -6,50 +6,28 @@
 #
 
 PORTNAME=		regexxer
-PORTVERSION=		0.8
-PORTREVISION=	4
+PORTVERSION=		0.9
 CATEGORIES=		devel textproc gnome
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE} \
-			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
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=		ports@FreeBSD.org
+MAINTAINER=		bg1tpt@gmail.com
 COMMENT=		An interactive tool for performing search and replace operations
 
 LIB_DEPENDS=		gconfmm-2.6:${PORTSDIR}/devel/gconfmm26 \
-			glademm-2.4:${PORTSDIR}/devel/libglademm24
+			glademm-2.4:${PORTSDIR}/devel/libglademm24 \
+			pcre.0:${PORTSDIR}/devel/pcre
 
-USE_BZIP2=		yes
+USE_GETTEXT=		yes
 USE_XLIB=		yes
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
 USE_GNOME=		gnomehack gnomeprefix gnometarget intltool intlhack
-CONFIGURE_ARGS=		PCRE_CONFIG="${PCRE_WRKDIR}/.install/bin/pcre-config"
-CONFIGURE_ENV=		CPPFLAGS="-I${PCRE_WRKDIR}/.install/include -I${LOCALBASE}/include" \
-			LDFLAGS="-L${PCRE_WRKDIR}/.install/lib -L${LOCALBASE}/lib"
+CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
+			LDFLAGS="-L${LOCALBASE}/lib"
 
 GCONF_SCHEMAS=		regexxer.schemas
-
-PCRE_NAME=		pcre
-PCRE_VERSION=		4.5
-PCRE_WRKDIR=		${WRKDIR}/${PCRE_NAME}-${PCRE_VERSION}
-
-pre-configure:
-	@(cd ${PCRE_WRKDIR} && \
-		${ECHO_CMD} "Configuring PCRE... " && \
-		${SETENV} CC="${CC}" CXX="${CXX}" \
-		CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
-		INSTALL="/usr/bin/install" \
-		INSTALL_DATA="${INSTALL_DATA}" \
-		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})
+INSTALLS_ICONS=		regexxer.png
 
 # This target is only meant to be used by the port maintainer.
 x-generate-plist:
diff --git a/devel/regexxer/distinfo b/devel/regexxer/distinfo
index 19a8f4bcfc68..2e5558dfb81f 100644
--- a/devel/regexxer/distinfo
+++ b/devel/regexxer/distinfo
@@ -1,6 +1,3 @@
-MD5 (regexxer-0.8.tar.bz2) = f84782bd5e3dd4e83e4034a4ad3f2f8a
-SHA256 (regexxer-0.8.tar.bz2) = 9e5850faac4652417d54d4e2b968c493155173060ed4ce98ca561751d3242017
-SIZE (regexxer-0.8.tar.bz2) = 224966
-MD5 (pcre-4.5.tar.bz2) = c51bd34197008b128046f0799d2242e4
-SHA256 (pcre-4.5.tar.bz2) = 2149cc922e26d53448e1e396e1a123925a1f1a83259a80f9bbe796807714c251
-SIZE (pcre-4.5.tar.bz2) = 349536
+MD5 (regexxer-0.9.tar.gz) = 3c45ed51f28c3d1c7228dff7fb904459
+SHA256 (regexxer-0.9.tar.gz) = ec6630745e4a87eb57aa498b5d36f014efb91a18293cc7acd9a5b506b6238479
+SIZE (regexxer-0.9.tar.gz) = 299095
diff --git a/devel/regexxer/pkg-plist b/devel/regexxer/pkg-plist
index 54bdb44a8944..0f77aa12e656 100644
--- a/devel/regexxer/pkg-plist
+++ b/devel/regexxer/pkg-plist
@@ -1,22 +1,53 @@
 bin/regexxer
 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/icons/hicolor/48x48/apps/regexxer.png
+share/locale/ar/LC_MESSAGES/regexxer.mo
+share/locale/bg/LC_MESSAGES/regexxer.mo
+share/locale/ca/LC_MESSAGES/regexxer.mo
 share/locale/cs/LC_MESSAGES/regexxer.mo
 share/locale/de/LC_MESSAGES/regexxer.mo
-share/locale/en/LC_MESSAGES/regexxer.mo
+share/locale/dz/LC_MESSAGES/regexxer.mo
 share/locale/en_CA/LC_MESSAGES/regexxer.mo
 share/locale/en_GB/LC_MESSAGES/regexxer.mo
+share/locale/es/LC_MESSAGES/regexxer.mo
+share/locale/eu/LC_MESSAGES/regexxer.mo
+share/locale/fi/LC_MESSAGES/regexxer.mo
+share/locale/fr/LC_MESSAGES/regexxer.mo
+share/locale/hu/LC_MESSAGES/regexxer.mo
 share/locale/it/LC_MESSAGES/regexxer.mo
 share/locale/ja/LC_MESSAGES/regexxer.mo
+share/locale/ne/LC_MESSAGES/regexxer.mo
 share/locale/nl/LC_MESSAGES/regexxer.mo
+share/locale/pa/LC_MESSAGES/regexxer.mo
+share/locale/pl/LC_MESSAGES/regexxer.mo
 share/locale/pt/LC_MESSAGES/regexxer.mo
 share/locale/pt_BR/LC_MESSAGES/regexxer.mo
+share/locale/rw/LC_MESSAGES/regexxer.mo
+share/locale/sl/LC_MESSAGES/regexxer.mo
+share/locale/sr/LC_MESSAGES/regexxer.mo
+share/locale/sr@Latn/LC_MESSAGES/regexxer.mo
 share/locale/sv/LC_MESSAGES/regexxer.mo
+share/locale/uk/LC_MESSAGES/regexxer.mo
+share/locale/vi/LC_MESSAGES/regexxer.mo
+share/locale/zh_CN/LC_MESSAGES/regexxer.mo
+share/locale/zh_HK/LC_MESSAGES/regexxer.mo
+share/locale/zh_TW/LC_MESSAGES/regexxer.mo
 @dirrm share/gnome/regexxer
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/pa/LC_MESSAGES
+@dirrmtry share/locale/pa
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/hu/LC_MESSAGES
+@dirrmtry share/locale/hu
+@dirrmtry share/locale/eu/LC_MESSAGES
+@dirrmtry share/locale/eu
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/bg/LC_MESSAGES
+@dirrmtry share/locale/bg
+@dirrmtry share/locale/ar/LC_MESSAGES
+@dirrmtry share/locale/ar