diff options
| author | Palle Girgensohn <girgen@FreeBSD.org> | 2010-10-07 06:58:10 +0000 |
|---|---|---|
| committer | Palle Girgensohn <girgen@FreeBSD.org> | 2010-10-07 06:58:10 +0000 |
| commit | 060a528952c060d3cacb5faa2337b86a947f9cc1 (patch) | |
| tree | c42f4aa0bb5da6b4d3d55839fff8d1bbed9e71f3 /databases/postgresql80-server/Makefile | |
| parent | bd169d68cc2b63d4f9e6017ffe8875de63696ede (diff) | |
Update all PostgreSQL ports to latest versions.
Also, try to break the previous 1:1 relation between FreeBSD system and
PostgreSQL versions installed. Use different PREFIX:es to install
different versions on the same system.
PR: ports/132402, ports/145002, ports/146657
Notes
Notes:
svn path=/head/; revision=262548
Diffstat (limited to 'databases/postgresql80-server/Makefile')
| -rw-r--r-- | databases/postgresql80-server/Makefile | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile index 445261097950..7ec0d002bb24 100644 --- a/databases/postgresql80-server/Makefile +++ b/databases/postgresql80-server/Makefile @@ -6,8 +6,7 @@ # PORTNAME?= postgresql -PORTVERSION?= 8.0.25 -PORTREVISION= 2 +PORTVERSION?= 8.0.26 CATEGORIES?= databases MASTER_SITES= ${MASTER_SITE_PGSQL} MASTER_SITE_SUBDIR= source/v${PORTVERSION} @@ -37,12 +36,13 @@ GNU_CONFIGURE= YES .undef GNU_CONFIGURE .endif -CONFIGURE_ARGS+=--with-libraries=${LOCALBASE}/lib \ - --with-includes=${LOCALBASE}/include \ +LDFLAGS+= -L${LOCALBASE}/lib +INCLUDES+= -I${LOCALBASE}/include +CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \ + --with-includes=${PREFIX}/lib \ --enable-thread-safety \ --with-docdir=${DOCSDIR} -LDFLAGS+= -L${PREFIX}/lib -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" \ +CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" INCLUDES="${INCLUDES}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" @@ -112,7 +112,7 @@ PATCHFILES+= pg-8025-icu-xx-2010-05-14.diff.gz:icu PATCH_DIST_STRIP=-p1 -. if defined(SERVER_ONLY) && defined(WITH_PAM) +. if defined(WITH_PAM) CONFIGURE_ARGS+=--with-pam . endif @@ -259,6 +259,11 @@ 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) + @${REINPLACE_CMD} -E -e \ + "s|^(m4_if.*)2.6[0-9](.*Autoconf version )2.6[0-9]|\1${AUTOCONF_VERSION:S/2/2./}\2${AUTOCONF_VERSION:S/2/2./}|g" \ + ${WRKSRC}/configure.in +. endif do-install: @for dir in ${INSTALL_DIRS}; do \ |