From owner-svn-ports-branches@FreeBSD.ORG Sun Aug 3 10:12:49 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1B28A6ED for ; Sun, 3 Aug 2014 10:12:49 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0B1562835 for ; Sun, 3 Aug 2014 10:12:49 +0000 (UTC) Received: from jhale (uid 1300) (envelope-from jhale@svn.freebsd.org) id 5071 by svn.freebsd.org (DragonFly Mail Agent v0.9+); Sun, 03 Aug 2014 10:12:48 +0000 From: Jason E. Hale Date: Sun, 3 Aug 2014 10:12:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r363867 - branches/2014Q3/security/vuxml X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <53de0b20.5071.572c16e4@svn.freebsd.org> X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Aug 2014 10:12:49 -0000 Author: jhale Date: Sun Aug 3 10:12:48 2014 New Revision: 363867 URL: http://svnweb.freebsd.org/changeset/ports/363867 QAT: https://qat.redports.org/buildarchive/r363867/ Log: MFH: r363776 - Document vulnerability in security/gpgme (CVE-2014-3564) Approved by: portmgr (mat) Modified: branches/2014Q3/security/vuxml/vuln.xml Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/security/vuxml/vuln.xml ============================================================================== --- branches/2014Q3/security/vuxml/vuln.xml Sun Aug 3 10:05:10 2014 (r363866) +++ branches/2014Q3/security/vuxml/vuln.xml Sun Aug 3 10:12:48 2014 (r363867) @@ -57,6 +57,33 @@ Notes: --> + + gpgme -- heap-based buffer overflow in gpgsm status handler + + + gpgme + 1.5.0 + + + + +

Tomas Trnka reports:

+
+

Gpgme contains a buffer overflow in the gpgsm status handler + that could possibly be exploited using a specially crafted certificate.

+
+ + + + CVE-2014-3564 + https://bugzilla.redhat.com/show_bug.cgi?id=1113267 + + + 2014-06-25 + 2014-08-02 + + + kdelibs -- KAuth PID Reuse Flaw From owner-svn-ports-branches@FreeBSD.ORG Sun Aug 3 10:14:31 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1248985B for ; Sun, 3 Aug 2014 10:14:31 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DBFF12854 for ; Sun, 3 Aug 2014 10:14:30 +0000 (UTC) Received: from jhale (uid 1300) (envelope-from jhale@svn.freebsd.org) id 5090 by svn.freebsd.org (DragonFly Mail Agent v0.9+); Sun, 03 Aug 2014 10:14:30 +0000 From: Jason E. Hale Date: Sun, 3 Aug 2014 10:14:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r363868 - branches/2014Q3/security/gpgme X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <53de0b86.5090.18f12782@svn.freebsd.org> X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Aug 2014 10:14:31 -0000 Author: jhale Date: Sun Aug 3 10:14:30 2014 New Revision: 363868 URL: http://svnweb.freebsd.org/changeset/ports/363868 QAT: https://qat.redports.org/buildarchive/r363868/ Log: MFH: r363777 - Update to 1.5.1 Security: 90ca3ba5-19e6-11e4-8616-001b3856973b Approved by: portmgr (mat) Modified: branches/2014Q3/security/gpgme/Makefile branches/2014Q3/security/gpgme/distinfo branches/2014Q3/security/gpgme/pkg-plist Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/security/gpgme/Makefile ============================================================================== --- branches/2014Q3/security/gpgme/Makefile Sun Aug 3 10:12:48 2014 (r363867) +++ branches/2014Q3/security/gpgme/Makefile Sun Aug 3 10:14:30 2014 (r363868) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gpgme -PORTVERSION= 1.5.0 +PORTVERSION= 1.5.1 CATEGORIES= security MASTER_SITES= GNUPG/gpgme Modified: branches/2014Q3/security/gpgme/distinfo ============================================================================== --- branches/2014Q3/security/gpgme/distinfo Sun Aug 3 10:12:48 2014 (r363867) +++ branches/2014Q3/security/gpgme/distinfo Sun Aug 3 10:14:30 2014 (r363868) @@ -1,2 +1,2 @@ -SHA256 (gpgme-1.5.0.tar.bz2) = d1127ed730976468255e692d91f1c25b49fe2a97aad1379fc443f2c83c683c83 -SIZE (gpgme-1.5.0.tar.bz2) = 964134 +SHA256 (gpgme-1.5.1.tar.bz2) = 6c2f3af8ceeb303277d44ec0216d9a1271701f65b91d5942264cf7cefb4a11e3 +SIZE (gpgme-1.5.1.tar.bz2) = 964623 Modified: branches/2014Q3/security/gpgme/pkg-plist ============================================================================== --- branches/2014Q3/security/gpgme/pkg-plist Sun Aug 3 10:12:48 2014 (r363867) +++ branches/2014Q3/security/gpgme/pkg-plist Sun Aug 3 10:14:30 2014 (r363868) @@ -6,11 +6,11 @@ lib/common-lisp/gpgme/gpgme.lisp lib/libgpgme-pthread.la lib/libgpgme-pthread.so lib/libgpgme-pthread.so.11 -lib/libgpgme-pthread.so.11.12.0 +lib/libgpgme-pthread.so.11.13.0 lib/libgpgme.la lib/libgpgme.so lib/libgpgme.so.11 -lib/libgpgme.so.11.12.0 +lib/libgpgme.so.11.13.0 share/aclocal/gpgme.m4 @dirrm lib/common-lisp/gpgme @dirrmtry lib/common-lisp From owner-svn-ports-branches@FreeBSD.ORG Sun Aug 3 10:16:43 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 87865B20 for ; Sun, 3 Aug 2014 10:16:43 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5C7E3287D for ; Sun, 3 Aug 2014 10:16:43 +0000 (UTC) Received: from pawel (uid 1252) (envelope-from pawel@svn.freebsd.org) id 50ef by svn.freebsd.org (DragonFly Mail Agent v0.9+); Sun, 03 Aug 2014 10:16:43 +0000 From: Pawel Pekala Date: Sun, 3 Aug 2014 10:16:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r363871 - branches/2014Q3/sysutils/runwhen X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <53de0c0b.50ef.13183bd5@svn.freebsd.org> X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Aug 2014 10:16:43 -0000 Author: pawel Date: Sun Aug 3 10:16:42 2014 New Revision: 363871 URL: http://svnweb.freebsd.org/changeset/ports/363871 QAT: https://qat.redports.org/buildarchive/r363871/ Log: MFH: r363864 - Fix build with clang (gcc linker default) - Add staging support - Convert to new options framework - Remove Author from pkg-descr Approved by: portmgr (antoine) Modified: branches/2014Q3/sysutils/runwhen/Makefile branches/2014Q3/sysutils/runwhen/pkg-descr Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/sysutils/runwhen/Makefile ============================================================================== --- branches/2014Q3/sysutils/runwhen/Makefile Sun Aug 3 10:16:35 2014 (r363870) +++ branches/2014Q3/sysutils/runwhen/Makefile Sun Aug 3 10:16:42 2014 (r363871) @@ -18,10 +18,13 @@ ALL_TARGET= default DOCS= src/CHANGES src/TODO package/README -NO_STAGE= yes +OPTIONS_DEFINE= DOCS + post-patch: @${REINPLACE_CMD} -e 's!gcc -O2!${CC} ${CFLAGS}!' \ ${WRKSRC}/conf-compile/host_compile.sh + @${REINPLACE_CMD} 's!gcc!${CC} ${LDFLAGS} ${LIBS}!' \ + ${WRKSRC}/conf-compile/host_link.sh do-configure: ${ECHO_CMD} ${PREFIX} > ${WRKSRC}/conf-compile/package_home @@ -31,10 +34,8 @@ do-build: cd ${WRKSRC} && package/compile do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/command/* ${PREFIX}/bin -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR} -.endif + ${INSTALL_PROGRAM} ${WRKSRC}/command/* ${STAGEDIR}${PREFIX}/bin + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}) .include Modified: branches/2014Q3/sysutils/runwhen/pkg-descr ============================================================================== --- branches/2014Q3/sysutils/runwhen/pkg-descr Sun Aug 3 10:16:35 2014 (r363870) +++ branches/2014Q3/sysutils/runwhen/pkg-descr Sun Aug 3 10:16:42 2014 (r363871) @@ -20,5 +20,4 @@ lots of things at(1) does that runwhen d - It doesn't check access control files - thus it doesn't gratuitously deny users. -Author: Paul Jarc WWW: http://code.dogmap.org/runwhen/ From owner-svn-ports-branches@FreeBSD.ORG Sun Aug 3 12:43:09 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B624C37F for ; Sun, 3 Aug 2014 12:43:09 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8CD20290B for ; Sun, 3 Aug 2014 12:43:09 +0000 (UTC) Received: from pawel (uid 1252) (envelope-from pawel@FreeBSD.org) id 5a2a by svn.freebsd.org (DragonFly Mail Agent v0.9+); Sun, 03 Aug 2014 12:43:09 +0000 From: Pawel Pekala Date: Sun, 3 Aug 2014 12:43:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r363892 - branches/2014Q3/sysutils/usbhotkey X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <53de2e5d.5a2a.5d568447@svn.freebsd.org> X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Aug 2014 12:43:09 -0000 Author: pawel Date: Sun Aug 3 12:43:09 2014 New Revision: 363892 URL: http://svnweb.freebsd.org/changeset/ports/363892 QAT: https://qat.redports.org/buildarchive/r363892/ Log: MFH: r363882 - Fix build with clang (needs to link with libX11) - Port is stage safe and uses GNU Configure Approved by: portmgr (antoine) Modified: branches/2014Q3/sysutils/usbhotkey/Makefile Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/sysutils/usbhotkey/Makefile ============================================================================== --- branches/2014Q3/sysutils/usbhotkey/Makefile Sun Aug 3 12:35:27 2014 (r363891) +++ branches/2014Q3/sysutils/usbhotkey/Makefile Sun Aug 3 12:43:09 2014 (r363892) @@ -16,12 +16,13 @@ LIB_DEPENDS= libhid.so:${PORTSDIR}/devel USES= gmake USE_RUBY= yes -HAS_CONFIGURE= yes +GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include \ -I${LOCALBASE}/include/ruby-${RUBY_VER} \ -I${LOCALBASE}/include/ruby-${RUBY_VER}/${RUBY_ARCH} LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -lX11 OPTIONS_DEFINE= GUI OPTIONS_DEFAULT= GUI @@ -30,5 +31,4 @@ GUI_DESC= Enable GUI bits (via Imlib) GUI_LIB_DEPENDS= libImlib.so:${PORTSDIR}/graphics/imlib GUI_CONFIGURE_OFF= --without-Imlib -NO_STAGE= yes .include From owner-svn-ports-branches@FreeBSD.ORG Sun Aug 3 15:49:38 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8526094D for ; Sun, 3 Aug 2014 15:49:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5A94A2D6E for ; Sun, 3 Aug 2014 15:49:38 +0000 (UTC) Received: from pawel (uid 1252) (envelope-from pawel@FreeBSD.org) id 5158 by svn.freebsd.org (DragonFly Mail Agent v0.9+); Sun, 03 Aug 2014 15:49:38 +0000 From: Pawel Pekala Date: Sun, 3 Aug 2014 15:49:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r363918 - branches/2014Q3/sysutils/mount.app X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <53de5a12.5158.1e053639@svn.freebsd.org> X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Aug 2014 15:49:38 -0000 Author: pawel Date: Sun Aug 3 15:49:37 2014 New Revision: 363918 URL: http://svnweb.freebsd.org/changeset/ports/363918 QAT: https://qat.redports.org/buildarchive/r363918/ Log: MFH: r363909 - Fix build with clang (needs link to libWUtil) - Port is stage safe Approved by: portmgr (antoine) Modified: branches/2014Q3/sysutils/mount.app/Makefile Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/sysutils/mount.app/Makefile ============================================================================== --- branches/2014Q3/sysutils/mount.app/Makefile Sun Aug 3 15:46:31 2014 (r363917) +++ branches/2014Q3/sysutils/mount.app/Makefile Sun Aug 3 15:49:37 2014 (r363918) @@ -17,7 +17,7 @@ USE_GNOME= gtk12 glib12 GNU_CONFIGURE= yes -LDFLAGS+= -L${LOCALBASE}/lib -L${LOCALBASE}/lib -lintl +LDFLAGS+= -L${LOCALBASE}/lib -L${LOCALBASE}/lib +LIBS+= -lintl -lWUtil -NO_STAGE= yes .include From owner-svn-ports-branches@FreeBSD.ORG Mon Aug 4 08:09:35 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DA3604AC for ; Mon, 4 Aug 2014 08:09:35 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B03B920F8 for ; Mon, 4 Aug 2014 08:09:35 +0000 (UTC) Received: from rakuco (uid 1262) (envelope-from rakuco@FreeBSD.org) id 5a05 by svn.freebsd.org (DragonFly Mail Agent v0.9+); Mon, 04 Aug 2014 08:09:35 +0000 From: Raphael Kubo da Costa Date: Mon, 4 Aug 2014 08:09:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r363970 - branches/2014Q3/security/vuxml X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <53df3fbf.5a05.61dfacc4@svn.freebsd.org> X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Aug 2014 08:09:35 -0000 Author: rakuco Date: Mon Aug 4 08:09:35 2014 New Revision: 363970 URL: http://svnweb.freebsd.org/changeset/ports/363970 QAT: https://qat.redports.org/buildarchive/r363970/ Log: MFH: r363944 Document CVE-2014-4607 in net/krfb. Approved by: portmgr (erwin) Modified: branches/2014Q3/security/vuxml/vuln.xml Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/security/vuxml/vuln.xml ============================================================================== --- branches/2014Q3/security/vuxml/vuln.xml Mon Aug 4 08:03:31 2014 (r363969) +++ branches/2014Q3/security/vuxml/vuln.xml Mon Aug 4 08:09:35 2014 (r363970) @@ -57,6 +57,38 @@ Notes: --> + + krfb -- Possible Denial of Service or code execution via integer overflow + + + krfb + 4.12.5_1 + + + + +

