summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorAlexander Nedotsukov <bland@FreeBSD.org>2004-07-08 11:18:18 +0000
committerAlexander Nedotsukov <bland@FreeBSD.org>2004-07-08 11:18:18 +0000
commitef2e0412350286772cc8b903ee699db1920df742 (patch)
treeda1ffdd4cdac702c0d93bf3b637f7dcf7745466f /devel
parentUpdate to 2.25. This version correctly handles zombie processes and no (diff)
- Update to 0.7
- Use pcre 4.5 Approved by: maintainer
Notes
Notes: svn path=/head/; revision=113203
Diffstat (limited to 'devel')
-rw-r--r--devel/regexxer/Makefile16
-rw-r--r--devel/regexxer/distinfo8
-rw-r--r--devel/regexxer/files/extra-patch-old_stl11
3 files changed, 25 insertions, 10 deletions
diff --git a/devel/regexxer/Makefile b/devel/regexxer/Makefile
index 814b3a0c20f4..44ecb4c3e2cc 100644
--- a/devel/regexxer/Makefile
+++ b/devel/regexxer/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= regexxer
-PORTVERSION= 0.6
-PORTREVISION= 2
+PORTVERSION= 0.7
CATEGORIES= devel textproc gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
${MASTER_SITE_SOURCEFORGE:S/$/:pcre/} \
@@ -20,8 +19,7 @@ DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
MAINTAINER= rui@ruilopes.com
COMMENT= An interactive tool for performing search and replace operations
-LIB_DEPENDS= gnomevfsmm-1.3:${PORTSDIR}/devel/gnome-vfsmm \
- gconfmm-2.0:${PORTSDIR}/devel/gconfmm
+LIB_DEPENDS= gconfmm-2.0:${PORTSDIR}/devel/gconfmm
USE_X_PREFIX= yes
USE_REINPLACE= yes
@@ -31,7 +29,7 @@ USE_GNOME= gnomehack gnomeprefix gnometarget
CONFIGURE_ARGS= PCRE_CONFIG="${PCRE_WRKDIR}/.install/bin/pcre-config"
PCRE_NAME= pcre
-PCRE_VERSION= 4.4
+PCRE_VERSION= 4.5
PCRE_WRKDIR= ${WRKDIR}/${PCRE_NAME}-${PCRE_VERSION}
post-patch:
@@ -49,4 +47,10 @@ pre-configure:
./configure --enable-utf8 --disable-shared --prefix="${PCRE_WRKDIR}/.install" && \
${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} $(INSTALL_TARGET))
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500000
+EXTRA_PATCHES= ${PATCHDIR}/extra-patch-old_stl
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/regexxer/distinfo b/devel/regexxer/distinfo
index 262b2bb10126..534d7360a5f3 100644
--- a/devel/regexxer/distinfo
+++ b/devel/regexxer/distinfo
@@ -1,4 +1,4 @@
-MD5 (regexxer-0.6.tar.gz) = 34ef50fa035669aca8520de3d085071a
-SIZE (regexxer-0.6.tar.gz) = 158592
-MD5 (pcre-4.4.tar.gz) = fd0becd667dd85e8dfab6a746ffee550
-SIZE (pcre-4.4.tar.gz) = 462395
+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
diff --git a/devel/regexxer/files/extra-patch-old_stl b/devel/regexxer/files/extra-patch-old_stl
new file mode 100644
index 000000000000..e5d95927021a
--- /dev/null
+++ b/devel/regexxer/files/extra-patch-old_stl
@@ -0,0 +1,11 @@
+--- 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);