MFH: r382722

Obtain a credential on login with KDM4 PAM_SETCRED(3)'s second parameter does not default to PAM_ESTABLISH_CRED on FreeBSD, so explify it, as was proposed on the forums[1] back in decembre. Bump port revision as this commit changes the runtime behavior of the installed port. [1] https://forums.freebsd.org/threads/problem-with-kdm4-kerberos-and-nfsv4.49253 PR: 195899 Approved by: rakuco (mentor) Approved by: ports-secteam (delphij)
MFH: r378253, r382860, r382881
2015-04-09 19:27:31 +00:00 · 2015-04-01 00:34:05 +00:00 · 2015-03-30 20:47:12 +00:00 · 2015-03-30 07:01:53 +00:00 · 2015-03-27 09:44:05 +00:00 · 2015-03-27 06:59:32 +00:00
489 changed files with 10535 additions and 8435 deletions
--- a/Mk/Uses/gecko.mk
+++ b/Mk/Uses/gecko.mk
@ -37,12 +37,12 @@ RUN_DEPENDS+=	libxul>=31:${PORTSDIR}/www/libxul
 .elif ${gecko_ARGS:Mfirefox}

 _GECKO_DEFAULT_VERSION=	31
-_GECKO_VERSIONS=		31 34
+_GECKO_VERSIONS=		31 37
 _GECKO_TYPE=	firefox

 # Dependence lines for different Firefox versions
 31_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox-esr
-34_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox
+37_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox

 .if exists(${LOCALBASE}/bin/firefox)
 _GECKO_INSTALLED_VER!=	${LOCALBASE}/bin/firefox --version 2>/dev/null