Albert Aastals Cid reports:

+
+

krfb embeds libvncserver which embeds liblzo2, it contains various + flaws that result in integer overflow problems.

+

This potentially allows a malicious application to create a + possible denial of service or code execution. Due to the need to + exploit precise details of the target architecture and threading it + is unlikely that remote code execution can be achieved in + practice.

+
+ + + + CVE-2014-4607 + http://lists.kde.org/?l=kde-announce&m=140709940701878&w=2 + + + 2014-08-03 + 2014-08-03 + + + gpgme -- heap-based buffer overflow in gpgsm status handler From owner-svn-ports-branches@FreeBSD.ORG Mon Aug 4 08:10:44 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A1042661 for ; Mon, 4 Aug 2014 08:10:44 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 18434210C for ; Mon, 4 Aug 2014 08:10:44 +0000 (UTC) Received: from rakuco (uid 1262) (envelope-from rakuco@FreeBSD.org) id 5a30 by svn.freebsd.org (DragonFly Mail Agent v0.9+); Mon, 04 Aug 2014 08:10:44 +0000 From: Raphael Kubo da Costa Date: Mon, 4 Aug 2014 08:10:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r363972 - in branches/2014Q3/net/krfb: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <53df4004.5a30.10160057@svn.freebsd.org> X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Aug 2014 08:10:44 -0000 Author: rakuco Date: Mon Aug 4 08:10:43 2014 New Revision: 363972 URL: http://svnweb.freebsd.org/changeset/ports/363972 QAT: https://qat.redports.org/buildarchive/r363972/ Log: MFH: r363945 Add patch for CVE-2014-4607. Security: be5421ab-1b56-11e4-a767-5453ed2e2b49 Approved by: portmgr (erwin) Added: branches/2014Q3/net/krfb/files/ - copied from r363945, head/net/krfb/files/ Modified: branches/2014Q3/net/krfb/Makefile Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/net/krfb/Makefile ============================================================================== --- branches/2014Q3/net/krfb/Makefile Mon Aug 4 08:10:41 2014 (r363971) +++ branches/2014Q3/net/krfb/Makefile Mon Aug 4 08:10:43 2014 (r363972) @@ -2,6 +2,7 @@ PORTNAME= krfb PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= net kde MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src DIST_SUBDIR= KDE/${PORTVERSION} From owner-svn-ports-branches@FreeBSD.ORG Wed Aug 6 11:57:33 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3EABCFF7 for ; Wed, 6 Aug 2014 11:57:33 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1461A2D7C for ; Wed, 6 Aug 2014 11:57:33 +0000 (UTC) Received: from antoine (uid 1152) (envelope-from antoine@FreeBSD.org) id 5aa1 by svn.freebsd.org (DragonFly Mail Agent v0.9+); Wed, 06 Aug 2014 11:57:33 +0000 From: Antoine Brodin Date: Wed, 6 Aug 2014 11:57:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r364161 - branches/2014Q3/audio/tuxguitar X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <53e2182d.5aa1.4d08ab5a@svn.freebsd.org> X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Aug 2014 11:57:33 -0000 Author: antoine Date: Wed Aug 6 11:57:32 2014 New Revision: 364161 URL: http://svnweb.freebsd.org/changeset/ports/364161 QAT: https://qat.redports.org/buildarchive/r364161/ Log: MFH: r362791 - Fix by appending to CFLAGS/LDFLAGS instead of trying to overwrite them - While at it, install stripped libraries Modified: branches/2014Q3/audio/tuxguitar/Makefile Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/audio/tuxguitar/Makefile ============================================================================== --- branches/2014Q3/audio/tuxguitar/Makefile Wed Aug 6 10:03:10 2014 (r364160) +++ branches/2014Q3/audio/tuxguitar/Makefile Wed Aug 6 11:57:32 2014 (r364161) @@ -59,7 +59,8 @@ post-patch: ${FIND} ${WRKSRC}/.. -name GNUmakefile | ${XARGS} ${REINPLACE_CMD} -e '\ s|-I$$(shell gcj -print-file-name=include/)|-I${JAVA_HOME}/include \ -I${JAVA_HOME}/include/freebsd -I${LOCALBASE}/include|; \ - s|LDFLAGS\?=.*|LDFLAGS?=-L${LOCALBASE}/lib|' + s|LDFLAGS\?=.*|LDFLAGS+=-L${LOCALBASE}/lib|; \ + s|CFLAGS\?=|CFLAGS+=|' ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g; \ s|%%PREFIX%%|${PREFIX}|g; \ s|%%JAVAJARDIR%%|${JAVAJARDIR}|g; \ @@ -85,8 +86,8 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/tuxguitar.jar ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/../misc/*.tg ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKDIR}/8MBGMSFX.SF2 ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/../TuxGuitar-oss/jni/libtuxguitar-oss-jni.so ${STAGEDIR}${PREFIX}/lib - ${INSTALL_DATA} ${WRKSRC}/../TuxGuitar-fluidsynth/jni/libtuxguitar-fluidsynth-jni.so ${STAGEDIR}${PREFIX}/lib + ${INSTALL_PROGRAM} ${WRKSRC}/../TuxGuitar-oss/jni/libtuxguitar-oss-jni.so ${STAGEDIR}${PREFIX}/lib + ${INSTALL_PROGRAM} ${WRKSRC}/../TuxGuitar-fluidsynth/jni/libtuxguitar-fluidsynth-jni.so ${STAGEDIR}${PREFIX}/lib .for p in ${PLUGINS} ${INSTALL_DATA} ${WRKSRC}/../TuxGuitar-${p}/tuxguitar-${p}.jar ${STAGEDIR}${DATADIR}/plugins .endfor From owner-svn-ports-branches@FreeBSD.ORG Wed Aug 6 11:59:17 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DD72A1BB for ; Wed, 6 Aug 2014 11:59:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AF42E2E90 for ; Wed, 6 Aug 2014 11:59:17 +0000 (UTC) Received: from antoine (uid 1152) (envelope-from antoine@FreeBSD.org) id 5ab8 by svn.freebsd.org (DragonFly Mail Agent v0.9+); Wed, 06 Aug 2014 11:59:17 +0000 From: Antoine Brodin Date: Wed, 6 Aug 2014 11:59:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r364162 - branches/2014Q3/audio/tuxguitar X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <53e21895.5ab8.6f247021@svn.freebsd.org> X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Aug 2014 11:59:17 -0000 Author: antoine Date: Wed Aug 6 11:59:17 2014 New Revision: 364162 URL: http://svnweb.freebsd.org/changeset/ports/364162 QAT: https://qat.redports.org/buildarchive/r364162/ Log: MFH: r363152 - Try to fix the build by patching Makefiles better - While at it, add USES=desktop-file-utils - Bump PORTREVISION Modified: branches/2014Q3/audio/tuxguitar/Makefile Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/audio/tuxguitar/Makefile ============================================================================== --- branches/2014Q3/audio/tuxguitar/Makefile Wed Aug 6 11:57:32 2014 (r364161) +++ branches/2014Q3/audio/tuxguitar/Makefile Wed Aug 6 11:59:17 2014 (r364162) @@ -3,7 +3,7 @@ PORTNAME= tuxguitar PORTVERSION= 1.2 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= audio java MASTER_SITES= SF/${PORTNAME}/TuxGuitar/TuxGuitar-${PORTVERSION}:src \ ${MASTER_SITE_LOCAL}/gahr/:fluid \ @@ -28,7 +28,7 @@ LIB_DEPENDS= libfluidsynth.so:${PORTSDIR MAKE_ENV+= PREFIX=${PREFIX} INSTALL_DOC_DIR=${DOCSDIR} \ INSTALL_SHARE_DIR=${DATADIR} -USES= gmake pkgconfig +USES= desktop-file-utils gmake pkgconfig USE_JAVA= yes USE_ANT= yes WITH_GECKO= libxul @@ -59,6 +59,8 @@ post-patch: ${FIND} ${WRKSRC}/.. -name GNUmakefile | ${XARGS} ${REINPLACE_CMD} -e '\ s|-I$$(shell gcj -print-file-name=include/)|-I${JAVA_HOME}/include \ -I${JAVA_HOME}/include/freebsd -I${LOCALBASE}/include|; \ + s|-I $$(shell $$(GCJ) -print-file-name=include/)|-I${JAVA_HOME}/include \ + -I${JAVA_HOME}/include/freebsd -I${LOCALBASE}/include|; \ s|LDFLAGS\?=.*|LDFLAGS+=-L${LOCALBASE}/lib|; \ s|CFLAGS\?=|CFLAGS+=|' ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g; \ From owner-svn-ports-branches@FreeBSD.ORG Wed Aug 6 12:03:37 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 720664FE for ; Wed, 6 Aug 2014 12:03:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 44B4F2F82 for ; Wed, 6 Aug 2014 12:03:37 +0000 (UTC) Received: from antoine (uid 1152) (envelope-from antoine@FreeBSD.org) id 5e02 by svn.freebsd.org (DragonFly Mail Agent v0.9+); Wed, 06 Aug 2014 12:03:37 +0000 From: Antoine Brodin Date: Wed, 6 Aug 2014 12:03:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r364163 - branches/2014Q3/science/jstrack X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <53e21999.5e02.303adcf5@svn.freebsd.org> X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Aug 2014 12:03:37 -0000 Author: antoine Date: Wed Aug 6 12:03:36 2014 New Revision: 364163 URL: http://svnweb.freebsd.org/changeset/ports/364163 QAT: https://qat.redports.org/buildarchive/r364163/ Log: MFH: r363740 Mark BROKEN: Checksum and size mismatch fetch: http://www.jstrack.org/jstrack/downloads/jstrack-3.3.4.tar.gz: size mismatch: expected 4192630, actual 3697555 Reported by: pkg-fallout Modified: branches/2014Q3/science/jstrack/Makefile Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/science/jstrack/Makefile ============================================================================== --- branches/2014Q3/science/jstrack/Makefile Wed Aug 6 11:59:17 2014 (r364162) +++ branches/2014Q3/science/jstrack/Makefile Wed Aug 6 12:03:36 2014 (r364163) @@ -10,6 +10,8 @@ MASTER_SITES= http://www.jstrack.org/${P MAINTAINER= 5u623l20@gmail.com COMMENT= Freeware hurricane tracking program +BROKEN= Checksum and size mismatch + LICENSE= JStrack LICENSE_NAME= JStrack LICENSE_TEXT= It is and always will be free, and [Jim Graham] wrote it...\ From owner-svn-ports-branches@FreeBSD.ORG Wed Aug 6 12:05:54 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 984FD601 for ; Wed, 6 Aug 2014 12:05:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6F1B12F9B for ; Wed, 6 Aug 2014 12:05:54 +0000 (UTC) Received: from antoine (uid 1152) (envelope-from antoine@FreeBSD.org) id 5e19 by svn.freebsd.org (DragonFly Mail Agent v0.9+); Wed, 06 Aug 2014 12:05:54 +0000 From: Antoine Brodin Date: Wed, 6 Aug 2014 12:05:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r364164 - branches/2014Q3/audio/raproxy X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <53e21a22.5e19.1d70ce88@svn.freebsd.org> X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Aug 2014 12:05:54 -0000 Author: antoine Date: Wed Aug 6 12:05:53 2014 New Revision: 364164 URL: http://svnweb.freebsd.org/changeset/ports/364164 QAT: https://qat.redports.org/buildarchive/r364164/ Log: MFH: r363741 Mark BROKEN: Unfetchable Reported by: pkg-fallout Modified: branches/2014Q3/audio/raproxy/Makefile Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/audio/raproxy/Makefile ============================================================================== --- branches/2014Q3/audio/raproxy/Makefile Wed Aug 6 12:03:36 2014 (r364163) +++ branches/2014Q3/audio/raproxy/Makefile Wed Aug 6 12:05:53 2014 (r364164) @@ -11,6 +11,8 @@ DISTNAME= ${PORTNAME}${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Progressive Networks RealAudio Proxy Kit 3.0 beta 1 +BROKEN= Unfetchable + ALL_TARGET= raproxy MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" From owner-svn-ports-branches@FreeBSD.ORG Wed Aug 6 12:12:08 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8C1217D4 for ; Wed, 6 Aug 2014 12:12:08 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6159B2084 for ; Wed, 6 Aug 2014 12:12:08 +0000 (UTC) Received: from antoine (uid 1152) (envelope-from antoine@FreeBSD.org) id 5179 by svn.freebsd.org (DragonFly Mail Agent v0.9+); Wed, 06 Aug 2014 12:12:08 +0000 From: Antoine Brodin Date: Wed, 6 Aug 2014 12:12:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r364165 - branches/2014Q3/devel/monodevelop-database X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <53e21b98.5179.4f03cef5@svn.freebsd.org> X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Aug 2014 12:12:08 -0000 Author: antoine Date: Wed Aug 6 12:12:07 2014 New Revision: 364165 URL: http://svnweb.freebsd.org/changeset/ports/364165 QAT: https://qat.redports.org/buildarchive/r364165/ Log: MFH: r363844 Mark broken: Fails to build with monodevelop-5.0.1 ./Widgets/DataGrid/Views/ImageVisualizerView.cs(88,32): error CS0117: `MonoDevelop.Ide.ImageService' does not contain a definition for `GetPixbuf' /usr/local/libdata/pkgconfig/../../lib/monodevelop/bin/MonoDevelop.Ide.dll (Location of the symbol related to previous error) ./Widgets/ProjectDirectoryComboBox.cs(94,29): error CS0117: `MonoDevelop.Ide.ImageService' does not contain a definition for `GetPixbuf' /usr/local/libdata/pkgconfig/../../lib/monodevelop/bin/MonoDevelop.Ide.dll (Location of the symbol related to previous error) ./Widgets/ProjectDirectoryComboBox.cs(96,29): error CS0117: `MonoDevelop.Ide.ImageService' does not contain a definition for `GetPixbuf' /usr/local/libdata/pkgconfig/../../lib/monodevelop/bin/MonoDevelop.Ide.dll (Location of the symbol related to previous error) ./Widgets/ProjectDirectoryComboBox.cs(126,38): error CS0117: `MonoDevelop.Ide.ImageService' does not contain a definition for `GetPixbuf' /usr/local/libdata/pkgconfig/../../lib/monodevelop/bin/MonoDevelop.Ide.dll (Location of the symbol related to previous error) ./Widgets/SelectSchemaWidget.cs(172,42): error CS0117: `MonoDevelop.Ide.ImageService' does not contain a definition for `GetPixbuf' /usr/local/libdata/pkgconfig/../../lib/monodevelop/bin/MonoDevelop.Ide.dll (Location of the symbol related to previous error) Compilation failed: 5 error(s), 1 warnings Reported by: pkg-fallout Modified: branches/2014Q3/devel/monodevelop-database/Makefile Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/devel/monodevelop-database/Makefile ============================================================================== --- branches/2014Q3/devel/monodevelop-database/Makefile Wed Aug 6 12:05:53 2014 (r364164) +++ branches/2014Q3/devel/monodevelop-database/Makefile Wed Aug 6 12:12:07 2014 (r364165) @@ -9,6 +9,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-2 MAINTAINER= mono@FreeBSD.org COMMENT= MonoDevelop database support +BROKEN= Fails to build with monodevelop-5.0.1 + LICENSE= MIT BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/monodevelop.pc:${PORTSDIR}/devel/monodevelop From owner-svn-ports-branches@FreeBSD.ORG Wed Aug 6 12:44:14 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 79D95D9 for ; Wed, 6 Aug 2014 12:44:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5083C2485 for ; Wed, 6 Aug 2014 12:44:14 +0000 (UTC) Received: from antoine (uid 1152) (envelope-from antoine@FreeBSD.org) id 5cce by svn.freebsd.org (DragonFly Mail Agent v0.9+); Wed, 06 Aug 2014 12:44:13 +0000 From: Antoine Brodin Date: Wed, 6 Aug 2014 12:44:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r364169 - branches/2014Q3/textproc/libsass X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <53e2231e.5cce.7d08e252@svn.freebsd.org> X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Aug 2014 12:44:14 -0000 Author: antoine Date: Wed Aug 6 12:44:13 2014 New Revision: 364169 URL: http://svnweb.freebsd.org/changeset/ports/364169 QAT: https://qat.redports.org/buildarchive/r364169/ Log: MFH: r360348 Add USES=libtool Modified: branches/2014Q3/textproc/libsass/Makefile branches/2014Q3/textproc/libsass/pkg-plist Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/textproc/libsass/Makefile ============================================================================== --- branches/2014Q3/textproc/libsass/Makefile Wed Aug 6 12:33:44 2014 (r364168) +++ branches/2014Q3/textproc/libsass/Makefile Wed Aug 6 12:44:13 2014 (r364169) @@ -3,7 +3,7 @@ PORTNAME= libsass PORTVERSION= 1.0.1 -#PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= textproc MAINTAINER= nivit@FreeBSD.org @@ -21,9 +21,9 @@ INSTALL_TARGET= install-strip PATHFIX_MAKEFILEIN= Makefile.am +USES= libtool pathfix USE_AUTOTOOLS= aclocal autoconf autoheader automake libtoolize USE_GITHUB= yes USE_LDCONFIG= yes -USES= pathfix .include Modified: branches/2014Q3/textproc/libsass/pkg-plist ============================================================================== --- branches/2014Q3/textproc/libsass/pkg-plist Wed Aug 6 12:33:44 2014 (r364168) +++ branches/2014Q3/textproc/libsass/pkg-plist Wed Aug 6 12:44:13 2014 (r364169) @@ -1,7 +1,7 @@ include/sass.h include/sass_interface.h lib/libsass.a -lib/libsass.la lib/libsass.so lib/libsass.so.0 +lib/libsass.so.0.0.0 libdata/pkgconfig/libsass.pc From owner-svn-ports-branches@FreeBSD.ORG Wed Aug 6 12:44:57 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8D1291D2 for ; Wed, 6 Aug 2014 12:44:57 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 631FE248F for ; Wed, 6 Aug 2014 12:44:57 +0000 (UTC) Received: from antoine (uid 1152) (envelope-from antoine@FreeBSD.org) id 5cee by svn.freebsd.org (DragonFly Mail Agent v0.9+); Wed, 06 Aug 2014 12:44:57 +0000 From: Antoine Brodin Date: Wed, 6 Aug 2014 12:44:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r364170 - branches/2014Q3/textproc/libsass X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <53e22349.5cee.2add408a@svn.freebsd.org> X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Aug 2014 12:44:57 -0000 Author: antoine Date: Wed Aug 6 12:44:56 2014 New Revision: 364170 URL: http://svnweb.freebsd.org/changeset/ports/364170 QAT: https://qat.redports.org/buildarchive/r364170/ Log: MFH: r360716 - Fix fetch The project was transferred to github.com/sass account (see https://twitter.com/hcatlin/status/474960329718628352 ) - Fix distinfo No difference in the source code: http://people.freebsd.org/~nivit/public_distfiles/libsass/1.0.1-hcatlin/libsass-1.0.1.tar.gz (old distfile) http://people.freebsd.org/~nivit/public_distfiles/libsass/1.0.1-sass/libsass-1.0.1.tar.gz (new distfile) PR: 191437 Submitted by: amdmi3 Modified: branches/2014Q3/textproc/libsass/Makefile branches/2014Q3/textproc/libsass/distinfo (contents, props changed) Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/textproc/libsass/Makefile ============================================================================== --- branches/2014Q3/textproc/libsass/Makefile Wed Aug 6 12:44:13 2014 (r364169) +++ branches/2014Q3/textproc/libsass/Makefile Wed Aug 6 12:44:56 2014 (r364170) @@ -3,7 +3,7 @@ PORTNAME= libsass PORTVERSION= 1.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc MAINTAINER= nivit@FreeBSD.org @@ -13,7 +13,7 @@ LICENSE= MIT AUTOMAKE_ARGS= --add-missing -GH_ACCOUNT= hcatlin +GH_ACCOUNT= sass GH_COMMIT= 0388a62 GH_TAGNAME= v${PORTVERSION} Modified: branches/2014Q3/textproc/libsass/distinfo ============================================================================== --- branches/2014Q3/textproc/libsass/distinfo Wed Aug 6 12:44:13 2014 (r364169) +++ branches/2014Q3/textproc/libsass/distinfo Wed Aug 6 12:44:56 2014 (r364170) @@ -1,2 +1,2 @@ -SHA256 (libsass-1.0.1.tar.gz) = 93ed72227a93966682a9e49b83a0adb2b1f273acd07ad5edd7939b2b458dcf45 -SIZE (libsass-1.0.1.tar.gz) = 81753 +SHA256 (libsass-1.0.1.tar.gz) = 5aa6e2971db8c9ed42161cea16978e3e9ddbe43bae7c81da2cfd20dc9d0c22c4 +SIZE (libsass-1.0.1.tar.gz) = 81733 From owner-svn-ports-branches@FreeBSD.ORG Wed Aug 6 21:46:23 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6A7FC954 for ; Wed, 6 Aug 2014 21:46:23 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 40BE92D29 for ; Wed, 6 Aug 2014 21:46:23 +0000 (UTC) Received: from pawel (uid 1252) (envelope-from pawel@FreeBSD.org) id 576b by svn.freebsd.org (DragonFly Mail Agent v0.9+); Wed, 06 Aug 2014 21:46:23 +0000 From: Pawel Pekala Date: Wed, 6 Aug 2014 21:46:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r364223 - in branches/2014Q3/textproc/yamcha: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <53e2a22f.576b.4a886798@svn.freebsd.org> X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Aug 2014 21:46:23 -0000 Author: pawel Date: Wed Aug 6 21:46:22 2014 New Revision: 364223 URL: http://svnweb.freebsd.org/changeset/ports/364223 QAT: https://qat.redports.org/buildarchive/r364223/ Log: MFH: r364219 - Fix build with clang (hardcoded linking with libstdc++) - Respect CXXFLAGS during build - Add staging support - Convert to USES=libtool, new options framework Approved by: portmgr (erwin) Added: branches/2014Q3/textproc/yamcha/files/ - copied from r364219, head/textproc/yamcha/files/ Modified: branches/2014Q3/textproc/yamcha/Makefile branches/2014Q3/textproc/yamcha/pkg-plist Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/textproc/yamcha/Makefile ============================================================================== --- branches/2014Q3/textproc/yamcha/Makefile Wed Aug 6 21:44:53 2014 (r364222) +++ branches/2014Q3/textproc/yamcha/Makefile Wed Aug 6 21:46:22 2014 (r364223) @@ -3,6 +3,7 @@ PORTNAME= yamcha PORTVERSION= 0.33 +PORTREVISION= 1 CATEGORIES= textproc science MASTER_SITES= http://chasen.org/~taku/software/yamcha/src/ @@ -11,28 +12,18 @@ COMMENT= Yet Another Multipurpose CHunk BUILD_DEPENDS= svm_learn:${PORTSDIR}/science/svmlight -USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes USE_LDCONFIG= yes -USES= perl5 +USES= libtool perl5 USE_PERL5= build -NO_STAGE= yes -DOC_FILES= feature.png feature2.png feature3.png \ +PORTDOCS= feature.png feature2.png feature3.png \ feature4.png feature5.png index.html \ yamcha.html yamcha.css -MAN1= yamcha.1 +OPTIONS_DEFINE= DOCS -.if !defined(NOPORTDOCS) post-install: - @${MKDIR} ${DOCSDIR} -.for doc in ${DOC_FILES} - ${INSTALL_DATA} ${WRKSRC}/doc/${doc} ${DOCSDIR} -.endfor - @${FIND} -s ${DOCSDIR} -type f | \ - ${SED} -e 's|^${PREFIX}/||' >> ${TMPPLIST} - @${FIND} -s ${DOCSDIR} -type d | \ - ${SED} -e 's|^${PREFIX}/|@dirrm |' >> ${TMPPLIST} -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR} .include Modified: branches/2014Q3/textproc/yamcha/pkg-plist ============================================================================== --- branches/2014Q3/textproc/yamcha/pkg-plist Wed Aug 6 21:44:53 2014 (r364222) +++ branches/2014Q3/textproc/yamcha/pkg-plist Wed Aug 6 21:46:22 2014 (r364223) @@ -2,21 +2,22 @@ bin/yamcha bin/yamcha-config bin/yamcha-mkmodel include/yamcha.h -lib/libyamcha.so.3 -lib/libyamcha.so -lib/libyamcha.la lib/libyamcha.a +lib/libyamcha.so +lib/libyamcha.so.1 +lib/libyamcha.so.1.2.0 +libexec/yamcha/Makefile +libexec/yamcha/PKE.pm +libexec/yamcha/PKI.pm libexec/yamcha/mkdarts -libexec/yamcha/mktrie -libexec/yamcha/pkemine libexec/yamcha/mkmodel -libexec/yamcha/mksvmdata -libexec/yamcha/svm_learn_wrapper libexec/yamcha/mkparam +libexec/yamcha/mksvmdata +libexec/yamcha/mktrie +libexec/yamcha/pkemine +libexec/yamcha/selecttag libexec/yamcha/showse +libexec/yamcha/svm_learn_wrapper libexec/yamcha/zipmodel -libexec/yamcha/selecttag -libexec/yamcha/PKI.pm -libexec/yamcha/PKE.pm -libexec/yamcha/Makefile +man/man1/yamcha.1.gz @dirrm libexec/yamcha From owner-svn-ports-branches@FreeBSD.ORG Thu Aug 7 16:56:48 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0FFDA7BD for ; Thu, 7 Aug 2014 16:56:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F1B4627F7 for ; Thu, 7 Aug 2014 16:56:47 +0000 (UTC) Received: from pawel (uid 1252) (envelope-from pawel@FreeBSD.org) id 249b by svn.freebsd.org (DragonFly Mail Agent v0.9+); Thu, 07 Aug 2014 16:56:46 +0000 From: Pawel Pekala Date: Thu, 7 Aug 2014 16:56:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r364308 - in branches/2014Q3/vietnamese/vnless: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <53e3afcf.249b.2d82a3c1@svn.freebsd.org> X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Aug 2014 16:56:48 -0000 Author: pawel Date: Thu Aug 7 16:56:46 2014 New Revision: 364308 URL: http://svnweb.freebsd.org/changeset/ports/364308 QAT: https://qat.redports.org/buildarchive/r364308/ Log: MFH: r364302 - Fix build with clang (functions not returing value) - Respect CFLAGS during build - Add staging support - Switch to PLIST_FILES - Rename patches to current standards Approved by: portmgr (erwin) Added: branches/2014Q3/vietnamese/vnless/files/patch-Makefile - copied unchanged from r364302, head/vietnamese/vnless/files/patch-Makefile branches/2014Q3/vietnamese/vnless/files/patch-defines.h - copied unchanged from r364302, head/vietnamese/vnless/files/patch-defines.h branches/2014Q3/vietnamese/vnless/files/patch-less.h - copied unchanged from r364302, head/vietnamese/vnless/files/patch-less.h branches/2014Q3/vietnamese/vnless/files/patch-os.c - copied unchanged from r364302, head/vietnamese/vnless/files/patch-os.c branches/2014Q3/vietnamese/vnless/files/patch-regerror.c - copied unchanged from r364302, head/vietnamese/vnless/files/patch-regerror.c Deleted: branches/2014Q3/vietnamese/vnless/files/patch-01 branches/2014Q3/vietnamese/vnless/files/patch-02 branches/2014Q3/vietnamese/vnless/files/patch-03 branches/2014Q3/vietnamese/vnless/files/patch-04 branches/2014Q3/vietnamese/vnless/files/patch-05 branches/2014Q3/vietnamese/vnless/pkg-plist Modified: branches/2014Q3/vietnamese/vnless/Makefile Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/vietnamese/vnless/Makefile ============================================================================== --- branches/2014Q3/vietnamese/vnless/Makefile Thu Aug 7 16:53:23 2014 (r364307) +++ branches/2014Q3/vietnamese/vnless/Makefile Thu Aug 7 16:56:46 2014 (r364308) @@ -12,13 +12,12 @@ MAINTAINER= obrien@FreeBSD.org COMMENT= A pager utility that speaks Vietnamese ALL_TARGET= clobber all -MAN1= vnless.1 vnlesskey.1 +CFLAGS+= -Wno-return-type -NO_STAGE= yes -post-install: - @strip ${PREFIX}/bin/vnless* - @${CHMOD} a+rx ${PREFIX}/bin/vnless* - @${CHMOD} a+r ${PREFIX}/share/misc/vnless.help - @${CHMOD} a+r ${PREFIX}/man/man1/vnless*.1* +PLIST_FILES= bin/vnless \ + bin/vnlesskey \ + man/man1/vnless.1.gz \ + man/man1/vnlesskey.1.gz \ + share/misc/vnless.help .include Copied: branches/2014Q3/vietnamese/vnless/files/patch-Makefile (from r364302, head/vietnamese/vnless/files/patch-Makefile) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q3/vietnamese/vnless/files/patch-Makefile Thu Aug 7 16:56:46 2014 (r364308, copy of r364302, head/vietnamese/vnless/files/patch-Makefile) @@ -0,0 +1,66 @@ +--- Makefile.orig 1992-02-24 22:15:42.000000000 +0100 ++++ Makefile 2014-08-07 18:09:42.383354763 +0200 +@@ -31,15 +31,15 @@ + # INSTALL_HELP is a list of the public version of the help file. + # INSTALL_LESSMAN is a list of the public versions of the less manual page. + # INSTALL_KEYMAN is a list of the public versions of the lesskey manual page. +-ROOT = ../../VN ++ROOT = ${PREFIX} + INSTALL_LESS = $(ROOT)/bin/vnless +-INSTALL_KEY = $(ROOT)/bin/lesskey +-INSTALL_HELP = $(ROOT)/man/less.help +-INSTALL_LESSMAN = $(ROOT)/man/vnless.1 +-INSTALL_KEYMAN = $(ROOT)/man/lesskey.1 ++INSTALL_KEY = $(ROOT)/bin/vnlesskey ++INSTALL_HELP = $(ROOT)/share/misc/vnless.help ++INSTALL_LESSMAN = $(ROOT)/man/man1/vnless.1 ++INSTALL_KEYMAN = $(ROOT)/man/man1/vnlesskey.1 + LESS_MANUAL = less.man + KEY_MANUAL = lesskey.man +-HELPFILE = $(ROOT)/man/less.help ++HELPFILE = $(ROOT)/share/misc/vnless.help + + + # OPTIM is passed to the compiler and the loader. +@@ -47,8 +47,9 @@ + #OPTIM = -O + + #CFLAGS = $(OPTIM) +-CFLAGS = -O +-LDFLAGS = ++CFLAGS ?= -O ++LDFLAGS ?= ++LDLIBS = -lcompat + + + ########################################################################## +@@ -82,24 +83,19 @@ + $(CC) $(CFLAGS) -c -DHELPFILE=\"$(HELPFILE)\" help.c + + install_less: vnless +- for f in $(INSTALL_LESS); do rm -f $$f; cp vnless $$f; done +- touch install_less ++ $(BSD_INSTALL_PROGRAM) vnless $(DESTDIR)$(INSTALL_LESS) + + install_key: lesskey +- for f in $(INSTALL_KEY); do rm -f $$f; cp lesskey $$f; done +- touch install_key ++ $(BSD_INSTALL_PROGRAM) lesskey $(DESTDIR)$(INSTALL_KEY) + + install_help: less.help +- for f in $(INSTALL_HELP); do rm -f $$f; cp less.help $$f; done +- touch install_help ++ $(BSD_INSTALL_DATA) less.help $(DESTDIR)$(INSTALL_HELP) + + install_lman: $(LESS_MANUAL) +- for f in $(INSTALL_LESSMAN); do rm -f $$f; cp $(LESS_MANUAL) $$f; done +- touch install_lman ++ $(BSD_INSTALL_MAN) $(LESS_MANUAL) $(DESTDIR)$(INSTALL_LESSMAN) + + install_kman: $(KEY_MANUAL) +- for f in $(INSTALL_KEYMAN); do rm -f $$f; cp $(KEY_MANUAL) $$f; done +- touch install_kman ++ $(BSD_INSTALL_MAN) $(KEY_MANUAL) $(DESTDIR)$(INSTALL_KEYMAN) + + ########################################################################## + # Maintenance Copied: branches/2014Q3/vietnamese/vnless/files/patch-defines.h (from r364302, head/vietnamese/vnless/files/patch-defines.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q3/vietnamese/vnless/files/patch-defines.h Thu Aug 7 16:56:46 2014 (r364308, copy of r364302, head/vietnamese/vnless/files/patch-defines.h) @@ -0,0 +1,34 @@ +--- defines.h.orig Mon Feb 24 12:45:37 1992 ++++ defines.h Sat Feb 2 10:57:31 1996 +@@ -40,14 +40,21 @@ + * If TERMIO is 0 your system must have /usr/include/sgtty.h. + * This is normally the case for BSD. + */ +-/*#define TERMIO 1*/ ++#include ++#ifdef BSD4_4 ++#define TERMIO 1 ++#endif + + /* + * SIGSETMASK is 1 if your system has the sigsetmask() call. + * This is normally the case only for BSD 4.2, + * not for BSD 4.1 or System 5. + */ ++#ifdef BSD4_4 ++#define SIGSETMASK 1 ++#else + #define SIGSETMASK 0 ++#endif + + /* + * REGCMP is 1 if your system has the regcmp() function. +@@ -73,7 +80,7 @@ + * EDIT_PGM is the name of the (default) editor to be invoked. + */ + #define EDITOR 1 +-#define EDIT_PGM "/usr/local/bin/vi" ++#define EDIT_PGM "/usr/bin/vi" + + /* + * TAGS is 1 if you wish to support tag files. Copied: branches/2014Q3/vietnamese/vnless/files/patch-less.h (from r364302, head/vietnamese/vnless/files/patch-less.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q3/vietnamese/vnless/files/patch-less.h Thu Aug 7 16:56:46 2014 (r364308, copy of r364302, head/vietnamese/vnless/files/patch-less.h) @@ -0,0 +1,29 @@ +--- less.h.orig 1992-02-24 12:45:38.000000000 -0800 ++++ less.h 2007-08-23 15:16:23.000000000 -0700 +@@ -31,7 +31,11 @@ typedef long POSITION; + * The type of signal handler functions. + * Usually int, although it should be void. + */ ++#if VOID ++typedef void HANDLER; ++#else + typedef int HANDLER; ++#endif + + + #define FILENAME 128 /* Max size of a filename */ +@@ -74,7 +78,14 @@ typedef int HANDLER; + #define SIGNAL(sig,func) signal(sig,func) + + /* Library function declarations */ ++#ifdef NO_STD_HDRS + offset_t lseek(); + char *calloc(); ++#else ++#include ++#include ++#include ++#include ++#endif + + #include "funcs.h" Copied: branches/2014Q3/vietnamese/vnless/files/patch-os.c (from r364302, head/vietnamese/vnless/files/patch-os.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q3/vietnamese/vnless/files/patch-os.c Thu Aug 7 16:56:46 2014 (r364308, copy of r364302, head/vietnamese/vnless/files/patch-os.c) @@ -0,0 +1,33 @@ +--- os.c.orig Mon Feb 24 12:45:40 1992 ++++ os.c Wed Dec 4 02:36:59 1996 +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + #include "less.h" + + char *getenv(); +@@ -153,7 +154,7 @@ + public long + get_time() + { +- long t; ++ time_t t; + + time(&t); + return (t); +@@ -294,9 +295,13 @@ + + #if PERROR + ++#ifdef USE_FBSD_STD_HDRS + extern char *sys_errlist[]; + extern int sys_nerr; + extern int errno; ++#else ++#include ++#endif + + public char * + errno_message(filename, message, len) Copied: branches/2014Q3/vietnamese/vnless/files/patch-regerror.c (from r364302, head/vietnamese/vnless/files/patch-regerror.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q3/vietnamese/vnless/files/patch-regerror.c Thu Aug 7 16:56:46 2014 (r364308, copy of r364302, head/vietnamese/vnless/files/patch-regerror.c) @@ -0,0 +1,13 @@ +--- regerror.c.orig Mon Feb 24 12:45:41 1992 ++++ regerror.c Wed Dec 4 02:42:23 1996 +@@ -1,7 +1,9 @@ + #include ++ ++#ifdef FBSD_HAS_THIS_IN_LIBCOMPAT + regerror(str) + char *str; + { + /* fprintf(stderr,"%s\n",str); */ + } +- ++#endif From owner-svn-ports-branches@FreeBSD.ORG Sat Aug 9 19:06:55 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EE5DE67A for ; Sat, 9 Aug 2014 19:06:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C42332C8C for ; Sat, 9 Aug 2014 19:06:55 +0000 (UTC) Received: from ohauer (uid 1234) (envelope-from ohauer@FreeBSD.org) id 2ca4 by svn.freebsd.org (DragonFly Mail Agent v0.9+); Sat, 09 Aug 2014 19:06:55 +0000 From: Olli Hauer Date: Sat, 9 Aug 2014 19:06:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r364467 - branches/2014Q3/Mk X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <53e6714f.2ca4.1252856@svn.freebsd.org> X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Aug 2014 19:06:56 -0000 Author: ohauer Date: Sat Aug 9 19:06:55 2014 New Revision: 364467 URL: http://svnweb.freebsd.org/changeset/ports/364467 QAT: https://qat.redports.org/buildarchive/r364467/ Log: MFH: r364455 - add some additional SUB_LIST hints Approved by: portmgr (erwin@) Modified: branches/2014Q3/Mk/bsd.apache.mk Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/Mk/bsd.apache.mk ============================================================================== --- branches/2014Q3/Mk/bsd.apache.mk Sat Aug 9 18:59:41 2014 (r364466) +++ branches/2014Q3/Mk/bsd.apache.mk Sat Aug 9 19:06:55 2014 (r364467) @@ -348,9 +348,15 @@ APACHE_PORT?= www/apache${APACHE_VERSION PLIST_SUB+= APACHEMODDIR="${APACHEMODDIR}" \ APACHEINCLUDEDIR="${APACHEINCLUDEDIR}" \ - APACHEETCDIR="${APACHEETCDIR}" + APACHEETCDIR="${APACHEETCDIR}" \ + APACHE_VERSION="${APACHE_VERSION}" + +SUB_LIST+= APACHEMODDIR="${APACHEMODDIR}" \ + APACHEETCDIR="${APACHEETCDIR}" \ + APACHE_VERSION="${APACHE_VERSION}" APACHE_PKGNAMEPREFIX= ap${APACHE_VERSION}- + .if defined(AP_FAST_BUILD) PKGNAMEPREFIX?= ${APACHE_PKGNAMEPREFIX} .endif @@ -462,7 +468,6 @@ ap-gen-plist: .if defined(AP_GENPLIST) . if !exists(${PLIST}) @${ECHO} "===> Generating apache plist" -# apache22 @${ECHO} "@unexec ${SED} -i '' -E '/LoadModule[[:blank:]]+%%AP_NAME%%_module/d' %D/%%APACHEETCDIR%%/httpd.conf" >> ${PLIST} @${ECHO} "%%APACHEMODDIR%%/%%AP_MODULE%%" >> ${PLIST} @${ECHO} "@exec %D/sbin/apxs -e ${AP_MOD_EN} -n %%AP_NAME%% %D/%F" >> ${PLIST} @@ -493,6 +498,7 @@ do-install: . endif . endif .endif + .endif # defined(AP_FAST_BUILD) -.endif # defined(AP_PORT_IS_MODULE) +.endif # defined(AP_PORT_IS_SERVER / AP_PORT_IS_MODULE) .endif # defined(_POSTMKINCLUDED) && !defined(Apache_Post_Include) From owner-svn-ports-branches@FreeBSD.ORG Sat Aug 9 21:22:15 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 65E20D3A for ; Sat, 9 Aug 2014 21:22:15 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 52CCE2A06 for ; Sat, 9 Aug 2014 21:22:15 +0000 (UTC) Received: from ohauer (uid 1234) (envelope-from ohauer@FreeBSD.org) id 2ae7 by svn.freebsd.org (DragonFly Mail Agent v0.9+); Sat, 09 Aug 2014 21:22:13 +0000 From: Olli Hauer Date: Sat, 9 Aug 2014 21:22:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r364479 - in branches/2014Q3/devel: subversion subversion16 subversion17 subversion17/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <53e69105.2ae7.4ed93262@svn.freebsd.org> X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Aug 2014 21:22:15 -0000 Author: ohauer Date: Sat Aug 9 21:22:12 2014 New Revision: 364479 URL: http://svnweb.freebsd.org/changeset/ports/364479 QAT: https://qat.redports.org/buildarchive/r364479/ Log: MFH: r364463 - add CPE information - use NO_STATIC instead DYNAMIC_ENABLED in pkg-plist Approved by: portmgr (erwin@) Modified: branches/2014Q3/devel/subversion/Makefile branches/2014Q3/devel/subversion/Makefile.common branches/2014Q3/devel/subversion/pkg-plist branches/2014Q3/devel/subversion16/Makefile branches/2014Q3/devel/subversion16/Makefile.common branches/2014Q3/devel/subversion16/pkg-plist branches/2014Q3/devel/subversion17/Makefile branches/2014Q3/devel/subversion17/Makefile.common branches/2014Q3/devel/subversion17/files/extra-patch-fbsd-template branches/2014Q3/devel/subversion17/pkg-plist Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/devel/subversion/Makefile ============================================================================== --- branches/2014Q3/devel/subversion/Makefile Sat Aug 9 21:15:24 2014 (r364478) +++ branches/2014Q3/devel/subversion/Makefile Sat Aug 9 21:22:12 2014 (r364479) @@ -77,9 +77,6 @@ BDB_BUILD_DEPENDS= yes OLD_LIB_DEPENDS:= ${LIB_DEPENDS:S!^!${LOCALBASE}/lib/!:C!(\.so|\.[0-9]+)?:!.a:!} BUILD_DEPENDS+= ${OLD_LIB_DEPENDS} LIB_DEPENDS= -PLIST_SUB+= DYNAMIC_ENABLED="@comment " -.else -PLIST_SUB+= DYNAMIC_ENABLED="" .endif .if ${PORT_OPTIONS:MBDB} @@ -227,8 +224,8 @@ _mkrepos: .USE .endif svn-build-outputs-hack: - cd ${WRKSRC} && ${PATCH} ${PATCH_DIST_ARGS} -p0 < ${PATCHDIR}/extra-patch-build.conf - cd ${WRKSRC} && python2 gen-make.py --release --installed-libs libsvn_client,libsvn_delta,libsvn_diff,libsvn_fs,libsvn_ra,libsvn_repos,libsvn_subr,libsvn_wc + (cd ${WRKSRC} && ${PATCH} ${PATCH_DIST_ARGS} -p0 < ${PATCHDIR}/extra-patch-build.conf) + (cd ${WRKSRC} && python2 gen-make.py --release --installed-libs libsvn_client,libsvn_delta,libsvn_diff,libsvn_fs,libsvn_ra,libsvn_repos,libsvn_subr,libsvn_wc) ${MV} ${WRKSRC}/build-outputs.mk ${FILESDIR}/build-outputs.mk.addons .include Modified: branches/2014Q3/devel/subversion/Makefile.common ============================================================================== --- branches/2014Q3/devel/subversion/Makefile.common Sat Aug 9 21:15:24 2014 (r364478) +++ branches/2014Q3/devel/subversion/Makefile.common Sat Aug 9 21:22:12 2014 (r364479) @@ -10,10 +10,12 @@ DIST_SUBDIR= subversion18 MASTER_SITE_SUBDIR= subversion GNU_CONFIGURE= yes -USES+= tar:bzip2 pkgconfig libtool +USES+= tar:bzip2 pkgconfig libtool cpe LICENSE= APACHE20 +CPE_VENDOR= apache + CONFLICTS_INSTALL+= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[^8].[0-9]* LIB_DEPENDS+= libapr-1.so:${PORTSDIR}/devel/apr1 \ Modified: branches/2014Q3/devel/subversion/pkg-plist ============================================================================== --- branches/2014Q3/devel/subversion/pkg-plist Sat Aug 9 21:15:24 2014 (r364478) +++ branches/2014Q3/devel/subversion/pkg-plist Sat Aug 9 21:22:12 2014 (r364479) @@ -68,61 +68,61 @@ include/subversion-1/svn_version.h include/subversion-1/svn_wc.h include/subversion-1/svn_xml.h lib/libsvn_client-1.a -%%DYNAMIC_ENABLED%%lib/libsvn_client-1.so -%%DYNAMIC_ENABLED%%lib/libsvn_client-1.so.0 -%%DYNAMIC_ENABLED%%lib/libsvn_client-1.so.0.0.0 +%%NO_STATIC%%lib/libsvn_client-1.so +%%NO_STATIC%%lib/libsvn_client-1.so.0 +%%NO_STATIC%%lib/libsvn_client-1.so.0.0.0 lib/libsvn_delta-1.a -%%DYNAMIC_ENABLED%%lib/libsvn_delta-1.so -%%DYNAMIC_ENABLED%%lib/libsvn_delta-1.so.0 -%%DYNAMIC_ENABLED%%lib/libsvn_delta-1.so.0.0.0 +%%NO_STATIC%%lib/libsvn_delta-1.so +%%NO_STATIC%%lib/libsvn_delta-1.so.0 +%%NO_STATIC%%lib/libsvn_delta-1.so.0.0.0 lib/libsvn_diff-1.a -%%DYNAMIC_ENABLED%%lib/libsvn_diff-1.so -%%DYNAMIC_ENABLED%%lib/libsvn_diff-1.so.0 -%%DYNAMIC_ENABLED%%lib/libsvn_diff-1.so.0.0.0 +%%NO_STATIC%%lib/libsvn_diff-1.so +%%NO_STATIC%%lib/libsvn_diff-1.so.0 +%%NO_STATIC%%lib/libsvn_diff-1.so.0.0.0 lib/libsvn_fs-1.a -%%DYNAMIC_ENABLED%%lib/libsvn_fs-1.so -%%DYNAMIC_ENABLED%%lib/libsvn_fs-1.so.0 -%%DYNAMIC_ENABLED%%lib/libsvn_fs-1.so.0.0.0 +%%NO_STATIC%%lib/libsvn_fs-1.so +%%NO_STATIC%%lib/libsvn_fs-1.so.0 +%%NO_STATIC%%lib/libsvn_fs-1.so.0.0.0 %%BDB%%lib/libsvn_fs_base-1.a -%%DYNAMIC_ENABLED%%%%BDB%%lib/libsvn_fs_base-1.so -%%DYNAMIC_ENABLED%%%%BDB%%lib/libsvn_fs_base-1.so.0 -%%DYNAMIC_ENABLED%%%%BDB%%lib/libsvn_fs_base-1.so.0.0.0 +%%NO_STATIC%%%%BDB%%lib/libsvn_fs_base-1.so +%%NO_STATIC%%%%BDB%%lib/libsvn_fs_base-1.so.0 +%%NO_STATIC%%%%BDB%%lib/libsvn_fs_base-1.so.0.0.0 lib/libsvn_fs_fs-1.a -%%DYNAMIC_ENABLED%%lib/libsvn_fs_fs-1.so -%%DYNAMIC_ENABLED%%lib/libsvn_fs_fs-1.so.0 -%%DYNAMIC_ENABLED%%lib/libsvn_fs_fs-1.so.0.0.0 +%%NO_STATIC%%lib/libsvn_fs_fs-1.so +%%NO_STATIC%%lib/libsvn_fs_fs-1.so.0 +%%NO_STATIC%%lib/libsvn_fs_fs-1.so.0.0.0 lib/libsvn_fs_util-1.a -%%DYNAMIC_ENABLED%%lib/libsvn_fs_util-1.so -%%DYNAMIC_ENABLED%%lib/libsvn_fs_util-1.so.0 -%%DYNAMIC_ENABLED%%lib/libsvn_fs_util-1.so.0.0.0 +%%NO_STATIC%%lib/libsvn_fs_util-1.so +%%NO_STATIC%%lib/libsvn_fs_util-1.so.0 +%%NO_STATIC%%lib/libsvn_fs_util-1.so.0.0.0 lib/libsvn_ra-1.a -%%DYNAMIC_ENABLED%%lib/libsvn_ra-1.so -%%DYNAMIC_ENABLED%%lib/libsvn_ra-1.so.0 -%%DYNAMIC_ENABLED%%lib/libsvn_ra-1.so.0.0.0 +%%NO_STATIC%%lib/libsvn_ra-1.so +%%NO_STATIC%%lib/libsvn_ra-1.so.0 +%%NO_STATIC%%lib/libsvn_ra-1.so.0.0.0 lib/libsvn_ra_local-1.a -%%DYNAMIC_ENABLED%%lib/libsvn_ra_local-1.so -%%DYNAMIC_ENABLED%%lib/libsvn_ra_local-1.so.0 -%%DYNAMIC_ENABLED%%lib/libsvn_ra_local-1.so.0.0.0 +%%NO_STATIC%%lib/libsvn_ra_local-1.so +%%NO_STATIC%%lib/libsvn_ra_local-1.so.0 +%%NO_STATIC%%lib/libsvn_ra_local-1.so.0.0.0 %%SERF%%lib/libsvn_ra_serf-1.a -%%DYNAMIC_ENABLED%%%%SERF%%lib/libsvn_ra_serf-1.so -%%DYNAMIC_ENABLED%%%%SERF%%lib/libsvn_ra_serf-1.so.0 -%%DYNAMIC_ENABLED%%%%SERF%%lib/libsvn_ra_serf-1.so.0.0.0 +%%NO_STATIC%%%%SERF%%lib/libsvn_ra_serf-1.so +%%NO_STATIC%%%%SERF%%lib/libsvn_ra_serf-1.so.0 +%%NO_STATIC%%%%SERF%%lib/libsvn_ra_serf-1.so.0.0.0 lib/libsvn_ra_svn-1.a -%%DYNAMIC_ENABLED%%lib/libsvn_ra_svn-1.so -%%DYNAMIC_ENABLED%%lib/libsvn_ra_svn-1.so.0 -%%DYNAMIC_ENABLED%%lib/libsvn_ra_svn-1.so.0.0.0 +%%NO_STATIC%%lib/libsvn_ra_svn-1.so +%%NO_STATIC%%lib/libsvn_ra_svn-1.so.0 +%%NO_STATIC%%lib/libsvn_ra_svn-1.so.0.0.0 lib/libsvn_repos-1.a -%%DYNAMIC_ENABLED%%lib/libsvn_repos-1.so -%%DYNAMIC_ENABLED%%lib/libsvn_repos-1.so.0 -%%DYNAMIC_ENABLED%%lib/libsvn_repos-1.so.0.0.0 +%%NO_STATIC%%lib/libsvn_repos-1.so +%%NO_STATIC%%lib/libsvn_repos-1.so.0 +%%NO_STATIC%%lib/libsvn_repos-1.so.0.0.0 lib/libsvn_subr-1.a -%%DYNAMIC_ENABLED%%lib/libsvn_subr-1.so -%%DYNAMIC_ENABLED%%lib/libsvn_subr-1.so.0 -%%DYNAMIC_ENABLED%%lib/libsvn_subr-1.so.0.0.0 +%%NO_STATIC%%lib/libsvn_subr-1.so +%%NO_STATIC%%lib/libsvn_subr-1.so.0 +%%NO_STATIC%%lib/libsvn_subr-1.so.0.0.0 lib/libsvn_wc-1.a -%%DYNAMIC_ENABLED%%lib/libsvn_wc-1.so -%%DYNAMIC_ENABLED%%lib/libsvn_wc-1.so.0 -%%DYNAMIC_ENABLED%%lib/libsvn_wc-1.so.0.0.0 +%%NO_STATIC%%lib/libsvn_wc-1.so +%%NO_STATIC%%lib/libsvn_wc-1.so.0 +%%NO_STATIC%%lib/libsvn_wc-1.so.0.0.0 man/man1/svn.1.gz man/man1/svnadmin.1.gz man/man1/svndumpfilter.1.gz Modified: branches/2014Q3/devel/subversion16/Makefile ============================================================================== --- branches/2014Q3/devel/subversion16/Makefile Sat Aug 9 21:15:24 2014 (r364478) +++ branches/2014Q3/devel/subversion16/Makefile Sat Aug 9 21:22:12 2014 (r364479) @@ -88,12 +88,6 @@ SVNGROUP?= svn SVNUSER?= svn .endif -.if ${PORT_OPTIONS:MSTATIC} -PLIST_SUB+= DYNAMIC_ENABLED="@comment " -.else -PLIST_SUB+= DYNAMIC_ENABLED="" -.endif - .if make(repository) WITH_REPOSITORY_CREATION= yes .endif Modified: branches/2014Q3/devel/subversion16/Makefile.common ============================================================================== --- branches/2014Q3/devel/subversion16/Makefile.common Sat Aug 9 21:15:24 2014 (r364478) +++ branches/2014Q3/devel/subversion16/Makefile.common Sat Aug 9 21:22:12 2014 (r364479) @@ -11,13 +11,14 @@ DIST_SUBDIR= subversion EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} -USE_BZIP2= yes USE_AUTOTOOLS= libtool USE_KDE4= # Used below if KWallet support is enabled -USES+= pkgconfig +USES+= pkgconfig tar:bzip2 cpe LICENSE= APACHE20 +CPE_VENDOR= apache + CONFLICTS_INSTALL+= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[^6].[0-9]* LIB_DEPENDS+= libapr-1.so:${PORTSDIR}/devel/apr1 \ Modified: branches/2014Q3/devel/subversion16/pkg-plist ============================================================================== --- branches/2014Q3/devel/subversion16/pkg-plist Sat Aug 9 21:15:24 2014 (r364478) +++ branches/2014Q3/devel/subversion16/pkg-plist Sat Aug 9 21:22:12 2014 (r364479) @@ -55,72 +55,72 @@ include/subversion-1/svn_wc.h include/subversion-1/svn_xml.h %%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.a %%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.la -%%DYNAMIC_ENABLED%%%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.so -%%DYNAMIC_ENABLED%%%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.so.0 +%%NO_STATIC%%%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.so +%%NO_STATIC%%%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.so.0 %%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.a %%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.la -%%DYNAMIC_ENABLED%%%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.so -%%DYNAMIC_ENABLED%%%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.so.0 +%%NO_STATIC%%%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.so +%%NO_STATIC%%%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.so.0 lib/libsvn_client-1.a lib/libsvn_client-1.la -%%DYNAMIC_ENABLED%%lib/libsvn_client-1.so -%%DYNAMIC_ENABLED%%lib/libsvn_client-1.so.0 +%%NO_STATIC%%lib/libsvn_client-1.so +%%NO_STATIC%%lib/libsvn_client-1.so.0 lib/libsvn_delta-1.a lib/libsvn_delta-1.la -%%DYNAMIC_ENABLED%%lib/libsvn_delta-1.so -%%DYNAMIC_ENABLED%%lib/libsvn_delta-1.so.0 +%%NO_STATIC%%lib/libsvn_delta-1.so +%%NO_STATIC%%lib/libsvn_delta-1.so.0 lib/libsvn_diff-1.a lib/libsvn_diff-1.la -%%DYNAMIC_ENABLED%%lib/libsvn_diff-1.so -%%DYNAMIC_ENABLED%%lib/libsvn_diff-1.so.0 +%%NO_STATIC%%lib/libsvn_diff-1.so +%%NO_STATIC%%lib/libsvn_diff-1.so.0 lib/libsvn_fs-1.a lib/libsvn_fs-1.la -%%DYNAMIC_ENABLED%%lib/libsvn_fs-1.so -%%DYNAMIC_ENABLED%%lib/libsvn_fs-1.so.0 +%%NO_STATIC%%lib/libsvn_fs-1.so +%%NO_STATIC%%lib/libsvn_fs-1.so.0 %%BDB%%lib/libsvn_fs_base-1.a %%BDB%%lib/libsvn_fs_base-1.la -%%DYNAMIC_ENABLED%%%%BDB%%lib/libsvn_fs_base-1.so -%%DYNAMIC_ENABLED%%%%BDB%%lib/libsvn_fs_base-1.so.0 +%%NO_STATIC%%%%BDB%%lib/libsvn_fs_base-1.so +%%NO_STATIC%%%%BDB%%lib/libsvn_fs_base-1.so.0 lib/libsvn_fs_fs-1.a lib/libsvn_fs_fs-1.la -%%DYNAMIC_ENABLED%%lib/libsvn_fs_fs-1.so -%%DYNAMIC_ENABLED%%lib/libsvn_fs_fs-1.so.0 +%%NO_STATIC%%lib/libsvn_fs_fs-1.so +%%NO_STATIC%%lib/libsvn_fs_fs-1.so.0 lib/libsvn_fs_util-1.a lib/libsvn_fs_util-1.la -%%DYNAMIC_ENABLED%%lib/libsvn_fs_util-1.so -%%DYNAMIC_ENABLED%%lib/libsvn_fs_util-1.so.0 +%%NO_STATIC%%lib/libsvn_fs_util-1.so +%%NO_STATIC%%lib/libsvn_fs_util-1.so.0 lib/libsvn_ra-1.a lib/libsvn_ra-1.la -%%DYNAMIC_ENABLED%%lib/libsvn_ra-1.so -%%DYNAMIC_ENABLED%%lib/libsvn_ra-1.so.0 +%%NO_STATIC%%lib/libsvn_ra-1.so +%%NO_STATIC%%lib/libsvn_ra-1.so.0 lib/libsvn_ra_local-1.a lib/libsvn_ra_local-1.la -%%DYNAMIC_ENABLED%%lib/libsvn_ra_local-1.so -%%DYNAMIC_ENABLED%%lib/libsvn_ra_local-1.so.0 +%%NO_STATIC%%lib/libsvn_ra_local-1.so +%%NO_STATIC%%lib/libsvn_ra_local-1.so.0 %%NEON%%lib/libsvn_ra_neon-1.a %%NEON%%lib/libsvn_ra_neon-1.la -%%DYNAMIC_ENABLED%%%%NEON%%lib/libsvn_ra_neon-1.so -%%DYNAMIC_ENABLED%%%%NEON%%lib/libsvn_ra_neon-1.so.0 +%%NO_STATIC%%%%NEON%%lib/libsvn_ra_neon-1.so +%%NO_STATIC%%%%NEON%%lib/libsvn_ra_neon-1.so.0 lib/libsvn_ra_svn-1.a lib/libsvn_ra_svn-1.la -%%DYNAMIC_ENABLED%%lib/libsvn_ra_svn-1.so -%%DYNAMIC_ENABLED%%lib/libsvn_ra_svn-1.so.0 +%%NO_STATIC%%lib/libsvn_ra_svn-1.so +%%NO_STATIC%%lib/libsvn_ra_svn-1.so.0 lib/libsvn_repos-1.a lib/libsvn_repos-1.la -%%DYNAMIC_ENABLED%%lib/libsvn_repos-1.so -%%DYNAMIC_ENABLED%%lib/libsvn_repos-1.so.0 +%%NO_STATIC%%lib/libsvn_repos-1.so +%%NO_STATIC%%lib/libsvn_repos-1.so.0 %%SERF%%lib/libsvn_ra_serf-1.a %%SERF%%lib/libsvn_ra_serf-1.la -%%DYNAMIC_ENABLED%%%%SERF%%lib/libsvn_ra_serf-1.so -%%DYNAMIC_ENABLED%%%%SERF%%lib/libsvn_ra_serf-1.so.0 +%%NO_STATIC%%%%SERF%%lib/libsvn_ra_serf-1.so +%%NO_STATIC%%%%SERF%%lib/libsvn_ra_serf-1.so.0 lib/libsvn_subr-1.a lib/libsvn_subr-1.la -%%DYNAMIC_ENABLED%%lib/libsvn_subr-1.so -%%DYNAMIC_ENABLED%%lib/libsvn_subr-1.so.0 +%%NO_STATIC%%lib/libsvn_subr-1.so +%%NO_STATIC%%lib/libsvn_subr-1.so.0 lib/libsvn_wc-1.a lib/libsvn_wc-1.la -%%DYNAMIC_ENABLED%%lib/libsvn_wc-1.so -%%DYNAMIC_ENABLED%%lib/libsvn_wc-1.so.0 +%%NO_STATIC%%lib/libsvn_wc-1.so +%%NO_STATIC%%lib/libsvn_wc-1.so.0 @comment enable modules in this order: dav_svn, authz_svn, dontdothat %%MOD_DAV_SVN%%@unexec %%SED%% -i '' -E '/LoadModule[[:blank:]]+dav_svn_module/d' %D/%%APACHEETCDIR%%/httpd.conf %%MOD_DAV_SVN%%%%APACHEMODDIR%%/mod_dav_svn.so Modified: branches/2014Q3/devel/subversion17/Makefile ============================================================================== --- branches/2014Q3/devel/subversion17/Makefile Sat Aug 9 21:15:24 2014 (r364478) +++ branches/2014Q3/devel/subversion17/Makefile Sat Aug 9 21:22:12 2014 (r364479) @@ -94,14 +94,10 @@ USES+= gettext:build . endif . if ${PORT_OPTIONS:MBDB} BDB_BUILD_DEPENDS= yes -.else . endif OLD_LIB_DEPENDS:= ${LIB_DEPENDS:S!^!${LOCALBASE}/lib/!:C!(\.so|\.[0-9]+)?:!.a:!} BUILD_DEPENDS+= ${OLD_LIB_DEPENDS} LIB_DEPENDS= -PLIST_SUB+= DYNAMIC_ENABLED="@comment " -.else -PLIST_SUB+= DYNAMIC_ENABLED="" .endif .if make(repository) @@ -282,7 +278,7 @@ _mkrepos: .USE .endif svn-build-outputs-hack: - (cd ${WRKSRC} && ./gen-make.py --release --installed-libs libsvn_client,libsvn_delta,libsvn_diff,libsvn_fs,libsvn_ra,libsvn_repos,libsvn_subr,libsvn_wc) - ${MV} ${WRKSRC}/build-outputs.mk ${FILESDIR}/build-outputs.mk + (cd ${WRKSRC} && python2 ./gen-make.py --release --installed-libs libsvn_client,libsvn_delta,libsvn_diff,libsvn_fs,libsvn_ra,libsvn_repos,libsvn_subr,libsvn_wc) + ${MV} ${WRKSRC}/build-outputs.mk ${FILESDIR}/build-outputs.mk.addons .include Modified: branches/2014Q3/devel/subversion17/Makefile.common ============================================================================== --- branches/2014Q3/devel/subversion17/Makefile.common Sat Aug 9 21:15:24 2014 (r364478) +++ branches/2014Q3/devel/subversion17/Makefile.common Sat Aug 9 21:22:12 2014 (r364479) @@ -12,10 +12,12 @@ MASTER_SITE_SUBDIR= subversion USE_KDE4= # Used below if KWallet support is enabled GNU_CONFIGURE= yes -USES+= tar:bzip2 pkgconfig libtool +USES+= tar:bzip2 pkgconfig libtool cpe LICENSE= APACHE20 +CPE_VENDOR= apache + CONFLICTS_INSTALL+= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[^7].[0-9]* LIB_DEPENDS+= libapr-1.so:${PORTSDIR}/devel/apr1 \ @@ -116,7 +118,7 @@ post-patch: @${REINPLACE_CMD} "s#^swig_pydir =.*#swig_pydir = ${PYTHON_SITELIBDIR}/libsvn#" ${WRKSRC}/Makefile.in @${REINPLACE_CMD} "s#^swig_pydir_extra =.*#swig_pydir_extra = ${PYTHON_SITELIBDIR}/svn#" ${WRKSRC}/Makefile.in .if defined(SVN_BUILD_BINDINGS) - @${CP} ${FILESDIR}/build-outputs.mk ${WRKSRC} + ${CP} ${FILESDIR}/build-outputs.mk ${WRKSRC} .endif .if ${PORT_OPTIONS:MFREEBSD_TEMPLATE} && defined(ORGANIZATION) @${ECHO_CMD} "#define ORGANIZATION_NAME \"${ORGANIZATION}\"" > ${WRKSRC}/subversion/freebsd-organization.h Modified: branches/2014Q3/devel/subversion17/files/extra-patch-fbsd-template ============================================================================== --- branches/2014Q3/devel/subversion17/files/extra-patch-fbsd-template Sat Aug 9 21:15:24 2014 (r364478) +++ branches/2014Q3/devel/subversion17/files/extra-patch-fbsd-template Sat Aug 9 21:22:12 2014 (r364479) @@ -91,7 +91,7 @@ + svn_stringbuf_appendcstr(default_msg, "Approved by:\t" APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "Obtained from:\t" APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "MFC after:\t" APR_EOL_STR); -+ svn_stringbuf_appendcstr(default_msg, "MFH:\t" APR_EOL_STR); ++ svn_stringbuf_appendcstr(default_msg, "MFH:\t\t" APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "Relnotes:\t" APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "Security:\t" APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "Sponsored by:\t" Modified: branches/2014Q3/devel/subversion17/pkg-plist ============================================================================== --- branches/2014Q3/devel/subversion17/pkg-plist Sat Aug 9 21:15:24 2014 (r364478) +++ branches/2014Q3/devel/subversion17/pkg-plist Sat Aug 9 21:22:12 2014 (r364479) @@ -60,73 +60,73 @@ include/subversion-1/svn_version.h include/subversion-1/svn_wc.h include/subversion-1/svn_xml.h %%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.a -%%DYNAMIC_ENABLED%%%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.so -%%DYNAMIC_ENABLED%%%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.so.0 -%%DYNAMIC_ENABLED%%%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.so.0.0.0 +%%NO_STATIC%%%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.so +%%NO_STATIC%%%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.so.0 +%%NO_STATIC%%%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.so.0.0.0 %%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.a -%%DYNAMIC_ENABLED%%%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.so -%%DYNAMIC_ENABLED%%%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.so.0 -%%DYNAMIC_ENABLED%%%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.so.0.0.0 +%%NO_STATIC%%%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.so +%%NO_STATIC%%%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.so.0 +%%NO_STATIC%%%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.so.0.0.0 lib/libsvn_client-1.a -%%DYNAMIC_ENABLED%%lib/libsvn_client-1.so -%%DYNAMIC_ENABLED%%lib/libsvn_client-1.so.0 -%%DYNAMIC_ENABLED%%lib/libsvn_client-1.so.0.0.0 +%%NO_STATIC%%lib/libsvn_client-1.so +%%NO_STATIC%%lib/libsvn_client-1.so.0 +%%NO_STATIC%%lib/libsvn_client-1.so.0.0.0 lib/libsvn_delta-1.a -%%DYNAMIC_ENABLED%%lib/libsvn_delta-1.so -%%DYNAMIC_ENABLED%%lib/libsvn_delta-1.so.0 -%%DYNAMIC_ENABLED%%lib/libsvn_delta-1.so.0.0.0 +%%NO_STATIC%%lib/libsvn_delta-1.so +%%NO_STATIC%%lib/libsvn_delta-1.so.0 +%%NO_STATIC%%lib/libsvn_delta-1.so.0.0.0 lib/libsvn_diff-1.a -%%DYNAMIC_ENABLED%%lib/libsvn_diff-1.so -%%DYNAMIC_ENABLED%%lib/libsvn_diff-1.so.0 -%%DYNAMIC_ENABLED%%lib/libsvn_diff-1.so.0.0.0 +%%NO_STATIC%%lib/libsvn_diff-1.so +%%NO_STATIC%%lib/libsvn_diff-1.so.0 +%%NO_STATIC%%lib/libsvn_diff-1.so.0.0.0 lib/libsvn_fs-1.a -%%DYNAMIC_ENABLED%%lib/libsvn_fs-1.so -%%DYNAMIC_ENABLED%%lib/libsvn_fs-1.so.0 -%%DYNAMIC_ENABLED%%lib/libsvn_fs-1.so.0.0.0 +%%NO_STATIC%%lib/libsvn_fs-1.so +%%NO_STATIC%%lib/libsvn_fs-1.so.0 +%%NO_STATIC%%lib/libsvn_fs-1.so.0.0.0 %%BDB%%lib/libsvn_fs_base-1.a -%%DYNAMIC_ENABLED%%%%BDB%%lib/libsvn_fs_base-1.so -%%DYNAMIC_ENABLED%%%%BDB%%lib/libsvn_fs_base-1.so.0 -%%DYNAMIC_ENABLED%%%%BDB%%lib/libsvn_fs_base-1.so.0.0.0 +%%NO_STATIC%%%%BDB%%lib/libsvn_fs_base-1.so +%%NO_STATIC%%%%BDB%%lib/libsvn_fs_base-1.so.0 +%%NO_STATIC%%%%BDB%%lib/libsvn_fs_base-1.so.0.0.0 lib/libsvn_fs_fs-1.a -%%DYNAMIC_ENABLED%%lib/libsvn_fs_fs-1.so -%%DYNAMIC_ENABLED%%lib/libsvn_fs_fs-1.so.0 -%%DYNAMIC_ENABLED%%lib/libsvn_fs_fs-1.so.0.0.0 +%%NO_STATIC%%lib/libsvn_fs_fs-1.so +%%NO_STATIC%%lib/libsvn_fs_fs-1.so.0 +%%NO_STATIC%%lib/libsvn_fs_fs-1.so.0.0.0 lib/libsvn_fs_util-1.a -%%DYNAMIC_ENABLED%%lib/libsvn_fs_util-1.so -%%DYNAMIC_ENABLED%%lib/libsvn_fs_util-1.so.0 -%%DYNAMIC_ENABLED%%lib/libsvn_fs_util-1.so.0.0.0 +%%NO_STATIC%%lib/libsvn_fs_util-1.so +%%NO_STATIC%%lib/libsvn_fs_util-1.so.0 +%%NO_STATIC%%lib/libsvn_fs_util-1.so.0.0.0 lib/libsvn_ra-1.a -%%DYNAMIC_ENABLED%%lib/libsvn_ra-1.so -%%DYNAMIC_ENABLED%%lib/libsvn_ra-1.so.0 -%%DYNAMIC_ENABLED%%lib/libsvn_ra-1.so.0.0.0 +%%NO_STATIC%%lib/libsvn_ra-1.so +%%NO_STATIC%%lib/libsvn_ra-1.so.0 +%%NO_STATIC%%lib/libsvn_ra-1.so.0.0.0 lib/libsvn_ra_local-1.a -%%DYNAMIC_ENABLED%%lib/libsvn_ra_local-1.so -%%DYNAMIC_ENABLED%%lib/libsvn_ra_local-1.so.0 -%%DYNAMIC_ENABLED%%lib/libsvn_ra_local-1.so.0.0.0 +%%NO_STATIC%%lib/libsvn_ra_local-1.so +%%NO_STATIC%%lib/libsvn_ra_local-1.so.0 +%%NO_STATIC%%lib/libsvn_ra_local-1.so.0.0.0 %%NEON%%lib/libsvn_ra_neon-1.a -%%DYNAMIC_ENABLED%%%%NEON%%lib/libsvn_ra_neon-1.so -%%DYNAMIC_ENABLED%%%%NEON%%lib/libsvn_ra_neon-1.so.0 -%%DYNAMIC_ENABLED%%%%NEON%%lib/libsvn_ra_neon-1.so.0.0.0 +%%NO_STATIC%%%%NEON%%lib/libsvn_ra_neon-1.so +%%NO_STATIC%%%%NEON%%lib/libsvn_ra_neon-1.so.0 +%%NO_STATIC%%%%NEON%%lib/libsvn_ra_neon-1.so.0.0.0 %%SERF%%lib/libsvn_ra_serf-1.a -%%DYNAMIC_ENABLED%%%%SERF%%lib/libsvn_ra_serf-1.so -%%DYNAMIC_ENABLED%%%%SERF%%lib/libsvn_ra_serf-1.so.0 -%%DYNAMIC_ENABLED%%%%SERF%%lib/libsvn_ra_serf-1.so.0.0.0 +%%NO_STATIC%%%%SERF%%lib/libsvn_ra_serf-1.so +%%NO_STATIC%%%%SERF%%lib/libsvn_ra_serf-1.so.0 +%%NO_STATIC%%%%SERF%%lib/libsvn_ra_serf-1.so.0.0.0 lib/libsvn_ra_svn-1.a -%%DYNAMIC_ENABLED%%lib/libsvn_ra_svn-1.so -%%DYNAMIC_ENABLED%%lib/libsvn_ra_svn-1.so.0 -%%DYNAMIC_ENABLED%%lib/libsvn_ra_svn-1.so.0.0.0 +%%NO_STATIC%%lib/libsvn_ra_svn-1.so +%%NO_STATIC%%lib/libsvn_ra_svn-1.so.0 +%%NO_STATIC%%lib/libsvn_ra_svn-1.so.0.0.0 lib/libsvn_repos-1.a -%%DYNAMIC_ENABLED%%lib/libsvn_repos-1.so -%%DYNAMIC_ENABLED%%lib/libsvn_repos-1.so.0 -%%DYNAMIC_ENABLED%%lib/libsvn_repos-1.so.0.0.0 +%%NO_STATIC%%lib/libsvn_repos-1.so +%%NO_STATIC%%lib/libsvn_repos-1.so.0 +%%NO_STATIC%%lib/libsvn_repos-1.so.0.0.0 lib/libsvn_subr-1.a -%%DYNAMIC_ENABLED%%lib/libsvn_subr-1.so -%%DYNAMIC_ENABLED%%lib/libsvn_subr-1.so.0 -%%DYNAMIC_ENABLED%%lib/libsvn_subr-1.so.0.0.0 +%%NO_STATIC%%lib/libsvn_subr-1.so +%%NO_STATIC%%lib/libsvn_subr-1.so.0 +%%NO_STATIC%%lib/libsvn_subr-1.so.0.0.0 lib/libsvn_wc-1.a -%%DYNAMIC_ENABLED%%lib/libsvn_wc-1.so -%%DYNAMIC_ENABLED%%lib/libsvn_wc-1.so.0 -%%DYNAMIC_ENABLED%%lib/libsvn_wc-1.so.0.0.0 +%%NO_STATIC%%lib/libsvn_wc-1.so +%%NO_STATIC%%lib/libsvn_wc-1.so.0 +%%NO_STATIC%%lib/libsvn_wc-1.so.0.0.0 @comment enable modules in this order: dav_svn, authz_svn, dontdothat %%MOD_DAV_SVN%%@unexec %%SED%% -i '' -E '/LoadModule[[:blank:]]+dav_svn_module/d' %D/%%APACHEETCDIR%%/httpd.conf %%MOD_DAV_SVN%%%%APACHEMODDIR%%/mod_dav_svn.so