diff options
| author | bapt <bapt@FreeBSD.org> | 2010-12-17 02:47:56 +0800 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2010-12-17 02:47:56 +0800 |
| commit | 8bd5c04480d2de92fc171aa8541a99d2496eb461 (patch) | |
| tree | 81af85352b2e1efacea77405781fbd7517b7886e /databases/postgresql92-server | |
| parent | 131717cc7a280e2493ae7870180987af59a88916 (diff) | |
| download | freebsd-ports-gnome-8bd5c04480d2de92fc171aa8541a99d2496eb461.tar.gz freebsd-ports-gnome-8bd5c04480d2de92fc171aa8541a99d2496eb461.tar.zst freebsd-ports-gnome-8bd5c04480d2de92fc171aa8541a99d2496eb461.zip | |
- Prepare for devel/icu4 deletion
- fix py-icu with icu4.6
- fix portsgresql*server with icu 4.6
- remove now useless icu patch from webkit
Diffstat (limited to 'databases/postgresql92-server')
| -rw-r--r-- | databases/postgresql92-server/Makefile | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile index dc3eb4f1c7a1..77abdb59c3d1 100644 --- a/databases/postgresql92-server/Makefile +++ b/databases/postgresql92-server/Makefile @@ -97,27 +97,18 @@ OPTIONS+= DEBUG "Builds with debugging symbols" off OPTIONS+= GSSAPI "BUild with GSSAPI support" on # See http://people.freebsd.org/~girgen/postgresql-icu/README.html for more info -OPTIONS+= ICU "Use ICU 4.6 for unicode collation (server)" off -OPTIONS+= ICU4 "Use ICU 4.4 for unicode collation (server)" off +OPTIONS+= ICU "Use ICU for unicode collation (server)" off # See http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/76999 for more info # (requires dump/restore if modified.) OPTIONS+= INTDATE "Builds with 64-bit date/time type (server)" on -. if defined(WITH_ICU) && defined(WITH_ICU4) -IGNORE= options WITH_ICU and WITH_ICU4 are mutually exclusive -. endif - -. if (defined(SERVER_ONLY) && (defined(WITH_ICU) || defined(WITH_ICU4))) || make(makesum) +. if (defined(SERVER_ONLY) && defined(WITH_ICU)) || make(makesum) USE_AUTOTOOLS= autoconf CONFIGURE_ARGS+=--with-icu PATCH_SITES+= http://people.freebsd.org/~girgen/postgresql-icu/:icu PATCHFILES+= pg-900-icu-2010-09-19.diff.gz:icu -. if defined(WITH_ICU4) -LIB_DEPENDS+= icudata.44:${PORTSDIR}/devel/icu4 -. else LIB_DEPENDS+= icudata.46:${PORTSDIR}/devel/icu -. endif . endif PATCH_DIST_STRIP=-p1 @@ -325,9 +316,10 @@ pre-su-install: .if !defined(NO_BUILD) post-patch: @${REINPLACE_CMD} s/@PTHREAD_LIBS@// ${WRKSRC}/src/Makefile.global.in -. if defined(WITH_ICU) || defined(WITH_ICU4) +. if defined(WITH_ICU) @${REINPLACE_CMD} -E -e \ "s|^(m4_if.*)2.6[0-9](.*Autoconf version )2.6[0-9]|\1${AUTOCONF_VERSION}\2${AUTOCONF_VERSION}|g" \ + -e "s|_44|_46|g" \ ${WRKSRC}/configure.in . endif |