@ -51,8 +51,8 @@ _GECKO_INSTALLED_VER:=	${_GECKO_INSTALLED_VER:M[0-9][0-9]*:C/([0-9][0-9]).*/\1/g

 .elif ${gecko_ARGS:Mseamonkey}

-_GECKO_DEFAULT_VERSION=	31
-_GECKO_VERSIONS=		31
+_GECKO_DEFAULT_VERSION=	33
+_GECKO_VERSIONS=		33
 _GECKO_TYPE=	seamonkey

 .if exists(${LOCALBASE}/bin/seamonkey)
@ -61,7 +61,7 @@ _GECKO_INSTALLED_VER:=	${_GECKO_INSTALLED_VER:M[0-9]*:C/[0-9].([0-9][0-9]).*/\1/
 .endif

 # Dependence lines for different Seamonkey versions
-31_DEPENDS=		${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey
+33_DEPENDS=		${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey

 .elif ${gecko_ARGS:Mthunderbird}

--- a/Mk/bsd.gecko.mk
+++ b/Mk/bsd.gecko.mk
@ -91,6 +91,10 @@ CPE_VENDOR?=mozilla
 USE_PERL5=	build
 USE_XORG=	xext xrender xt

+.if ${MOZILLA} != "libxul"
+BUNDLE_LIBS=	yes
+.endif
+
 MOZILLA_SUFX?=	none
 MOZSRC?=	${WRKSRC}
 WRKSRC?=	${WRKDIR}/mozilla
@ -126,7 +130,7 @@ LDFLAGS+=		-L${LOCALBASE}/lib -Wl,-rpath,${PREFIX}/lib/${MOZILLA}

 # use jemalloc 3.0.0 API for stats/tuning
 MOZ_EXPORT+=	MOZ_JEMALLOC3=1
-.if ${OSVERSION} < 1000012
+.if ${OSVERSION} < 1000012 || ${MOZILLA_VER:R:R} >= 37
 MOZ_OPTIONS+=	--enable-jemalloc
 .endif

@ -142,7 +146,7 @@ event_MOZ_OPTIONS=	--with-system-libevent
 ffi_LIB_DEPENDS=	libffi.so:${PORTSDIR}/devel/libffi
 ffi_MOZ_OPTIONS=	--enable-system-ffi

-.if exists(${FILESDIR}/patch-bug847568) || exists(${FILESDIR}/patch-z-bug847568)
+.if exists(${FILESDIR}/patch-bug847568)
 graphite_LIB_DEPENDS=	libgraphite2.so:${PORTSDIR}/graphics/graphite2
 graphite_MOZ_OPTIONS=	--with-system-graphite2

@ -168,7 +172,7 @@ nspr_MOZ_OPTIONS=	--with-system-nspr
 nss_LIB_DEPENDS=	libnss3.so:${PORTSDIR}/security/nss
 nss_MOZ_OPTIONS=	--with-system-nss

-.if exists(${FILESDIR}/patch-z-bug517422) || exists(${FILESDIR}/patch-zz-bug517422)
+.if exists(${FILESDIR}/patch-z-bug517422)
 opus_LIB_DEPENDS=	libopus.so:${PORTSDIR}/audio/opus
 opus_MOZ_OPTIONS=	--with-system-opus
 .endif
@ -179,7 +183,7 @@ pixman_MOZ_OPTIONS=	--enable-system-pixman
 png_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
 png_MOZ_OPTIONS=	--with-system-png=${LOCALBASE}

-.if exists(${FILESDIR}/patch-z-bug517422) || exists(${FILESDIR}/patch-zz-bug517422)
+.if exists(${FILESDIR}/patch-z-bug517422)
 soundtouch_LIB_DEPENDS=	libSoundTouch.so:${PORTSDIR}/audio/soundtouch
 soundtouch_MOZ_OPTIONS=	--with-system-soundtouch

@ -191,7 +195,7 @@ speex_MOZ_OPTIONS=	--with-system-speex
 sqlite_LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
 sqlite_MOZ_OPTIONS=	--enable-system-sqlite

-.if exists(${FILESDIR}/patch-z-bug517422) || exists(${FILESDIR}/patch-zz-bug517422)
+.if exists(${FILESDIR}/patch-z-bug517422)
 # XXX disabled: update to 1.2.x or review backported fixes
 theora_LIB_DEPENDS=	libtheora.so:${PORTSDIR}/multimedia/libtheora
 theora_MOZ_OPTIONS=	--with-system-theora
@ -318,15 +322,6 @@ MOZ_OPTIONS+=	--enable-gnomeui
 MOZ_OPTIONS+=	--disable-gnomeui
 .endif

-.if ${PORT_OPTIONS:MGNOMEVFS2}
-BUILD_DEPENDS+=	${gnomevfs2_DETECT}:${gnomevfs2_LIB_DEPENDS:C/.*://}
-USE_GNOME+=		gnomevfs2:build
-MOZ_OPTIONS+=	--enable-gnomevfs
-MOZ_OPTIONS:=	${MOZ_OPTIONS:C/(extensions)=(.*)/\1=\2,gnomevfs/}
-.else
-MOZ_OPTIONS+=	--disable-gnomevfs
-.endif
-
 .if ${PORT_OPTIONS:MLIBPROXY}
 LIB_DEPENDS+=	libproxy.so:${PORTSDIR}/net/libproxy
 MOZ_OPTIONS+=	--enable-libproxy
@ -534,10 +529,9 @@ gecko-post-patch:
 	@if [ -f ${WRKSRC}/config/baseconfig.mk ] ; then \
 		${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \
 			${WRKSRC}/config/baseconfig.mk; \
-	else \
-		${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \
-			${WRKSRC}/config/autoconf.mk.in; \
 	fi
+	@${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \
+			${MOZSRC}/config/baseconfig.mk
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
 		s|%%LOCALBASE%%|${LOCALBASE}|g' \
 			${MOZSRC}/build/unix/run-mozilla.sh
--- a/archivers/dact/Makefile
+++ b/archivers/dact/Makefile
@ -3,13 +3,16 @@

 PORTNAME=	dact
 PORTVERSION=	0.8.42
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	archivers
 MASTER_SITES=	http://www.rkeene.org/files/oss/dact/release/

 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Dynamic Adaptive Compression Tool

+LICENSE=	GPLv2 # or later
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
 LIB_DEPENDS=	libmcrypt.so:${PORTSDIR}/security/libmcrypt \
 		liblzo2.so:${PORTSDIR}/archivers/lzo2

@ -22,11 +25,14 @@ MAKE_ARGS=	TOBUILD="dact libdact.so dact.conf"

 USE_LDCONFIG=	yes

-OPTIONS_DEFINE=	DOCS EXAMPLES
+OPTIONS_DEFINE=	DOCS

 post-install:
-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/dact.conf ${STAGEDIR}${EXAMPLESDIR}
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} \
+		${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so \
+		${STAGEDIR}${DATADIR}/*.so
+	${MV} ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf \
+		${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/Docs/dact.txt ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
--- a/archivers/dact/files/patch-Makefile.in
+++ b/archivers/dact/files/patch-Makefile.in
@ -1,5 +1,5 @@
--- ./Makefile.in.orig	2006-03-25 14:15:04.000000000 +0100
-+++ ./Makefile.in	2014-03-25 00:16:17.000000000 +0100
+--- Makefile.in.orig	2006-03-25 16:15:04.000000000 +0300
+++ Makefile.in	2015-02-25 22:26:51.000000000 +0300
@@ -24,8 +24,8 @@
 
 prefix = @prefix@
@ -11,3 +11,19 @@
 sysconfdir = @sysconfdir@
 mandir = @mandir@
 datadir = @datadir@
+@@ -41,13 +41,14 @@
+ # be kept in sync with OBJS
+ SHLIBOBJS += dact_common_shr.o comp_fail_shr.o comp_plain_shr.o buffer_shr.o header_shr.o sort_shr.o module_shr.o parse_shr.o dendian_shr.o crc_shr.o net_shr.o ui_shr.o sfx_shr.o libdact_shr.o @SHLIBOBJS@
+ ALGO = comp_snibble.c comp_delta.c comp_text.c comp_rle.c cipher_chaos.c cipher_sub.c cipher_psub.c @ALGO@
+MODS = $(ALGO:.c=.so)
+ 
+ TOBUILD = dact$(EXEEXT) libdact.$(SHOBJEXT) libdact.a dact.conf
+ 
+ all: @DEFAULT@
+ 
+ module: @DEPEND@
+-	@MODS="$(ALGO:.c=.so)" LDLIBS="@ALLMODLIBS@" \
+	@LDLIBS="@ALLMODLIBS@" \
+ 	  $(MAKE) $(TOBUILD)
+ 
+ static: @DEPEND@
--- a/archivers/dact/pkg-plist
+++ b/archivers/dact/pkg-plist
@ -1,7 +1,18 @@
 bin/dact
-etc/dact.conf
+@sample etc/dact.conf.sample
 lib/libdact.so
 man/man1/dact.1.gz
+%%DATADIR%%/cipher_chaos.so
+%%DATADIR%%/cipher_psub.so
+%%DATADIR%%/cipher_serpent.so
+%%DATADIR%%/cipher_sub.so
+%%DATADIR%%/comp_bzlib.so
+%%DATADIR%%/comp_delta.so
+%%DATADIR%%/comp_mzlib.so
+%%DATADIR%%/comp_mzlib2.so
+%%DATADIR%%/comp_rle.so
+%%DATADIR%%/comp_snibble.so
+%%DATADIR%%/comp_text.so
+%%DATADIR%%/comp_zlib.so
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/dact.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dact.conf
--- a/archivers/rpm4/Makefile
+++ b/archivers/rpm4/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	rpm
 PORTVERSION=	4.12.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	archivers
 MASTER_SITES=	http://rpm.org/releases/rpm-${PORTVERSION:R:R}.x/ \
 		ftp://ftp.mirrorservice.org/sites/ftp.rpm.org/pub/rpm/dist/rpm-${PORTVERSION:E}.x/
--- a/archivers/rpm4/files/patch-lib_cpio.c
+++ b/archivers/rpm4/files/patch-lib_cpio.c
@ -0,0 +1,15 @@
+Fix for CVE-2014-8118 as found at
+https://bugzilla.redhat.com/show_bug.cgi?id=1168715
+
+--- lib/cpio.c.orig	2015-03-22 19:29:29.000000000 +0100
+++ lib/cpio.c	2015-03-22 19:29:30.000000000 +0100
+@@ -399,6 +399,9 @@ int rpmcpioHeaderRead(rpmcpio_t cpio, ch
+ 
+     GET_NUM_FIELD(hdr.filesize, fsize);
+     GET_NUM_FIELD(hdr.namesize, nameSize);
+    if (nameSize <= 0 || nameSize > 4096) {
+	return RPMERR_BAD_HEADER;
+    }
+ 
+     char name[nameSize + 1];
+     read = Fread(name, nameSize, 1, cpio->fd);
--- a/archivers/unace/Makefile
+++ b/archivers/unace/Makefile
@ -3,12 +3,12 @@

 PORTNAME=	unace
 PORTVERSION=	1.2b
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	utils/compress

-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	rodrigo@FreeBSD.org
 COMMENT=	Extract, view & test ACE archives

 MAKE_JOBS_UNSAFE=	yes
--- a/archivers/unace/files/patch-CVE-2015-2063
+++ b/archivers/unace/files/patch-CVE-2015-2063
@ -0,0 +1,88 @@
+Description: Fixes a buffer overflow when reading bogus file headers
+ The header parser was not checking if it had read enough data when trying
+ to parse the header from memory, causing it to accept files with headers
+ smaller than expected.
+ .
+ Fixes CVE-2015-2063.
+Author: Guillem Jover <guillem@debian.org>
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/775003
+Forwarded: no
+Last-Update: 2015-02-24
+
+---
+ unace.c |   25 +++++++++++++++++++++++--
+ 1 file changed, 23 insertions(+), 2 deletions(-)
+
+--- unace.c
+++ unace.c
+@@ -113,6 +113,7 @@ INT  read_header(INT print_err)
+ {
+    USHORT rd,
+         head_size,
+        need_size,
+         crc_ok;
+    LONG crc;
+    UCHAR *tp=readbuf;
+@@ -128,6 +129,9 @@ INT  read_header(INT print_err)
+ #endif
+                                         // read size_headrdb bytes into 
+    head_size = head.HEAD_SIZE;          // header structure 
+   need_size = 3;
+   if (need_size > head.HEAD_SIZE)
+      return 0;
+    rd = (head_size > size_headrdb) ? size_headrdb : head_size;
+    if (read(archan, readbuf, rd) < rd)
+       return 0;
+@@ -147,7 +151,12 @@ INT  read_header(INT print_err)
+    head.HEAD_FLAGS=BUFP2WORD(tp);
+ 
+    if (head.HEAD_FLAGS & ACE_ADDSIZE)
+   {
+      need_size += 4;
+      if (need_size > head.HEAD_SIZE)
+         return 0;
+       skipsize = head.ADDSIZE = BUF2LONG(tp);   // get ADDSIZE
+   }
+    else
+       skipsize = 0;
+ 
+@@ -158,6 +167,9 @@ INT  read_header(INT print_err)
+    switch (head.HEAD_TYPE)              // specific buffer to head conversion
+    {
+       case MAIN_BLK:
+         need_size += 24;
+         if (need_size > head.HEAD_SIZE)
+            return 0;
+          memcpy(mhead.ACESIGN, tp, acesign_len); tp+=acesign_len;
+          mhead.VER_MOD=*tp++;
+          mhead.VER_CR =*tp++;
+@@ -168,9 +180,15 @@ INT  read_header(INT print_err)
+          mhead.RES2   =BUFP2WORD(tp);
+          mhead.RES    =BUFP2LONG(tp);
+          mhead.AV_SIZE=*tp++;
+-         memcpy(mhead.AV, tp, rd-(USHORT)(tp-readbuf));
+         if (mhead.AV_SIZE > sizeof(mhead.AV) ||
+             mhead.AV_SIZE + need_size > head.HEAD_SIZE)
+            return 0;
+         memcpy(mhead.AV, tp, mhead.AV_SIZE);
+          break;
+       case FILE_BLK:
+         need_size += 28;
+         if (need_size > head.HEAD_SIZE)
+            return 0;
+          fhead.PSIZE     =BUFP2LONG(tp);
+          fhead.SIZE      =BUFP2LONG(tp);
+          fhead.FTIME     =BUFP2LONG(tp);
+@@ -181,7 +199,10 @@ INT  read_header(INT print_err)
+          fhead.TECH.PARM =BUFP2WORD(tp);
+          fhead.RESERVED  =BUFP2WORD(tp);
+          fhead.FNAME_SIZE=BUFP2WORD(tp);
+-         memcpy(fhead.FNAME, tp, rd-(USHORT)(tp-readbuf));
+         if (fhead.FNAME_SIZE > sizeof(fhead.FNAME) ||
+             fhead.FNAME_SIZE + need_size > head.HEAD_SIZE)
+            return 0;
+         memcpy(fhead.FNAME, tp, fhead.FNAME_SIZE);
+          break;
+ //    default: (REC_BLK and future things): 
+ //              do nothing 'cause isn't needed for extraction
--- a/archivers/unzip/Makefile
+++ b/archivers/unzip/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	unzip
 PORTVERSION=	6.0
-PORTREVISION=	2
+PORTREVISION=	5
 CATEGORIES=	archivers
 MASTER_SITES=	SF/infozip/UnZip%206.x%20%28latest%29/UnZip%20${PORTVERSION}/:main \
 		SF/infozip/UnZip%205.x%20and%20earlier/5.51/:unreduce
--- a/archivers/unzip/files/extra-iconv-patch-unix_unix.c
+++ b/archivers/unzip/files/extra-iconv-patch-unix_unix.c
@ -1,5 +1,5 @@
--- unix/unix.c.orig	2009-01-23 23:31:26 UTC
-+++ unix/unix.c
+--- unix/unix.c.orig	2015-02-17 15:18:36.176142072 -0800
+++ unix/unix.c	2015-02-17 15:18:56.289341100 -0800
@@ -30,6 +30,9 @@
 #define UNZIP_INTERNAL
 #include "unzip.h"
@ -10,7 +10,7 @@
 #ifdef SCO_XENIX
 #  define SYSNDIR
 #else  /* SCO Unix, AIX, DNIX, TI SysV, Coherent 4.x, ... */
-@@ -1874,3 +1877,90 @@ static void qlfix(__G__ ef_ptr, ef_len)
+@@ -1874,3 +1877,102 @@
     }
 }
 #endif /* QLZIP */
@ -76,15 +76,27 @@
 +
 +    slen = strlen(string);
 +    s = string;
-+    dlen = buflen = 2*slen;
-+    d = buf = malloc(buflen + 1);
+
+    /*  Make sure OUTBUFSIZ + 1 never ends up smaller than FILNAMSIZ
+     *  as this function also gets called with G.outbuf in fileio.c
+     */
+    buflen = FILNAMSIZ;
+    if (OUTBUFSIZ + 1 < FILNAMSIZ)
+    {
+        buflen = OUTBUFSIZ + 1;
+    }
+
+    d = buf = malloc(buflen);
 +    if(!d)
 +    	goto cleanup;
+
 +    bzero(buf,buflen);
+    dlen = buflen - 1;
+
 +    if(iconv(cd, &s, &slen, &d, &dlen) == (size_t)-1)
 +    	goto cleanup;
 +    strncpy(string, buf, buflen);
-+    
+
 +    cleanup:
 +    free(buf);
 +    iconv_close(cd);
--- a/archivers/unzip/files/patch-extract.c
+++ b/archivers/unzip/files/patch-extract.c
@ -0,0 +1,77 @@
+--- extract.c.orig	2009-03-14 01:32:52 UTC
+++ extract.c
+@@ -1,5 +1,5 @@
+ /*
+-  Copyright (c) 1990-2009 Info-ZIP.  All rights reserved.
+  Copyright (c) 1990-2014 Info-ZIP.  All rights reserved.
+ 
+   See the accompanying file LICENSE, version 2009-Jan-02 or later
+   (the contents of which are also included in unzip.h) for terms of use.
+@@ -298,6 +298,8 @@ char ZCONST Far TruncNTSD[] =
+ #ifndef SFX
+    static ZCONST char Far InconsistEFlength[] = "bad extra-field entry:\n \
+      EF block length (%u bytes) exceeds remaining EF data (%u bytes)\n";
+   static ZCONST char Far TooSmallEFlength[] = "bad extra-field entry:\n \
+     EF block length (%u bytes) invalid (< %d)\n";
+    static ZCONST char Far InvalidComprDataEAs[] =
+      " invalid compressed data for EAs\n";
+ #  if (defined(WIN32) && defined(NTSD_EAS))
+@@ -2023,7 +2025,8 @@ static int TestExtraField(__G__ ef, ef_l
+         ebID = makeword(ef);
+         ebLen = (unsigned)makeword(ef+EB_LEN);
+ 
+-        if (ebLen > (ef_len - EB_HEADSIZE)) {
+        if (ebLen > (ef_len - EB_HEADSIZE))
+        {
+            /* Discovered some extra field inconsistency! */
+             if (uO.qflag)
+                 Info(slide, 1, ((char *)slide, "%-22s ",
+@@ -2032,6 +2035,16 @@ static int TestExtraField(__G__ ef, ef_l
+               ebLen, (ef_len - EB_HEADSIZE)));
+             return PK_ERR;
+         }
+        else if (ebLen < EB_HEADSIZE)
+        {
+            /* Extra block length smaller than header length. */
+            if (uO.qflag)
+                Info(slide, 1, ((char *)slide, "%-22s ",
+                  FnFilter1(G.filename)));
+            Info(slide, 1, ((char *)slide, LoadFarString(TooSmallEFlength),
+              ebLen, EB_HEADSIZE));
+            return PK_ERR;
+        }
+ 
+         switch (ebID) {
+             case EF_OS2:
+@@ -2217,14 +2230,28 @@ static int test_compr_eb(__G__ eb, eb_si
+     ulg eb_ucsize;
+     uch *eb_ucptr;
+     int r;
+    ush method;
+ 
+     if (compr_offset < 4)                /* field is not compressed: */
+         return PK_OK;                    /* do nothing and signal OK */
+ 
+    /* Return no/bad-data error status if any problem is found:
+     *    1. eb_size is too small to hold the uncompressed size
+     *       (eb_ucsize).  (Else extract eb_ucsize.)
+     *    2. eb_ucsize is zero (invalid).  2014-12-04 SMS.
+     *    3. eb_ucsize is positive, but eb_size is too small to hold
+     *       the compressed data header.
+     */
+     if ((eb_size < (EB_UCSIZE_P + 4)) ||
+-        ((eb_ucsize = makelong(eb+(EB_HEADSIZE+EB_UCSIZE_P))) > 0L &&
+-         eb_size <= (compr_offset + EB_CMPRHEADLEN)))
+-        return IZ_EF_TRUNC;               /* no compressed data! */
+     ((eb_ucsize = makelong( eb+ (EB_HEADSIZE+ EB_UCSIZE_P))) == 0L) ||
+     ((eb_ucsize > 0L) && (eb_size <= (compr_offset + EB_CMPRHEADLEN))))
+        return IZ_EF_TRUNC;             /* no/bad compressed data! */
+
+    method = makeword(eb + (EB_HEADSIZE + compr_offset));
+    if ((method == STORED) && (eb_size - compr_offset != eb_ucsize))
+	return PK_ERR;			  /* compressed & uncompressed
+					   * should match in STORED
+					   * method */
+ 
+     if (
+ #ifdef INT_16BIT
--- a/audio/atunes/Makefile
+++ b/audio/atunes/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	atunes
 PORTVERSION=	3.1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio java
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/aTunes%20${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
@ -63,7 +63,7 @@ RUN_DEPENDS+=	flac:${PORTSDIR}/audio/flac
 DESKTOP_ENTRIES="aTunes" \
 		"Audio player and manager" \
 		"${PREFIX}/share/pixmaps/atunes.png" \
-		"aTunes" \
+		"atunes" \
 		"Audio;AudioVideo;Java;" \
 		true

--- a/audio/gkrellmvolume2/Makefile
+++ b/audio/gkrellmvolume2/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	gkrellmvolume
 PORTVERSION=	2.1.13
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	audio
 MASTER_SITES=	http://gkrellm.luon.net/files/
 PKGNAMESUFFIX=	2
--- a/audio/gkrellmvolume2/files/patch-oss_mixer.c
+++ b/audio/gkrellmvolume2/files/patch-oss_mixer.c
@ -1,7 +1,5 @@
-Index: oss_mixer.c
-diff -u -p oss_mixer.c.orig oss_mixer.c
--- oss_mixer.c.orig	Wed May 19 04:39:27 2004
-+++ oss_mixer.c	Wed May 19 04:39:43 2004
+--- oss_mixer.c.orig	2004-08-20 00:07:27.000000000 +0400
+++ oss_mixer.c	2015-02-01 20:21:32.000000000 +0300
@@ -32,6 +32,9 @@
 #else
   #include <sys/soundcard.h>
@ -12,3 +10,12 @@ diff -u -p oss_mixer.c.orig oss_mixer.c
 
 #include "mixer.h"
 #include "oss_mixer.h"
+@@ -126,7 +129,7 @@
+   long amount;
+   ioctl(OSSMIXER(mixer)->fd,MIXER_READ(OSSMIXER(mixer)->table[devid]),&amount);
+   *left = amount & 0xff;
+-  *right = amount >> 8;
+  *right = (amount >> 8) & 0xff;
+ }
+ 
+ static void  
--- a/audio/gkrellmvolume2/pkg-descr
+++ b/audio/gkrellmvolume2/pkg-descr
@ -2,5 +2,4 @@ GKrellM volume plugin

 A plugin for gkrellm 2.0, that lets you control your mixer..

-Author:  Sjoerd Simons <Sjoerd@donald-duck.ele.tue.nl>
-WWW: http://gkrellm.luon.net/volume.phtml
+WWW: http://gkrellm.luon.net/volume.php
--- a/audio/wxguitar/Makefile
+++ b/audio/wxguitar/Makefile
@ -13,6 +13,7 @@ COMMENT=	Simple guitar tuning assistant

 RUN_DEPENDS=	wavplay:${PORTSDIR}/audio/wavplay

+USES=		compiler:c++11-lib
 GNU_CONFIGURE=	yes
 USE_WX=		3.0
 WX_UNICODE=	yes
--- a/benchmarks/polygraph/Makefile
+++ b/benchmarks/polygraph/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	polygraph
 PORTVERSION=	4.3.2
+PORTREVISION=	1
 CATEGORIES=	benchmarks www
 MASTER_SITES=	http://www.web-polygraph.org/downloads/srcs/ \
 		http://people.bsdgroup.de/~as/freebsd/distfiles/
@ -14,10 +15,11 @@ COMMENT=	Benchmarking tool for Web proxies
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE

-USES=		tar:tgz
+USES=		shebangfix tar:tgz
+SHEBANG_FILES=	tools/*.pl
 USE_GCC=	any
 GNU_CONFIGURE=	yes
-WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}

 CONFLICTS=	ltrace-0*

--- a/biology/platon/Makefile
+++ b/biology/platon/Makefile
@ -16,6 +16,7 @@ DISTNAME=	platon
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tool for viewing molecular/crystallographic structures

+BROKEN=		Unfetchable
 # PLATON may be used free of charge by the academic community under
 # the condition that it is not redistributed for a current & fresh copy.
 # There is a charge of US$ 5000 for commercial users.
--- a/chinese/wordpress-zh_TW/Makefile
+++ b/chinese/wordpress-zh_TW/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	wordpress
-PORTVERSION=	4.0.1
+PORTVERSION=	4.1
 CATEGORIES=	chinese www
 MASTER_SITES=	http://tw.wordpress.org/ \
 		http://mirror.joehorn.idv.tw/wordpress/
--- a/chinese/wordpress-zh_TW/distinfo
+++ b/chinese/wordpress-zh_TW/distinfo
@ -1,2 +1,2 @@
-SHA256 (wordpress-4.0.1-zh_TW.tar.gz) = 60eb409d838c3cabf8905175044c4057e91de0ea858c65482342e2cd11e58bc1
-SIZE (wordpress-4.0.1-zh_TW.tar.gz) = 6451186
+SHA256 (wordpress-4.1-zh_TW.tar.gz) = d329b718e059d856b71b027b07fa656cf45754d0c47fb4ad30ae61ac19c1097c
+SIZE (wordpress-4.1-zh_TW.tar.gz) = 6581461
--- a/comms/librs232/Makefile
+++ b/comms/librs232/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	librs232
-PORTVERSION=	20141206
+PORTVERSION=	20150110
 CATEGORIES=	comms
 DISTNAME=	RS-232
 MASTER_SITES=	http://www.teuniz.net/RS-232/
--- a/comms/librs232/distinfo
+++ b/comms/librs232/distinfo
@ -1,2 +1,2 @@
-SHA256 (RS-232.tar.gz) = d515fb842dc3a67816aa238b2e45d2ede675be254f04c512f51077980f7b4b6a
-SIZE (RS-232.tar.gz) = 12088
+SHA256 (RS-232.tar.gz) = 9fbf74cab1d19d0c2fe6506959dac6dcce406b7972ed3f1d90ed35f4595407cd
+SIZE (RS-232.tar.gz) = 12109
--- a/comms/owfs/files/patch-module_owfs_src_c_owfs.c
+++ b/comms/owfs/files/patch-module_owfs_src_c_owfs.c
@ -0,0 +1,11 @@
+--- module/owfs/src/c/owfs.c.orig	2014-10-11 03:23:18.000000000 +0400
+++ module/owfs/src/c/owfs.c	2014-12-30 19:53:53.000000000 +0300
+@@ -129,7 +129,7 @@
+ 
+ 	// Unmount just in case
+ 	// No checks -- can fail without consequences
+-	umount( Outbound_Control.head->name ) ;
+	unmount( Outbound_Control.head->name, 0) ;
+ 
+ 	Fuse_parse(fuse_mnt_opt, &fuse_options);
+ 	LEVEL_DEBUG("fuse_mnt_opt=[%s]", fuse_mnt_opt);
--- a/comms/yaps/Makefile
+++ b/comms/yaps/Makefile
@ -3,23 +3,24 @@

 PORTNAME=	yaps
 PORTVERSION=	0.96
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	comms
-MASTER_SITES=	${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	apps/serialcomm/machines
+MASTER_SITES=	SUNSITE/apps/serialcomm/machines

 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Yet Another Pager Software: send messages to pager (SMS, TAP, ...)

 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING.GPL

 USES=		gmake

 OPTIONS_DEFINE=	DOCS

-post-install:
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/yaps ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_DATA} ${WRKSRC}/yaps.rc ${STAGEDIR}${PREFIX}/etc/yaps.rc.sample
-	${INSTALL_MAN} ${WRKSRC}/yaps.1 ${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/yaps.1 ${STAGEDIR}${PREFIX}/man/man1/
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/yaps.doc ${WRKSRC}/yaps.html ${STAGEDIR}${DOCSDIR}

--- a/comms/yaps/files/patch-Makefile
+++ b/comms/yaps/files/patch-Makefile
@ -1,6 +1,6 @@
--- Makefile.orig	2013-11-17 23:01:50.000000000 +0800
-+++ Makefile	2013-11-17 23:04:00.000000000 +0800
-@@ -33,15 +33,15 @@ yaps.doc:	yaps.html
+--- Makefile.orig	1997-06-06 15:45:35.000000000 +0400
+++ Makefile	2015-02-26 00:28:11.000000000 +0300
+@@ -33,15 +33,15 @@
 	lynx -cfg=/dev/null -nolist -dump $< > $@
 
 install:	$(DSTFLE) $(CFGFILE)
@ -15,7 +15,7 @@
 
 $(DSTFLE):	yaps
 -	install -o $(YAPS_USER) -g $(YAPS_GROUP) -m $(YAPS_MODE) -s yaps $@
-+	install -o $(YAPS_USER) -g $(YAPS_GROUP) -m $(YAPS_MODE) -s yaps $(DESTDIR)$@
+	install -m 711 -s yaps $(DESTDIR)$@
 
 $(CFGFILE):	yaps.rc
 	@if [ ! -f $@ ]; then \
--- a/comms/yaps/pkg-plist
+++ b/comms/yaps/pkg-plist
@ -1,5 +1,5 @@
-bin/yaps
-etc/yaps.rc.sample
+@(root,dialer,2711) bin/yaps
+@sample etc/yaps.rc.sample
 man/man1/yaps.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/yaps.doc
 %%PORTDOCS%%%%DOCSDIR%%/yaps.html
--- a/databases/percona55-client/files/patch-CMakeLists.txt
+++ b/databases/percona55-client/files/patch-CMakeLists.txt
@ -1,6 +1,6 @@
--- CMakeLists.txt.orig	2014-10-06 18:02:58.000000000 +0200
-+++ CMakeLists.txt	2014-10-17 20:59:57.890024727 +0200
-@@ -419,31 +419,12 @@
+--- CMakeLists.txt.orig	2015-01-07 10:49:52.000000000 +0100
+++ CMakeLists.txt	2015-01-21 20:01:50.952601051 +0100
+@@ -400,32 +400,11 @@
 ENDIF()
 
 ADD_SUBDIRECTORY(extra)
@ -28,8 +28,8 @@
 -    ADD_SUBDIRECTORY(internal)
 -  ENDIF()
 -  ADD_SUBDIRECTORY(packaging/rpm-oel)
+-  ADD_SUBDIRECTORY(packaging/rpm-sles)
 -ENDIF()
-+
 +ADD_SUBDIRECTORY(client)
 +ADD_SUBDIRECTORY(libservices)
 +ADD_SUBDIRECTORY(support-files)
@ -38,7 +38,7 @@
 
 INCLUDE(cmake/abi_check.cmake)
 INCLUDE(cmake/tags.cmake)
-@@ -479,19 +460,21 @@
+@@ -461,19 +440,21 @@
 ELSE()
   SET(CPACK_GENERATOR "TGZ")
 ENDIF() 
@ -61,10 +61,11 @@
 IF(NOT INSTALL_LAYOUT MATCHES "RPM")
   INSTALL(FILES COPYING LICENSE.mysql 
   DESTINATION ${INSTALL_DOCREADMEDIR} 
-@@ -518,5 +501,6 @@
+@@ -499,6 +480,7 @@
     PATTERN "sp-imp-spec.txt" EXCLUDE
   )
 ENDIF()
 +ENDIF()
 
 INCLUDE(CPack)
+ 
--- a/databases/percona55-client/files/patch-client_CMakeLists.txt
+++ b/databases/percona55-client/files/patch-client_CMakeLists.txt
@ -1,18 +1,23 @@
--- client/CMakeLists.txt.orig	2014-03-15 18:08:16.000000000 +0100
-+++ client/CMakeLists.txt	2014-03-22 19:33:32.505508311 +0100
-@@ -33,9 +33,11 @@
+--- client/CMakeLists.txt.orig	2015-01-07 10:49:52.000000000 +0100
+++ client/CMakeLists.txt	2015-01-21 20:03:30.747577544 +0100
+@@ -33,6 +33,7 @@
   TARGET_LINK_LIBRARIES(mysql ${READLINE_LIBRARY})
 ENDIF(UNIX)
 
 +IF(FALSE)
 MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
 SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
+ # mysqltest has unused result errors, so we skip Werror
+@@ -42,7 +43,7 @@
+   ADD_COMPILE_FLAGS(mysqltest.cc COMPILE_FLAGS "-Wno-error")
+ ENDIF()
 TARGET_LINK_LIBRARIES(mysqltest perconaserverclient regex)
+-
 +ENDIF()
 
- 
 MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
-@@ -47,15 +49,19 @@
+ TARGET_LINK_LIBRARIES(mysqlcheck perconaserverclient)
+@@ -53,15 +54,19 @@
 MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
 TARGET_LINK_LIBRARIES(mysqlimport perconaserverclient)
 
@ -32,7 +37,7 @@
 
 MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc sql_string.cc
                      ../sql/rpl_filter.cc ../sql/sql_list.cc)
-@@ -73,7 +79,7 @@
+@@ -79,7 +84,7 @@
   MYSQL_ADD_EXECUTABLE(echo echo.c)
 ENDIF(WIN32)
 
--- a/databases/percona55-server/Makefile
+++ b/databases/percona55-server/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME?=	percona
-DISTVERSION=	5.5.40-36.1
+DISTVERSION=	5.5.41-37.0
 PORTREVISION?=	0
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://www.percona.com/downloads/Percona-Server-5.5/Percona-Server-${DISTVERSION}/source/tarball/
--- a/databases/percona55-server/distinfo
+++ b/databases/percona55-server/distinfo
@ -1,2 +1,2 @@
-SHA256 (percona-server-5.5.40-36.1.tar.gz) = 33b2a66c2a221ec4e02b38f065f5a8fbbe5fdcaaf00e0ae5f267d4e2b746ffb4
-SIZE (percona-server-5.5.40-36.1.tar.gz) = 22710586
+SHA256 (percona-server-5.5.41-37.0.tar.gz) = 4de65ccbdd6c266f18339c2ea5427a15d90a8ce1ce1c7574aa2e72f685a10833
+SIZE (percona-server-5.5.41-37.0.tar.gz) = 22670445
--- a/databases/percona55-server/files/patch-client_CMakeLists.txt
+++ b/databases/percona55-server/files/patch-client_CMakeLists.txt
@ -1,6 +1,6 @@
--- client/CMakeLists.txt.orig	2014-03-15 18:08:16.000000000 +0100
-+++ client/CMakeLists.txt	2014-03-22 21:03:06.194178397 +0100
-@@ -27,17 +27,20 @@
+--- client/CMakeLists.txt.orig	2015-01-07 10:49:52.000000000 +0100
+++ client/CMakeLists.txt	2015-01-21 20:06:10.493605146 +0100
+@@ -27,11 +27,13 @@
 
 ADD_DEFINITIONS(${READLINE_DEFINES})
 ADD_DEFINITIONS(${SSL_DEFINES})
@ -14,6 +14,7 @@
 
 MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
 SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
+@@ -44,6 +46,7 @@
 TARGET_LINK_LIBRARIES(mysqltest perconaserverclient regex)
 
 
@ -21,7 +22,7 @@
 MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
 TARGET_LINK_LIBRARIES(mysqlcheck perconaserverclient)
 
-@@ -46,17 +49,21 @@
+@@ -52,17 +55,21 @@
 
 MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
 TARGET_LINK_LIBRARIES(mysqlimport perconaserverclient)
@ -43,7 +44,7 @@
 MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc sql_string.cc
                      ../sql/rpl_filter.cc ../sql/sql_list.cc)
 TARGET_LINK_LIBRARIES(mysqlbinlog perconaserverclient)
-@@ -67,13 +74,14 @@
+@@ -73,13 +80,14 @@
 MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c)
 SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
 TARGET_LINK_LIBRARIES(mysqlslap perconaserverclient)
--- a/databases/percona56-client/files/patch-CMakeLists.txt
+++ b/databases/percona56-client/files/patch-CMakeLists.txt
@ -1,6 +1,6 @@
 --- CMakeLists.txt.orig	2014-10-06 18:06:02.000000000 +0200
 +++ CMakeLists.txt	2014-10-18 16:20:43.311977761 +0200
-@@ -500,39 +500,17 @@
+@@ -468,40 +468,17 @@
 
 ADD_SUBDIRECTORY(extra)
 ADD_SUBDIRECTORY(client)
@ -36,6 +36,7 @@
 -  ENDIF()
 -  ADD_SUBDIRECTORY(packaging/rpm-oel)
 -  ADD_SUBDIRECTORY(packaging/rpm-fedora)
+-  ADD_SUBDIRECTORY(packaging/rpm-sles)
 -ENDIF()
 -
 INCLUDE(cmake/abi_check.cmake)
--- a/databases/percona56-server/Makefile
+++ b/databases/percona56-server/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME?=	percona
-DISTVERSION=	5.6.21-70.1
+DISTVERSION=	5.6.22-71.0
 PORTREVISION?=	0
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-${DISTVERSION}/source/tarball/
--- a/databases/percona56-server/distinfo
+++ b/databases/percona56-server/distinfo
@ -1,2 +1,2 @@
-SHA256 (percona-server-5.6.21-70.1.tar.gz) = 3f2ed35912a7a22f740be441078736e868a079b2f76e82988720e238b3ea8160
-SIZE (percona-server-5.6.21-70.1.tar.gz) = 33911244
+SHA256 (percona-server-5.6.22-71.0.tar.gz) = 0a7269a71e009bc802adef1dd3502562f22b881b7f88823ca84c987724dcf10c
+SIZE (percona-server-5.6.22-71.0.tar.gz) = 33992150
--- a/databases/php-adodb-ext/Makefile
+++ b/databases/php-adodb-ext/Makefile
@ -18,6 +18,8 @@ USES=		dos2unix zip
 USE_PHP=	yes
 USE_PHPEXT=	yes
 PHP_MODNAME=	adodb
+PHP_DEFAULT=	55
+IGNORE_WITH_PHP=56

 SUB_FILES=	pkg-message

--- a/databases/phpmyadmin/Makefile
+++ b/databases/phpmyadmin/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	phpMyAdmin
-DISTVERSION=	4.3.4
+DISTVERSION=	4.3.11.1
 CATEGORIES=	databases www
 MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME}/${DISTVERSION}
 DISTNAME=	${PORTNAME}-${DISTVERSION}-all-languages
--- a/databases/phpmyadmin/distinfo
+++ b/databases/phpmyadmin/distinfo
@ -1,2 +1,2 @@
-SHA256 (phpMyAdmin-4.3.4-all-languages.tar.xz) = 91258e07e04e25c5e49284b194ebff8ffa807ad38832fbe802cc6af3f7cb96d3
-SIZE (phpMyAdmin-4.3.4-all-languages.tar.xz) = 5285212
+SHA256 (phpMyAdmin-4.3.11.1-all-languages.tar.xz) = 6c4dd0fcf331d53668824a6b857745a5c3774c2bbd483ba453c37488417d16d5
+SIZE (phpMyAdmin-4.3.11.1-all-languages.tar.xz) = 5446076
--- a/databases/postgresql90-client/Makefile
+++ b/databases/postgresql90-client/Makefile
@ -8,6 +8,7 @@ COMMENT=	PostgreSQL database (client)

 MASTERDIR=	${.CURDIR}/../postgresql90-server

+LIB_DEPENDS=	libedit.so.0:${PORTSDIR}/devel/libedit
 BUILD_DIRS=	config src/include src/interfaces src/port \
 		src/bin/pg_dump src/bin/psql src/bin/scripts src/bin/pg_config \
 		doc src/makefiles
@ -15,6 +16,6 @@ INSTALL_DIRS=	${BUILD_DIRS}
 CLIENT_ONLY=	yes
 COMPONENT=	-client
 USE_LDCONFIG=	yes
-USES+=		readline
+CONFIGURE_ARGS+=--with-libedit-preferred

 .include "${MASTERDIR}/Makefile"
--- a/databases/postgresql90-contrib/Makefile
+++ b/databases/postgresql90-contrib/Makefile
@ -2,7 +2,6 @@
 # $FreeBSD$

 PORTNAME=	postgresql
-PORTREVISION=	1
 CATEGORIES=	databases
 PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${COMPONENT}

--- a/databases/postgresql90-server/Makefile
+++ b/databases/postgresql90-server/Makefile
@ -1,7 +1,7 @@
 # Created by: Marc G. Fournier <scrappy@FreeBSD.org>
 # $FreeBSD$

-DISTVERSION?=	9.0.18
+DISTVERSION?=	9.0.19
 PORTREVISION=	0
 PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${COMPONENT}

--- a/databases/postgresql90-server/distinfo
+++ b/databases/postgresql90-server/distinfo
@ -1,4 +1,4 @@
-SHA256 (postgresql/postgresql-9.0.18.tar.bz2) = 7c8a07d0ab78fe39522c6bb268a7b357f456d9d4796f57d7b43a004e4a9d3003
-SIZE (postgresql/postgresql-9.0.18.tar.bz2) = 14984096
+SHA256 (postgresql/postgresql-9.0.19.tar.bz2) = 53ad12bca99ba8ff0e002e39e50634c4dba1035232be1475cb77b3f6579385c0
+SIZE (postgresql/postgresql-9.0.19.tar.bz2) = 15019406
 SHA256 (postgresql/pg-9017-icu-2014-06-09.diff.gz) = a28988885b532e73c2d6e67c6d2d9593f34d4360f2b4c9f6c419a373e16f149f
 SIZE (postgresql/pg-9017-icu-2014-06-09.diff.gz) = 4395
--- a/databases/postgresql90-server/pkg-plist-client
+++ b/databases/postgresql90-server/pkg-plist-client
@ -476,54 +476,54 @@ include/postgresql/server/windowapi.h
 include/sqlda-compat.h
 include/sqlda-native.h
 include/sqlda.h
-@dirrm include/postgresql/server/utils
-@dirrm include/postgresql/server/tsearch/dicts
-@dirrm include/postgresql/server/tsearch
-@dirrm include/postgresql/server/tcop
-@dirrm include/postgresql/server/storage
-@dirrm include/postgresql/server/snowball/libstemmer
-@dirrm include/postgresql/server/snowball
-@dirrm include/postgresql/server/rewrite
-@dirrm include/postgresql/server/replication
-@dirrm include/postgresql/server/regex
-@dirrm include/postgresql/server/postmaster
-@dirrm include/postgresql/server/portability
-@dirrm include/postgresql/server/port/win32_msvc/sys
-@dirrm include/postgresql/server/port/win32_msvc
-@dirrm include/postgresql/server/port/win32/sys
-@dirrm include/postgresql/server/port/win32/netinet
-@dirrm include/postgresql/server/port/win32/arpa
-@dirrm include/postgresql/server/port/win32
-@dirrm include/postgresql/server/port
-@dirrm include/postgresql/server/parser
-@dirrm include/postgresql/server/optimizer
-@dirrm include/postgresql/server/nodes
-@dirrm include/postgresql/server/mb
-@dirrm include/postgresql/server/libpq
-@dirrm include/postgresql/server/lib
-@dirrm include/postgresql/server/foreign
-@dirrm include/postgresql/server/executor
-@dirrm include/postgresql/server/commands
-@dirrm include/postgresql/server/catalog
-@dirrm include/postgresql/server/bootstrap
-@dirrm include/postgresql/server/access
-@dirrm include/postgresql/server
+@dir include/postgresql/server/utils
+@dir include/postgresql/server/tsearch/dicts
+@dir include/postgresql/server/tsearch
+@dir include/postgresql/server/tcop
+@dir include/postgresql/server/storage
+@dir include/postgresql/server/snowball/libstemmer
+@dir include/postgresql/server/snowball
+@dir include/postgresql/server/rewrite
+@dir include/postgresql/server/replication
+@dir include/postgresql/server/regex
+@dir include/postgresql/server/postmaster
+@dir include/postgresql/server/portability
+@dir include/postgresql/server/port/win32_msvc/sys
+@dir include/postgresql/server/port/win32_msvc
+@dir include/postgresql/server/port/win32/sys
+@dir include/postgresql/server/port/win32/netinet
+@dir include/postgresql/server/port/win32/arpa
+@dir include/postgresql/server/port/win32
+@dir include/postgresql/server/port
+@dir include/postgresql/server/parser
+@dir include/postgresql/server/optimizer
+@dir include/postgresql/server/nodes
+@dir include/postgresql/server/mb
+@dir include/postgresql/server/libpq
+@dir include/postgresql/server/lib
+@dir include/postgresql/server/foreign
+@dir include/postgresql/server/executor
+@dir include/postgresql/server/commands
+@dir include/postgresql/server/catalog
+@dir include/postgresql/server/bootstrap
+@dir include/postgresql/server/access
+@dir include/postgresql/server
 include/libpq/libpq-fs.h
-@dirrm include/libpq
+@dir include/libpq
 include/postgresql/internal/libpq/pqcomm.h
-@dirrm include/postgresql/internal/libpq
+@dir include/postgresql/internal/libpq
 include/postgresql/informix/esql/datetime.h
 include/postgresql/informix/esql/decimal.h
 include/postgresql/informix/esql/sqltypes.h
-@dirrm include/postgresql/informix/esql
-@dirrm include/postgresql/informix
+@dir include/postgresql/informix/esql
+@dir include/postgresql/informix
 include/postgresql/internal/c.h
 include/postgresql/internal/libpq-int.h
 include/postgresql/internal/postgres_fe.h
 include/postgresql/internal/port.h
 include/postgresql/internal/pqexpbuffer.h
-@dirrm include/postgresql/internal
-@dirrm include/postgresql
+@dir include/postgresql/internal
+@dir include/postgresql
 include/ecpg_informix.h
 include/ecpgerrno.h
 include/ecpglib.h
@ -559,11 +559,11 @@ lib/postgresql/pgxs/src/Makefile.global
 lib/postgresql/pgxs/src/Makefile.port
 lib/postgresql/pgxs/src/Makefile.shlib
 lib/postgresql/pgxs/src/nls-global.mk
-@dirrm lib/postgresql/pgxs/src/makefiles
-@dirrm lib/postgresql/pgxs/config
-@dirrm lib/postgresql/pgxs/src
-@dirrm lib/postgresql/pgxs
-@dirrm lib/postgresql
+@dir lib/postgresql/pgxs/src/makefiles
+@dir lib/postgresql/pgxs/config
+@dir lib/postgresql/pgxs/src
+@dir lib/postgresql/pgxs
+@dir lib/postgresql
 man/man1/clusterdb.1.gz
 man/man1/createdb.1.gz
 man/man1/createlang.1.gz
@ -791,10 +791,10 @@ man/man7/VACUUM.7.gz
 man/man7/VALUES.7.gz
 man/man7/WITH.7.gz
 %%DOCSDIR%%/README-client
-@dirrmtry %%DOCSDIR%%
-share/postgresql/pg_service.conf.sample
-share/postgresql/psqlrc.sample
-@dirrmtry share/postgresql
+@dir %%DOCSDIR%%
+%%DATADIR%%/pg_service.conf.sample
+%%DATADIR%%/psqlrc.sample
+@dir %%DATADIR%%
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/ecpg-9.0.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/ecpglib6-9.0.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq5-9.0.mo
--- a/databases/postgresql90-server/pkg-plist-contrib
+++ b/databases/postgresql90-server/pkg-plist-contrib
@ -51,82 +51,82 @@ lib/postgresql/uuid-ossp.so
 %%DOCSDIR%%/contrib/moddatetime.example
 %%DOCSDIR%%/contrib/refint.example
 %%DOCSDIR%%/contrib/timetravel.example
-share/postgresql/contrib/_int.sql
-share/postgresql/contrib/adminpack.sql
-share/postgresql/contrib/autoinc.sql
-share/postgresql/contrib/btree_gin.sql
-share/postgresql/contrib/btree_gist.sql
-share/postgresql/contrib/chkpass.sql
-share/postgresql/contrib/citext.sql
-share/postgresql/contrib/cube.sql
-share/postgresql/contrib/dblink.sql
-share/postgresql/contrib/dict_int.sql
-share/postgresql/contrib/dict_xsyn.sql
-share/postgresql/contrib/earthdistance.sql
-share/postgresql/contrib/fuzzystrmatch.sql
-share/postgresql/contrib/hstore.sql
-share/postgresql/contrib/insert_username.sql
-share/postgresql/contrib/int_aggregate.sql
-share/postgresql/contrib/isn.sql
-share/postgresql/contrib/lo.sql
-share/postgresql/contrib/ltree.sql
-share/postgresql/contrib/moddatetime.sql
-share/postgresql/contrib/pageinspect.sql
-share/postgresql/contrib/pg_buffercache.sql
-share/postgresql/contrib/pg_freespacemap.sql
-share/postgresql/contrib/pg_stat_statements.sql
-share/postgresql/contrib/pg_trgm.sql
-share/postgresql/contrib/pgcrypto.sql
-share/postgresql/contrib/pgrowlocks.sql
-share/postgresql/contrib/pgstattuple.sql
-share/postgresql/contrib/pgxml.sql
-share/postgresql/contrib/refint.sql
-share/postgresql/contrib/seg.sql
-share/postgresql/contrib/sslinfo.sql
-share/postgresql/contrib/tablefunc.sql
-share/postgresql/contrib/test_parser.sql
-share/postgresql/contrib/timetravel.sql
-share/postgresql/contrib/tsearch2.sql
-share/postgresql/contrib/unaccent.sql
-share/postgresql/contrib/uninstall_uuid-ossp.sql
-share/postgresql/contrib/uuid-ossp.sql
-share/postgresql/contrib/uninstall__int.sql
-share/postgresql/contrib/uninstall_adminpack.sql
-share/postgresql/contrib/uninstall_btree_gin.sql
-share/postgresql/contrib/uninstall_btree_gist.sql
-share/postgresql/contrib/uninstall_chkpass.sql
-share/postgresql/contrib/uninstall_citext.sql
-share/postgresql/contrib/uninstall_cube.sql
-share/postgresql/contrib/uninstall_dblink.sql
-share/postgresql/contrib/uninstall_dict_int.sql
-share/postgresql/contrib/uninstall_dict_xsyn.sql
-share/postgresql/contrib/uninstall_earthdistance.sql
-share/postgresql/contrib/uninstall_fuzzystrmatch.sql
-share/postgresql/contrib/uninstall_hstore.sql
-share/postgresql/contrib/uninstall_int_aggregate.sql
-share/postgresql/contrib/uninstall_isn.sql
-share/postgresql/contrib/uninstall_lo.sql
-share/postgresql/contrib/uninstall_ltree.sql
-share/postgresql/contrib/uninstall_pageinspect.sql
-share/postgresql/contrib/uninstall_pg_buffercache.sql
-share/postgresql/contrib/uninstall_pg_freespacemap.sql
-share/postgresql/contrib/uninstall_pg_stat_statements.sql
-share/postgresql/contrib/uninstall_pg_trgm.sql
-share/postgresql/contrib/uninstall_pgcrypto.sql
-share/postgresql/contrib/uninstall_pgrowlocks.sql
-share/postgresql/contrib/uninstall_pgstattuple.sql
-share/postgresql/contrib/uninstall_pgxml.sql
-share/postgresql/contrib/uninstall_seg.sql
-share/postgresql/contrib/uninstall_sslinfo.sql
-share/postgresql/contrib/uninstall_tablefunc.sql
-share/postgresql/contrib/uninstall_test_parser.sql
-share/postgresql/contrib/uninstall_tsearch2.sql
-share/postgresql/contrib/uninstall_unaccent.sql
-share/postgresql/tsearch_data/unaccent.rules
-share/postgresql/tsearch_data/xsyn_sample.rules
-@dirrmtry share/postgresql/tsearch_data
-@dirrmtry share/postgresql/contrib
-@dirrmtry share/postgresql
-@dirrmtry %%DOCSDIR%%/contrib
-@dirrmtry %%DOCSDIR%%
-@dirrmtry lib/postgresql
+%%DATADIR%%/contrib/_int.sql
+%%DATADIR%%/contrib/adminpack.sql
+%%DATADIR%%/contrib/autoinc.sql
+%%DATADIR%%/contrib/btree_gin.sql
+%%DATADIR%%/contrib/btree_gist.sql
+%%DATADIR%%/contrib/chkpass.sql
+%%DATADIR%%/contrib/citext.sql
+%%DATADIR%%/contrib/cube.sql
+%%DATADIR%%/contrib/dblink.sql
+%%DATADIR%%/contrib/dict_int.sql
+%%DATADIR%%/contrib/dict_xsyn.sql
+%%DATADIR%%/contrib/earthdistance.sql
+%%DATADIR%%/contrib/fuzzystrmatch.sql
+%%DATADIR%%/contrib/hstore.sql
+%%DATADIR%%/contrib/insert_username.sql
+%%DATADIR%%/contrib/int_aggregate.sql
+%%DATADIR%%/contrib/isn.sql
+%%DATADIR%%/contrib/lo.sql
+%%DATADIR%%/contrib/ltree.sql
+%%DATADIR%%/contrib/moddatetime.sql
+%%DATADIR%%/contrib/pageinspect.sql
+%%DATADIR%%/contrib/pg_buffercache.sql
+%%DATADIR%%/contrib/pg_freespacemap.sql
+%%DATADIR%%/contrib/pg_stat_statements.sql
+%%DATADIR%%/contrib/pg_trgm.sql
+%%DATADIR%%/contrib/pgcrypto.sql
+%%DATADIR%%/contrib/pgrowlocks.sql
+%%DATADIR%%/contrib/pgstattuple.sql
+%%DATADIR%%/contrib/pgxml.sql
+%%DATADIR%%/contrib/refint.sql
+%%DATADIR%%/contrib/seg.sql
+%%DATADIR%%/contrib/sslinfo.sql
+%%DATADIR%%/contrib/tablefunc.sql
+%%DATADIR%%/contrib/test_parser.sql
+%%DATADIR%%/contrib/timetravel.sql
+%%DATADIR%%/contrib/tsearch2.sql
+%%DATADIR%%/contrib/unaccent.sql
+%%DATADIR%%/contrib/uninstall_uuid-ossp.sql
+%%DATADIR%%/contrib/uuid-ossp.sql
+%%DATADIR%%/contrib/uninstall__int.sql
+%%DATADIR%%/contrib/uninstall_adminpack.sql
+%%DATADIR%%/contrib/uninstall_btree_gin.sql
+%%DATADIR%%/contrib/uninstall_btree_gist.sql
+%%DATADIR%%/contrib/uninstall_chkpass.sql
+%%DATADIR%%/contrib/uninstall_citext.sql
+%%DATADIR%%/contrib/uninstall_cube.sql
+%%DATADIR%%/contrib/uninstall_dblink.sql
+%%DATADIR%%/contrib/uninstall_dict_int.sql
+%%DATADIR%%/contrib/uninstall_dict_xsyn.sql
+%%DATADIR%%/contrib/uninstall_earthdistance.sql
+%%DATADIR%%/contrib/uninstall_fuzzystrmatch.sql
+%%DATADIR%%/contrib/uninstall_hstore.sql
+%%DATADIR%%/contrib/uninstall_int_aggregate.sql
+%%DATADIR%%/contrib/uninstall_isn.sql
+%%DATADIR%%/contrib/uninstall_lo.sql
+%%DATADIR%%/contrib/uninstall_ltree.sql
+%%DATADIR%%/contrib/uninstall_pageinspect.sql
+%%DATADIR%%/contrib/uninstall_pg_buffercache.sql
+%%DATADIR%%/contrib/uninstall_pg_freespacemap.sql
+%%DATADIR%%/contrib/uninstall_pg_stat_statements.sql
+%%DATADIR%%/contrib/uninstall_pg_trgm.sql
+%%DATADIR%%/contrib/uninstall_pgcrypto.sql
+%%DATADIR%%/contrib/uninstall_pgrowlocks.sql
+%%DATADIR%%/contrib/uninstall_pgstattuple.sql
+%%DATADIR%%/contrib/uninstall_pgxml.sql
+%%DATADIR%%/contrib/uninstall_seg.sql
+%%DATADIR%%/contrib/uninstall_sslinfo.sql
+%%DATADIR%%/contrib/uninstall_tablefunc.sql
+%%DATADIR%%/contrib/uninstall_test_parser.sql
+%%DATADIR%%/contrib/uninstall_tsearch2.sql
+%%DATADIR%%/contrib/uninstall_unaccent.sql
+%%DATADIR%%/tsearch_data/unaccent.rules
+%%DATADIR%%/tsearch_data/xsyn_sample.rules
+@dir %%DATADIR%%/tsearch_data
+@dir %%DATADIR%%/contrib
+@dir %%DATADIR%%
+@dir %%DOCSDIR%%/contrib
+@dir %%DOCSDIR%%
+@dir lib/postgresql
--- a/databases/postgresql90-server/pkg-plist-plperl
+++ b/databases/postgresql90-server/pkg-plist-plperl
@ -1,4 +1,4 @@
 %%DOCSDIR%%/README-plperl
 lib/postgresql/plperl.so
-@dirrmtry lib/postgresql
-@dirrmtry %%DOCSDIR%%
+@dir lib/postgresql
+@dir %%DOCSDIR%%
--- a/databases/postgresql90-server/pkg-plist-plpython
+++ b/databases/postgresql90-server/pkg-plist-plpython
@ -1,5 +1,5 @@
 %%DOCSDIR%%/README-plpython
 lib/postgresql/plpython.so
 lib/postgresql/plpython2.so
-@dirrmtry lib/postgresql
-@dirrmtry %%DOCSDIR%%
+@dir lib/postgresql
+@dir %%DOCSDIR%%
--- a/databases/postgresql90-server/pkg-plist-pltcl
+++ b/databases/postgresql90-server/pkg-plist-pltcl
@ -1,9 +1,9 @@
 %%DOCSDIR%%/README-pltcl
 lib/postgresql/pltcl.so
-@dirrmtry lib/postgresql
+@dir lib/postgresql
 bin/pltcl_loadmod
 bin/pltcl_delmod
 bin/pltcl_listmod
-share/postgresql/unknown.pltcl
-@dirrmtry share/postgresql
-@dirrmtry %%DOCSDIR%%
+%%DATADIR%%/unknown.pltcl
+@dir %%DATADIR%%
+@dir %%DOCSDIR%%
--- a/databases/postgresql90-server/pkg-plist-server
+++ b/databases/postgresql90-server/pkg-plist-server
--- a/databases/postgresql91-client/Makefile
+++ b/databases/postgresql91-client/Makefile
@ -8,6 +8,7 @@ COMMENT=	PostgreSQL database (client)

 MASTERDIR=	${.CURDIR}/../postgresql91-server

+LIB_DEPENDS=	libedit.so.0:${PORTSDIR}/devel/libedit
 BUILD_DIRS=	config src/include src/interfaces src/port \
 		src/bin/pg_dump src/bin/psql src/bin/scripts src/bin/pg_config \
 		doc src/makefiles
@ -16,6 +17,6 @@ INSTALL_DIRS=	${BUILD_DIRS}
 CLIENT_ONLY=	yes
 COMPONENT=	-client
 USE_LDCONFIG=	yes
-USES+=		readline
+CONFIGURE_ARGS+=--with-libedit-preferred

 .include "${MASTERDIR}/Makefile"
--- a/databases/postgresql91-contrib/Makefile
+++ b/databases/postgresql91-contrib/Makefile
@ -2,7 +2,6 @@
 # $FreeBSD$

 PORTNAME=	postgresql
-PORTREVISION=	1
 CATEGORIES=	databases
 PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${COMPONENT}

--- a/databases/postgresql91-server/Makefile
+++ b/databases/postgresql91-server/Makefile
@ -2,8 +2,8 @@
 # $FreeBSD$

 PORTNAME?=	postgresql
-DISTVERSION?=	9.1.14
-PORTREVISION?=	1
+DISTVERSION?=	9.1.15
+PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	PGSQL
 MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
@ -12,10 +12,10 @@ PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${COMPONENT}
 MAINTAINER?=	pgsql@FreeBSD.org
 COMMENT?=	The most advanced open-source database available anywhere

-CONFLICTS?=	${PORTNAME}[^${PORTVERSION:R:R}]?-client* \
-		${PORTNAME}${COMPONENT}-[^${PORTVERSION:R:R}].* \
-		${PORTNAME}9[^${PORTVERSION:R:E}]-client* \
-		${PORTNAME}${COMPONENT}-9.[^${PORTVERSION:R:E}].*
+#CONFLICTS?=	${PORTNAME}[^${PORTVERSION:R:R}]?-client* \
+#		${PORTNAME}${COMPONENT}-[^${PORTVERSION:R:R}].* \
+#		${PORTNAME}9[^${PORTVERSION:R:E}]-client* \
+#		${PORTNAME}${COMPONENT}-9.[^${PORTVERSION:R:E}].*

 WRKSRC=		${WRKDIR}/postgresql-${DISTVERSION}
 DIST_SUBDIR=	postgresql
--- a/databases/postgresql91-server/distinfo
+++ b/databases/postgresql91-server/distinfo
@ -1,4 +1,4 @@
-SHA256 (postgresql/postgresql-9.1.14.tar.bz2) = d0647ce563d18ae02bf68c5dd646a4c75e8b45b3a4fada64d481371fdc16f522
-SIZE (postgresql/postgresql-9.1.14.tar.bz2) = 15666442
+SHA256 (postgresql/postgresql-9.1.15.tar.bz2) = 67d6deaf15cdc35fcdff2c319234d0577a86bce6f363e4f0e4e987e419e0de5f
+SIZE (postgresql/postgresql-9.1.15.tar.bz2) = 15768092
 SHA256 (postgresql/pg-928-icu-2014-06-09.diff.gz) = 6f856ee0fd27118650f806fb674220d9851a0183ffa125e6fbe5468dfabeea5c
 SIZE (postgresql/pg-928-icu-2014-06-09.diff.gz) = 4449
--- a/databases/postgresql91-server/pkg-plist-client
+++ b/databases/postgresql91-server/pkg-plist-client
@ -498,54 +498,54 @@ include/postgresql/server/windowapi.h
 include/sqlda-compat.h
 include/sqlda-native.h
 include/sqlda.h
-@dirrm include/postgresql/server/utils
-@dirrm include/postgresql/server/tsearch/dicts
-@dirrm include/postgresql/server/tsearch
-@dirrm include/postgresql/server/tcop
-@dirrm include/postgresql/server/storage
-@dirrm include/postgresql/server/snowball/libstemmer
-@dirrm include/postgresql/server/snowball
-@dirrm include/postgresql/server/rewrite
-@dirrm include/postgresql/server/replication
-@dirrm include/postgresql/server/regex
-@dirrm include/postgresql/server/postmaster
-@dirrm include/postgresql/server/portability
-@dirrm include/postgresql/server/port/win32_msvc/sys
-@dirrm include/postgresql/server/port/win32_msvc
-@dirrm include/postgresql/server/port/win32/sys
-@dirrm include/postgresql/server/port/win32/netinet
-@dirrm include/postgresql/server/port/win32/arpa
-@dirrm include/postgresql/server/port/win32
-@dirrm include/postgresql/server/port
-@dirrm include/postgresql/server/parser
-@dirrm include/postgresql/server/optimizer
-@dirrm include/postgresql/server/nodes
-@dirrm include/postgresql/server/mb
-@dirrm include/postgresql/server/libpq
-@dirrm include/postgresql/server/lib
-@dirrm include/postgresql/server/foreign
-@dirrm include/postgresql/server/executor
-@dirrm include/postgresql/server/commands
-@dirrm include/postgresql/server/catalog
-@dirrm include/postgresql/server/bootstrap
-@dirrm include/postgresql/server/access
-@dirrm include/postgresql/server
+@dir include/postgresql/server/utils
+@dir include/postgresql/server/tsearch/dicts
+@dir include/postgresql/server/tsearch
+@dir include/postgresql/server/tcop
+@dir include/postgresql/server/storage
+@dir include/postgresql/server/snowball/libstemmer
+@dir include/postgresql/server/snowball
+@dir include/postgresql/server/rewrite
+@dir include/postgresql/server/replication
+@dir include/postgresql/server/regex
+@dir include/postgresql/server/postmaster
+@dir include/postgresql/server/portability
+@dir include/postgresql/server/port/win32_msvc/sys
+@dir include/postgresql/server/port/win32_msvc
+@dir include/postgresql/server/port/win32/sys
+@dir include/postgresql/server/port/win32/netinet
+@dir include/postgresql/server/port/win32/arpa
+@dir include/postgresql/server/port/win32
+@dir include/postgresql/server/port
+@dir include/postgresql/server/parser
+@dir include/postgresql/server/optimizer
+@dir include/postgresql/server/nodes
+@dir include/postgresql/server/mb
+@dir include/postgresql/server/libpq
+@dir include/postgresql/server/lib
+@dir include/postgresql/server/foreign
+@dir include/postgresql/server/executor
+@dir include/postgresql/server/commands
+@dir include/postgresql/server/catalog
+@dir include/postgresql/server/bootstrap
+@dir include/postgresql/server/access
+@dir include/postgresql/server
 include/libpq/libpq-fs.h
-@dirrm include/libpq
+@dir include/libpq
 include/postgresql/internal/libpq/pqcomm.h
-@dirrm include/postgresql/internal/libpq
+@dir include/postgresql/internal/libpq
 include/postgresql/informix/esql/datetime.h
 include/postgresql/informix/esql/decimal.h
 include/postgresql/informix/esql/sqltypes.h
-@dirrm include/postgresql/informix/esql
-@dirrm include/postgresql/informix
+@dir include/postgresql/informix/esql
+@dir include/postgresql/informix
 include/postgresql/internal/c.h
 include/postgresql/internal/libpq-int.h
 include/postgresql/internal/postgres_fe.h
 include/postgresql/internal/port.h
 include/postgresql/internal/pqexpbuffer.h
-@dirrm include/postgresql/internal
-@dirrm include/postgresql
+@dir include/postgresql/internal
+@dir include/postgresql
 include/ecpg_informix.h
 include/ecpgerrno.h
 include/ecpglib.h
@ -581,11 +581,11 @@ lib/postgresql/pgxs/src/Makefile.global
 lib/postgresql/pgxs/src/Makefile.port
 lib/postgresql/pgxs/src/Makefile.shlib
 lib/postgresql/pgxs/src/nls-global.mk
-@dirrm lib/postgresql/pgxs/src/makefiles
-@dirrm lib/postgresql/pgxs/config
-@dirrm lib/postgresql/pgxs/src
-@dirrm lib/postgresql/pgxs
-@dirrm lib/postgresql
+@dir lib/postgresql/pgxs/src/makefiles
+@dir lib/postgresql/pgxs/config
+@dir lib/postgresql/pgxs/src
+@dir lib/postgresql/pgxs
+@dir lib/postgresql
 man/man1/clusterdb.1.gz
 man/man1/createdb.1.gz
 man/man1/createlang.1.gz
@ -823,10 +823,10 @@ man/man7/VACUUM.7.gz
 man/man7/VALUES.7.gz
 man/man7/WITH.7.gz
 %%DOCSDIR%%/README-client
-@dirrmtry %%DOCSDIR%%
-share/postgresql/pg_service.conf.sample
-share/postgresql/psqlrc.sample
-@dirrmtry share/postgresql
+@dir %%DOCSDIR%%
+%%DATADIR%%/pg_service.conf.sample
+%%DATADIR%%/psqlrc.sample
+@dir %%DATADIR%%
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/ecpg-9.1.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/ecpglib6-9.1.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq5-9.1.mo
--- a/databases/postgresql91-server/pkg-plist-contrib
+++ b/databases/postgresql91-server/pkg-plist-contrib
@ -55,126 +55,126 @@ share/doc/postgresql/extension/insert_username.example
 share/doc/postgresql/extension/moddatetime.example
 share/doc/postgresql/extension/refint.example
 share/doc/postgresql/extension/timetravel.example
-share/postgresql/extension/adminpack--1.0.sql
-share/postgresql/extension/adminpack.control
-share/postgresql/extension/autoinc--1.0.sql
-share/postgresql/extension/autoinc--unpackaged--1.0.sql
-share/postgresql/extension/autoinc.control
-share/postgresql/extension/btree_gin--1.0.sql
-share/postgresql/extension/btree_gin--unpackaged--1.0.sql
-share/postgresql/extension/btree_gin.control
-share/postgresql/extension/btree_gist--1.0.sql
-share/postgresql/extension/btree_gist--unpackaged--1.0.sql
-share/postgresql/extension/btree_gist.control
-share/postgresql/extension/chkpass--1.0.sql
-share/postgresql/extension/chkpass--unpackaged--1.0.sql
-share/postgresql/extension/chkpass.control
-share/postgresql/extension/citext--1.0.sql
-share/postgresql/extension/citext--unpackaged--1.0.sql
-share/postgresql/extension/citext.control
-share/postgresql/extension/cube--1.0.sql
-share/postgresql/extension/cube--unpackaged--1.0.sql
-share/postgresql/extension/cube.control
-share/postgresql/extension/dblink--1.0.sql
-share/postgresql/extension/dblink--unpackaged--1.0.sql
-share/postgresql/extension/dblink.control
-share/postgresql/extension/dict_int--1.0.sql
-share/postgresql/extension/dict_int--unpackaged--1.0.sql
-share/postgresql/extension/dict_int.control
-share/postgresql/extension/dict_xsyn--1.0.sql
-share/postgresql/extension/dict_xsyn--unpackaged--1.0.sql
-share/postgresql/extension/dict_xsyn.control
-share/postgresql/extension/earthdistance--1.0.sql
-share/postgresql/extension/earthdistance--unpackaged--1.0.sql
-share/postgresql/extension/earthdistance.control
-share/postgresql/extension/file_fdw--1.0.sql
-share/postgresql/extension/file_fdw.control
-share/postgresql/extension/fuzzystrmatch--1.0.sql
-share/postgresql/extension/fuzzystrmatch--unpackaged--1.0.sql
-share/postgresql/extension/fuzzystrmatch.control
-share/postgresql/extension/hstore--1.0.sql
-share/postgresql/extension/hstore--unpackaged--1.0.sql
-share/postgresql/extension/hstore.control
-share/postgresql/extension/insert_username--1.0.sql
-share/postgresql/extension/insert_username--unpackaged--1.0.sql
-share/postgresql/extension/insert_username.control
-share/postgresql/extension/intagg--1.0.sql
-share/postgresql/extension/intagg--unpackaged--1.0.sql
-share/postgresql/extension/intagg.control
-share/postgresql/extension/intarray--1.0.sql
-share/postgresql/extension/intarray--unpackaged--1.0.sql
-share/postgresql/extension/intarray.control
-share/postgresql/extension/isn--1.0.sql
-share/postgresql/extension/isn--unpackaged--1.0.sql
-share/postgresql/extension/isn.control
-share/postgresql/extension/lo--1.0.sql
-share/postgresql/extension/lo--unpackaged--1.0.sql
-share/postgresql/extension/lo.control
-share/postgresql/extension/ltree--1.0.sql
-share/postgresql/extension/ltree--unpackaged--1.0.sql
-share/postgresql/extension/ltree.control
-share/postgresql/extension/moddatetime--1.0.sql
-share/postgresql/extension/moddatetime--unpackaged--1.0.sql
-share/postgresql/extension/moddatetime.control
-share/postgresql/extension/pageinspect--1.0.sql
-share/postgresql/extension/pageinspect--unpackaged--1.0.sql
-share/postgresql/extension/pageinspect.control
-share/postgresql/extension/pg_buffercache--1.0.sql
-share/postgresql/extension/pg_buffercache--unpackaged--1.0.sql
-share/postgresql/extension/pg_buffercache.control
-share/postgresql/extension/pg_freespacemap--1.0.sql
-share/postgresql/extension/pg_freespacemap--unpackaged--1.0.sql
-share/postgresql/extension/pg_freespacemap.control
-share/postgresql/extension/pg_stat_statements--1.0.sql
-share/postgresql/extension/pg_stat_statements--unpackaged--1.0.sql
-share/postgresql/extension/pg_stat_statements.control
-share/postgresql/extension/pg_trgm--1.0.sql
-share/postgresql/extension/pg_trgm--unpackaged--1.0.sql
-share/postgresql/extension/pg_trgm.control
-share/postgresql/extension/pgcrypto--1.0.sql
-share/postgresql/extension/pgcrypto--unpackaged--1.0.sql
-share/postgresql/extension/pgcrypto.control
-share/postgresql/extension/pgrowlocks--1.0.sql
-share/postgresql/extension/pgrowlocks--unpackaged--1.0.sql
-share/postgresql/extension/pgrowlocks.control
-share/postgresql/extension/pgstattuple--1.0.sql
-share/postgresql/extension/pgstattuple--unpackaged--1.0.sql
-share/postgresql/extension/pgstattuple.control
-share/postgresql/extension/refint--1.0.sql
-share/postgresql/extension/refint--unpackaged--1.0.sql
-share/postgresql/extension/refint.control
-share/postgresql/extension/seg--1.0.sql
-share/postgresql/extension/seg--unpackaged--1.0.sql
-share/postgresql/extension/seg.control
-share/postgresql/extension/sslinfo--1.0.sql
-share/postgresql/extension/sslinfo--unpackaged--1.0.sql
-share/postgresql/extension/sslinfo.control
-share/postgresql/extension/tablefunc--1.0.sql
-share/postgresql/extension/tablefunc--unpackaged--1.0.sql
-share/postgresql/extension/tablefunc.control
-share/postgresql/extension/test_parser--1.0.sql
-share/postgresql/extension/test_parser--unpackaged--1.0.sql
-share/postgresql/extension/test_parser.control
-share/postgresql/extension/timetravel--1.0.sql
-share/postgresql/extension/timetravel--unpackaged--1.0.sql
-share/postgresql/extension/timetravel.control
-share/postgresql/extension/tsearch2--1.0.sql
-share/postgresql/extension/tsearch2--unpackaged--1.0.sql
-share/postgresql/extension/tsearch2.control
-share/postgresql/extension/unaccent--1.0.sql
-share/postgresql/extension/unaccent--unpackaged--1.0.sql
-share/postgresql/extension/unaccent.control
-share/postgresql/extension/uuid-ossp--1.0.sql
-share/postgresql/extension/uuid-ossp--unpackaged--1.0.sql
-share/postgresql/extension/uuid-ossp.control
-share/postgresql/extension/xml2--1.0.sql
-share/postgresql/extension/xml2--unpackaged--1.0.sql
-share/postgresql/extension/xml2.control
-share/postgresql/tsearch_data/unaccent.rules
-share/postgresql/tsearch_data/xsyn_sample.rules
-@dirrmtry share/postgresql/tsearch_data
-@dirrmtry share/postgresql/extension
-@dirrmtry share/postgresql
-@dirrmtry %%DOCSDIR%%/extension
-@dirrmtry %%DOCSDIR%%
-@dirrmtry lib/postgresql
+%%DATADIR%%/extension/adminpack--1.0.sql
+%%DATADIR%%/extension/adminpack.control
+%%DATADIR%%/extension/autoinc--1.0.sql
+%%DATADIR%%/extension/autoinc--unpackaged--1.0.sql
+%%DATADIR%%/extension/autoinc.control
+%%DATADIR%%/extension/btree_gin--1.0.sql
+%%DATADIR%%/extension/btree_gin--unpackaged--1.0.sql
+%%DATADIR%%/extension/btree_gin.control
+%%DATADIR%%/extension/btree_gist--1.0.sql
+%%DATADIR%%/extension/btree_gist--unpackaged--1.0.sql
+%%DATADIR%%/extension/btree_gist.control
+%%DATADIR%%/extension/chkpass--1.0.sql
+%%DATADIR%%/extension/chkpass--unpackaged--1.0.sql
+%%DATADIR%%/extension/chkpass.control
+%%DATADIR%%/extension/citext--1.0.sql
+%%DATADIR%%/extension/citext--unpackaged--1.0.sql
+%%DATADIR%%/extension/citext.control
+%%DATADIR%%/extension/cube--1.0.sql
+%%DATADIR%%/extension/cube--unpackaged--1.0.sql
+%%DATADIR%%/extension/cube.control
+%%DATADIR%%/extension/dblink--1.0.sql
+%%DATADIR%%/extension/dblink--unpackaged--1.0.sql
+%%DATADIR%%/extension/dblink.control
+%%DATADIR%%/extension/dict_int--1.0.sql
+%%DATADIR%%/extension/dict_int--unpackaged--1.0.sql
+%%DATADIR%%/extension/dict_int.control
+%%DATADIR%%/extension/dict_xsyn--1.0.sql
+%%DATADIR%%/extension/dict_xsyn--unpackaged--1.0.sql
+%%DATADIR%%/extension/dict_xsyn.control
+%%DATADIR%%/extension/earthdistance--1.0.sql
+%%DATADIR%%/extension/earthdistance--unpackaged--1.0.sql
+%%DATADIR%%/extension/earthdistance.control
+%%DATADIR%%/extension/file_fdw--1.0.sql
+%%DATADIR%%/extension/file_fdw.control
+%%DATADIR%%/extension/fuzzystrmatch--1.0.sql
+%%DATADIR%%/extension/fuzzystrmatch--unpackaged--1.0.sql
+%%DATADIR%%/extension/fuzzystrmatch.control
+%%DATADIR%%/extension/hstore--1.0.sql
+%%DATADIR%%/extension/hstore--unpackaged--1.0.sql
+%%DATADIR%%/extension/hstore.control
+%%DATADIR%%/extension/insert_username--1.0.sql
+%%DATADIR%%/extension/insert_username--unpackaged--1.0.sql
+%%DATADIR%%/extension/insert_username.control
+%%DATADIR%%/extension/intagg--1.0.sql
+%%DATADIR%%/extension/intagg--unpackaged--1.0.sql
+%%DATADIR%%/extension/intagg.control
+%%DATADIR%%/extension/intarray--1.0.sql
+%%DATADIR%%/extension/intarray--unpackaged--1.0.sql
+%%DATADIR%%/extension/intarray.control
+%%DATADIR%%/extension/isn--1.0.sql
+%%DATADIR%%/extension/isn--unpackaged--1.0.sql
+%%DATADIR%%/extension/isn.control
+%%DATADIR%%/extension/lo--1.0.sql
+%%DATADIR%%/extension/lo--unpackaged--1.0.sql
+%%DATADIR%%/extension/lo.control
+%%DATADIR%%/extension/ltree--1.0.sql
+%%DATADIR%%/extension/ltree--unpackaged--1.0.sql
+%%DATADIR%%/extension/ltree.control
+%%DATADIR%%/extension/moddatetime--1.0.sql
+%%DATADIR%%/extension/moddatetime--unpackaged--1.0.sql
+%%DATADIR%%/extension/moddatetime.control
+%%DATADIR%%/extension/pageinspect--1.0.sql
+%%DATADIR%%/extension/pageinspect--unpackaged--1.0.sql
+%%DATADIR%%/extension/pageinspect.control
+%%DATADIR%%/extension/pg_buffercache--1.0.sql
+%%DATADIR%%/extension/pg_buffercache--unpackaged--1.0.sql
+%%DATADIR%%/extension/pg_buffercache.control
+%%DATADIR%%/extension/pg_freespacemap--1.0.sql
+%%DATADIR%%/extension/pg_freespacemap--unpackaged--1.0.sql
+%%DATADIR%%/extension/pg_freespacemap.control
+%%DATADIR%%/extension/pg_stat_statements--1.0.sql
+%%DATADIR%%/extension/pg_stat_statements--unpackaged--1.0.sql
+%%DATADIR%%/extension/pg_stat_statements.control
+%%DATADIR%%/extension/pg_trgm--1.0.sql
+%%DATADIR%%/extension/pg_trgm--unpackaged--1.0.sql
+%%DATADIR%%/extension/pg_trgm.control
+%%DATADIR%%/extension/pgcrypto--1.0.sql
+%%DATADIR%%/extension/pgcrypto--unpackaged--1.0.sql
+%%DATADIR%%/extension/pgcrypto.control
+%%DATADIR%%/extension/pgrowlocks--1.0.sql
+%%DATADIR%%/extension/pgrowlocks--unpackaged--1.0.sql
+%%DATADIR%%/extension/pgrowlocks.control
+%%DATADIR%%/extension/pgstattuple--1.0.sql
+%%DATADIR%%/extension/pgstattuple--unpackaged--1.0.sql
+%%DATADIR%%/extension/pgstattuple.control
+%%DATADIR%%/extension/refint--1.0.sql
+%%DATADIR%%/extension/refint--unpackaged--1.0.sql
+%%DATADIR%%/extension/refint.control
+%%DATADIR%%/extension/seg--1.0.sql
+%%DATADIR%%/extension/seg--unpackaged--1.0.sql
+%%DATADIR%%/extension/seg.control
+%%DATADIR%%/extension/sslinfo--1.0.sql
+%%DATADIR%%/extension/sslinfo--unpackaged--1.0.sql
+%%DATADIR%%/extension/sslinfo.control
+%%DATADIR%%/extension/tablefunc--1.0.sql
+%%DATADIR%%/extension/tablefunc--unpackaged--1.0.sql
+%%DATADIR%%/extension/tablefunc.control
+%%DATADIR%%/extension/test_parser--1.0.sql
+%%DATADIR%%/extension/test_parser--unpackaged--1.0.sql
+%%DATADIR%%/extension/test_parser.control
+%%DATADIR%%/extension/timetravel--1.0.sql
+%%DATADIR%%/extension/timetravel--unpackaged--1.0.sql
+%%DATADIR%%/extension/timetravel.control
+%%DATADIR%%/extension/tsearch2--1.0.sql
+%%DATADIR%%/extension/tsearch2--unpackaged--1.0.sql
+%%DATADIR%%/extension/tsearch2.control
+%%DATADIR%%/extension/unaccent--1.0.sql
+%%DATADIR%%/extension/unaccent--unpackaged--1.0.sql
+%%DATADIR%%/extension/unaccent.control
+%%DATADIR%%/extension/uuid-ossp--1.0.sql
+%%DATADIR%%/extension/uuid-ossp--unpackaged--1.0.sql
+%%DATADIR%%/extension/uuid-ossp.control
+%%DATADIR%%/extension/xml2--1.0.sql
+%%DATADIR%%/extension/xml2--unpackaged--1.0.sql
+%%DATADIR%%/extension/xml2.control
+%%DATADIR%%/tsearch_data/unaccent.rules
+%%DATADIR%%/tsearch_data/xsyn_sample.rules
+@dir %%DATADIR%%/tsearch_data
+@dir %%DATADIR%%/extension
+@dir %%DATADIR%%
+@dir %%DOCSDIR%%/extension
+@dir %%DOCSDIR%%
+@dir lib/postgresql
--- a/databases/postgresql91-server/pkg-plist-plperl
+++ b/databases/postgresql91-server/pkg-plist-plperl
@ -6,7 +6,7 @@
 %%DATADIR%%/extension/plperl--unpackaged--1.0.sql
 %%DOCSDIR%%/README-plperl
 lib/postgresql/plperl.so
-@dirrmtry lib/postgresql
-@dirrmtry %%DOCSDIR%%
-@dirrmtry %%DATADIR%%/extension
-@dirrmtry %%DATADIR%%
+@dir lib/postgresql
+@dir %%DOCSDIR%%
+@dir %%DATADIR%%/extension
+@dir %%DATADIR%%
--- a/databases/postgresql91-server/pkg-plist-plpython
+++ b/databases/postgresql91-server/pkg-plist-plpython
@ -10,6 +10,6 @@
 %%PYTHON3%%%%DATADIR%%/extension/plpython3u.control
 %%PYTHON3%%%%DATADIR%%/extension/plpython3u--1.0.sql
 %%PYTHON3%%%%DATADIR%%/extension/plpython3u--unpackaged--1.0.sql
-@dirrmtry %%DATADIR%%/extension
-@dirrmtry lib/postgresql
-@dirrmtry %%DOCSDIR%%
+@dir %%DATADIR%%/extension
+@dir lib/postgresql
+@dir %%DOCSDIR%%
--- a/databases/postgresql91-server/pkg-plist-pltcl
+++ b/databases/postgresql91-server/pkg-plist-pltcl
@ -6,11 +6,11 @@
 %%DATADIR%%/extension/pltclu--unpackaged--1.0.sql
 %%DOCSDIR%%/README-pltcl
 lib/postgresql/pltcl.so
-@dirrmtry lib/postgresql
+@dir lib/postgresql
 bin/pltcl_loadmod
 bin/pltcl_delmod
 bin/pltcl_listmod
-share/postgresql/unknown.pltcl
-@dirrmtry %%DATADIR%%/extension
-@dirrmtry %%DATADIR%%
-@dirrmtry %%DOCSDIR%%
+%%DATADIR%%/unknown.pltcl
+@dir %%DATADIR%%/extension
+@dir %%DATADIR%%
+@dir %%DOCSDIR%%
--- a/databases/postgresql91-server/pkg-plist-server
+++ b/databases/postgresql91-server/pkg-plist-server
--- a/databases/postgresql92-client/Makefile
+++ b/databases/postgresql92-client/Makefile
@ -8,6 +8,7 @@ COMMENT=	PostgreSQL database (client)

 MASTERDIR=	${.CURDIR}/../postgresql92-server

+LIB_DEPENDS=	libedit.so.0:${PORTSDIR}/devel/libedit
 BUILD_DIRS=	config src/include src/interfaces src/port \
 		src/bin/pg_dump src/bin/psql src/bin/scripts src/bin/pg_config \
 		doc src/makefiles
@ -16,6 +17,6 @@ INSTALL_DIRS=	${BUILD_DIRS}
 CLIENT_ONLY=	yes
 COMPONENT=	-client
 USE_LDCONFIG=	yes
-USES+=		readline
+CONFIGURE_ARGS+=--with-libedit-preferred

 .include "${MASTERDIR}/Makefile"
--- a/databases/postgresql92-contrib/Makefile
+++ b/databases/postgresql92-contrib/Makefile
@ -3,7 +3,6 @@

 PORTNAME=	postgresql
 CATEGORIES=	databases
-PORTREVISION=	1
 PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${COMPONENT}

 MAINTAINER=	pgsql@FreeBSD.org
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@ -2,8 +2,8 @@
 # $FreeBSD$

 PORTNAME?=	postgresql
-DISTVERSION?=	9.2.9
-PORTREVISION?=	1
+DISTVERSION?=	9.2.10
+PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	PGSQL
 MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
--- a/databases/postgresql92-server/distinfo
+++ b/databases/postgresql92-server/distinfo
@ -1,4 +1,4 @@
-SHA256 (postgresql/postgresql-9.2.9.tar.bz2) = 94ec6d330f125b6fc725741293073b07d7d20cc3e7b8ed127bc3d14ad2370197
-SIZE (postgresql/postgresql-9.2.9.tar.bz2) = 16269349
+SHA256 (postgresql/postgresql-9.2.10.tar.bz2) = 35545bbfead46f70936a7f3f39ccef13e02cdb79c2b3ef3688888df5b18d73ad
+SIZE (postgresql/postgresql-9.2.10.tar.bz2) = 16353487
 SHA256 (postgresql/pg-928-icu-2014-06-09.diff.gz) = 6f856ee0fd27118650f806fb674220d9851a0183ffa125e6fbe5468dfabeea5c
 SIZE (postgresql/pg-928-icu-2014-06-09.diff.gz) = 4449
--- a/databases/postgresql92-server/pkg-plist-client
+++ b/databases/postgresql92-server/pkg-plist-client
@ -506,55 +506,55 @@ include/postgresql/server/windowapi.h
 include/sqlda-compat.h
 include/sqlda-native.h
 include/sqlda.h
-@dirrm include/postgresql/server/utils
-@dirrm include/postgresql/server/tsearch/dicts
-@dirrm include/postgresql/server/tsearch
-@dirrm include/postgresql/server/tcop
-@dirrm include/postgresql/server/storage
-@dirrm include/postgresql/server/snowball/libstemmer
-@dirrm include/postgresql/server/snowball
-@dirrm include/postgresql/server/rewrite
-@dirrm include/postgresql/server/replication
-@dirrm include/postgresql/server/regex
-@dirrm include/postgresql/server/postmaster
-@dirrm include/postgresql/server/portability
-@dirrm include/postgresql/server/port/win32_msvc/sys
-@dirrm include/postgresql/server/port/win32_msvc
-@dirrm include/postgresql/server/port/win32/sys
-@dirrm include/postgresql/server/port/win32/netinet
-@dirrm include/postgresql/server/port/win32/arpa
-@dirrm include/postgresql/server/port/win32
-@dirrm include/postgresql/server/port
-@dirrm include/postgresql/server/parser
-@dirrm include/postgresql/server/optimizer
-@dirrm include/postgresql/server/nodes
-@dirrm include/postgresql/server/mb
-@dirrm include/postgresql/server/libpq
-@dirrm include/postgresql/server/lib
-@dirrm include/postgresql/server/foreign
-@dirrm include/postgresql/server/executor
-@dirrm include/postgresql/server/datatype
-@dirrm include/postgresql/server/commands
-@dirrm include/postgresql/server/catalog
-@dirrm include/postgresql/server/bootstrap
-@dirrm include/postgresql/server/access
-@dirrm include/postgresql/server
+@dir include/postgresql/server/utils
+@dir include/postgresql/server/tsearch/dicts
+@dir include/postgresql/server/tsearch
+@dir include/postgresql/server/tcop
+@dir include/postgresql/server/storage
+@dir include/postgresql/server/snowball/libstemmer
+@dir include/postgresql/server/snowball
+@dir include/postgresql/server/rewrite
+@dir include/postgresql/server/replication
+@dir include/postgresql/server/regex
+@dir include/postgresql/server/postmaster
+@dir include/postgresql/server/portability
+@dir include/postgresql/server/port/win32_msvc/sys
+@dir include/postgresql/server/port/win32_msvc
+@dir include/postgresql/server/port/win32/sys
+@dir include/postgresql/server/port/win32/netinet
+@dir include/postgresql/server/port/win32/arpa
+@dir include/postgresql/server/port/win32
+@dir include/postgresql/server/port
+@dir include/postgresql/server/parser
+@dir include/postgresql/server/optimizer
+@dir include/postgresql/server/nodes
+@dir include/postgresql/server/mb
+@dir include/postgresql/server/libpq
+@dir include/postgresql/server/lib
+@dir include/postgresql/server/foreign
+@dir include/postgresql/server/executor
+@dir include/postgresql/server/datatype
+@dir include/postgresql/server/commands
+@dir include/postgresql/server/catalog
+@dir include/postgresql/server/bootstrap
+@dir include/postgresql/server/access
+@dir include/postgresql/server
 include/libpq/libpq-fs.h
-@dirrm include/libpq
+@dir include/libpq
 include/postgresql/internal/libpq/pqcomm.h
-@dirrm include/postgresql/internal/libpq
+@dir include/postgresql/internal/libpq
 include/postgresql/informix/esql/datetime.h
 include/postgresql/informix/esql/decimal.h
 include/postgresql/informix/esql/sqltypes.h
-@dirrm include/postgresql/informix/esql
-@dirrm include/postgresql/informix
+@dir include/postgresql/informix/esql
+@dir include/postgresql/informix
 include/postgresql/internal/c.h
 include/postgresql/internal/libpq-int.h
 include/postgresql/internal/postgres_fe.h
 include/postgresql/internal/port.h
 include/postgresql/internal/pqexpbuffer.h
-@dirrm include/postgresql/internal
-@dirrm include/postgresql
+@dir include/postgresql/internal
+@dir include/postgresql
 include/ecpg_informix.h
 include/ecpgerrno.h
 include/ecpglib.h
@ -590,11 +590,11 @@ lib/postgresql/pgxs/src/Makefile.global
 lib/postgresql/pgxs/src/Makefile.port
 lib/postgresql/pgxs/src/Makefile.shlib
 lib/postgresql/pgxs/src/nls-global.mk
-@dirrm lib/postgresql/pgxs/src/makefiles
-@dirrm lib/postgresql/pgxs/config
-@dirrm lib/postgresql/pgxs/src
-@dirrm lib/postgresql/pgxs
-@dirrm lib/postgresql
+@dir lib/postgresql/pgxs/src/makefiles
+@dir lib/postgresql/pgxs/config
+@dir lib/postgresql/pgxs/src
+@dir lib/postgresql/pgxs
+@dir lib/postgresql
 man/man1/clusterdb.1.gz
 man/man1/createdb.1.gz
 man/man1/createlang.1.gz
@ -842,10 +842,10 @@ man/man7/VACUUM.7.gz
 man/man7/VALUES.7.gz
 man/man7/WITH.7.gz
 %%DOCSDIR%%/README-client
-@dirrmtry %%DOCSDIR%%
-share/postgresql/pg_service.conf.sample
-share/postgresql/psqlrc.sample
-@dirrmtry share/postgresql
+@dir %%DOCSDIR%%
+%%DATADIR%%/pg_service.conf.sample
+%%DATADIR%%/psqlrc.sample
+@dir %%DATADIR%%
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/ecpg-9.2.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/ecpglib6-9.2.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq5-9.2.mo
--- a/databases/postgresql92-server/pkg-plist-contrib
+++ b/databases/postgresql92-server/pkg-plist-contrib
@ -57,130 +57,130 @@ share/doc/postgresql/extension/insert_username.example
 share/doc/postgresql/extension/moddatetime.example
 share/doc/postgresql/extension/refint.example
 share/doc/postgresql/extension/timetravel.example
-share/postgresql/extension/adminpack--1.0.sql
-share/postgresql/extension/adminpack.control
-share/postgresql/extension/autoinc--1.0.sql
-share/postgresql/extension/autoinc--unpackaged--1.0.sql
-share/postgresql/extension/autoinc.control
-share/postgresql/extension/btree_gin--1.0.sql
-share/postgresql/extension/btree_gin--unpackaged--1.0.sql
-share/postgresql/extension/btree_gin.control
-share/postgresql/extension/btree_gist--1.0.sql
-share/postgresql/extension/btree_gist--unpackaged--1.0.sql
-share/postgresql/extension/btree_gist.control
-share/postgresql/extension/chkpass--1.0.sql
-share/postgresql/extension/chkpass--unpackaged--1.0.sql
-share/postgresql/extension/chkpass.control
-share/postgresql/extension/citext--1.0.sql
-share/postgresql/extension/citext--unpackaged--1.0.sql
-share/postgresql/extension/citext.control
-share/postgresql/extension/cube--1.0.sql
-share/postgresql/extension/cube--unpackaged--1.0.sql
-share/postgresql/extension/cube.control
-share/postgresql/extension/dblink--1.0.sql
-share/postgresql/extension/dblink--unpackaged--1.0.sql
-share/postgresql/extension/dblink.control
-share/postgresql/extension/dict_int--1.0.sql
-share/postgresql/extension/dict_int--unpackaged--1.0.sql
-share/postgresql/extension/dict_int.control
-share/postgresql/extension/dict_xsyn--1.0.sql
-share/postgresql/extension/dict_xsyn--unpackaged--1.0.sql
-share/postgresql/extension/dict_xsyn.control
-share/postgresql/extension/earthdistance--1.0.sql
-share/postgresql/extension/earthdistance--unpackaged--1.0.sql
-share/postgresql/extension/earthdistance.control
-share/postgresql/extension/file_fdw--1.0.sql
-share/postgresql/extension/file_fdw.control
-share/postgresql/extension/fuzzystrmatch--1.0.sql
-share/postgresql/extension/fuzzystrmatch--unpackaged--1.0.sql
-share/postgresql/extension/fuzzystrmatch.control
-share/postgresql/extension/hstore--1.0--1.1.sql
-share/postgresql/extension/hstore--1.1.sql
-share/postgresql/extension/hstore--unpackaged--1.0.sql
-share/postgresql/extension/hstore.control
-share/postgresql/extension/insert_username--1.0.sql
-share/postgresql/extension/insert_username--unpackaged--1.0.sql
-share/postgresql/extension/insert_username.control
-share/postgresql/extension/intagg--1.0.sql
-share/postgresql/extension/intagg--unpackaged--1.0.sql
-share/postgresql/extension/intagg.control
-share/postgresql/extension/intarray--1.0.sql
-share/postgresql/extension/intarray--unpackaged--1.0.sql
-share/postgresql/extension/intarray.control
-share/postgresql/extension/isn--1.0.sql
-share/postgresql/extension/isn--unpackaged--1.0.sql
-share/postgresql/extension/isn.control
-share/postgresql/extension/lo--1.0.sql
-share/postgresql/extension/lo--unpackaged--1.0.sql
-share/postgresql/extension/lo.control
-share/postgresql/extension/ltree--1.0.sql
-share/postgresql/extension/ltree--unpackaged--1.0.sql
-share/postgresql/extension/ltree.control
-share/postgresql/extension/moddatetime--1.0.sql
-share/postgresql/extension/moddatetime--unpackaged--1.0.sql
-share/postgresql/extension/moddatetime.control
-share/postgresql/extension/pageinspect--1.0.sql
-share/postgresql/extension/pageinspect--unpackaged--1.0.sql
-share/postgresql/extension/pageinspect.control
-share/postgresql/extension/pg_buffercache--1.0.sql
-share/postgresql/extension/pg_buffercache--unpackaged--1.0.sql
-share/postgresql/extension/pg_buffercache.control
-share/postgresql/extension/pg_freespacemap--1.0.sql
-share/postgresql/extension/pg_freespacemap--unpackaged--1.0.sql
-share/postgresql/extension/pg_freespacemap.control
-share/postgresql/extension/pg_stat_statements--1.0--1.1.sql
-share/postgresql/extension/pg_stat_statements--1.1.sql
-share/postgresql/extension/pg_stat_statements--unpackaged--1.0.sql
-share/postgresql/extension/pg_stat_statements.control
-share/postgresql/extension/pg_trgm--1.0.sql
-share/postgresql/extension/pg_trgm--unpackaged--1.0.sql
-share/postgresql/extension/pg_trgm.control
-share/postgresql/extension/pgcrypto--1.0.sql
-share/postgresql/extension/pgcrypto--unpackaged--1.0.sql
-share/postgresql/extension/pgcrypto.control
-share/postgresql/extension/pgrowlocks--1.0.sql
-share/postgresql/extension/pgrowlocks--unpackaged--1.0.sql
-share/postgresql/extension/pgrowlocks.control
-share/postgresql/extension/pgstattuple--1.0.sql
-share/postgresql/extension/pgstattuple--unpackaged--1.0.sql
-share/postgresql/extension/pgstattuple.control
-share/postgresql/extension/refint--1.0.sql
-share/postgresql/extension/refint--unpackaged--1.0.sql
-share/postgresql/extension/refint.control
-share/postgresql/extension/seg--1.0.sql
-share/postgresql/extension/seg--unpackaged--1.0.sql
-share/postgresql/extension/seg.control
-share/postgresql/extension/sslinfo--1.0.sql
-share/postgresql/extension/sslinfo--unpackaged--1.0.sql
-share/postgresql/extension/sslinfo.control
-share/postgresql/extension/tablefunc--1.0.sql
-share/postgresql/extension/tablefunc--unpackaged--1.0.sql
-share/postgresql/extension/tablefunc.control
-share/postgresql/extension/tcn--1.0.sql
-share/postgresql/extension/tcn.control
-share/postgresql/extension/test_parser--1.0.sql
-share/postgresql/extension/test_parser--unpackaged--1.0.sql
-share/postgresql/extension/test_parser.control
-share/postgresql/extension/timetravel--1.0.sql
-share/postgresql/extension/timetravel--unpackaged--1.0.sql
-share/postgresql/extension/timetravel.control
-share/postgresql/extension/tsearch2--1.0.sql
-share/postgresql/extension/tsearch2--unpackaged--1.0.sql
-share/postgresql/extension/tsearch2.control
-share/postgresql/extension/unaccent--1.0.sql
-share/postgresql/extension/unaccent--unpackaged--1.0.sql
-share/postgresql/extension/unaccent.control
-share/postgresql/extension/uuid-ossp--1.0.sql
-share/postgresql/extension/uuid-ossp--unpackaged--1.0.sql
-share/postgresql/extension/uuid-ossp.control
-share/postgresql/extension/xml2--1.0.sql
-share/postgresql/extension/xml2--unpackaged--1.0.sql
-share/postgresql/extension/xml2.control
-share/postgresql/tsearch_data/unaccent.rules
-share/postgresql/tsearch_data/xsyn_sample.rules
-@dirrmtry share/postgresql/tsearch_data
-@dirrmtry share/postgresql/extension
-@dirrmtry share/postgresql
-@dirrmtry %%DOCSDIR%%/extension
-@dirrmtry %%DOCSDIR%%
-@dirrmtry lib/postgresql
+%%DATADIR%%/extension/adminpack--1.0.sql
+%%DATADIR%%/extension/adminpack.control
+%%DATADIR%%/extension/autoinc--1.0.sql
+%%DATADIR%%/extension/autoinc--unpackaged--1.0.sql
+%%DATADIR%%/extension/autoinc.control
+%%DATADIR%%/extension/btree_gin--1.0.sql
+%%DATADIR%%/extension/btree_gin--unpackaged--1.0.sql
+%%DATADIR%%/extension/btree_gin.control
+%%DATADIR%%/extension/btree_gist--1.0.sql
+%%DATADIR%%/extension/btree_gist--unpackaged--1.0.sql
+%%DATADIR%%/extension/btree_gist.control
+%%DATADIR%%/extension/chkpass--1.0.sql
+%%DATADIR%%/extension/chkpass--unpackaged--1.0.sql
+%%DATADIR%%/extension/chkpass.control
+%%DATADIR%%/extension/citext--1.0.sql
+%%DATADIR%%/extension/citext--unpackaged--1.0.sql
+%%DATADIR%%/extension/citext.control
+%%DATADIR%%/extension/cube--1.0.sql
+%%DATADIR%%/extension/cube--unpackaged--1.0.sql
+%%DATADIR%%/extension/cube.control
+%%DATADIR%%/extension/dblink--1.0.sql
+%%DATADIR%%/extension/dblink--unpackaged--1.0.sql
+%%DATADIR%%/extension/dblink.control
+%%DATADIR%%/extension/dict_int--1.0.sql
+%%DATADIR%%/extension/dict_int--unpackaged--1.0.sql
+%%DATADIR%%/extension/dict_int.control
+%%DATADIR%%/extension/dict_xsyn--1.0.sql
+%%DATADIR%%/extension/dict_xsyn--unpackaged--1.0.sql
+%%DATADIR%%/extension/dict_xsyn.control
+%%DATADIR%%/extension/earthdistance--1.0.sql
+%%DATADIR%%/extension/earthdistance--unpackaged--1.0.sql
+%%DATADIR%%/extension/earthdistance.control
+%%DATADIR%%/extension/file_fdw--1.0.sql
+%%DATADIR%%/extension/file_fdw.control
+%%DATADIR%%/extension/fuzzystrmatch--1.0.sql
+%%DATADIR%%/extension/fuzzystrmatch--unpackaged--1.0.sql
+%%DATADIR%%/extension/fuzzystrmatch.control
+%%DATADIR%%/extension/hstore--1.0--1.1.sql
+%%DATADIR%%/extension/hstore--1.1.sql
+%%DATADIR%%/extension/hstore--unpackaged--1.0.sql
+%%DATADIR%%/extension/hstore.control
+%%DATADIR%%/extension/insert_username--1.0.sql
+%%DATADIR%%/extension/insert_username--unpackaged--1.0.sql
+%%DATADIR%%/extension/insert_username.control
+%%DATADIR%%/extension/intagg--1.0.sql
+%%DATADIR%%/extension/intagg--unpackaged--1.0.sql
+%%DATADIR%%/extension/intagg.control
+%%DATADIR%%/extension/intarray--1.0.sql
+%%DATADIR%%/extension/intarray--unpackaged--1.0.sql
+%%DATADIR%%/extension/intarray.control
+%%DATADIR%%/extension/isn--1.0.sql
+%%DATADIR%%/extension/isn--unpackaged--1.0.sql
+%%DATADIR%%/extension/isn.control
+%%DATADIR%%/extension/lo--1.0.sql
+%%DATADIR%%/extension/lo--unpackaged--1.0.sql
+%%DATADIR%%/extension/lo.control
+%%DATADIR%%/extension/ltree--1.0.sql
+%%DATADIR%%/extension/ltree--unpackaged--1.0.sql
+%%DATADIR%%/extension/ltree.control
+%%DATADIR%%/extension/moddatetime--1.0.sql
+%%DATADIR%%/extension/moddatetime--unpackaged--1.0.sql
+%%DATADIR%%/extension/moddatetime.control
+%%DATADIR%%/extension/pageinspect--1.0.sql
+%%DATADIR%%/extension/pageinspect--unpackaged--1.0.sql
+%%DATADIR%%/extension/pageinspect.control
+%%DATADIR%%/extension/pg_buffercache--1.0.sql
+%%DATADIR%%/extension/pg_buffercache--unpackaged--1.0.sql
+%%DATADIR%%/extension/pg_buffercache.control
+%%DATADIR%%/extension/pg_freespacemap--1.0.sql
+%%DATADIR%%/extension/pg_freespacemap--unpackaged--1.0.sql
+%%DATADIR%%/extension/pg_freespacemap.control
+%%DATADIR%%/extension/pg_stat_statements--1.0--1.1.sql
+%%DATADIR%%/extension/pg_stat_statements--1.1.sql
+%%DATADIR%%/extension/pg_stat_statements--unpackaged--1.0.sql
+%%DATADIR%%/extension/pg_stat_statements.control
+%%DATADIR%%/extension/pg_trgm--1.0.sql
+%%DATADIR%%/extension/pg_trgm--unpackaged--1.0.sql
+%%DATADIR%%/extension/pg_trgm.control
+%%DATADIR%%/extension/pgcrypto--1.0.sql
+%%DATADIR%%/extension/pgcrypto--unpackaged--1.0.sql
+%%DATADIR%%/extension/pgcrypto.control
+%%DATADIR%%/extension/pgrowlocks--1.0.sql
+%%DATADIR%%/extension/pgrowlocks--unpackaged--1.0.sql
+%%DATADIR%%/extension/pgrowlocks.control
+%%DATADIR%%/extension/pgstattuple--1.0.sql
+%%DATADIR%%/extension/pgstattuple--unpackaged--1.0.sql
+%%DATADIR%%/extension/pgstattuple.control
+%%DATADIR%%/extension/refint--1.0.sql
+%%DATADIR%%/extension/refint--unpackaged--1.0.sql
+%%DATADIR%%/extension/refint.control
+%%DATADIR%%/extension/seg--1.0.sql
+%%DATADIR%%/extension/seg--unpackaged--1.0.sql
+%%DATADIR%%/extension/seg.control
+%%DATADIR%%/extension/sslinfo--1.0.sql
+%%DATADIR%%/extension/sslinfo--unpackaged--1.0.sql
+%%DATADIR%%/extension/sslinfo.control
+%%DATADIR%%/extension/tablefunc--1.0.sql
+%%DATADIR%%/extension/tablefunc--unpackaged--1.0.sql
+%%DATADIR%%/extension/tablefunc.control
+%%DATADIR%%/extension/tcn--1.0.sql
+%%DATADIR%%/extension/tcn.control
+%%DATADIR%%/extension/test_parser--1.0.sql
+%%DATADIR%%/extension/test_parser--unpackaged--1.0.sql
+%%DATADIR%%/extension/test_parser.control
+%%DATADIR%%/extension/timetravel--1.0.sql
+%%DATADIR%%/extension/timetravel--unpackaged--1.0.sql
+%%DATADIR%%/extension/timetravel.control
+%%DATADIR%%/extension/tsearch2--1.0.sql
+%%DATADIR%%/extension/tsearch2--unpackaged--1.0.sql
+%%DATADIR%%/extension/tsearch2.control
+%%DATADIR%%/extension/unaccent--1.0.sql
+%%DATADIR%%/extension/unaccent--unpackaged--1.0.sql
+%%DATADIR%%/extension/unaccent.control
+%%DATADIR%%/extension/uuid-ossp--1.0.sql
+%%DATADIR%%/extension/uuid-ossp--unpackaged--1.0.sql
+%%DATADIR%%/extension/uuid-ossp.control
+%%DATADIR%%/extension/xml2--1.0.sql
+%%DATADIR%%/extension/xml2--unpackaged--1.0.sql
+%%DATADIR%%/extension/xml2.control
+%%DATADIR%%/tsearch_data/unaccent.rules
+%%DATADIR%%/tsearch_data/xsyn_sample.rules
+@dir %%DATADIR%%/tsearch_data
+@dir %%DATADIR%%/extension
+@dir %%DATADIR%%
+@dir %%DOCSDIR%%/extension
+@dir %%DOCSDIR%%
+@dir lib/postgresql
--- a/databases/postgresql92-server/pkg-plist-plperl
+++ b/databases/postgresql92-server/pkg-plist-plperl
@ -6,7 +6,7 @@
 %%DATADIR%%/extension/plperl--unpackaged--1.0.sql
 %%DOCSDIR%%/README-plperl
 lib/postgresql/plperl.so
-@dirrmtry lib/postgresql
-@dirrmtry %%DOCSDIR%%
-@dirrmtry %%DATADIR%%/extension
-@dirrmtry %%DATADIR%%
+@dir lib/postgresql
+@dir %%DOCSDIR%%
+@dir %%DATADIR%%/extension
+@dir %%DATADIR%%
--- a/databases/postgresql92-server/pkg-plist-plpython
+++ b/databases/postgresql92-server/pkg-plist-plpython
@ -10,6 +10,6 @@
 %%PYTHON3%%%%DATADIR%%/extension/plpython3u.control
 %%PYTHON3%%%%DATADIR%%/extension/plpython3u--1.0.sql
 %%PYTHON3%%%%DATADIR%%/extension/plpython3u--unpackaged--1.0.sql
-@dirrmtry %%DATADIR%%/extension
-@dirrmtry lib/postgresql
-@dirrmtry %%DOCSDIR%%
+@dir %%DATADIR%%/extension
+@dir lib/postgresql
+@dir %%DOCSDIR%%
--- a/databases/postgresql92-server/pkg-plist-pltcl
+++ b/databases/postgresql92-server/pkg-plist-pltcl
@ -6,11 +6,11 @@
 %%DATADIR%%/extension/pltclu--unpackaged--1.0.sql
 %%DOCSDIR%%/README-pltcl
 lib/postgresql/pltcl.so
-@dirrmtry lib/postgresql
+@dir lib/postgresql
 bin/pltcl_loadmod
 bin/pltcl_delmod
 bin/pltcl_listmod
-share/postgresql/unknown.pltcl
-@dirrmtry %%DATADIR%%/extension
-@dirrmtry %%DATADIR%%
-@dirrmtry %%DOCSDIR%%
+%%DATADIR%%/unknown.pltcl
+@dir %%DATADIR%%/extension
+@dir %%DATADIR%%
+@dir %%DOCSDIR%%
--- a/databases/postgresql92-server/pkg-plist-server
+++ b/databases/postgresql92-server/pkg-plist-server
--- a/databases/postgresql93-client/Makefile
+++ b/databases/postgresql93-client/Makefile
@ -8,6 +8,7 @@ COMMENT=	PostgreSQL database (client)

 MASTERDIR=	${.CURDIR}/../postgresql93-server

+LIB_DEPENDS=	libedit.so.0:${PORTSDIR}/devel/libedit
 BUILD_DIRS=	config src/include src/interfaces src/port \
 		src/bin/pg_dump src/bin/psql src/bin/scripts src/bin/pg_config \
 		doc src/makefiles
@ -16,6 +17,7 @@ INSTALL_DIRS=	${BUILD_DIRS}
 CLIENT_ONLY=	yes
 COMPONENT=	-client
 USE_LDCONFIG=	yes
-USES+=		pkgconfig readline
+USES+=		pkgconfig
+CONFIGURE_ARGS+=--with-libedit-preferred

 .include "${MASTERDIR}/Makefile"
--- a/databases/postgresql93-contrib/Makefile
+++ b/databases/postgresql93-contrib/Makefile
@ -2,7 +2,6 @@
 # $FreeBSD$

 PORTNAME=	postgresql
-PORTREVISION=	1
 CATEGORIES=	databases
 PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${COMPONENT}

--- a/databases/postgresql93-server/Makefile
+++ b/databases/postgresql93-server/Makefile
@ -1,7 +1,7 @@
 # Created by: Marc G. Fournier <scrappy@FreeBSD.org>
 # $FreeBSD$

-DISTVERSION?=	9.3.5
+DISTVERSION?=	9.3.6
 PORTREVISION?=	0
 PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${COMPONENT}

--- a/databases/postgresql93-server/distinfo
+++ b/databases/postgresql93-server/distinfo
@ -1,4 +1,4 @@
-SHA256 (postgresql/postgresql-9.3.5.tar.bz2) = 14176ffb1f90a189e7626214365be08ea2bfc26f26994bafb4235be314b9b4b0
-SIZE (postgresql/postgresql-9.3.5.tar.bz2) = 16727725
+SHA256 (postgresql/postgresql-9.3.6.tar.bz2) = 2368cb61e68d9581da7bfdb61bdf39ffbe59d2d95609b0e93adb3b6b8fd6ca14
+SIZE (postgresql/postgresql-9.3.5.tar.bz2) = 16889913
 SHA256 (postgresql/pg-928-icu-2014-06-09.diff.gz) = 6f856ee0fd27118650f806fb674220d9851a0183ffa125e6fbe5468dfabeea5c
 SIZE (postgresql/pg-928-icu-2014-06-09.diff.gz) = 4449
--- a/databases/postgresql93-server/pkg-plist-client
+++ b/databases/postgresql93-server/pkg-plist-client
@ -168,6 +168,7 @@ include/postgresql/server/commands/variable.h
 include/postgresql/server/commands/view.h
 include/postgresql/server/common/fe_memutils.h
 include/postgresql/server/common/relpath.h
+include/postgresql/server/common/string.h
 include/postgresql/server/datatype/timestamp.h
 include/postgresql/server/dynloader.h
 include/postgresql/server/executor/execdebug.h
@ -530,56 +531,56 @@ include/postgresql/server/windowapi.h
 include/sqlda-compat.h
 include/sqlda-native.h
 include/sqlda.h
-@dirrm include/postgresql/server/utils
-@dirrm include/postgresql/server/tsearch/dicts
-@dirrm include/postgresql/server/tsearch
-@dirrm include/postgresql/server/tcop
-@dirrm include/postgresql/server/storage
-@dirrm include/postgresql/server/snowball/libstemmer
-@dirrm include/postgresql/server/snowball
-@dirrm include/postgresql/server/rewrite
-@dirrm include/postgresql/server/replication
-@dirrm include/postgresql/server/regex
-@dirrm include/postgresql/server/postmaster
-@dirrm include/postgresql/server/portability
-@dirrm include/postgresql/server/port/win32_msvc/sys
-@dirrm include/postgresql/server/port/win32_msvc
-@dirrm include/postgresql/server/port/win32/sys
-@dirrm include/postgresql/server/port/win32/netinet
-@dirrm include/postgresql/server/port/win32/arpa
-@dirrm include/postgresql/server/port/win32
-@dirrm include/postgresql/server/port
-@dirrm include/postgresql/server/parser
-@dirrm include/postgresql/server/optimizer
-@dirrm include/postgresql/server/nodes
-@dirrm include/postgresql/server/mb
-@dirrm include/postgresql/server/libpq
-@dirrm include/postgresql/server/lib
-@dirrm include/postgresql/server/foreign
-@dirrm include/postgresql/server/executor
-@dirrm include/postgresql/server/datatype
-@dirrm include/postgresql/server/common
-@dirrm include/postgresql/server/commands
-@dirrm include/postgresql/server/catalog
-@dirrm include/postgresql/server/bootstrap
-@dirrm include/postgresql/server/access
-@dirrm include/postgresql/server
+@dir include/postgresql/server/utils
+@dir include/postgresql/server/tsearch/dicts
+@dir include/postgresql/server/tsearch
+@dir include/postgresql/server/tcop
+@dir include/postgresql/server/storage
+@dir include/postgresql/server/snowball/libstemmer
+@dir include/postgresql/server/snowball
+@dir include/postgresql/server/rewrite
+@dir include/postgresql/server/replication
+@dir include/postgresql/server/regex
+@dir include/postgresql/server/postmaster
+@dir include/postgresql/server/portability
+@dir include/postgresql/server/port/win32_msvc/sys
+@dir include/postgresql/server/port/win32_msvc
+@dir include/postgresql/server/port/win32/sys
+@dir include/postgresql/server/port/win32/netinet
+@dir include/postgresql/server/port/win32/arpa
+@dir include/postgresql/server/port/win32
+@dir include/postgresql/server/port
+@dir include/postgresql/server/parser
+@dir include/postgresql/server/optimizer
+@dir include/postgresql/server/nodes
+@dir include/postgresql/server/mb
+@dir include/postgresql/server/libpq
+@dir include/postgresql/server/lib
+@dir include/postgresql/server/foreign
+@dir include/postgresql/server/executor
+@dir include/postgresql/server/datatype
+@dir include/postgresql/server/common
+@dir include/postgresql/server/commands
+@dir include/postgresql/server/catalog
+@dir include/postgresql/server/bootstrap
+@dir include/postgresql/server/access
+@dir include/postgresql/server
 include/libpq/libpq-fs.h
-@dirrm include/libpq
+@dir include/libpq
 include/postgresql/internal/libpq/pqcomm.h
-@dirrm include/postgresql/internal/libpq
+@dir include/postgresql/internal/libpq
 include/postgresql/informix/esql/datetime.h
 include/postgresql/informix/esql/decimal.h
 include/postgresql/informix/esql/sqltypes.h
-@dirrm include/postgresql/informix/esql
-@dirrm include/postgresql/informix
+@dir include/postgresql/informix/esql
+@dir include/postgresql/informix
 include/postgresql/internal/c.h
 include/postgresql/internal/libpq-int.h
 include/postgresql/internal/postgres_fe.h
 include/postgresql/internal/port.h
 include/postgresql/internal/pqexpbuffer.h
-@dirrm include/postgresql/internal
-@dirrm include/postgresql
+@dir include/postgresql/internal
+@dir include/postgresql
 include/ecpg_informix.h
 include/ecpgerrno.h
 include/ecpglib.h
@ -619,11 +620,11 @@ lib/postgresql/pgxs/src/Makefile.global
 lib/postgresql/pgxs/src/Makefile.port
 lib/postgresql/pgxs/src/Makefile.shlib
 lib/postgresql/pgxs/src/nls-global.mk
-@dirrm lib/postgresql/pgxs/src/makefiles
-@dirrm lib/postgresql/pgxs/config
-@dirrm lib/postgresql/pgxs/src
-@dirrm lib/postgresql/pgxs
-@dirrm lib/postgresql
+@dir lib/postgresql/pgxs/src/makefiles
+@dir lib/postgresql/pgxs/config
+@dir lib/postgresql/pgxs/src
+@dir lib/postgresql/pgxs
+@dir lib/postgresql
 man/man1/clusterdb.1.gz
 man/man1/createdb.1.gz
 man/man1/createlang.1.gz
@ -881,10 +882,10 @@ man/man7/VACUUM.7.gz
 man/man7/VALUES.7.gz
 man/man7/WITH.7.gz
 %%DOCSDIR%%/README-client
-@dirrmtry %%DOCSDIR%%
-share/postgresql/pg_service.conf.sample
-share/postgresql/psqlrc.sample
-@dirrmtry share/postgresql
+@dir %%DOCSDIR%%
+%%DATADIR%%/pg_service.conf.sample
+%%DATADIR%%/psqlrc.sample
+@dir %%DATADIR%%
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/ecpg-9.3.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/ecpglib6-9.3.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq5-9.3.mo
--- a/databases/postgresql93-server/pkg-plist-contrib
+++ b/databases/postgresql93-server/pkg-plist-contrib
@ -60,138 +60,138 @@ share/doc/postgresql/extension/insert_username.example
 share/doc/postgresql/extension/moddatetime.example
 share/doc/postgresql/extension/refint.example
 share/doc/postgresql/extension/timetravel.example
-share/postgresql/extension/adminpack--1.0.sql
-share/postgresql/extension/adminpack.control
-share/postgresql/extension/autoinc--1.0.sql
-share/postgresql/extension/autoinc--unpackaged--1.0.sql
-share/postgresql/extension/autoinc.control
-share/postgresql/extension/btree_gin--1.0.sql
-share/postgresql/extension/btree_gin--unpackaged--1.0.sql
-share/postgresql/extension/btree_gin.control
-share/postgresql/extension/btree_gist--1.0.sql
-share/postgresql/extension/btree_gist--unpackaged--1.0.sql
-share/postgresql/extension/btree_gist.control
-share/postgresql/extension/chkpass--1.0.sql
-share/postgresql/extension/chkpass--unpackaged--1.0.sql
-share/postgresql/extension/chkpass.control
-share/postgresql/extension/citext--1.0.sql
-share/postgresql/extension/citext--unpackaged--1.0.sql
-share/postgresql/extension/citext.control
-share/postgresql/extension/cube--1.0.sql
-share/postgresql/extension/cube--unpackaged--1.0.sql
-share/postgresql/extension/cube.control
-share/postgresql/extension/dblink--1.0--1.1.sql
-share/postgresql/extension/dblink--1.1.sql
-share/postgresql/extension/dblink--unpackaged--1.0.sql
-share/postgresql/extension/dblink.control
-share/postgresql/extension/dict_int--1.0.sql
-share/postgresql/extension/dict_int--unpackaged--1.0.sql
-share/postgresql/extension/dict_int.control
-share/postgresql/extension/dict_xsyn--1.0.sql
-share/postgresql/extension/dict_xsyn--unpackaged--1.0.sql
-share/postgresql/extension/dict_xsyn.control
-share/postgresql/extension/earthdistance--1.0.sql
-share/postgresql/extension/earthdistance--unpackaged--1.0.sql
-share/postgresql/extension/earthdistance.control
-share/postgresql/extension/file_fdw--1.0.sql
-share/postgresql/extension/file_fdw.control
-share/postgresql/extension/fuzzystrmatch--1.0.sql
-share/postgresql/extension/fuzzystrmatch--unpackaged--1.0.sql
-share/postgresql/extension/fuzzystrmatch.control
-share/postgresql/extension/hstore--1.0--1.1.sql
-share/postgresql/extension/hstore--1.1--1.2.sql
-share/postgresql/extension/hstore--1.2.sql
-share/postgresql/extension/hstore--unpackaged--1.0.sql
-share/postgresql/extension/hstore.control
-share/postgresql/extension/insert_username--1.0.sql
-share/postgresql/extension/insert_username--unpackaged--1.0.sql
-share/postgresql/extension/insert_username.control
-share/postgresql/extension/intagg--1.0.sql
-share/postgresql/extension/intagg--unpackaged--1.0.sql
-share/postgresql/extension/intagg.control
-share/postgresql/extension/intarray--1.0.sql
-share/postgresql/extension/intarray--unpackaged--1.0.sql
-share/postgresql/extension/intarray.control
-share/postgresql/extension/isn--1.0.sql
-share/postgresql/extension/isn--unpackaged--1.0.sql
-share/postgresql/extension/isn.control
-share/postgresql/extension/lo--1.0.sql
-share/postgresql/extension/lo--unpackaged--1.0.sql
-share/postgresql/extension/lo.control
-share/postgresql/extension/ltree--1.0.sql
-share/postgresql/extension/ltree--unpackaged--1.0.sql
-share/postgresql/extension/ltree.control
-share/postgresql/extension/moddatetime--1.0.sql
-share/postgresql/extension/moddatetime--unpackaged--1.0.sql
-share/postgresql/extension/moddatetime.control
-share/postgresql/extension/pageinspect--1.0--1.1.sql
-share/postgresql/extension/pageinspect--1.1.sql
-share/postgresql/extension/pageinspect--unpackaged--1.0.sql
-share/postgresql/extension/pageinspect.control
-share/postgresql/extension/pg_buffercache--1.0.sql
-share/postgresql/extension/pg_buffercache--unpackaged--1.0.sql
-share/postgresql/extension/pg_buffercache.control
-share/postgresql/extension/pg_freespacemap--1.0.sql
-share/postgresql/extension/pg_freespacemap--unpackaged--1.0.sql
-share/postgresql/extension/pg_freespacemap.control
-share/postgresql/extension/pg_stat_statements--1.0--1.1.sql
-share/postgresql/extension/pg_stat_statements--1.1.sql
-share/postgresql/extension/pg_stat_statements--unpackaged--1.0.sql
-share/postgresql/extension/pg_stat_statements.control
-share/postgresql/extension/pg_trgm--1.0--1.1.sql
-share/postgresql/extension/pg_trgm--1.1.sql
-share/postgresql/extension/pg_trgm--unpackaged--1.0.sql
-share/postgresql/extension/pg_trgm.control
-share/postgresql/extension/pgcrypto--1.0.sql
-share/postgresql/extension/pgcrypto--unpackaged--1.0.sql
-share/postgresql/extension/pgcrypto.control
-share/postgresql/extension/pgrowlocks--1.0--1.1.sql
-share/postgresql/extension/pgrowlocks--1.1.sql
-share/postgresql/extension/pgrowlocks--unpackaged--1.0.sql
-share/postgresql/extension/pgrowlocks.control
-share/postgresql/extension/pgstattuple--1.0--1.1.sql
-share/postgresql/extension/pgstattuple--1.1.sql
-share/postgresql/extension/pgstattuple--unpackaged--1.0.sql
-share/postgresql/extension/pgstattuple.control
-share/postgresql/extension/postgres_fdw--1.0.sql
-share/postgresql/extension/postgres_fdw.control
-share/postgresql/extension/refint--1.0.sql
-share/postgresql/extension/refint--unpackaged--1.0.sql
-share/postgresql/extension/refint.control
-share/postgresql/extension/seg--1.0.sql
-share/postgresql/extension/seg--unpackaged--1.0.sql
-share/postgresql/extension/seg.control
-share/postgresql/extension/sslinfo--1.0.sql
-share/postgresql/extension/sslinfo--unpackaged--1.0.sql
-share/postgresql/extension/sslinfo.control
-share/postgresql/extension/tablefunc--1.0.sql
-share/postgresql/extension/tablefunc--unpackaged--1.0.sql
-share/postgresql/extension/tablefunc.control
-share/postgresql/extension/tcn--1.0.sql
-share/postgresql/extension/tcn.control
-share/postgresql/extension/test_parser--1.0.sql
-share/postgresql/extension/test_parser--unpackaged--1.0.sql
-share/postgresql/extension/test_parser.control
-share/postgresql/extension/timetravel--1.0.sql
-share/postgresql/extension/timetravel--unpackaged--1.0.sql
-share/postgresql/extension/timetravel.control
-share/postgresql/extension/tsearch2--1.0.sql
-share/postgresql/extension/tsearch2--unpackaged--1.0.sql
-share/postgresql/extension/tsearch2.control
-share/postgresql/extension/unaccent--1.0.sql
-share/postgresql/extension/unaccent--unpackaged--1.0.sql
-share/postgresql/extension/unaccent.control
-share/postgresql/extension/uuid-ossp--1.0.sql
-share/postgresql/extension/uuid-ossp--unpackaged--1.0.sql
-share/postgresql/extension/uuid-ossp.control
-share/postgresql/extension/xml2--1.0.sql
-share/postgresql/extension/xml2--unpackaged--1.0.sql
-share/postgresql/extension/xml2.control
-share/postgresql/tsearch_data/unaccent.rules
-share/postgresql/tsearch_data/xsyn_sample.rules
-@dirrmtry share/postgresql/tsearch_data
-@dirrmtry share/postgresql/extension
-@dirrmtry share/postgresql
-@dirrmtry %%DOCSDIR%%/extension
-@dirrmtry %%DOCSDIR%%
-@dirrmtry lib/postgresql
+%%DATADIR%%/extension/adminpack--1.0.sql
+%%DATADIR%%/extension/adminpack.control
+%%DATADIR%%/extension/autoinc--1.0.sql
+%%DATADIR%%/extension/autoinc--unpackaged--1.0.sql
+%%DATADIR%%/extension/autoinc.control
+%%DATADIR%%/extension/btree_gin--1.0.sql
+%%DATADIR%%/extension/btree_gin--unpackaged--1.0.sql
+%%DATADIR%%/extension/btree_gin.control
+%%DATADIR%%/extension/btree_gist--1.0.sql
+%%DATADIR%%/extension/btree_gist--unpackaged--1.0.sql
+%%DATADIR%%/extension/btree_gist.control
+%%DATADIR%%/extension/chkpass--1.0.sql
+%%DATADIR%%/extension/chkpass--unpackaged--1.0.sql
+%%DATADIR%%/extension/chkpass.control
+%%DATADIR%%/extension/citext--1.0.sql
+%%DATADIR%%/extension/citext--unpackaged--1.0.sql
+%%DATADIR%%/extension/citext.control
+%%DATADIR%%/extension/cube--1.0.sql
+%%DATADIR%%/extension/cube--unpackaged--1.0.sql
+%%DATADIR%%/extension/cube.control
+%%DATADIR%%/extension/dblink--1.0--1.1.sql
+%%DATADIR%%/extension/dblink--1.1.sql
+%%DATADIR%%/extension/dblink--unpackaged--1.0.sql
+%%DATADIR%%/extension/dblink.control
+%%DATADIR%%/extension/dict_int--1.0.sql
+%%DATADIR%%/extension/dict_int--unpackaged--1.0.sql
+%%DATADIR%%/extension/dict_int.control
+%%DATADIR%%/extension/dict_xsyn--1.0.sql
+%%DATADIR%%/extension/dict_xsyn--unpackaged--1.0.sql
+%%DATADIR%%/extension/dict_xsyn.control
+%%DATADIR%%/extension/earthdistance--1.0.sql
+%%DATADIR%%/extension/earthdistance--unpackaged--1.0.sql
+%%DATADIR%%/extension/earthdistance.control
+%%DATADIR%%/extension/file_fdw--1.0.sql
+%%DATADIR%%/extension/file_fdw.control
+%%DATADIR%%/extension/fuzzystrmatch--1.0.sql
+%%DATADIR%%/extension/fuzzystrmatch--unpackaged--1.0.sql
+%%DATADIR%%/extension/fuzzystrmatch.control
+%%DATADIR%%/extension/hstore--1.0--1.1.sql
+%%DATADIR%%/extension/hstore--1.1--1.2.sql
+%%DATADIR%%/extension/hstore--1.2.sql
+%%DATADIR%%/extension/hstore--unpackaged--1.0.sql
+%%DATADIR%%/extension/hstore.control
+%%DATADIR%%/extension/insert_username--1.0.sql
+%%DATADIR%%/extension/insert_username--unpackaged--1.0.sql
+%%DATADIR%%/extension/insert_username.control
+%%DATADIR%%/extension/intagg--1.0.sql
+%%DATADIR%%/extension/intagg--unpackaged--1.0.sql
+%%DATADIR%%/extension/intagg.control
+%%DATADIR%%/extension/intarray--1.0.sql
+%%DATADIR%%/extension/intarray--unpackaged--1.0.sql
+%%DATADIR%%/extension/intarray.control
+%%DATADIR%%/extension/isn--1.0.sql
+%%DATADIR%%/extension/isn--unpackaged--1.0.sql
+%%DATADIR%%/extension/isn.control
+%%DATADIR%%/extension/lo--1.0.sql
+%%DATADIR%%/extension/lo--unpackaged--1.0.sql
+%%DATADIR%%/extension/lo.control
+%%DATADIR%%/extension/ltree--1.0.sql
+%%DATADIR%%/extension/ltree--unpackaged--1.0.sql
+%%DATADIR%%/extension/ltree.control
+%%DATADIR%%/extension/moddatetime--1.0.sql
+%%DATADIR%%/extension/moddatetime--unpackaged--1.0.sql
+%%DATADIR%%/extension/moddatetime.control
+%%DATADIR%%/extension/pageinspect--1.0--1.1.sql
+%%DATADIR%%/extension/pageinspect--1.1.sql
+%%DATADIR%%/extension/pageinspect--unpackaged--1.0.sql
+%%DATADIR%%/extension/pageinspect.control
+%%DATADIR%%/extension/pg_buffercache--1.0.sql
+%%DATADIR%%/extension/pg_buffercache--unpackaged--1.0.sql
+%%DATADIR%%/extension/pg_buffercache.control
+%%DATADIR%%/extension/pg_freespacemap--1.0.sql
+%%DATADIR%%/extension/pg_freespacemap--unpackaged--1.0.sql
+%%DATADIR%%/extension/pg_freespacemap.control
+%%DATADIR%%/extension/pg_stat_statements--1.0--1.1.sql
+%%DATADIR%%/extension/pg_stat_statements--1.1.sql
+%%DATADIR%%/extension/pg_stat_statements--unpackaged--1.0.sql
+%%DATADIR%%/extension/pg_stat_statements.control
+%%DATADIR%%/extension/pg_trgm--1.0--1.1.sql
+%%DATADIR%%/extension/pg_trgm--1.1.sql
+%%DATADIR%%/extension/pg_trgm--unpackaged--1.0.sql
+%%DATADIR%%/extension/pg_trgm.control
+%%DATADIR%%/extension/pgcrypto--1.0.sql
+%%DATADIR%%/extension/pgcrypto--unpackaged--1.0.sql
+%%DATADIR%%/extension/pgcrypto.control
+%%DATADIR%%/extension/pgrowlocks--1.0--1.1.sql
+%%DATADIR%%/extension/pgrowlocks--1.1.sql
+%%DATADIR%%/extension/pgrowlocks--unpackaged--1.0.sql
+%%DATADIR%%/extension/pgrowlocks.control
+%%DATADIR%%/extension/pgstattuple--1.0--1.1.sql
+%%DATADIR%%/extension/pgstattuple--1.1.sql
+%%DATADIR%%/extension/pgstattuple--unpackaged--1.0.sql
+%%DATADIR%%/extension/pgstattuple.control
+%%DATADIR%%/extension/postgres_fdw--1.0.sql
+%%DATADIR%%/extension/postgres_fdw.control
+%%DATADIR%%/extension/refint--1.0.sql
+%%DATADIR%%/extension/refint--unpackaged--1.0.sql
+%%DATADIR%%/extension/refint.control
+%%DATADIR%%/extension/seg--1.0.sql
+%%DATADIR%%/extension/seg--unpackaged--1.0.sql
+%%DATADIR%%/extension/seg.control
+%%DATADIR%%/extension/sslinfo--1.0.sql
+%%DATADIR%%/extension/sslinfo--unpackaged--1.0.sql
+%%DATADIR%%/extension/sslinfo.control
+%%DATADIR%%/extension/tablefunc--1.0.sql
+%%DATADIR%%/extension/tablefunc--unpackaged--1.0.sql
+%%DATADIR%%/extension/tablefunc.control
+%%DATADIR%%/extension/tcn--1.0.sql
+%%DATADIR%%/extension/tcn.control
+%%DATADIR%%/extension/test_parser--1.0.sql
+%%DATADIR%%/extension/test_parser--unpackaged--1.0.sql
+%%DATADIR%%/extension/test_parser.control
+%%DATADIR%%/extension/timetravel--1.0.sql
+%%DATADIR%%/extension/timetravel--unpackaged--1.0.sql
+%%DATADIR%%/extension/timetravel.control
+%%DATADIR%%/extension/tsearch2--1.0.sql
+%%DATADIR%%/extension/tsearch2--unpackaged--1.0.sql
+%%DATADIR%%/extension/tsearch2.control
+%%DATADIR%%/extension/unaccent--1.0.sql
+%%DATADIR%%/extension/unaccent--unpackaged--1.0.sql
+%%DATADIR%%/extension/unaccent.control
+%%DATADIR%%/extension/uuid-ossp--1.0.sql
+%%DATADIR%%/extension/uuid-ossp--unpackaged--1.0.sql
+%%DATADIR%%/extension/uuid-ossp.control
+%%DATADIR%%/extension/xml2--1.0.sql
+%%DATADIR%%/extension/xml2--unpackaged--1.0.sql
+%%DATADIR%%/extension/xml2.control
+%%DATADIR%%/tsearch_data/unaccent.rules
+%%DATADIR%%/tsearch_data/xsyn_sample.rules
+@dir %%DATADIR%%/tsearch_data
+@dir %%DATADIR%%/extension
+@dir %%DATADIR%%
+@dir %%DOCSDIR%%/extension
+@dir %%DOCSDIR%%
+@dir lib/postgresql
--- a/databases/postgresql93-server/pkg-plist-plperl
+++ b/databases/postgresql93-server/pkg-plist-plperl
@ -6,7 +6,7 @@
 %%DATADIR%%/extension/plperl--unpackaged--1.0.sql
 %%DOCSDIR%%/README-plperl
 lib/postgresql/plperl.so
-@dirrmtry lib/postgresql
-@dirrmtry %%DOCSDIR%%
-@dirrmtry %%DATADIR%%/extension
-@dirrmtry %%DATADIR%%
+@dir lib/postgresql
+@dir %%DOCSDIR%%
+@dir %%DATADIR%%/extension
+@dir %%DATADIR%%
--- a/databases/postgresql93-server/pkg-plist-plpython
+++ b/databases/postgresql93-server/pkg-plist-plpython
@ -10,6 +10,6 @@
 %%PYTHON3%%%%DATADIR%%/extension/plpython3u.control
 %%PYTHON3%%%%DATADIR%%/extension/plpython3u--1.0.sql
 %%PYTHON3%%%%DATADIR%%/extension/plpython3u--unpackaged--1.0.sql
-@dirrmtry %%DATADIR%%/extension
-@dirrmtry lib/postgresql
-@dirrmtry %%DOCSDIR%%
+@dir %%DATADIR%%/extension
+@dir lib/postgresql
+@dir %%DOCSDIR%%
--- a/databases/postgresql93-server/pkg-plist-pltcl
+++ b/databases/postgresql93-server/pkg-plist-pltcl
@ -6,11 +6,11 @@
 %%DATADIR%%/extension/pltclu--unpackaged--1.0.sql
 %%DOCSDIR%%/README-pltcl
 lib/postgresql/pltcl.so
-@dirrmtry lib/postgresql
+@dir lib/postgresql
 bin/pltcl_loadmod
 bin/pltcl_delmod
 bin/pltcl_listmod
-share/postgresql/unknown.pltcl
-@dirrmtry %%DATADIR%%/extension
-@dirrmtry %%DATADIR%%
-@dirrmtry %%DOCSDIR%%
+%%DATADIR%%/unknown.pltcl
+@dir %%DATADIR%%/extension
+@dir %%DATADIR%%
+@dir %%DOCSDIR%%
--- a/databases/postgresql93-server/pkg-plist-server
+++ b/databases/postgresql93-server/pkg-plist-server
--- a/databases/postgresql94-client/Makefile
+++ b/databases/postgresql94-client/Makefile
@ -7,6 +7,7 @@ PORTREVISION=	0

 MASTERDIR=	${.CURDIR}/../postgresql94-server

+LIB_DEPENDS=	libedit.so.0:${PORTSDIR}/devel/libedit
 BUILD_DIRS=	config src/include src/interfaces src/port \
 		src/bin/pg_dump src/bin/psql src/bin/scripts src/bin/pg_config \
 		doc src/makefiles
@ -15,6 +16,7 @@ INSTALL_DIRS=	${BUILD_DIRS}
 CLIENT_ONLY=	yes
 COMPONENT=	-client
 USE_LDCONFIG=	yes
-USES=		pkgconfig readline
+USES=		pkgconfig
+CONFIGURE_ARGS+=--with-libedit-preferred

 .include "${MASTERDIR}/Makefile"
--- a/databases/postgresql94-server/Makefile
+++ b/databases/postgresql94-server/Makefile
@ -1,7 +1,7 @@
 # Created by: Marc G. Fournier <scrappy@FreeBSD.org>
 # $FreeBSD$

-DISTVERSION?=	9.4.0
+DISTVERSION?=	9.4.1
 PORTREVISION=	0

 MAINTAINER?=	pgsql@FreeBSD.org
--- a/databases/postgresql94-server/distinfo
+++ b/databases/postgresql94-server/distinfo
@ -1,4 +1,4 @@
-SHA256 (postgresql/postgresql-9.4.0.tar.bz2) = 7a35c3cb77532f7b15702e474d7ef02f0f419527ee80a4ca6036fffb551625a5
-SIZE (postgresql/postgresql-9.4.0.tar.bz2) = 17344910
+SHA256 (postgresql/postgresql-9.4.1.tar.bz2) = 29ddb77c820095b8f52e5455e9c6c6c20cf979b0834ed1986a8857b84888c3a6
+SIZE (postgresql/postgresql-9.4.1.tar.bz2) = 17549976
 SHA256 (postgresql/pg-940-icu-2014-06-09.diff.gz) = 83de4b99c37aec1ad741c686cb2ea7f4bccff516c357ae71032b2d1f8da0d1c1
 SIZE (postgresql/pg-940-icu-2014-06-09.diff.gz) = 4259
--- a/databases/postgresql94-server/pkg-plist-client
+++ b/databases/postgresql94-server/pkg-plist-client
@ -193,6 +193,7 @@ include/postgresql/server/commands/variable.h
 include/postgresql/server/commands/view.h
 include/postgresql/server/common/fe_memutils.h
 include/postgresql/server/common/relpath.h
+include/postgresql/server/common/string.h
 include/postgresql/server/common/username.h
 include/postgresql/server/datatype/timestamp.h
 include/postgresql/server/dynloader.h
--- a/databases/postgresql94-server/pkg-plist-pltcl
+++ b/databases/postgresql94-server/pkg-plist-pltcl
@ -10,7 +10,7 @@ lib/postgresql/pltcl.so
 bin/pltcl_loadmod
 bin/pltcl_delmod
 bin/pltcl_listmod
-share/postgresql/unknown.pltcl
+%%DATADIR%%/unknown.pltcl
@dir %%DATADIR%%/extension
@dir %%DATADIR%%
@dir %%DOCSDIR%%
--- a/databases/postgresql94-server/pkg-plist-server
+++ b/databases/postgresql94-server/pkg-plist-server
@ -80,6 +80,7 @@ lib/libpgcommon.a
 %%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_resetxlog-9.4.mo
 %%GETTEXT%%share/locale/fr/LC_MESSAGES/plpgsql-9.4.mo
 %%GETTEXT%%share/locale/fr/LC_MESSAGES/postgres-9.4.mo
+%%GETTEXT%%share/locale/id/LC_MESSAGES/postgres-9.4.mo
 %%GETTEXT%%share/locale/it/LC_MESSAGES/initdb-9.4.mo
 %%GETTEXT%%share/locale/it/LC_MESSAGES/pg_basebackup-9.4.mo
 %%GETTEXT%%share/locale/it/LC_MESSAGES/pg_controldata-9.4.mo
--- a/deskutils/egroupware/Makefile
+++ b/deskutils/egroupware/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	eGroupware
-PORTVERSION=	1.8.007.20140512
+PORTVERSION=	1.8.007.20150218
 CATEGORIES=	deskutils
 MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME}-1.8/${PORTNAME}-${PORTVERSION}
 DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.bz2 \
--- a/deskutils/egroupware/distinfo
+++ b/deskutils/egroupware/distinfo
@ -1,4 +1,4 @@
-SHA256 (eGroupware-1.8.007.20140512.tar.bz2) = 134074231aebbad201799ee444ae10906de2d07d88b23b581750f75ad9093db8
-SIZE (eGroupware-1.8.007.20140512.tar.bz2) = 10834105
-SHA256 (eGroupware-egw-pear-1.8.007.20140512.tar.bz2) = 7e8d37e1fb6ed07c5efe1bc41fd87ea2162b9a0905a9ef55654d052e9f5a9719
-SIZE (eGroupware-egw-pear-1.8.007.20140512.tar.bz2) = 77582
+SHA256 (eGroupware-1.8.007.20150218.tar.bz2) = 1f4a7297ac3b230bd93d909b6dccae41bbf9d56926ce69f068de8045bafbe3c2
+SIZE (eGroupware-1.8.007.20150218.tar.bz2) = 10783139
+SHA256 (eGroupware-egw-pear-1.8.007.20150218.tar.bz2) = 1be8d6dcaf671fd211731dcc0d505713d12fe0bac16275b1f2b0c45fc3437a2f
+SIZE (eGroupware-egw-pear-1.8.007.20150218.tar.bz2) = 77547
--- a/deskutils/treesheets/Makefile
+++ b/deskutils/treesheets/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	treesheets
-PORTVERSION=	0.0.20141104
+PORTVERSION=	0.0.20141225
 CATEGORIES=	deskutils

 MAINTAINER=	lightside@gmx.com
@ -13,14 +13,13 @@ LICENSE_FILE=	${WRKSRC}/ZLIB_LICENSE.txt

 USE_GITHUB=	yes
 GH_ACCOUNT=	aardappel
-GH_PROJECT=	${PORTNAME}
-GH_COMMIT=	4417a4f
+GH_COMMIT=	6ff99fb
 GH_TAGNAME=	${GH_COMMIT}

 BUILD_WRKSRC=	${WRKSRC}/src
 EXTRACT_AFTER_ARGS=	--exclude .gitignore

-USES=		compiler:c++11-lang
+USES=		compiler:c++11-lib
 USE_WX=		3.0+
 WX_UNICODE=	yes

--- a/deskutils/treesheets/distinfo
+++ b/deskutils/treesheets/distinfo
@ -1,2 +1,2 @@
-SHA256 (treesheets-0.0.20141104.tar.gz) = 36385d69e365371a3264cd77c9d990e261aebf212e50c3509cb6ef687e2bb41d
-SIZE (treesheets-0.0.20141104.tar.gz) = 1792428
+SHA256 (treesheets-0.0.20141225.tar.gz) = d1087d1746ff3762505be08c6a5ebcc3f3c75a6e77c76a516f07fc5830db47f7
+SIZE (treesheets-0.0.20141225.tar.gz) = 1793649
--- a/devel/bugzilla44/Makefile
+++ b/devel/bugzilla44/Makefile
@ -1,8 +1,7 @@
 # $FreeBSD$

 PORTNAME=	bugzilla
-PORTVERSION=	4.4.6
-PORTREVISION=	3
+PORTVERSION=	4.4.8
 CATEGORIES=	devel
 MASTER_SITES=	BUGZILLA
 MASTER_SITE_SUBDIR=	webtools webtools/archived
@ -15,7 +14,7 @@ LICENSE=	MPL
 # see Bugzilla/Install/Requirements.pm
 RUN_DEPENDS=	\
 		p5-CGI.pm>=3.51:${PORTSDIR}/www/p5-CGI.pm \
-		p5-DBI>=1.54:${PORTSDIR}/databases/p5-DBI \
+		p5-DBI>=1.614:${PORTSDIR}/databases/p5-DBI \
 		p5-DateTime-TimeZone>=1.64:${PORTSDIR}/devel/p5-DateTime-TimeZone \
 		p5-DateTime>=0.75:${PORTSDIR}/devel/p5-DateTime \
 		p5-Email-MIME>=1.904:${PORTSDIR}/mail/p5-Email-MIME \
@ -89,7 +88,7 @@ RUN_DEPENDS+=	p5-PatchReader>=0.9.6:${PORTSDIR}/devel/p5-PatchReader \
 .endif

 .if ${PORT_OPTIONS:MMORE_HTML}
-RUN_DEPENDS+=	p5-HTML-Parser>=3.40:${PORTSDIR}/www/p5-HTML-Parser \
+RUN_DEPENDS+=	p5-HTML-Parser>=3.67:${PORTSDIR}/www/p5-HTML-Parser \
 		p5-HTML-Scrubber>=0:${PORTSDIR}/www/p5-HTML-Scrubber
 .endif

@ -174,7 +173,7 @@ RUN_DEPENDS+=	p5-File-MimeInfo>=0.16:${PORTSDIR}/devel/p5-File-MimeInfo \
 .endif

 post-extract:
-	@${RM} -rf ${WRKSRC}/.bzr
+	@${RM} -rf ${WRKSRC}/.git
 	@${RM} -f ${WRKSRC}/.bzrignore ${WRKSRC}/.gitignore ${WRKSRC}/.gitrev \
 		${WRKSRC}/docs/en/README.docs ${WRKSRC}/docs/en/html/Bugzilla-Guide.proc \
 		${WRKSRC}/.travis.yml ${WRKSRC}/Build.PL ${WRKSRC}/MANIFEST.SKIP
--- a/devel/bugzilla44/distinfo
+++ b/devel/bugzilla44/distinfo
@ -1,2 +1,2 @@
-SHA256 (bugzilla/bugzilla-4.4.6.tar.gz) = ac3547195f2ce156488aac2cc537620775e08a9d888441daab2b40ab66ab01f4
-SIZE (bugzilla/bugzilla-4.4.6.tar.gz) = 2956046
+SHA256 (bugzilla/bugzilla-4.4.8.tar.gz) = 90edf7a3193a3bd8c7ac49e3325e63c539b506db28bd48eb173d30ff59385046
+SIZE (bugzilla/bugzilla-4.4.8.tar.gz) = 4924519
--- a/devel/clig/Makefile
+++ b/devel/clig/Makefile
@ -3,29 +3,30 @@

 PORTNAME=	clig
 PORTVERSION=	1.9.11.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel tcl
 MASTER_SITES=	http://wsd.iitb.fhg.de/~geg/clighome/

 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Auto-generate an (argc, argv) processor, usage message, and manpage

-OPTIONS_DEFINE=	DOCS
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING-2.0

 NO_BUILD=	yes
 USES+=		tcl
 MAKEFILE=	makefile
 MAKE_ENV+=	NOPORTDOCS=${NOPORTDOCS}
+MAKE_ARGS=	prefix="${PREFIX}" build_root="${STAGEDIR}"
 WRKSRC=		${WRKDIR}/${PORTNAME}
 PORTDOCS=	*

-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	DOCS

 post-patch:
 	@${RM} ${WRKSRC}/example/.cvsignore
 	@${FIND} -d ${WRKSRC} -type d -and -name CVS -exec ${RM} -r {} \;
-	@${REINPLACE_CMD} -e 's|prefix =/usr|prefix=${STAGEDIR}${PREFIX}|; \
-		s|/usr/bin/tclsh|${TCLSH}|; \
+	@${REINPLACE_CMD} -e 's|/usr/bin/tclsh|${TCLSH}|; \
 		s|/doc/|/share/doc/|; \
 		s|-$$(VERSION)||;' \
 			${WRKSRC}/makefile
--- a/devel/efl/Makefile
+++ b/devel/efl/Makefile
@ -109,7 +109,7 @@ PLIST_SUB+=			AUDIO="@comment "

 .if ${PORT_OPTIONS:MSSL}
 USE_OPENSSL=			yes
-. if ${OSVERSION} >= 1000000
+. if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1001000
 EXTRA_PATCHES+=			${FILESDIR}/extra-patch-configure.ac
 CONFIGURE_ENV+=			ECORE_CON_CFLAGS="-I${OPENSSLINC} -L${OPENSSLLIB}" ECORE_CON_LIBS="-lssl"
 . else
--- a/devel/jenkins-lts/Makefile
+++ b/devel/jenkins-lts/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	jenkins
-PORTVERSION=	1.580.1
+PORTVERSION=	1.596.2
 CATEGORIES=	devel java
 MASTER_SITES=	http://mirrors.jenkins-ci.org/war-stable/${PORTVERSION}/
 PKGNAMESUFFIX=	-lts
--- a/devel/jenkins-lts/distinfo
+++ b/devel/jenkins-lts/distinfo
@ -1,2 +1,2 @@
-SHA256 (jenkins/1.580.1/jenkins.war) = 53608b7e5b89d5cc1fbdbf8588b5c0a04a664f34d403ae4bffb80016511a6cdb
-SIZE (jenkins/1.580.1/jenkins.war) = 68022189
+SHA256 (jenkins/1.596.2/jenkins.war) = 769fee082d420819f0113d5271be98004d3f3227d98c4e445f6e5f60dde6de37
+SIZE (jenkins/1.596.2/jenkins.war) = 68553541
--- a/devel/jenkins/Makefile
+++ b/devel/jenkins/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	jenkins
-PORTVERSION=	1.595
+PORTVERSION=	1.606
 CATEGORIES=	devel java
 MASTER_SITES=	http://mirrors.jenkins-ci.org/war/${PORTVERSION}/
 DISTNAME=	jenkins
--- a/devel/jenkins/distinfo
+++ b/devel/jenkins/distinfo
@ -1,2 +1,2 @@
-SHA256 (jenkins/1.595/jenkins.war) = 2424e6316ec45d524d132203438e8d767a5e9bed747b2c583047ff944f2e2935
-SIZE (jenkins/1.595/jenkins.war) = 68215690
+SHA256 (jenkins/1.606/jenkins.war) = d950630af9be9a84a1f6b34d6bab5a0bdc4eba7cc61c81a69074dcb57a487953
+SIZE (jenkins/1.606/jenkins.war) = 69023294
--- a/devel/libevent2/Makefile
+++ b/devel/libevent2/Makefile
@ -2,11 +2,9 @@
 # $FreeBSD$

 PORTNAME=	libevent2
-PORTVERSION=	2.0.21
-PORTREVISION=	3
+PORTVERSION=	2.0.22
+PORTREVISION=	1
 CATEGORIES=	devel
-MASTER_SITES=	http://cloud.github.com/downloads/libevent/libevent/
-DISTNAME=	${PORTNAME:S/2//}-${DISTVERSION}-stable

 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	API for executing callback functions on events or timeouts
@ -14,8 +12,15 @@ COMMENT=	API for executing callback functions on events or timeouts
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE

+USE_GITHUB=	yes
+GH_ACCOUNT=	${GH_PROJECT}
+GH_PROJECT=	${PORTNAME:S/2$//}
+GH_TAGNAME=	release-${DISTVERSION}-stable
+GH_COMMIT=	d8ceae8
+
 GNU_CONFIGURE=	yes
-USES=		libtool pathfix
+USES=		autoreconf libtool pathfix
+PATHFIX_MAKEFILEIN=Makefile.am
 USE_LDCONFIG=	yes

 OPTIONS_DEFINE=	OPENSSL THREADS
@ -28,7 +33,12 @@ OPENSSL_CPPFLAGS=	-I${OPENSSLINC}
 OPENSSL_LDFLAGS=	-L${OPENSSLLIB}
 OPENSSL_CONFIGURE_ENABLE=	openssl

-THREADS_CONFIGURE_ENABLE=	support
+THREADS_CONFIGURE_ENABLE=	thread-support
+
+post-patch:
+	${ECHO_CMD} 'AC_CONFIG_MACRO_DIR([m4])' >>${WRKSRC}/configure.in
+# error: using '$(top_srcdir)' in TESTS is currently broken
+	${REINPLACE_CMD} 's/^TESTS.*top_srcdir/#&/' ${WRKSRC}/test/Makefile.am

 regression-test: build
 	@(${SH} ${WRKSRC}/test/regress)
--- a/devel/libevent2/distinfo
+++ b/devel/libevent2/distinfo
@ -1,2 +1,2 @@
-SHA256 (libevent-2.0.21-stable.tar.gz) = 22a530a8a5ba1cb9c080cba033206b17dacd21437762155c6d30ee6469f574f5
-SIZE (libevent-2.0.21-stable.tar.gz) = 850772
+SHA256 (libevent2-2.0.22.tar.gz) = 24d500180c62e05bc3188f1ca8aebadf2b85ea6f25333931437cbe3010c55d1a
+SIZE (libevent2-2.0.22.tar.gz) = 512585
--- a/devel/libevent2/pkg-plist
+++ b/devel/libevent2/pkg-plist
@ -30,23 +30,23 @@ include/evhttp.h
 include/evrpc.h
 include/evutil.h
 lib/libevent-2.0.so.5
-lib/libevent-2.0.so.5.1.9
+lib/libevent-2.0.so.5.1.10
 lib/libevent.a
 lib/libevent.so
 lib/libevent_core-2.0.so.5
-lib/libevent_core-2.0.so.5.1.9
+lib/libevent_core-2.0.so.5.1.10
 lib/libevent_core.a
 lib/libevent_core.so
 lib/libevent_extra-2.0.so.5
-lib/libevent_extra-2.0.so.5.1.9
+lib/libevent_extra-2.0.so.5.1.10
 lib/libevent_extra.a
 lib/libevent_extra.so
 %%OPENSSL%%lib/libevent_openssl-2.0.so.5
-%%OPENSSL%%lib/libevent_openssl-2.0.so.5.1.9
+%%OPENSSL%%lib/libevent_openssl-2.0.so.5.1.10
 %%OPENSSL%%lib/libevent_openssl.a
 %%OPENSSL%%lib/libevent_openssl.so
 %%THREADS%%lib/libevent_pthreads-2.0.so.5
-%%THREADS%%lib/libevent_pthreads-2.0.so.5.1.9
+%%THREADS%%lib/libevent_pthreads-2.0.so.5.1.10
 %%THREADS%%lib/libevent_pthreads.a
 %%THREADS%%lib/libevent_pthreads.so
 libdata/pkgconfig/libevent.pc
--- a/devel/libvirt/Makefile
+++ b/devel/libvirt/Makefile
@ -21,8 +21,8 @@ BUILD_DEPENDS=	dnsmasq:${PORTSDIR}/dns/dnsmasq
 RUN_DEPENDS=	dnsmasq:${PORTSDIR}/dns/dnsmasq

 OPTIONS_DEFINE=	DOCS NLS QEMU
-OPTIONS_DEFINE_amd64=	BHYVE
 .if exists(/usr/sbin/bhyve)
+OPTIONS_DEFINE_amd64=	BHYVE
 OPTIONS_DEFAULT_amd64=	BHYVE
 .endif
 QEMU_DESC=	QEMU driver
@ -36,8 +36,6 @@ QEMU_LIB_DEPENDS=	libyajl.so:${PORTSDIR}/devel/yajl
 QEMU_RUN_DEPENDS=	dmidecode:${PORTSDIR}/sysutils/dmidecode \
 			qemu-io:${PORTSDIR}/emulators/qemu-devel

-BHYVE_CONFIGURE_WITH=	bhyve
-
 NLS_USES=	gettext
 NLS_CONFIGURE_ENABLE=	nls
 NLS_CONFIGURE_ON=	--with-libintl-prefix=${LOCALBASE}
@ -79,13 +77,15 @@ PORTDOCS=	*

 .include <bsd.port.options.mk>

-#work around an options bug (thanks mat@)
-.if ${ARCH} != amd64
-PLIST_SUB+=	BHYVE="@comment "
+.if (exists(/usr/sbin/bhyve) && ${OSVERSION} >= 100051)
+CONFIGURE_ARGS+=	--with-bhyve
+.else
+CONFIGURE_ARGS+=	--without-bhyve
 .endif

 .if ${PORT_OPTIONS:MBHYVE}
-STRIP_FILES+=	libvirt/connection-driver/libvirt_driver_bhyve.so
+STRIP_FILES+=	lib/libvirt/connection-driver/libvirt_driver_bhyve.so
+PLIST_FILES+=	lib/libvirt/connection-driver/libvirt_driver_bhyve.so
 .endif

 post-patch:
@ -116,6 +116,12 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
 .endfor

+.if ${PORT_OPTIONS:MBHYVE}
+.for strip in ${STRIP_FILES}
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${strip}
+.endfor
+.endif
+
 .for dir in run/libvirt/network \
 	run/libvirt/qemu \
 	run/libvirt/lockd \
--- a/Show More
+++ b/Show More