diff options
| -rw-r--r-- | MOVED | 1 | ||||
| -rw-r--r-- | devel/Makefile | 1 | ||||
| -rw-r--r-- | devel/aifad/Makefile | 3 | ||||
| -rw-r--r-- | devel/anjuta/Makefile | 4 | ||||
| -rw-r--r-- | devel/ocaml-pcre/Makefile | 3 | ||||
| -rw-r--r-- | devel/pcre-utf8/Makefile | 12 | ||||
| -rw-r--r-- | devel/pcre/Makefile | 13 | ||||
| -rw-r--r-- | lang/cduce/Makefile | 3 | ||||
| -rw-r--r-- | multimedia/subtitleeditor/Makefile | 3 | ||||
| -rw-r--r-- | net-im/sulci/Makefile | 4 | ||||
| -rw-r--r-- | news/pan/Makefile | 3 | ||||
| -rw-r--r-- | www/bluefish/Makefile | 3 | ||||
| -rw-r--r-- | www/epiphany-extensions/Makefile | 2 |
13 files changed, 21 insertions, 34 deletions
@@ -2851,3 +2851,4 @@ java/linux-ibm-jdk14||2007-03-09|Has expired: Vulnerabilities in the browser plu japanese/emacs20-dl-canna||2007-03-09|Has expired: has deprecated dependency japanese/emacs20-dl-wnn6||2007-03-09|Has expired: has deprecated dependency misc/pbs||2007-03-11|Has expired: failed to build +devel/pcre-utf8||2007-03-11|UTF8 support is now enabled in devel/pcre diff --git a/devel/Makefile b/devel/Makefile index 67b562996102..f70f13908e4c 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -1601,7 +1601,6 @@ SUBDIR += pcl-cvs-emacs20 SUBDIR += pcre SUBDIR += pcre++ - SUBDIR += pcre-utf8 SUBDIR += pcsc-lite SUBDIR += pdcurses SUBDIR += pear diff --git a/devel/aifad/Makefile b/devel/aifad/Makefile index c71cd4e564d3..1eb594d9ca81 100644 --- a/devel/aifad/Makefile +++ b/devel/aifad/Makefile @@ -8,6 +8,7 @@ PORTNAME= aifad PORTVERSION= 1.0.27 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://www.ocaml.info/ocaml_sources/ @@ -17,7 +18,7 @@ COMMENT= Machine learning system BUILD_DEPENDS= ${SA_DIR}/pcre/pcre.a:${PORTSDIR}/devel/ocaml-pcre \ ${SA_DIR}/res/res.a:${PORTSDIR}/devel/ocaml-res \ ${SA_DIR}/cfg/cfg.a:${PORTSDIR}/devel/ocaml-cfg -LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre-utf8 +LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre USE_BZIP2= yes USE_GMAKE= yes diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile index a01939a2c168..67f4b95d59f0 100644 --- a/devel/anjuta/Makefile +++ b/devel/anjuta/Makefile @@ -7,7 +7,7 @@ PORTNAME= anjuta PORTVERSION= 1.2.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= anjuta @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= anjuta MAINTAINER= gnome@FreeBSD.org COMMENT= Integrated Development Environment for C and C++ -LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre-utf8 +LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre RUN_DEPENDS= ${LOCALBASE}/gnu-autotools/bin/autoconf:${PORTSDIR}/devel/gnu-autoconf \ ${LOCALBASE}/gnu-autotools/bin/automake:${PORTSDIR}/devel/gnu-automake \ libtool:${PORTSDIR}/devel/libtool15 diff --git a/devel/ocaml-pcre/Makefile b/devel/ocaml-pcre/Makefile index b78ca86521a2..66a77a08da2d 100644 --- a/devel/ocaml-pcre/Makefile +++ b/devel/ocaml-pcre/Makefile @@ -7,6 +7,7 @@ PORTNAME= pcre PORTVERSION= 5.11.2 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://www.ocaml.info/ocaml_sources/ PKGNAMEPREFIX= ocaml- @@ -15,7 +16,7 @@ DISTNAME= pcre-ocaml-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Perl compatible regular expressions for Objective Caml -LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre-utf8 +LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre USE_OCAML= yes USE_OCAML_FINDLIB= yes diff --git a/devel/pcre-utf8/Makefile b/devel/pcre-utf8/Makefile deleted file mode 100644 index e240169097b4..000000000000 --- a/devel/pcre-utf8/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# New ports collection makefile for: pcre-utf8 -# Date created: 20.03.2005 -# Whom: krion -# -# $FreeBSD$ -# - -MASTERDIR= ${.CURDIR}/../pcre - -WITH_UTF8= yes - -.include "${MASTERDIR}/Makefile" diff --git a/devel/pcre/Makefile b/devel/pcre/Makefile index ba305e3921ab..259dc6576f9d 100644 --- a/devel/pcre/Makefile +++ b/devel/pcre/Makefile @@ -7,6 +7,7 @@ PORTNAME= pcre PORTVERSION= 7.0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ftp://ftp.csx.cam.ac.uk/pub/software/programming/%SUBDIR%/ \ ftp://ftp.fu-berlin.de/unix/misc/%SUBDIR%/ \ @@ -16,25 +17,17 @@ MASTER_SITE_SUBDIR=${PORTNAME} MAINTAINER= krion@FreeBSD.org COMMENT= Perl Compatible Regular Expressions library -CONFLICTS?= pcre-utf8-[0-9]* - USE_BZIP2= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes -CONFIGURE_ARGS= --mandir=${PREFIX}/man +CONFIGURE_ARGS= --mandir=${PREFIX}/man --enable-utf8 \ + --enable-unicode-properties CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} .if !defined(NOPORTDOCS) PORTDOCS= * .endif -.if defined(WITH_UTF8) -CONFLICTS= pcre-[0-9]* -PKGNAMESUFFIX= -utf8 -CONFIGURE_ARGS+=--enable-utf8 \ - --enable-unicode-properties -.endif - .if defined(WITH_LINK_SIZE) CONFIGURE_ARGS+=--with-link-size=${WITH_LINK_SIZE} .endif diff --git a/lang/cduce/Makefile b/lang/cduce/Makefile index 458a578798f8..9d2bb0405e1f 100644 --- a/lang/cduce/Makefile +++ b/lang/cduce/Makefile @@ -6,13 +6,14 @@ PORTNAME= cduce PORTVERSION= 0.4.1 +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= http://www.cduce.org/download/ MAINTAINER= ports@FreeBSD.org COMMENT= An efficient XML centric functionnal programming language -LIB_DEPENDS= pcre:${PORTSDIR}/devel/pcre-utf8 +LIB_DEPENDS= pcre:${PORTSDIR}/devel/pcre BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml \ ocamlfind:${PORTSDIR}/devel/ocaml-findlib \ ${LOCALBASE}/lib/ocaml/site-lib/ulex/ulexing.a:${PORTSDIR}/devel/ocaml-ulex \ diff --git a/multimedia/subtitleeditor/Makefile b/multimedia/subtitleeditor/Makefile index dd88ba0031bd..026ff0cd5534 100644 --- a/multimedia/subtitleeditor/Makefile +++ b/multimedia/subtitleeditor/Makefile @@ -7,6 +7,7 @@ PORTNAME= subtitleeditor PORTVERSION= 0.13.2 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://kitone.free.fr/subtitleeditor/files/ CSME @@ -18,7 +19,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \ glademm-2.4.1:${PORTSDIR}/devel/libglademm24 \ enchant.1:${PORTSDIR}/textproc/enchant \ - pcre.0:${PORTSDIR}/devel/pcre-utf8 + pcre.0:${PORTSDIR}/devel/pcre USE_GNOME= gtk20 USE_GSTREAMER= good diff --git a/net-im/sulci/Makefile b/net-im/sulci/Makefile index 125f25e21c6d..cd7c631daa47 100644 --- a/net-im/sulci/Makefile +++ b/net-im/sulci/Makefile @@ -7,7 +7,7 @@ PORTNAME= sulci PORTVERSION= 0.5.a.20060221 -PORTEPOCH= 1 +PORTEPOCH= 2 CATEGORIES= net-im MASTER_SITES= http://www.jabber.ru/files/sulci/ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.a./-alpha-/} @@ -23,7 +23,7 @@ BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml \ ${OCAML_SITELIBDIR}/netclient/netclient.a:${PORTSDIR}/net/ocaml-netclient \ ${OCAML_SITELIBDIR}/pcre/pcre.a:${PORTSDIR}/devel/ocaml-pcre LIB_DEPENDS= sqlite.2:${PORTSDIR}/databases/sqlite2 \ - pcre.0:${PORTSDIR}/devel/pcre-utf8 + pcre.0:${PORTSDIR}/devel/pcre RUN_DEPENDS= ${OCAML_SITELIBDIR}/netstring/netstring.a:${PORTSDIR}/www/ocaml-net \ mueller:${PORTSDIR}/russian/mueller-dic diff --git a/news/pan/Makefile b/news/pan/Makefile index 57efa373b026..27cd61b4a82f 100644 --- a/news/pan/Makefile +++ b/news/pan/Makefile @@ -8,6 +8,7 @@ PORTNAME= pan PORTVERSION= 0.125 +PORTREVISION= 1 CATEGORIES= news gnome MASTER_SITES= http://pan.rebelbase.com/download/releases/${PORTVERSION}/source/ DIST_SUBDIR= gnome2 @@ -15,7 +16,7 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Threaded GTK+2 newsreader based on Agent for Windows -LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre-utf8 \ +LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre \ gmime-2.0.4:${PORTSDIR}/mail/gmime2 USE_XLIB= yes diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile index 6488c0d07a21..f2a8e65a1190 100644 --- a/www/bluefish/Makefile +++ b/www/bluefish/Makefile @@ -8,6 +8,7 @@ PORTNAME= bluefish PORTVERSION= 1.0.7 +PORTREVISION= 1 CATEGORIES= www editors MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -15,7 +16,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= farrokhi@FreeBSD.org COMMENT= HTML editor designed for the experienced web designer -LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre-utf8 \ +LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre \ aspell.16:${PORTSDIR}/textproc/aspell .if !defined(WITHOUT_WEBLINT) diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile index c4f7f2e64aca..70a86061aa57 100644 --- a/www/epiphany-extensions/Makefile +++ b/www/epiphany-extensions/Makefile @@ -51,7 +51,7 @@ CONFIGURE_ARGS+= --disable-opensp .if !defined(WITHOUT_ADBLOCK) EPHY_EXTENSIONS:= ${EPHY_EXTENSIONS},adblock -LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre-utf8 +LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre PLIST_SUB+= ADBLOCK="" .else PLIST_SUB+= ADBLOCK="@comment " |