From owner-svn-ports-branches@FreeBSD.ORG Sun Dec 22 09:42:34 2013 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 567B4D58; Sun, 22 Dec 2013 09:42:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4241E1F77; Sun, 22 Dec 2013 09:42:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBM9gYWQ081151; Sun, 22 Dec 2013 09:42:34 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBM9gYL0081150; Sun, 22 Dec 2013 09:42:34 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201312220942.rBM9gYL0081150@svn.freebsd.org> From: Antoine Brodin Date: Sun, 22 Dec 2013 09:42:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337179 - branches/2014Q1/audio/gmpc X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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, 22 Dec 2013 09:42:34 -0000 Author: antoine Date: Sun Dec 22 09:42:33 2013 New Revision: 337179 URL: http://svnweb.freebsd.org/changeset/ports/337179 Log: MFH: r337178 Fix LIB_DEPENDS Approved by: portmgr (implicit) Modified: branches/2014Q1/audio/gmpc/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/audio/gmpc/Makefile ============================================================================== --- branches/2014Q1/audio/gmpc/Makefile Sun Dec 22 09:39:09 2013 (r337178) +++ branches/2014Q1/audio/gmpc/Makefile Sun Dec 22 09:42:33 2013 (r337179) @@ -18,7 +18,7 @@ LIB_DEPENDS= libmpd.so:${PORTSDIR}/audio libsexy.so:${PORTSDIR}/x11-toolkits/libsexy \ libsqlite3.so:${PORTSDIR}/databases/sqlite3 \ libsoup-2.4.so:${PORTSDIR}/devel/libsoup \ - libunique-1.so:${PORTSDIR}/x11-toolkits/unique + libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique GNU_CONFIGURE= yes USE_GNOME= glib20 gtk20 libglade2 From owner-svn-ports-branches@FreeBSD.ORG Sun Dec 22 10:04:59 2013 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 E2705279; Sun, 22 Dec 2013 10:04:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CDFC110AF; Sun, 22 Dec 2013 10:04:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBMA4xGh088688; Sun, 22 Dec 2013 10:04:59 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBMA4xXM088687; Sun, 22 Dec 2013 10:04:59 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201312221004.rBMA4xXM088687@svn.freebsd.org> From: Antoine Brodin Date: Sun, 22 Dec 2013 10:04:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337181 - branches/2014Q1/www/py-django-evolution X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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, 22 Dec 2013 10:05:00 -0000 Author: antoine Date: Sun Dec 22 10:04:59 2013 New Revision: 337181 URL: http://svnweb.freebsd.org/changeset/ports/337181 Log: MFH: r337180 - Fix RUN_DEPENDS - Stage support PR: ports/184793 Submitted by: Anes Mukhametov Approved by: portmgr (implicit) Modified: branches/2014Q1/www/py-django-evolution/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/www/py-django-evolution/Makefile ============================================================================== --- branches/2014Q1/www/py-django-evolution/Makefile Sun Dec 22 10:03:15 2013 (r337180) +++ branches/2014Q1/www/py-django-evolution/Makefile Sun Dec 22 10:04:59 2013 (r337181) @@ -14,10 +14,9 @@ COMMENT= A database schema evolution too LICENSE= BSD -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>=1.1.1<1.5:${PORTSDIR}/www/py-django14 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django14>=1.1.1<1.5:${PORTSDIR}/www/py-django14 USE_PYTHON= yes USE_PYDISTUTILS= easy_install -NO_STAGE= yes .include From owner-svn-ports-branches@FreeBSD.ORG Sun Dec 22 10:17:02 2013 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 0D1827EC; Sun, 22 Dec 2013 10:17:02 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id ED0071189; Sun, 22 Dec 2013 10:17:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBMAH1CO092881; Sun, 22 Dec 2013 10:17:01 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBMAH1ai092880; Sun, 22 Dec 2013 10:17:01 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201312221017.rBMAH1ai092880@svn.freebsd.org> From: Antoine Brodin Date: Sun, 22 Dec 2013 10:17:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337183 - branches/2014Q1/www/py-django-pipeline X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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, 22 Dec 2013 10:17:02 -0000 Author: antoine Date: Sun Dec 22 10:17:01 2013 New Revision: 337183 URL: http://svnweb.freebsd.org/changeset/ports/337183 Log: MFH: r337182 - Fix RUN_DEPENDS - Stage support PR: ports/184792 Submitted by: Anes Mukhametov Approved by: portmgr (implicit) Modified: branches/2014Q1/www/py-django-pipeline/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/www/py-django-pipeline/Makefile ============================================================================== --- branches/2014Q1/www/py-django-pipeline/Makefile Sun Dec 22 10:15:19 2013 (r337182) +++ branches/2014Q1/www/py-django-pipeline/Makefile Sun Dec 22 10:17:01 2013 (r337183) @@ -10,10 +10,9 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= clsung@FreeBSD.org COMMENT= Asset (css/js) packaging library for Django -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django>0<1.5:${PORTSDIR}/www/py-django14 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django14>0<1.5:${PORTSDIR}/www/py-django14 USE_PYTHON= -2.7 USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include From owner-svn-ports-branches@FreeBSD.ORG Sun Dec 22 12:00:46 2013 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 0F19E35D; Sun, 22 Dec 2013 12:00:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id EF1F317C1; Sun, 22 Dec 2013 12:00:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBMC0jml031246; Sun, 22 Dec 2013 12:00:45 GMT (envelope-from matthew@svn.freebsd.org) Received: (from matthew@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBMC0jlG031245; Sun, 22 Dec 2013 12:00:45 GMT (envelope-from matthew@svn.freebsd.org) Message-Id: <201312221200.rBMC0jlG031245@svn.freebsd.org> From: Matthew Seaman Date: Sun, 22 Dec 2013 12:00:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337186 - branches/2014Q1/www/rt42/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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, 22 Dec 2013 12:00:46 -0000 Author: matthew Date: Sun Dec 22 12:00:45 2013 New Revision: 337186 URL: http://svnweb.freebsd.org/changeset/ports/337186 Log: MFH: r337165 Fix support for alternate perl versions, and (while I'm here) non-standard $PREFIX settings. PR: ports/185044 Reported by: ler@lerctr.org Approved by: portmgr (erwin) Modified: branches/2014Q1/www/rt42/files/patch-config.layout Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/www/rt42/files/patch-config.layout ============================================================================== --- branches/2014Q1/www/rt42/files/patch-config.layout Sun Dec 22 11:48:43 2013 (r337185) +++ branches/2014Q1/www/rt42/files/patch-config.layout Sun Dec 22 12:00:45 2013 (r337186) @@ -1,11 +1,19 @@ --- ./config.layout.orig 2013-11-13 18:25:50.000000000 +0000 -+++ ./config.layout 2013-12-01 12:29:19.357557589 +0000 -@@ -110,24 +110,24 @@ ++++ ./config.layout 2013-12-21 20:55:02.411251960 +0000 +@@ -103,31 +103,31 @@ + + + +- prefix: /usr/local ++ prefix: %%PREFIX%% + exec_prefix: ${prefix} + bindir: ${exec_prefix}/bin + sbindir: ${exec_prefix}/sbin sysconfdir: ${prefix}/etc+ mandir: ${prefix}/man plugindir: ${prefix}/plugins - libdir: ${prefix}/lib+ -+ libdir: /usr/local/lib/perl5/site_perl/5.16 ++ libdir: %%SITE_PERL%% datadir: ${prefix}/share+ htmldir: ${datadir}/html lexdir: ${datadir}/po From owner-svn-ports-branches@FreeBSD.ORG Sun Dec 22 16:02:50 2013 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 EF6131CA; Sun, 22 Dec 2013 16:02:50 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C0F0A1612; Sun, 22 Dec 2013 16:02:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBMG2oiw019342; Sun, 22 Dec 2013 16:02:50 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBMG2ouj019340; Sun, 22 Dec 2013 16:02:50 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312221602.rBMG2ouj019340@svn.freebsd.org> From: Mathieu Arnold Date: Sun, 22 Dec 2013 16:02:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337194 - in branches/2014Q1/lang: perl5.16 perl5.18 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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, 22 Dec 2013 16:02:51 -0000 Author: mat Date: Sun Dec 22 16:02:50 2013 New Revision: 337194 URL: http://svnweb.freebsd.org/changeset/ports/337194 Log: MFH: r337193 Fixup perldoc by using groff from ports. Approved by: portmgr (implicit) Modified: branches/2014Q1/lang/perl5.16/Makefile branches/2014Q1/lang/perl5.18/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/lang/perl5.16/Makefile ============================================================================== --- branches/2014Q1/lang/perl5.16/Makefile Sun Dec 22 15:59:13 2013 (r337193) +++ branches/2014Q1/lang/perl5.16/Makefile Sun Dec 22 16:02:50 2013 (r337194) @@ -3,7 +3,7 @@ PORTNAME= perl PORTVERSION= ${PERL_VERSION} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= lang devel perl5 MASTER_SITES= CPAN \ ${MASTER_SITE_LOCAL:S/$/:local/} \ @@ -22,6 +22,8 @@ LICENSE_COMB= dual CONFLICTS_INSTALL= perl5.12-* perl5.14-* perl5.16-* perl5.18-* +RUN_DEPENDS= groff>=1.20.1:${PORTSDIR}/textproc/groff + OPTIONS_DEFINE= DEBUG GDBM PERL_MALLOC PERL_64BITINT THREADS PTHREAD \ MULTIPLICITY SITECUSTOMIZE USE_PERL OPTIONS_DEFAULT= PERL_64BITINT THREADS PTHREAD USE_PERL @@ -188,6 +190,8 @@ post-patch: ${BSDPAN_WRKSRC}/ExtUtils/*.pm ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/Configure ${WRKSRC}/hints/freebsd.sh + ${REINPLACE_CMD} -e '52s| = .*;$$| = "${LOCALBASE}/bin/groff";|' \ + ${WRKSRC}/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToMan.pm .if ${PORT_OPTIONS:MPTHREAD} ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g;' \ -e 's|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|g;' \ Modified: branches/2014Q1/lang/perl5.18/Makefile ============================================================================== --- branches/2014Q1/lang/perl5.18/Makefile Sun Dec 22 15:59:13 2013 (r337193) +++ branches/2014Q1/lang/perl5.18/Makefile Sun Dec 22 16:02:50 2013 (r337194) @@ -3,7 +3,7 @@ PORTNAME= perl PORTVERSION= ${PERL_VERSION} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= lang devel perl5 MASTER_SITES= CPAN \ ${MASTER_SITE_LOCAL:S/$/:local/} \ @@ -22,6 +22,8 @@ LICENSE_COMB= dual CONFLICTS_INSTALL= perl5.12-* perl5.14-* perl5.16-* perl5.18-* +RUN_DEPENDS= groff>=1.20.1:${PORTSDIR}/textproc/groff + OPTIONS_DEFINE= DEBUG GDBM PERL_64BITINT PTHREAD \ MULTIPLICITY SITECUSTOMIZE USE_PERL # it seems perl malloc has problems with threaded perl on FreeBSD @@ -170,6 +172,8 @@ post-patch: ${BSDPAN_WRKSRC}/ExtUtils/*.pm ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/Configure ${WRKSRC}/hints/freebsd.sh + ${REINPLACE_CMD} -e '52s| = .*;$$| = "${LOCALBASE}/bin/groff";|' \ + ${WRKSRC}/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToMan.pm .if ${PORT_OPTIONS:MPTHREAD} ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g;' \ -e 's|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|g;' \ From owner-svn-ports-branches@FreeBSD.ORG Sun Dec 22 16:11:42 2013 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 9F5C1630; Sun, 22 Dec 2013 16:11:42 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7269E16A4; Sun, 22 Dec 2013 16:11:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBMGBgeL023321; Sun, 22 Dec 2013 16:11:42 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBMGBgaA023319; Sun, 22 Dec 2013 16:11:42 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312221611.rBMGBgaA023319@svn.freebsd.org> From: Mathieu Arnold Date: Sun, 22 Dec 2013 16:11:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337196 - in branches/2014Q1/lang: perl5.16 perl5.18 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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, 22 Dec 2013 16:11:42 -0000 Author: mat Date: Sun Dec 22 16:11:41 2013 New Revision: 337196 URL: http://svnweb.freebsd.org/changeset/ports/337196 Log: MFH: r337195 Revert r337193, groff needs perl, makes a loop, is bad. Pointy hat to: myself Approved by: portmgr (implicit) Modified: branches/2014Q1/lang/perl5.16/Makefile branches/2014Q1/lang/perl5.18/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/lang/perl5.16/Makefile ============================================================================== --- branches/2014Q1/lang/perl5.16/Makefile Sun Dec 22 16:09:43 2013 (r337195) +++ branches/2014Q1/lang/perl5.16/Makefile Sun Dec 22 16:11:41 2013 (r337196) @@ -3,7 +3,7 @@ PORTNAME= perl PORTVERSION= ${PERL_VERSION} -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= lang devel perl5 MASTER_SITES= CPAN \ ${MASTER_SITE_LOCAL:S/$/:local/} \ @@ -22,8 +22,6 @@ LICENSE_COMB= dual CONFLICTS_INSTALL= perl5.12-* perl5.14-* perl5.16-* perl5.18-* -RUN_DEPENDS= groff>=1.20.1:${PORTSDIR}/textproc/groff - OPTIONS_DEFINE= DEBUG GDBM PERL_MALLOC PERL_64BITINT THREADS PTHREAD \ MULTIPLICITY SITECUSTOMIZE USE_PERL OPTIONS_DEFAULT= PERL_64BITINT THREADS PTHREAD USE_PERL @@ -190,8 +188,6 @@ post-patch: ${BSDPAN_WRKSRC}/ExtUtils/*.pm ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/Configure ${WRKSRC}/hints/freebsd.sh - ${REINPLACE_CMD} -e '52s| = .*;$$| = "${LOCALBASE}/bin/groff";|' \ - ${WRKSRC}/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToMan.pm .if ${PORT_OPTIONS:MPTHREAD} ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g;' \ -e 's|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|g;' \ Modified: branches/2014Q1/lang/perl5.18/Makefile ============================================================================== --- branches/2014Q1/lang/perl5.18/Makefile Sun Dec 22 16:09:43 2013 (r337195) +++ branches/2014Q1/lang/perl5.18/Makefile Sun Dec 22 16:11:41 2013 (r337196) @@ -3,7 +3,7 @@ PORTNAME= perl PORTVERSION= ${PERL_VERSION} -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= lang devel perl5 MASTER_SITES= CPAN \ ${MASTER_SITE_LOCAL:S/$/:local/} \ @@ -22,8 +22,6 @@ LICENSE_COMB= dual CONFLICTS_INSTALL= perl5.12-* perl5.14-* perl5.16-* perl5.18-* -RUN_DEPENDS= groff>=1.20.1:${PORTSDIR}/textproc/groff - OPTIONS_DEFINE= DEBUG GDBM PERL_64BITINT PTHREAD \ MULTIPLICITY SITECUSTOMIZE USE_PERL # it seems perl malloc has problems with threaded perl on FreeBSD @@ -172,8 +170,6 @@ post-patch: ${BSDPAN_WRKSRC}/ExtUtils/*.pm ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/Configure ${WRKSRC}/hints/freebsd.sh - ${REINPLACE_CMD} -e '52s| = .*;$$| = "${LOCALBASE}/bin/groff";|' \ - ${WRKSRC}/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToMan.pm .if ${PORT_OPTIONS:MPTHREAD} ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g;' \ -e 's|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|g;' \ From owner-svn-ports-branches@FreeBSD.ORG Mon Dec 23 04:33:05 2013 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 7ACE75AA; Mon, 23 Dec 2013 04:33:05 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 66AEE1688; Mon, 23 Dec 2013 04:33:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBN4X5uK091841; Mon, 23 Dec 2013 04:33:05 GMT (envelope-from marcus@svn.freebsd.org) Received: (from marcus@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBN4X5Md091839; Mon, 23 Dec 2013 04:33:05 GMT (envelope-from marcus@svn.freebsd.org) Message-Id: <201312230433.rBN4X5Md091839@svn.freebsd.org> From: Joe Marcus Clarke Date: Mon, 23 Dec 2013 04:33:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337227 - branches/2014Q1/net/wireshark X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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, 23 Dec 2013 04:33:05 -0000 Author: marcus Date: Mon Dec 23 04:33:04 2013 New Revision: 337227 URL: http://svnweb.freebsd.org/changeset/ports/337227 Log: MFH: Update to 1.10.5. See http://www.wireshark.org/docs/relnotes/wireshark-1.10.5.html for the list of changes in this release. Modified: branches/2014Q1/net/wireshark/Makefile branches/2014Q1/net/wireshark/distinfo Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/net/wireshark/Makefile ============================================================================== --- branches/2014Q1/net/wireshark/Makefile Mon Dec 23 04:30:36 2013 (r337226) +++ branches/2014Q1/net/wireshark/Makefile Mon Dec 23 04:33:04 2013 (r337227) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= wireshark -PORTVERSION= 1.10.3 +PORTVERSION= 1.10.5 CATEGORIES= net ipv6 MASTER_SITES= http://www.wireshark.org/download/src/ \ http://ftp.uni-kl.de/pub/wireshark/src/ \ Modified: branches/2014Q1/net/wireshark/distinfo ============================================================================== --- branches/2014Q1/net/wireshark/distinfo Mon Dec 23 04:30:36 2013 (r337226) +++ branches/2014Q1/net/wireshark/distinfo Mon Dec 23 04:33:04 2013 (r337227) @@ -1,2 +1,2 @@ -SHA256 (wireshark-1.10.3.tar.bz2) = c1641b36aeb0ca2c1a95fb01d2c647888b65e00a215c9a6464b5fc61e0fd498c -SIZE (wireshark-1.10.3.tar.bz2) = 26672853 +SHA256 (wireshark-1.10.5.tar.bz2) = a02190da9573dd381e7598277a31d0c63b05b2af9fe05ab6b7fc058bbea141f5 +SIZE (wireshark-1.10.5.tar.bz2) = 26666846 From owner-svn-ports-branches@FreeBSD.ORG Mon Dec 23 10:47:23 2013 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 F0F8CFE8; Mon, 23 Dec 2013 10:47:22 +0000 (UTC) Received: from prod2.absolight.net (mx3.absolight.net [IPv6:2a01:678:2:100::25]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7ECE21036; Mon, 23 Dec 2013 10:47:19 +0000 (UTC) Received: from prod2.absolight.net (localhost [127.0.0.1]) by prod2.absolight.net (Postfix) with ESMTP id C168ABDC5A; Mon, 23 Dec 2013 11:47:17 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=mat.cc; h=date:from:to :subject:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=plouf; bh=2ODlzHQORlQ DfH2Xui07JtT29VA=; b=XWRTCdI+dvfTeGwoWgzTUbc0am9mVoKeuk10o2nb8uE 8h8SrQB7NcaUotQwZTVTY4c/isZ8s+Tw7CDhAOwu0EK9Tmsiod01Gl/TIh8DdIlW Hl8qOrmJC7FbGtbQNtHG0p/mD/6HjfQzflLfjQ/+ly+uKULq+DJCVVGxzMMRMCXg = Received: from atuin.in.mat.cc (atuin.in.mat.cc [79.143.241.205]) by prod2.absolight.net (Postfix) with ESMTPA id 9E8DABDC56; Mon, 23 Dec 2013 11:47:17 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by atuin.in.mat.cc (Postfix) with ESMTP id 875D1CA85827; Mon, 23 Dec 2013 11:47:15 +0100 (CET) Date: Mon, 23 Dec 2013 11:47:12 +0100 From: Mathieu Arnold To: Joe Marcus Clarke , ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: Re: svn commit: r337227 - branches/2014Q1/net/wireshark Message-ID: In-Reply-To: <201312230433.rBN4X5Md091839@svn.freebsd.org> References: <201312230433.rBN4X5Md091839@svn.freebsd.org> X-Mailer: Mulberry/4.0.8 (Mac OS X) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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, 23 Dec 2013 10:47:23 -0000 +--On 23 d=C3=A9cembre 2013 04:33:05 +0000 Joe Marcus Clarke wrote: | Author: marcus | Date: Mon Dec 23 04:33:04 2013 | New Revision: 337227 | URL: http://svnweb.freebsd.org/changeset/ports/337227 |=20 | Log: | MFH: | =20 | Update to 1.10.5. See | http://www.wireshark.org/docs/relnotes/wireshark-1.10.5.html for the | list of changes in this release. Hum, what part of the release notes justifies the merge ? --=20 Mathieu Arnold From owner-svn-ports-branches@FreeBSD.ORG Mon Dec 23 14:42:57 2013 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 06B7830C; Mon, 23 Dec 2013 14:42:57 +0000 (UTC) Received: from alln-iport-4.cisco.com (alln-iport-4.cisco.com [173.37.142.91]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9F86F126D; Mon, 23 Dec 2013 14:42:56 +0000 (UTC) X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AhsFADBLuFKtJXHB/2dsb2JhbABZgws4g1a2P4EcFnSCJQEBAQQjDwEFQBELDgYEAgIFFgsCAgkDAgECAUUGAQwGAgEBBYd7DbE+mTwXgSmOA4JugUgBA4lDkASLLYU3g0se X-IronPort-AV: E=Sophos;i="4.95,537,1384300800"; d="scan'208";a="8655078" Received: from rcdn-core2-6.cisco.com ([173.37.113.193]) by alln-iport-4.cisco.com with ESMTP; 23 Dec 2013 14:41:46 +0000 Received: from rtp-jclarke-89111.cisco.com (rtp-jclarke-89111.cisco.com [10.117.46.172]) by rcdn-core2-6.cisco.com (8.14.5/8.14.5) with ESMTP id rBNEfkhO025465; Mon, 23 Dec 2013 14:41:46 GMT Message-ID: <52B84BAB.8060002@freebsd.org> Date: Mon, 23 Dec 2013 09:41:47 -0500 From: Joe Marcus Clarke Organization: FreeBSD, Inc. User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.9; rv:24.0) Gecko/20100101 Thunderbird/24.2.0 MIME-Version: 1.0 To: Mathieu Arnold , ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: Re: svn commit: r337227 - branches/2014Q1/net/wireshark References: <201312230433.rBN4X5Md091839@svn.freebsd.org> In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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, 23 Dec 2013 14:42:57 -0000 On 12/23/13, 5:47 AM, Mathieu Arnold wrote: > +--On 23 décembre 2013 04:33:05 +0000 Joe Marcus Clarke > wrote: > | Author: marcus > | Date: Mon Dec 23 04:33:04 2013 > | New Revision: 337227 > | URL: http://svnweb.freebsd.org/changeset/ports/337227 > | > | Log: > | MFH: > | > | Update to 1.10.5. See > | http://www.wireshark.org/docs/relnotes/wireshark-1.10.5.html for the > | list of changes in this release. > > Hum, what part of the release notes justifies the merge ? > This was actually a two-rev leap. I thought I had done .4, but did not. 1.10.4 fixes some security issues. Plus, this was minor enough, that the bugfixes alone would be valuable to users wanting a more stable experience. When the 1.12 release comes around, it will not make the quarterly branch. Joe -- Joe Marcus Clarke FreeBSD GNOME Team :: gnome@FreeBSD.org FreeNode / #freebsd-gnome http://www.FreeBSD.org/gnome From owner-svn-ports-branches@FreeBSD.ORG Mon Dec 23 15:02:18 2013 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 9673B7F6; Mon, 23 Dec 2013 15:02:18 +0000 (UTC) Received: from prod2.absolight.net (mx3.absolight.net [IPv6:2a01:678:2:100::25]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4BF60139C; Mon, 23 Dec 2013 15:02:18 +0000 (UTC) Received: from prod2.absolight.net (localhost [127.0.0.1]) by prod2.absolight.net (Postfix) with ESMTP id 9B9A2BDC2E; Mon, 23 Dec 2013 16:02:16 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=mat.cc; h=date:from:to :subject:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=plouf; bh=GEwDIBzI7sv jTDwP8yG3/9Vc27s=; b=rsgcLTeWHQEyf0k4Syastv4GPA3uN7y2ZUtuL1wqLJk ypQzrn8LPXGWF6OcWiGmKb/MmPZEL3RAmsxPuvmil3s7S0m52HeHNAZAXeywJ+pX QDGPLageHo/tc1wOAyZCrYaX0b6d+S6WDFwFLPJ0HYBvQxr7Wvy3K4kGaax/Xa+w = Received: from gw.in.absolight.net (gw-ecl.in.absolight.net [79.143.241.69]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "gw.in.absolight.net", Issuer "CA Cert Signing Authority" (not verified)) by prod2.absolight.net (Postfix) with ESMTPSA id 7A786BDC24; Mon, 23 Dec 2013 16:02:16 +0100 (CET) Received: from ogg.in.absolight.net (ogg.in.absolight.net [79.143.241.239]) by gw.in.absolight.net (Postfix) with ESMTP id D672A6124; Mon, 23 Dec 2013 16:02:15 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by ogg.in.absolight.net (Postfix) with ESMTP id 68FDC66C7A0D; Mon, 23 Dec 2013 16:02:15 +0100 (CET) Date: Mon, 23 Dec 2013 16:02:15 +0100 From: Mathieu Arnold To: Joe Marcus Clarke , ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: Re: svn commit: r337227 - branches/2014Q1/net/wireshark Message-ID: <0A6205C33BADDA2F0EFCA541@ogg.in.absolight.net> In-Reply-To: <52B84BAB.8060002@freebsd.org> References: <201312230433.rBN4X5Md091839@svn.freebsd.org> <52B84BAB.8060002@freebsd.org> X-Mailer: Mulberry/4.0.8 (Mac OS X) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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, 23 Dec 2013 15:02:18 -0000 +--On 23 d=C3=A9cembre 2013 09:41:47 -0500 Joe Marcus Clarke wrote: | On 12/23/13, 5:47 AM, Mathieu Arnold wrote: |> +--On 23 d=C3=A9cembre 2013 04:33:05 +0000 Joe Marcus Clarke |> wrote: |> | Author: marcus |> | Date: Mon Dec 23 04:33:04 2013 |> | New Revision: 337227 |> | URL: http://svnweb.freebsd.org/changeset/ports/337227 |> |=20 |> | Log: |> | MFH: |> |=20 |> | Update to 1.10.5. See |> | http://www.wireshark.org/docs/relnotes/wireshark-1.10.5.html for the |> | list of changes in this release. |>=20 |> Hum, what part of the release notes justifies the merge ? |>=20 |=20 | This was actually a two-rev leap. I thought I had done .4, but did not. | 1.10.4 fixes some security issues. Plus, this was minor enough, that the | bugfixes alone would be valuable to users wanting a more stable | experience. When the 1.12 release comes around, it will not make the | quarterly branch. Ok, great, thanks :-) --=20 Mathieu Arnold From owner-svn-ports-branches@FreeBSD.ORG Mon Dec 23 17:48:48 2013 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 38A8F69F; Mon, 23 Dec 2013 17:48:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 24CA51085; Mon, 23 Dec 2013 17:48:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBNHmm8x070717; Mon, 23 Dec 2013 17:48:48 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBNHmlpB070716; Mon, 23 Dec 2013 17:48:48 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201312231748.rBNHmlpB070716@svn.freebsd.org> From: Antoine Brodin Date: Mon, 23 Dec 2013 17:48:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337268 - branches/2014Q1/deskutils/cairo-dock X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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, 23 Dec 2013 17:48:48 -0000 Author: antoine Date: Mon Dec 23 17:48:47 2013 New Revision: 337268 URL: http://svnweb.freebsd.org/changeset/ports/337268 Log: MFH: r337267 Fix LIB_DEPENDS Approved by: portmgr (implicit) Modified: branches/2014Q1/deskutils/cairo-dock/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/deskutils/cairo-dock/Makefile ============================================================================== --- branches/2014Q1/deskutils/cairo-dock/Makefile Mon Dec 23 17:46:58 2013 (r337267) +++ branches/2014Q1/deskutils/cairo-dock/Makefile Mon Dec 23 17:48:47 2013 (r337268) @@ -13,7 +13,7 @@ COMMENT= Cairo-Dock is a light and eye-c LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo \ libcurl.so:${PORTSDIR}/ftp/curl \ libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ - libgtkglext-x11-1.so:${PORTSDIR}/x11-toolkits/gtkglext + libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \ sox:${PORTSDIR}/audio/sox From owner-svn-ports-branches@FreeBSD.ORG Mon Dec 23 20:34:01 2013 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 468213CE; Mon, 23 Dec 2013 20:34:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 316AF1E12; Mon, 23 Dec 2013 20:34:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBNKY1e7033264; Mon, 23 Dec 2013 20:34:01 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBNKY1FT033263; Mon, 23 Dec 2013 20:34:01 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201312232034.rBNKY1FT033263@svn.freebsd.org> From: Antoine Brodin Date: Mon, 23 Dec 2013 20:34:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337291 - branches/2014Q1/cad/netgen X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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, 23 Dec 2013 20:34:01 -0000 Author: antoine Date: Mon Dec 23 20:34:00 2013 New Revision: 337291 URL: http://svnweb.freebsd.org/changeset/ports/337291 Log: MFH: r337290 Fix LIB_DEPENDS Approved by: portmgr (implicit) Modified: branches/2014Q1/cad/netgen/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/cad/netgen/Makefile ============================================================================== --- branches/2014Q1/cad/netgen/Makefile Mon Dec 23 20:32:11 2013 (r337290) +++ branches/2014Q1/cad/netgen/Makefile Mon Dec 23 20:34:00 2013 (r337291) @@ -10,9 +10,9 @@ MASTER_SITES= SF/netgen-mesher/netgen-me MAINTAINER= stephen@FreeBSD.org COMMENT= An automatic 3D tetrahedral mesh generator -LIB_DEPENDS= liobTix8.4.so:${PORTSDIR}/x11-toolkits/tix \ - liobjpeg.so:${PORTSDIR}/graphics/jpeg \ - liobtogl.so:${PORTSDIR}/graphics/togl +LIB_DEPENDS= libTix8.4.3.so:${PORTSDIR}/x11-toolkits/tix \ + libjpeg.so:${PORTSDIR}/graphics/jpeg \ + libtogl.so:${PORTSDIR}/graphics/togl USE_LDCONFIG= yes USES= gmake From owner-svn-ports-branches@FreeBSD.ORG Mon Dec 23 20:43:48 2013 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 8807C761; Mon, 23 Dec 2013 20:43:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 72E3F1E9E; Mon, 23 Dec 2013 20:43:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBNKhmeJ036775; Mon, 23 Dec 2013 20:43:48 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBNKhmmt036774; Mon, 23 Dec 2013 20:43:48 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201312232043.rBNKhmmt036774@svn.freebsd.org> From: Antoine Brodin Date: Mon, 23 Dec 2013 20:43:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337293 - branches/2014Q1/databases/pgbouncer X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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, 23 Dec 2013 20:43:48 -0000 Author: antoine Date: Mon Dec 23 20:43:47 2013 New Revision: 337293 URL: http://svnweb.freebsd.org/changeset/ports/337293 Log: MFH: r337292 Fix LIB_DEPENDS Approved by: portmgr (implicit) Modified: branches/2014Q1/databases/pgbouncer/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/databases/pgbouncer/Makefile ============================================================================== --- branches/2014Q1/databases/pgbouncer/Makefile Mon Dec 23 20:42:11 2013 (r337292) +++ branches/2014Q1/databases/pgbouncer/Makefile Mon Dec 23 20:43:47 2013 (r337293) @@ -12,7 +12,7 @@ COMMENT= Lightweight connection pooler f LICENSE= BSD -LIB_DEPENDS= libevent-2.so:${PORTSDIR}/devel/libevent2 +LIB_DEPENDS= libevent-2.0.so:${PORTSDIR}/devel/libevent2 PORTSCOUT= site:http://pgfoundry.org/frs/?group_id=1000258 From owner-svn-ports-branches@FreeBSD.ORG Tue Dec 24 09:33:30 2013 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 5DBC997D; Tue, 24 Dec 2013 09:33:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 48D6D1E84; Tue, 24 Dec 2013 09:33:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBO9XUNH014672; Tue, 24 Dec 2013 09:33:30 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBO9XTr1014670; Tue, 24 Dec 2013 09:33:29 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201312240933.rBO9XTr1014670@svn.freebsd.org> From: Antoine Brodin Date: Tue, 24 Dec 2013 09:33:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337325 - in branches/2014Q1/deskutils/cairo-dock-plugins: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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: Tue, 24 Dec 2013 09:33:30 -0000 Author: antoine Date: Tue Dec 24 09:33:29 2013 New Revision: 337325 URL: http://svnweb.freebsd.org/changeset/ports/337325 Log: MFH: r337323 - Fix build - Do not reinplace binary files (*.wav, *.jpg...) - Stage support PR: ports/184944 Submitted by: Ivan Klymenko (maintainer) Approved by: portmgr (implicit) Added: branches/2014Q1/deskutils/cairo-dock-plugins/files/ - copied from r337323, head/deskutils/cairo-dock-plugins/files/ Modified: branches/2014Q1/deskutils/cairo-dock-plugins/Makefile branches/2014Q1/deskutils/cairo-dock-plugins/pkg-plist Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/deskutils/cairo-dock-plugins/Makefile ============================================================================== --- branches/2014Q1/deskutils/cairo-dock-plugins/Makefile Tue Dec 24 09:32:47 2013 (r337324) +++ branches/2014Q1/deskutils/cairo-dock-plugins/Makefile Tue Dec 24 09:33:29 2013 (r337325) @@ -18,16 +18,14 @@ DATADIR= ${PREFIX}/share/cairo-dock ICONS_PACKAGE= cairo-dock-plugins-png-icons GNU_CONFIGURE= yes -USE_GMAKE= yes -USE_GNOME= gnomehack glib20 gtk20 librsvg2 libxml2 +USE_GNOME= glib20 gtk20 librsvg2 libxml2 USE_LDCONFIG= yes USE_PYTHON= yes USE_XORG= xrender -USE_DOS2UNIX= YES USES= cmake gettext pkgconfig LDFLAGS+= -L${LOCALBASE}/lib PLIST_SUB+= PYVER="${PYTHON_VERSION:S/thon//}" -CMAKE_ARGS+= -Dinstall-pc-path:STRING="${LOCALBASE}/libdata/pkgconfig" +CMAKE_ARGS+= -DROOT_PREFIX:PATH=${STAGEDIR} OPTIONS_DEFINE= XFCE_INTEGRATION ALSA_MIXER GMENU \ KEYBOARD_INDICATOR IMPULSE \ @@ -44,14 +42,15 @@ WEBLETS_DESC= Weblets applet OPTIONS_SUB= yes -NO_STAGE= yes .include post-patch: @${CP} -R ${WRKDIR}/${ICONS_PACKAGE}/* ${WRKSRC} - @${FIND} ${WRKSRC} -type f -name "*" | ${XARGS} ${REINPLACE_CMD} -i.orig -e \ + @${FIND} ${WRKSRC} -type f \( -name "*.c" -o -name "*.conf" \ + -o -name netspeed -o -name nvidia-config -o -name "*.sh" \ + -o -name "*.rb" \) | ${XARGS} ${REINPLACE_CMD} -i.orig -e \ 's|/bin/bash|${LOCALBASE}/bin/bash|g; \ - s|/usr/bin/python|${LOCALBASE}/bin/python|g; \ + s|/usr/bin/python|${PYTHON_CMD}|g; \ s|/usr/bin/ruby|${LOCALBASE}/bin/ruby|g; \ s|/usr/share/applications|${LOCALBASE}/share/applications|g; \ s|/usr/share/cairo-dock|${LOCALBASE}/share/cairo-dock|g' Modified: branches/2014Q1/deskutils/cairo-dock-plugins/pkg-plist ============================================================================== --- branches/2014Q1/deskutils/cairo-dock-plugins/pkg-plist Tue Dec 24 09:32:47 2013 (r337324) +++ branches/2014Q1/deskutils/cairo-dock-plugins/pkg-plist Tue Dec 24 09:33:29 2013 (r337325) @@ -45,7 +45,6 @@ lib/cairo-dock/libcd-weather.so lib/cairo-dock/libcd-wifi.so lib/cairo-dock/libcd_gnome-integration.so lib/libCDApplet.so -lib/pkgconfig/CDApplet.pc %%XFCE_INTEGRATION%%lib/cairo-dock/libcd_xfce-integration.so %%PYTHON_SITELIBDIR%%/CDApplet.py %%PYTHON_SITELIBDIR%%/CDApplet.pyc @@ -55,6 +54,7 @@ lib/pkgconfig/CDApplet.pc %%PYTHON_SITELIBDIR%%/CDBashApplet-1.0-%%PYVER%%.egg-info %%PYTHON_SITELIBDIR%%/CairoDock.py %%PYTHON_SITELIBDIR%%/CairoDock.pyc +libdata/pkgconfig/CDApplet.pc share/locale/he/LC_MESSAGES/cairo-dock-plugins.mo share/locale/hr/LC_MESSAGES/cairo-dock-plugins.mo share/locale/fr/LC_MESSAGES/cairo-dock-plugins.mo @@ -485,7 +485,6 @@ share/cairo-dock/plug-ins/Xgamma/icon.pn share/cairo-dock/plug-ins/Xgamma/preview.jpg share/vala/vapi/CDApplet.vapi share/vala/vapi/CDApplet.deps -@dirrmtry lib/pkgconfig @dirrm share/cairo-dock/plug-ins/clock/digital/default @dirrm share/cairo-dock/plug-ins/clock/digital @dirrm share/cairo-dock/plug-ins/clock/themes/default From owner-svn-ports-branches@FreeBSD.ORG Tue Dec 24 09:44:52 2013 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 DE503BC2; Tue, 24 Dec 2013 09:44:52 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CA05B1F08; Tue, 24 Dec 2013 09:44:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBO9iqdA018334; Tue, 24 Dec 2013 09:44:52 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBO9iqh6018333; Tue, 24 Dec 2013 09:44:52 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201312240944.rBO9iqh6018333@svn.freebsd.org> From: Antoine Brodin Date: Tue, 24 Dec 2013 09:44:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337327 - branches/2014Q1/converters/iconv-rfc1345 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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: Tue, 24 Dec 2013 09:44:52 -0000 Author: antoine Date: Tue Dec 24 09:44:52 2013 New Revision: 337327 URL: http://svnweb.freebsd.org/changeset/ports/337327 Log: MFH: r337326 Fix LIB_DEPENDS Approved by: portmgr (implicit) Modified: branches/2014Q1/converters/iconv-rfc1345/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/converters/iconv-rfc1345/Makefile ============================================================================== --- branches/2014Q1/converters/iconv-rfc1345/Makefile Tue Dec 24 09:43:59 2013 (r337326) +++ branches/2014Q1/converters/iconv-rfc1345/Makefile Tue Dec 24 09:44:52 2013 (r337327) @@ -10,7 +10,7 @@ MASTER_SITE_SUBDIR= bland MAINTAINER= bland@FreeBSD.org COMMENT= Additional charset modules for the iconv library (from RFC1345) -LIB_DEPENDS= libbbiconv.so:${PORTSDIR}/converters/iconv +LIB_DEPENDS= libbiconv.so:${PORTSDIR}/converters/iconv USES= perl5 From owner-svn-ports-branches@FreeBSD.ORG Tue Dec 24 10:17:16 2013 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 8BF7312D; Tue, 24 Dec 2013 10:17:16 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7794710C6; Tue, 24 Dec 2013 10:17:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBOAHGpD029755; Tue, 24 Dec 2013 10:17:16 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBOAHGrv029753; Tue, 24 Dec 2013 10:17:16 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201312241017.rBOAHGrv029753@svn.freebsd.org> From: Antoine Brodin Date: Tue, 24 Dec 2013 10:17:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337330 - branches/2014Q1/databases/mysql-proxy X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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: Tue, 24 Dec 2013 10:17:16 -0000 Author: antoine Date: Tue Dec 24 10:17:15 2013 New Revision: 337330 URL: http://svnweb.freebsd.org/changeset/ports/337330 Log: MFH: r337329 Fix LIB_DEPENDS and plist Approved by: portmgr (implicit) Modified: branches/2014Q1/databases/mysql-proxy/Makefile branches/2014Q1/databases/mysql-proxy/pkg-plist Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/databases/mysql-proxy/Makefile ============================================================================== --- branches/2014Q1/databases/mysql-proxy/Makefile Tue Dec 24 10:16:18 2013 (r337329) +++ branches/2014Q1/databases/mysql-proxy/Makefile Tue Dec 24 10:17:15 2013 (r337330) @@ -11,7 +11,7 @@ MAINTAINER= swills@FreeBSD.org COMMENT= Monitor, analyze, or transform the communication of MySQL LIB_DEPENDS= libevent-1.4.so:${PORTSDIR}/devel/libevent \ - libglib.so:${PORTSDIR}/devel/glib20 + libglib-2.0.so:${PORTSDIR}/devel/glib20 CONFIGURE_ARGS+= --with-lua=lua-5.1 --with-mysql=${LOCALBASE}/bin/mysql_config --docdir=${DATADIR} --enable-self-contained CFLAGS+= -I${LOCALBASE}/include Modified: branches/2014Q1/databases/mysql-proxy/pkg-plist ============================================================================== --- branches/2014Q1/databases/mysql-proxy/pkg-plist Tue Dec 24 10:16:18 2013 (r337329) +++ branches/2014Q1/databases/mysql-proxy/pkg-plist Tue Dec 24 10:17:15 2013 (r337330) @@ -133,7 +133,4 @@ libexec/pkgconfig/mysql-proxy.pc @dirrmtry lib/mysql-proxy @dirrmtry libexec/pkgconfig @dirrmtry %%EXAMPLESDIR%% -@dirrmtry %%DATADIR%%/lua/proxy -@dirrmtry %%DATADIR%%/lua @dirrmtry %%DATADIR%% -@dirrmtry %%DOCSDIR%% From owner-svn-ports-branches@FreeBSD.ORG Tue Dec 24 10:21:57 2013 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 7F5DA359; Tue, 24 Dec 2013 10:21:57 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6AF871138; Tue, 24 Dec 2013 10:21:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBOALvpS032720; Tue, 24 Dec 2013 10:21:57 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBOALv5v032718; Tue, 24 Dec 2013 10:21:57 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201312241021.rBOALv5v032718@svn.freebsd.org> From: Antoine Brodin Date: Tue, 24 Dec 2013 10:21:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337332 - branches/2014Q1/textproc/p5-CSS-Croco X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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: Tue, 24 Dec 2013 10:21:57 -0000 Author: antoine Date: Tue Dec 24 10:21:56 2013 New Revision: 337332 URL: http://svnweb.freebsd.org/changeset/ports/337332 Log: MFH: r337331 Fix LIB_DEPENDS Approved by: portmgr (implicit) Modified: branches/2014Q1/textproc/p5-CSS-Croco/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/textproc/p5-CSS-Croco/Makefile ============================================================================== --- branches/2014Q1/textproc/p5-CSS-Croco/Makefile Tue Dec 24 10:21:01 2013 (r337331) +++ branches/2014Q1/textproc/p5-CSS-Croco/Makefile Tue Dec 24 10:21:56 2013 (r337332) @@ -12,7 +12,7 @@ COMMENT= Quick CSS parser BUILD_DEPENDS= p5-URI>=0:${PORTSDIR}/net/p5-URI RUN_DEPENDS:= ${BUILD_DEPENDS} -LIB_DEPENDS= libcroco.so:${PORTSDIR}/textproc/libcroco +LIB_DEPENDS= libcroco-0.6.so:${PORTSDIR}/textproc/libcroco USES= perl5 pkgconfig USE_PERL5= configure From owner-svn-ports-branches@FreeBSD.ORG Tue Dec 24 10:46:53 2013 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 0F419AB6; Tue, 24 Dec 2013 10:46:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id EF9FE1282; Tue, 24 Dec 2013 10:46:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBOAkqZ4040734; Tue, 24 Dec 2013 10:46:52 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBOAkqsL040733; Tue, 24 Dec 2013 10:46:52 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201312241046.rBOAkqsL040733@svn.freebsd.org> From: Antoine Brodin Date: Tue, 24 Dec 2013 10:46:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337337 - branches/2014Q1/www/thundersnarf X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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: Tue, 24 Dec 2013 10:46:53 -0000 Author: antoine Date: Tue Dec 24 10:46:52 2013 New Revision: 337337 URL: http://svnweb.freebsd.org/changeset/ports/337337 Log: MFH: r337336 Fix RUN_DEPENDS Approved by: portmgr (implicit) Modified: branches/2014Q1/www/thundersnarf/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/www/thundersnarf/Makefile ============================================================================== --- branches/2014Q1/www/thundersnarf/Makefile Tue Dec 24 10:45:57 2013 (r337336) +++ branches/2014Q1/www/thundersnarf/Makefile Tue Dec 24 10:46:52 2013 (r337337) @@ -30,9 +30,8 @@ USE_APACHE_RUN= 22+ .endif .if ${PORT_OPTIONS:MPGSQL} -USE_PGSQL= yes +USE_PGSQL= server WANT_PGSQL_VER= 84+ -RUN_DEPENDS+= postgresql-server>=0:${PORTSDIR}/databases/postgresql${PGSQL_VER}-server .endif .if ${PORT_OPTIONS:MPHP} && ${PORT_OPTIONS:MPGSQL} From owner-svn-ports-branches@FreeBSD.ORG Tue Dec 24 12:45:38 2013 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 D69E05BF; Tue, 24 Dec 2013 12:45:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B79391E60; Tue, 24 Dec 2013 12:45:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBOCjcw8083092; Tue, 24 Dec 2013 12:45:38 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBOCjc1V083088; Tue, 24 Dec 2013 12:45:38 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312241245.rBOCjc1V083088@svn.freebsd.org> From: Mathieu Arnold Date: Tue, 24 Dec 2013 12:45:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337340 - in branches/2014Q1/games/0verkill: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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: Tue, 24 Dec 2013 12:45:38 -0000 Author: mat Date: Tue Dec 24 12:45:37 2013 New Revision: 337340 URL: http://svnweb.freebsd.org/changeset/ports/337340 Log: MFH: r337259 1. Merge fixes for long known bugs from hackndev[1] version 3507529 64bit fix ... now works on amd64 as well ;-) 95d2af2 Replaced all those insecure sprintf's with snprintf's (partial) 33a1a8d Fix sigsegv on hero reaching topmost or leftmost border of the game area 436bbfc Push back network stack underflow bugfix 160e4d6 Prevent buffer overflow ee911ba make the server invulnerable to long names 2. Add patch from gentoo linux[2] to use unmodified game data. 3. Support staging 4. Use options framework [1] https://github.com/hackndev/0verkill [2] http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/games-action/0verkill/files/0verkill-0.16-gentoo-paths.patch?revision=1.1&view=markup PR: ports/184252 Submitted by: Vladimir Kondratiev Approved by: portmgr (implicit) Added: branches/2014Q1/games/0verkill/files/ - copied from r337259, head/games/0verkill/files/ Modified: branches/2014Q1/games/0verkill/Makefile branches/2014Q1/games/0verkill/pkg-descr branches/2014Q1/games/0verkill/pkg-plist Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/games/0verkill/Makefile ============================================================================== --- branches/2014Q1/games/0verkill/Makefile Tue Dec 24 12:42:38 2013 (r337339) +++ branches/2014Q1/games/0verkill/Makefile Tue Dec 24 12:45:37 2013 (r337340) @@ -3,7 +3,7 @@ PORTNAME= 0verkill PORTVERSION= 0.16 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://artax.karlin.mff.cuni.cz/~brain/0verkill/release/ EXTRACT_SUFX= .tgz @@ -15,51 +15,39 @@ LICENSE= GPLv2 GNU_CONFIGURE= yes -.if defined(WITHOUT_X11) -PLIST_SUB= X11="@comment " -.else -USE_XORG= xpm -CONFIGURE_ARGS+= --with-x -PLIST_SUB= X11="" -.endif +OPTIONS_DEFINE= X11 DOCS +OPTIONS_DEFAULT=X11 DOCS -NO_STAGE= yes -pre-everything:: -.if !defined(WITHOUT_X11) - @${ECHO_MSG} - @${ECHO_MSG} "If you want to compile without X11 support," - @${ECHO_MSG} "hit Ctrl-C right now and use \"make WITHOUT_X11=yes\"" - @${ECHO_MSG} -.endif +OPTIONS_SUB= yes +X11_USE= XORG=xpm +X11_CONFIGURE_WITH= x + +.include post-patch: @${REINPLACE_CMD} -e 's|data/|${DATADIR}/data/|g' ${WRKSRC}/cfg.h - @${REINPLACE_CMD} -e 's|grx/|${DATADIR}/grx/|g' ${WRKSRC}/data/* @${REINPLACE_CMD} -e 's|-O3 ||g ; \ s|gcc |\$$\(CC\) |g' ${WRKSRC}/Makefile.in do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/0verkill ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/0verkill ${STAGEDIR}${PREFIX}/bin .for file in avi bot editor server test_server - ${INSTALL_PROGRAM} ${WRKSRC}/${file} ${PREFIX}/bin/0verkill-${file} + ${INSTALL_PROGRAM} ${WRKSRC}/${file} \ + ${STAGEDIR}${PREFIX}/bin/0verkill-${file} .endfor -.if !defined(WITHOUT_X11) - ${INSTALL_PROGRAM} ${WRKSRC}/x0verkill ${PREFIX}/bin +.if ${PORT_OPTIONS:MX11} + ${INSTALL_PROGRAM} ${WRKSRC}/x0verkill ${STAGEDIR}${PREFIX}/bin .for file in avi editor - ${INSTALL_PROGRAM} ${WRKSRC}/x${file} ${PREFIX}/bin/x0verkill-${file} + ${INSTALL_PROGRAM} ${WRKSRC}/x${file} \ + ${STAGEDIR}${PREFIX}/bin/x0verkill-${file} .endfor .endif - @${MKDIR} ${DATADIR}/data -.for file in banner.dat level.dat sprites.dat *.sp *.dn *.st - ${INSTALL_DATA} ${WRKSRC}/data/${file} ${DATADIR}/data +.for dir in data grx + cd ${WRKSRC} && ${COPYTREE_SHARE} ${dir} ${STAGEDIR}${DATADIR} .endfor - @${MKDIR} ${DATADIR}/grx - ${INSTALL_DATA} ${WRKSRC}/grx/* ${DATADIR}/grx -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for file in AUTHORS README.html avi.txt bot.txt doc.html - ${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/${file} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include Modified: branches/2014Q1/games/0verkill/pkg-descr ============================================================================== --- branches/2014Q1/games/0verkill/pkg-descr Tue Dec 24 12:42:38 2013 (r337339) +++ branches/2014Q1/games/0verkill/pkg-descr Tue Dec 24 12:45:37 2013 (r337340) @@ -8,4 +8,4 @@ of network-game action in such a massive No one ever connected gushing blood with those innocent ASCII letters that were so utterly boring until recently, when 0verkill was released. -WWW: http://artax.karlin.mff.cuni.cz/~brain/0verkill/ +WWW: http://artax.karlin.mff.cuni.cz/~brain/0verkill/ Modified: branches/2014Q1/games/0verkill/pkg-plist ============================================================================== --- branches/2014Q1/games/0verkill/pkg-plist Tue Dec 24 12:42:38 2013 (r337339) +++ branches/2014Q1/games/0verkill/pkg-plist Tue Dec 24 12:45:37 2013 (r337340) @@ -7,250 +7,250 @@ bin/0verkill-test_server %%X11%%bin/x0verkill %%X11%%bin/x0verkill-avi %%X11%%bin/x0verkill-editor -share/0verkill/data/banner.dat -share/0verkill/data/level.dat -share/0verkill/data/sprites.dat -share/0verkill/data/level1.dn -share/0verkill/data/level1.sp -share/0verkill/data/level1.st -share/0verkill/data/level2.dn -share/0verkill/data/level2.sp -share/0verkill/data/level2.st -share/0verkill/grx/0verkill.avi -share/0verkill/grx/ackermann.avi -share/0verkill/grx/altar.avi -share/0verkill/grx/ammo.avi -share/0verkill/grx/anthrax.avi -share/0verkill/grx/armor.avi -share/0verkill/grx/barrel.avi -share/0verkill/grx/barrel_fire.avi -share/0verkill/grx/bedna.avi -share/0verkill/grx/bedna_v.avi -share/0verkill/grx/bednarek.avi -share/0verkill/grx/beer.avi -share/0verkill/grx/beran.avi -share/0verkill/grx/bici.avi -share/0verkill/grx/biohazard.avi -share/0verkill/grx/blood.avi -share/0verkill/grx/bulge.avi -share/0verkill/grx/bullet.avi -share/0verkill/grx/bus.avi -share/0verkill/grx/camel.avi -share/0verkill/grx/cartridge.avi -share/0verkill/grx/chain1.avi -share/0verkill/grx/chain2.avi -share/0verkill/grx/chain3.avi -share/0verkill/grx/closed.avi -share/0verkill/grx/cloud.avi -share/0verkill/grx/corpse1.avi -share/0verkill/grx/corpse2.avi -share/0verkill/grx/corpse3.avi -share/0verkill/grx/corpse4.avi -share/0verkill/grx/corpse5.avi -share/0verkill/grx/corpse6.avi -share/0verkill/grx/corpse7.avi -share/0verkill/grx/corpse8.avi -share/0verkill/grx/corpse9.avi -share/0verkill/grx/corpseA.avi -share/0verkill/grx/corpseB.avi -share/0verkill/grx/corpseC.avi -share/0verkill/grx/corpseD.avi -share/0verkill/grx/corpseE.avi -share/0verkill/grx/corpseF.avi -share/0verkill/grx/corpse_girl_1.avi -share/0verkill/grx/corpse_girl_2.avi -share/0verkill/grx/corpse_girl_3.avi -share/0verkill/grx/corpse_girl_4.avi -share/0verkill/grx/corpse_girl_5.avi -share/0verkill/grx/corpse_girl_6.avi -share/0verkill/grx/corpse_girl_7.avi -share/0verkill/grx/corpse_girl_8.avi -share/0verkill/grx/corpse_girl_9.avi -share/0verkill/grx/corpse_girl_A.avi -share/0verkill/grx/corpse_girl_B.avi -share/0verkill/grx/corpse_girl_C.avi -share/0verkill/grx/corpse_girl_D.avi -share/0verkill/grx/corpse_girl_E.avi -share/0verkill/grx/corpse_girl_F.avi -share/0verkill/grx/corpse_girl_univ.avi -share/0verkill/grx/corpse_univ.avi -share/0verkill/grx/cowboys.avi -share/0verkill/grx/dekl.avi -share/0verkill/grx/domecek.avi -share/0verkill/grx/door.avi -share/0verkill/grx/dope.avi -share/0verkill/grx/dvirka.avi -share/0verkill/grx/erectus.avi -share/0verkill/grx/fan.avi -share/0verkill/grx/favo.avi -share/0verkill/grx/footboard.avi -share/0verkill/grx/forum.avi -share/0verkill/grx/gentlemen.avi -share/0verkill/grx/girl1.avi -share/0verkill/grx/girl2.avi -share/0verkill/grx/girl3.avi -share/0verkill/grx/girl4.avi -share/0verkill/grx/girl5.avi -share/0verkill/grx/girl6.avi -share/0verkill/grx/girl7.avi -share/0verkill/grx/girl8.avi -share/0verkill/grx/girl9.avi -share/0verkill/grx/girlA.avi -share/0verkill/grx/girlB.avi -share/0verkill/grx/girlC.avi -share/0verkill/grx/girlD.avi -share/0verkill/grx/girlE.avi -share/0verkill/grx/girlF.avi -share/0verkill/grx/girl_univ.avi -share/0verkill/grx/grave1.avi -share/0verkill/grx/grave2.avi -share/0verkill/grx/grave3.avi -share/0verkill/grx/grenade.avi -share/0verkill/grx/grenades.avi -share/0verkill/grx/guitarist1.avi -share/0verkill/grx/guitarist2.avi -share/0verkill/grx/guitarist3.avi -share/0verkill/grx/gun.avi -share/0verkill/grx/hajzl.avi -share/0verkill/grx/hajzlik.avi -share/0verkill/grx/hellslime.avi -share/0verkill/grx/hero1.avi -share/0verkill/grx/hero2.avi -share/0verkill/grx/hero3.avi -share/0verkill/grx/hero4.avi -share/0verkill/grx/hero5.avi -share/0verkill/grx/hero6.avi -share/0verkill/grx/hero7.avi -share/0verkill/grx/hero8.avi -share/0verkill/grx/hero9.avi -share/0verkill/grx/heroA.avi -share/0verkill/grx/heroB.avi -share/0verkill/grx/heroC.avi -share/0verkill/grx/heroD.avi -share/0verkill/grx/heroE.avi -share/0verkill/grx/heroF.avi -share/0verkill/grx/hero_univ.avi -share/0verkill/grx/heute.avi -share/0verkill/grx/hit.avi -share/0verkill/grx/hlina.avi -share/0verkill/grx/hook.avi -share/0verkill/grx/humpolec.avi -share/0verkill/grx/kamelky.avi -share/0verkill/grx/kanal.avi -share/0verkill/grx/klesani.avi -share/0verkill/grx/koleje.avi -share/0verkill/grx/kotel.avi -share/0verkill/grx/kotelna.avi -share/0verkill/grx/kotelnik.avi -share/0verkill/grx/koubek.avi -share/0verkill/grx/krovi.avi -share/0verkill/grx/ladder.avi -share/0verkill/grx/ladies.avi -share/0verkill/grx/lamp1.avi -share/0verkill/grx/lamp2.avi -share/0verkill/grx/lamp3.avi -share/0verkill/grx/lava.avi -share/0verkill/grx/lava1.avi -share/0verkill/grx/lava2.avi -share/0verkill/grx/lebzhnaty.avi -share/0verkill/grx/links.avi -share/0verkill/grx/liqory.avi -share/0verkill/grx/make_hero -share/0verkill/grx/mar.avi -share/0verkill/grx/medikit.avi -share/0verkill/grx/melasa.avi -share/0verkill/grx/mess.avi -share/0verkill/grx/mess1.avi -share/0verkill/grx/mess2.avi -share/0verkill/grx/mess3.avi -share/0verkill/grx/mess4.avi -share/0verkill/grx/metro.avi -share/0verkill/grx/noise.avi -share/0verkill/grx/nosmoking.avi -share/0verkill/grx/ohrada.avi -share/0verkill/grx/okno.avi -share/0verkill/grx/para.avi -share/0verkill/grx/perm.avi -share/0verkill/grx/petice.avi -share/0verkill/grx/pi.avi -share/0verkill/grx/pillar.avi -share/0verkill/grx/pipe.avi -share/0verkill/grx/pipe1.avi -share/0verkill/grx/pipe2.avi -share/0verkill/grx/pipe3.avi -share/0verkill/grx/pipe4.avi -share/0verkill/grx/pivrnec.avi -share/0verkill/grx/podium.avi -share/0verkill/grx/podlaha.avi -share/0verkill/grx/prkno.avi -share/0verkill/grx/pruhonice.avi -share/0verkill/grx/pub.avi -share/0verkill/grx/pumping.avi -share/0verkill/grx/pytlak.avi -share/0verkill/grx/radioactive.avi -share/0verkill/grx/raid.avi -share/0verkill/grx/raidrekl.avi -share/0verkill/grx/rampa.avi -share/0verkill/grx/reklama.avi -share/0verkill/grx/rg6.avi -share/0verkill/grx/rifle.avi -share/0verkill/grx/rocket.avi -share/0verkill/grx/rough.avi -share/0verkill/grx/schody1l.avi -share/0verkill/grx/schody1r.avi -share/0verkill/grx/schodyl.avi -share/0verkill/grx/schodyr.avi -share/0verkill/grx/shell.avi -share/0verkill/grx/shells.avi -share/0verkill/grx/shotgun.avi -share/0verkill/grx/shrapnel1.avi -share/0verkill/grx/shrapnel10.avi -share/0verkill/grx/shrapnel2.avi -share/0verkill/grx/shrapnel3.avi -share/0verkill/grx/shrapnel4.avi -share/0verkill/grx/shrapnel5.avi -share/0verkill/grx/shrapnel6.avi -share/0verkill/grx/shrapnel7.avi -share/0verkill/grx/shrapnel8.avi -share/0verkill/grx/shrapnel9.avi -share/0verkill/grx/skull.avi -share/0verkill/grx/slug.avi -share/0verkill/grx/smoker.avi -share/0verkill/grx/sshell.avi -share/0verkill/grx/stone.avi -share/0verkill/grx/stone1.avi -share/0verkill/grx/stone2.avi -share/0verkill/grx/stone3.avi -share/0verkill/grx/stone_steps_l.avi -share/0verkill/grx/stone_steps_r.avi -share/0verkill/grx/sugar.avi -share/0verkill/grx/svab.avi -share/0verkill/grx/swing_lamp.avi -share/0verkill/grx/tabule.avi -share/0verkill/grx/tnt.avi -share/0verkill/grx/toadstool.avi -share/0verkill/grx/traverza.avi -share/0verkill/grx/traverza1.avi -share/0verkill/grx/traverza2.avi -share/0verkill/grx/u_kuceru.avi -share/0verkill/grx/uhli.avi -share/0verkill/grx/uzi.avi -share/0verkill/grx/vetrak.avi -share/0verkill/grx/waltr.avi -share/0verkill/grx/water.avi -share/0verkill/grx/zabradli.avi -share/0verkill/grx/zarivka.avi -share/0verkill/grx/zebrik2.avi -share/0verkill/grx/zed.avi -share/0verkill/grx/zed2.avi -share/0verkill/grx/zed3.avi -share/0verkill/grx/zpevak.avi -%%PORTDOCS%%share/doc/0verkill/AUTHORS -%%PORTDOCS%%share/doc/0verkill/README.html -%%PORTDOCS%%share/doc/0verkill/avi.txt -%%PORTDOCS%%share/doc/0verkill/bot.txt -%%PORTDOCS%%share/doc/0verkill/doc.html -%%PORTDOCS%%@dirrm share/doc/0verkill -@dirrm share/0verkill/grx -@dirrm share/0verkill/data -@dirrm share/0verkill +%%DATADIR%%/data/banner.dat +%%DATADIR%%/data/level.dat +%%DATADIR%%/data/sprites.dat +%%DATADIR%%/data/level1.dn +%%DATADIR%%/data/level1.sp +%%DATADIR%%/data/level1.st +%%DATADIR%%/data/level2.dn +%%DATADIR%%/data/level2.sp +%%DATADIR%%/data/level2.st +%%DATADIR%%/grx/0verkill.avi +%%DATADIR%%/grx/ackermann.avi +%%DATADIR%%/grx/altar.avi +%%DATADIR%%/grx/ammo.avi +%%DATADIR%%/grx/anthrax.avi +%%DATADIR%%/grx/armor.avi +%%DATADIR%%/grx/barrel.avi +%%DATADIR%%/grx/barrel_fire.avi +%%DATADIR%%/grx/bedna.avi +%%DATADIR%%/grx/bedna_v.avi +%%DATADIR%%/grx/bednarek.avi +%%DATADIR%%/grx/beer.avi +%%DATADIR%%/grx/beran.avi +%%DATADIR%%/grx/bici.avi +%%DATADIR%%/grx/biohazard.avi +%%DATADIR%%/grx/blood.avi +%%DATADIR%%/grx/bulge.avi +%%DATADIR%%/grx/bullet.avi +%%DATADIR%%/grx/bus.avi +%%DATADIR%%/grx/camel.avi +%%DATADIR%%/grx/cartridge.avi +%%DATADIR%%/grx/chain1.avi +%%DATADIR%%/grx/chain2.avi +%%DATADIR%%/grx/chain3.avi +%%DATADIR%%/grx/closed.avi +%%DATADIR%%/grx/cloud.avi +%%DATADIR%%/grx/corpse1.avi +%%DATADIR%%/grx/corpse2.avi +%%DATADIR%%/grx/corpse3.avi +%%DATADIR%%/grx/corpse4.avi +%%DATADIR%%/grx/corpse5.avi +%%DATADIR%%/grx/corpse6.avi +%%DATADIR%%/grx/corpse7.avi +%%DATADIR%%/grx/corpse8.avi +%%DATADIR%%/grx/corpse9.avi +%%DATADIR%%/grx/corpseA.avi +%%DATADIR%%/grx/corpseB.avi +%%DATADIR%%/grx/corpseC.avi +%%DATADIR%%/grx/corpseD.avi +%%DATADIR%%/grx/corpseE.avi +%%DATADIR%%/grx/corpseF.avi +%%DATADIR%%/grx/corpse_girl_1.avi +%%DATADIR%%/grx/corpse_girl_2.avi +%%DATADIR%%/grx/corpse_girl_3.avi +%%DATADIR%%/grx/corpse_girl_4.avi +%%DATADIR%%/grx/corpse_girl_5.avi +%%DATADIR%%/grx/corpse_girl_6.avi +%%DATADIR%%/grx/corpse_girl_7.avi +%%DATADIR%%/grx/corpse_girl_8.avi +%%DATADIR%%/grx/corpse_girl_9.avi +%%DATADIR%%/grx/corpse_girl_A.avi +%%DATADIR%%/grx/corpse_girl_B.avi +%%DATADIR%%/grx/corpse_girl_C.avi +%%DATADIR%%/grx/corpse_girl_D.avi +%%DATADIR%%/grx/corpse_girl_E.avi +%%DATADIR%%/grx/corpse_girl_F.avi +%%DATADIR%%/grx/corpse_girl_univ.avi +%%DATADIR%%/grx/corpse_univ.avi +%%DATADIR%%/grx/cowboys.avi +%%DATADIR%%/grx/dekl.avi +%%DATADIR%%/grx/domecek.avi +%%DATADIR%%/grx/door.avi +%%DATADIR%%/grx/dope.avi +%%DATADIR%%/grx/dvirka.avi +%%DATADIR%%/grx/erectus.avi +%%DATADIR%%/grx/fan.avi +%%DATADIR%%/grx/favo.avi +%%DATADIR%%/grx/footboard.avi +%%DATADIR%%/grx/forum.avi +%%DATADIR%%/grx/gentlemen.avi +%%DATADIR%%/grx/girl1.avi +%%DATADIR%%/grx/girl2.avi +%%DATADIR%%/grx/girl3.avi +%%DATADIR%%/grx/girl4.avi +%%DATADIR%%/grx/girl5.avi +%%DATADIR%%/grx/girl6.avi +%%DATADIR%%/grx/girl7.avi +%%DATADIR%%/grx/girl8.avi +%%DATADIR%%/grx/girl9.avi +%%DATADIR%%/grx/girlA.avi +%%DATADIR%%/grx/girlB.avi +%%DATADIR%%/grx/girlC.avi +%%DATADIR%%/grx/girlD.avi +%%DATADIR%%/grx/girlE.avi +%%DATADIR%%/grx/girlF.avi +%%DATADIR%%/grx/girl_univ.avi +%%DATADIR%%/grx/grave1.avi +%%DATADIR%%/grx/grave2.avi +%%DATADIR%%/grx/grave3.avi +%%DATADIR%%/grx/grenade.avi +%%DATADIR%%/grx/grenades.avi +%%DATADIR%%/grx/guitarist1.avi +%%DATADIR%%/grx/guitarist2.avi +%%DATADIR%%/grx/guitarist3.avi +%%DATADIR%%/grx/gun.avi +%%DATADIR%%/grx/hajzl.avi +%%DATADIR%%/grx/hajzlik.avi +%%DATADIR%%/grx/hellslime.avi +%%DATADIR%%/grx/hero1.avi +%%DATADIR%%/grx/hero2.avi +%%DATADIR%%/grx/hero3.avi +%%DATADIR%%/grx/hero4.avi +%%DATADIR%%/grx/hero5.avi +%%DATADIR%%/grx/hero6.avi +%%DATADIR%%/grx/hero7.avi +%%DATADIR%%/grx/hero8.avi +%%DATADIR%%/grx/hero9.avi +%%DATADIR%%/grx/heroA.avi +%%DATADIR%%/grx/heroB.avi +%%DATADIR%%/grx/heroC.avi +%%DATADIR%%/grx/heroD.avi +%%DATADIR%%/grx/heroE.avi +%%DATADIR%%/grx/heroF.avi +%%DATADIR%%/grx/hero_univ.avi +%%DATADIR%%/grx/heute.avi +%%DATADIR%%/grx/hit.avi +%%DATADIR%%/grx/hlina.avi +%%DATADIR%%/grx/hook.avi +%%DATADIR%%/grx/humpolec.avi +%%DATADIR%%/grx/kamelky.avi +%%DATADIR%%/grx/kanal.avi +%%DATADIR%%/grx/klesani.avi +%%DATADIR%%/grx/koleje.avi +%%DATADIR%%/grx/kotel.avi +%%DATADIR%%/grx/kotelna.avi +%%DATADIR%%/grx/kotelnik.avi +%%DATADIR%%/grx/koubek.avi +%%DATADIR%%/grx/krovi.avi +%%DATADIR%%/grx/ladder.avi +%%DATADIR%%/grx/ladies.avi +%%DATADIR%%/grx/lamp1.avi +%%DATADIR%%/grx/lamp2.avi +%%DATADIR%%/grx/lamp3.avi +%%DATADIR%%/grx/lava.avi +%%DATADIR%%/grx/lava1.avi +%%DATADIR%%/grx/lava2.avi +%%DATADIR%%/grx/lebzhnaty.avi +%%DATADIR%%/grx/links.avi +%%DATADIR%%/grx/liqory.avi +%%DATADIR%%/grx/make_hero +%%DATADIR%%/grx/mar.avi +%%DATADIR%%/grx/medikit.avi +%%DATADIR%%/grx/melasa.avi +%%DATADIR%%/grx/mess.avi +%%DATADIR%%/grx/mess1.avi +%%DATADIR%%/grx/mess2.avi +%%DATADIR%%/grx/mess3.avi +%%DATADIR%%/grx/mess4.avi +%%DATADIR%%/grx/metro.avi +%%DATADIR%%/grx/noise.avi +%%DATADIR%%/grx/nosmoking.avi +%%DATADIR%%/grx/ohrada.avi +%%DATADIR%%/grx/okno.avi +%%DATADIR%%/grx/para.avi +%%DATADIR%%/grx/perm.avi +%%DATADIR%%/grx/petice.avi +%%DATADIR%%/grx/pi.avi +%%DATADIR%%/grx/pillar.avi +%%DATADIR%%/grx/pipe.avi +%%DATADIR%%/grx/pipe1.avi +%%DATADIR%%/grx/pipe2.avi +%%DATADIR%%/grx/pipe3.avi +%%DATADIR%%/grx/pipe4.avi +%%DATADIR%%/grx/pivrnec.avi +%%DATADIR%%/grx/podium.avi +%%DATADIR%%/grx/podlaha.avi +%%DATADIR%%/grx/prkno.avi +%%DATADIR%%/grx/pruhonice.avi +%%DATADIR%%/grx/pub.avi +%%DATADIR%%/grx/pumping.avi +%%DATADIR%%/grx/pytlak.avi +%%DATADIR%%/grx/radioactive.avi +%%DATADIR%%/grx/raid.avi +%%DATADIR%%/grx/raidrekl.avi +%%DATADIR%%/grx/rampa.avi +%%DATADIR%%/grx/reklama.avi +%%DATADIR%%/grx/rg6.avi +%%DATADIR%%/grx/rifle.avi +%%DATADIR%%/grx/rocket.avi +%%DATADIR%%/grx/rough.avi +%%DATADIR%%/grx/schody1l.avi +%%DATADIR%%/grx/schody1r.avi +%%DATADIR%%/grx/schodyl.avi +%%DATADIR%%/grx/schodyr.avi +%%DATADIR%%/grx/shell.avi +%%DATADIR%%/grx/shells.avi +%%DATADIR%%/grx/shotgun.avi +%%DATADIR%%/grx/shrapnel1.avi +%%DATADIR%%/grx/shrapnel10.avi +%%DATADIR%%/grx/shrapnel2.avi +%%DATADIR%%/grx/shrapnel3.avi +%%DATADIR%%/grx/shrapnel4.avi +%%DATADIR%%/grx/shrapnel5.avi +%%DATADIR%%/grx/shrapnel6.avi +%%DATADIR%%/grx/shrapnel7.avi +%%DATADIR%%/grx/shrapnel8.avi +%%DATADIR%%/grx/shrapnel9.avi +%%DATADIR%%/grx/skull.avi +%%DATADIR%%/grx/slug.avi +%%DATADIR%%/grx/smoker.avi +%%DATADIR%%/grx/sshell.avi +%%DATADIR%%/grx/stone.avi +%%DATADIR%%/grx/stone1.avi +%%DATADIR%%/grx/stone2.avi +%%DATADIR%%/grx/stone3.avi +%%DATADIR%%/grx/stone_steps_l.avi +%%DATADIR%%/grx/stone_steps_r.avi +%%DATADIR%%/grx/sugar.avi +%%DATADIR%%/grx/svab.avi +%%DATADIR%%/grx/swing_lamp.avi +%%DATADIR%%/grx/tabule.avi +%%DATADIR%%/grx/tnt.avi +%%DATADIR%%/grx/toadstool.avi +%%DATADIR%%/grx/traverza.avi +%%DATADIR%%/grx/traverza1.avi +%%DATADIR%%/grx/traverza2.avi +%%DATADIR%%/grx/u_kuceru.avi +%%DATADIR%%/grx/uhli.avi +%%DATADIR%%/grx/uzi.avi +%%DATADIR%%/grx/vetrak.avi +%%DATADIR%%/grx/waltr.avi +%%DATADIR%%/grx/water.avi +%%DATADIR%%/grx/zabradli.avi +%%DATADIR%%/grx/zarivka.avi +%%DATADIR%%/grx/zebrik2.avi +%%DATADIR%%/grx/zed.avi +%%DATADIR%%/grx/zed2.avi +%%DATADIR%%/grx/zed3.avi +%%DATADIR%%/grx/zpevak.avi +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/README.html +%%PORTDOCS%%%%DOCSDIR%%/avi.txt +%%PORTDOCS%%%%DOCSDIR%%/bot.txt +%%PORTDOCS%%%%DOCSDIR%%/doc.html +%%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrm %%DATADIR%%/grx +@dirrm %%DATADIR%%/data +@dirrm %%DATADIR%% From owner-svn-ports-branches@FreeBSD.ORG Tue Dec 24 12:46:45 2013 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 34DE06B6; Tue, 24 Dec 2013 12:46:45 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 202C11E6C; Tue, 24 Dec 2013 12:46:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBOCkitt083310; Tue, 24 Dec 2013 12:46:44 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBOCkidx083308; Tue, 24 Dec 2013 12:46:44 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312241246.rBOCkidx083308@svn.freebsd.org> From: Mathieu Arnold Date: Tue, 24 Dec 2013 12:46:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337341 - branches/2014Q1/biology/boinc-simap X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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: Tue, 24 Dec 2013 12:46:45 -0000 Author: mat Date: Tue Dec 24 12:46:44 2013 New Revision: 337341 URL: http://svnweb.freebsd.org/changeset/ports/337341 Log: MFH: r337273 Several fixes: - install files as the BOINC user/group, this ensures that work units can be downloaded and sent - try to remove ~boinc/projects if empty - do not specify -o and -g parameters to ${INSTALL}, this ensures the package can be built as user - only extract the hmmer binary from the hmmer distribution file, this ensures correct permissions when modifying app_info.xml as user - Bump PORTREVISION Reviewed by: bapt Approved by: portmgr (implicit) Modified: branches/2014Q1/biology/boinc-simap/Makefile branches/2014Q1/biology/boinc-simap/pkg-plist Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/biology/boinc-simap/Makefile ============================================================================== --- branches/2014Q1/biology/boinc-simap/Makefile Tue Dec 24 12:45:37 2013 (r337340) +++ branches/2014Q1/biology/boinc-simap/Makefile Tue Dec 24 12:46:44 2013 (r337341) @@ -3,7 +3,7 @@ PORTNAME= boinc-simap PORTVERSION= ${SIMAP_VERSION}.${HMMER_VERSION} -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= biology MASTER_SITES= http://boincsimap.org/boincsimap/download/ DISTNAME= ${SIMAP_BINARY} ${HMMER_BINARY} @@ -29,9 +29,13 @@ SIMAP_BINARY= simap_${SIMAP_VERSION}_${M SIMAP_VERSION= 5.10 HMMER_BINARY= hmmer_${HMMER_VERSION}_${MACH}-pc-freebsd HMMER_VERSION= 5.09 +EXTRACT_AFTER_ARGS+= --include=${HMMER_BINARY} PLIST_SUB= SIMAP_BINARY=${SIMAP_BINARY} HMMER_BINARY=${HMMER_BINARY} \ - SIMAP_SITE=${SIMAP_SITE} BOINC_CLIENT_HOME=${BOINC_CLIENT_HOME} + SIMAP_SITE=${SIMAP_SITE} \ + BOINC_CLIENT_HOME=${BOINC_CLIENT_HOME} \ + BOINC_CLIENT_USER=${BOINC_CLIENT_USER} \ + BOINC_CLIENT_GROUP=${BOINC_CLIENT_GROUP} ONLY_FOR_ARCHS= i386 amd64 @@ -64,16 +68,12 @@ do-extract: ${DISTDIR}/${HMMER_BINARY} ${EXTRACT_AFTER_ARGS}) do-install: - ${INSTALL} -d -o ${BOINC_CLIENT_USER} -g ${BOINC_CLIENT_GROUP} \ - ${STAGEDIR}${BOINC_CLIENT_HOME}/projects - ${INSTALL} -d -o ${BOINC_CLIENT_USER} -g ${BOINC_CLIENT_GROUP} \ - ${STAGEDIR}${BOINC_CLIENT_HOME}/projects/${SIMAP_SITE} - ${INSTALL_DATA} -o ${BOINC_CLIENT_USER} -g ${BOINC_CLIENT_GROUP} \ - ${WRKDIR}/app_info.xml \ + ${INSTALL} -d ${STAGEDIR}${BOINC_CLIENT_HOME}/projects + ${INSTALL} -d ${STAGEDIR}${BOINC_CLIENT_HOME}/projects/${SIMAP_SITE} + ${INSTALL_DATA} ${WRKDIR}/app_info.xml \ ${STAGEDIR}${BOINC_CLIENT_HOME}/projects/${SIMAP_SITE} .for APP in ${DISTNAME} - ${INSTALL_PROGRAM} -o ${BOINC_CLIENT_USER} -g ${BOINC_CLIENT_GROUP} \ - ${WRKDIR}/${APP} \ + ${INSTALL_PROGRAM} ${WRKDIR}/${APP} \ ${STAGEDIR}${BOINC_CLIENT_HOME}/projects/${SIMAP_SITE} .endfor Modified: branches/2014Q1/biology/boinc-simap/pkg-plist ============================================================================== --- branches/2014Q1/biology/boinc-simap/pkg-plist Tue Dec 24 12:45:37 2013 (r337340) +++ branches/2014Q1/biology/boinc-simap/pkg-plist Tue Dec 24 12:46:44 2013 (r337341) @@ -1,5 +1,9 @@ +@owner %%BOINC_CLIENT_USER%% +@group %%BOINC_CLIENT_GROUP%% @cwd %%BOINC_CLIENT_HOME%% projects/%%SIMAP_SITE%%/app_info.xml projects/%%SIMAP_SITE%%/%%SIMAP_BINARY%% projects/%%SIMAP_SITE%%/%%HMMER_BINARY%% @dirrmtry projects/%%SIMAP_SITE%% +@dirrmtry projects +@exec chown -R %%BOINC_CLIENT_USER%%:%%BOINC_CLIENT_GROUP%% projects/ From owner-svn-ports-branches@FreeBSD.ORG Tue Dec 24 12:47:42 2013 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 6AEAA792; Tue, 24 Dec 2013 12:47:42 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 56E161E73; Tue, 24 Dec 2013 12:47:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBOClgrW083526; Tue, 24 Dec 2013 12:47:42 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBOClfqx083523; Tue, 24 Dec 2013 12:47:41 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312241247.rBOClfqx083523@svn.freebsd.org> From: Mathieu Arnold Date: Tue, 24 Dec 2013 12:47:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337342 - branches/2014Q1/astro/boinc-setiathome-v7 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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: Tue, 24 Dec 2013 12:47:42 -0000 Author: mat Date: Tue Dec 24 12:47:41 2013 New Revision: 337342 URL: http://svnweb.freebsd.org/changeset/ports/337342 Log: MFH: r337299 - Ensure correct ownership of installed files and directories in ~boinc - Enable package building as user - Use option helpers - Drop conflict with removed astro/boinc-setiathome-enhanced - Bump PORTREVISION Inspiration from: biology/boinc-simap Approved by: portmgr (implicit) Modified: branches/2014Q1/astro/boinc-setiathome-v7/Makefile branches/2014Q1/astro/boinc-setiathome-v7/pkg-plist Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/astro/boinc-setiathome-v7/Makefile ============================================================================== --- branches/2014Q1/astro/boinc-setiathome-v7/Makefile Tue Dec 24 12:46:44 2013 (r337341) +++ branches/2014Q1/astro/boinc-setiathome-v7/Makefile Tue Dec 24 12:47:41 2013 (r337342) @@ -3,7 +3,7 @@ PORTNAME= boinc-setiathome-v7 PORTVERSION= 7.00 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= astro MASTER_SITES= ftp://rene-ladan.nl/pub/distfiles/ DISTNAME= setiathome-svn-1924 # modified archive, see leftout in top directory @@ -23,8 +23,6 @@ USE_XZ= yes USE_AUTOTOOLS= autoconf:env automake:env GNU_CONFIGURE= yes -NEED_ROOT= yes - CFLAGS+= -O2 -I${LOCALBASE}/include/boinc -I${LOCALBASE}/include \ -L${LOCALBASE}/lib .if defined(CPUTYPE) @@ -40,19 +38,18 @@ OPTIONS_DEFINE= X11 X11_DESC= Build screensaver (requires net/boinc-client with X11) +OPTIONS_SUB= yes + +X11_BUILD_DEPENDS= ${LOCALBASE}/lib/libboinc_graphics2.a:${PORTSDIR}/net/boinc-client +X11_LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg +X11_USE= GL=gl,glu,glut \ + XORG=ice,sm,x11,xau,xcb,xext,xi,xdamage,xdmcp,xfixes,xmu,xt,xxf86vm +X11_CONFIGURE_ENABLE= graphics + .include -.if ${PORT_OPTIONS:MX11} -LIB_DEPENDS+= libjpeg.so:${PORTSDIR}/graphics/jpeg -USE_GL= gl glu glut -USE_XORG= ice sm x11 xau xcb xext xi xdamage xdmcp xfixes xmu xt xxf86vm -BUILD_DEPENDS+= ${LOCALBASE}/lib/libboinc_graphics2.a:${PORTSDIR}/net/boinc-client -PLIST_SUB+= X11="" -CONFLICTS= boinc-setiathome-enhanced-[0-9]* -.else +.if ! ${PORT_OPTIONS:MX11} BUILD_DEPENDS+= ${LOCALBASE}/include/boinc/std_fixes.h:${PORTSDIR}/net/boinc-client -CONFIGURE_ARGS+= --disable-graphics -PLIST_SUB+= X11="@comment " .endif .if ${ARCH} == i386 || ${ARCH} == amd64 @@ -80,10 +77,12 @@ SUB_LIST= SETI_BINARY=${SETI_BINARY} \ BOINC_CLIENT_HOME=${BOINC_CLIENT_HOME} \ BOINC_CLIENT_USER=${BOINC_CLIENT_USER} \ BOINC_CLIENT_GROUP=${BOINC_CLIENT_GROUP} -PLIST_SUB+= SETI_BINARY=${SETI_BINARY} \ +PLIST_SUB+= PREFIX=${PREFIX} \ + SETI_BINARY=${SETI_BINARY} \ SETI_SITE=${SETI_SITE} \ BOINC_CLIENT_HOME=${BOINC_CLIENT_HOME} \ - PREFIX=${PREFIX} + BOINC_CLIENT_USER=${BOINC_CLIENT_USER} \ + BOINC_CLIENT_GROUP=${BOINC_CLIENT_GROUP} # str_replace.h is included in newer versions of net/boinc-client, # but it is not needed on FreeBSD @@ -99,17 +98,12 @@ pre-configure: (cd ${WRKSRC} ; ./_autosetup) do-install: - ${INSTALL} -d -o ${BOINC_CLIENT_USER} -g ${BOINC_CLIENT_GROUP} \ - ${STAGEDIR}${BOINC_CLIENT_HOME}/projects - ${INSTALL} -d -o ${BOINC_CLIENT_USER} -g ${BOINC_CLIENT_GROUP} \ - ${STAGEDIR}${BOINC_CLIENT_HOME}/projects/${SETI_SITE} - ${INSTALL_PROGRAM} -o ${BOINC_CLIENT_USER} -g ${BOINC_CLIENT_GROUP} \ - ${WRKSRC}/client/${SETI_BINARY} \ + ${INSTALL} -d ${STAGEDIR}${BOINC_CLIENT_HOME}/projects + ${INSTALL} -d ${STAGEDIR}${BOINC_CLIENT_HOME}/projects/${SETI_SITE} + ${INSTALL_PROGRAM} ${WRKSRC}/client/${SETI_BINARY} \ ${STAGEDIR}${BOINC_CLIENT_HOME}/projects/${SETI_SITE}/ .if ${PORT_OPTIONS:MX11} - ${INSTALL_PROGRAM} -o ${BOINC_CLIENT_USER} -g ${BOINC_CLIENT_GROUP} \ - ${WRKSRC}/client/seti_graphics \ + ${INSTALL_PROGRAM} ${WRKSRC}/client/seti_graphics \ ${STAGEDIR}${BOINC_CLIENT_HOME}/projects/${SETI_SITE}/ .endif - .include Modified: branches/2014Q1/astro/boinc-setiathome-v7/pkg-plist ============================================================================== --- branches/2014Q1/astro/boinc-setiathome-v7/pkg-plist Tue Dec 24 12:46:44 2013 (r337341) +++ branches/2014Q1/astro/boinc-setiathome-v7/pkg-plist Tue Dec 24 12:47:41 2013 (r337342) @@ -1,5 +1,8 @@ -@cwd %%BOINC_CLIENT_HOME%%/projects -%%SETI_SITE%%/%%SETI_BINARY%% -%%X11%%%%SETI_SITE%%/seti_graphics -@dirrmtry %%SETI_SITE%% -@cwd %%PREFIX%% +@owner %%BOINC_CLIENT_USER%% +@group %%BOINC_CLIENT_GROUP%% +@cwd %%BOINC_CLIENT_HOME%% +projects/%%SETI_SITE%%/%%SETI_BINARY%% +%%X11%%projects/%%SETI_SITE%%/seti_graphics +@dirrmtry projects/%%SETI_SITE%% +@dirrmtry projects +@exec chown -R %%BOINC_CLIENT_USER%%:%%BOINC_CLIENT_GROUP%% projects/ From owner-svn-ports-branches@FreeBSD.ORG Tue Dec 24 12:48:53 2013 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 8951D890; Tue, 24 Dec 2013 12:48:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 753C41E84; Tue, 24 Dec 2013 12:48:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBOCmrhQ083758; Tue, 24 Dec 2013 12:48:53 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBOCmroM083756; Tue, 24 Dec 2013 12:48:53 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312241248.rBOCmroM083756@svn.freebsd.org> From: Mathieu Arnold Date: Tue, 24 Dec 2013 12:48:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337343 - branches/2014Q1/astro/boinc-astropulse X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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: Tue, 24 Dec 2013 12:48:53 -0000 Author: mat Date: Tue Dec 24 12:48:52 2013 New Revision: 337343 URL: http://svnweb.freebsd.org/changeset/ports/337343 Log: MFH: r337300 - Ensure correct ownership of installed files and directories in ~boinc - Enable package building as user - Use option helpers - Bump PORTREVISION Approved by: portmgr (implicit) Modified: branches/2014Q1/astro/boinc-astropulse/Makefile branches/2014Q1/astro/boinc-astropulse/pkg-plist Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/astro/boinc-astropulse/Makefile ============================================================================== --- branches/2014Q1/astro/boinc-astropulse/Makefile Tue Dec 24 12:47:41 2013 (r337342) +++ branches/2014Q1/astro/boinc-astropulse/Makefile Tue Dec 24 12:48:52 2013 (r337343) @@ -3,7 +3,7 @@ PORTNAME= boinc-astropulse PORTVERSION= 6.01 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= astro MASTER_SITES= ftp://rene-ladan.nl/pub/distfiles/ DISTNAME= astropulse-svn-1702 # modified archive, see leftout in top directory @@ -31,8 +31,6 @@ CFLAGS+= -O2 -I${LOCALBASE}/include/boin CFLAGS+= -march=${CPUTYPE} .endif -NEED_ROOT= yes - # these must match settings in ${PORTSDIR}/net/boinc-client/Makefile BOINC_CLIENT_USER?= boinc BOINC_CLIENT_GROUP?= nobody @@ -41,18 +39,18 @@ BOINC_CLIENT_HOME?= /var/db/boinc OPTIONS_DEFINE= X11 X11_DESC= Build screensaver (requires net/boinc-client with X11) +OPTIONS_SUB= yes + +X11_BUILD_DEPENDS= ${LOCALBASE}/lib/libboinc_graphics2.a:${PORTSDIR}/net/boinc-client +X11_LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg +X11_USE= GL=gl,glu,glut \ + XORG=ice,sm,x11,xau,xcb,xext,xi,xdamage,xdmcp,xfixes,xmu,xt,xxf86vm +X11_CONFIGURE_ENABLE= graphics + .include -.if ${PORT_OPTIONS:MX11} -LIB_DEPENDS+= libjpeg.so:${PORTSDIR}/graphics/jpeg -USE_GL= gl glu glut -USE_XORG= ice sm x11 xau xcb xext xi xdamage xdmcp xfixes xmu xt xxf86vm -BUILD_DEPENDS+= ${LOCALBASE}/lib/libboinc_graphics2.a:${PORTSDIR}/net/boinc-client -PLIST_SUB+= X11="" -.else +.if ! ${PORT_OPTIONS:MX11} BUILD_DEPENDS+= ${LOCALBASE}/include/boinc/std_fixes.h:${PORTSDIR}/net/boinc-client -CONFIGURE_ARGS+= --disable-graphics -PLIST_SUB+= X11="@comment " .endif .if ${ARCH} == amd64 || ${ARCH} == i386 @@ -79,22 +77,20 @@ SUB_LIST= AP_BINARY=${AP_BINARY} \ BOINC_CLIENT_GROUP=${BOINC_CLIENT_GROUP} PLIST_SUB+= AP_BINARY=${AP_BINARY} \ SETI_SITE=${SETI_SITE} \ - BOINC_CLIENT_HOME=${BOINC_CLIENT_HOME} + BOINC_CLIENT_HOME=${BOINC_CLIENT_HOME} \ + BOINC_CLIENT_USER=${BOINC_CLIENT_USER} \ + BOINC_CLIENT_GROUP=${BOINC_CLIENT_GROUP} pre-configure: (cd ${WRKSRC} ; ./_autosetup) do-install: - ${INSTALL} -d -o ${BOINC_CLIENT_USER} -g ${BOINC_CLIENT_GROUP} \ - ${STAGEDIR}${BOINC_CLIENT_HOME}/projects - ${INSTALL} -d -o ${BOINC_CLIENT_USER} -g ${BOINC_CLIENT_GROUP} \ - ${STAGEDIR}${BOINC_CLIENT_HOME}/projects/${SETI_SITE} - ${INSTALL_PROGRAM} -o ${BOINC_CLIENT_USER} -g ${BOINC_CLIENT_GROUP} \ - ${WRKSRC}/${AP_BINARY} \ + ${INSTALL} -d ${STAGEDIR}${BOINC_CLIENT_HOME}/projects + ${INSTALL} -d ${STAGEDIR}${BOINC_CLIENT_HOME}/projects/${SETI_SITE} + ${INSTALL_PROGRAM} ${WRKSRC}/${AP_BINARY} \ ${STAGEDIR}${BOINC_CLIENT_HOME}/projects/${SETI_SITE}/ .if ${PORT_OPTIONS:MX11} - ${INSTALL_PROGRAM} -o ${BOINC_CLIENT_USER} -g ${BOINC_CLIENT_GROUP} \ - ${WRKSRC}/ap_graphics \ + ${INSTALL_PROGRAM} ${WRKSRC}/ap_graphics \ ${STAGEDIR}${BOINC_CLIENT_HOME}/projects/${SETI_SITE}/ .endif Modified: branches/2014Q1/astro/boinc-astropulse/pkg-plist ============================================================================== --- branches/2014Q1/astro/boinc-astropulse/pkg-plist Tue Dec 24 12:47:41 2013 (r337342) +++ branches/2014Q1/astro/boinc-astropulse/pkg-plist Tue Dec 24 12:48:52 2013 (r337343) @@ -1,4 +1,8 @@ -@cwd %%BOINC_CLIENT_HOME%%/projects -%%SETI_SITE%%/%%AP_BINARY%% -%%X11%%%%SETI_SITE%%/ap_graphics -@dirrmtry %%SETI_SITE%% +@owner %%BOINC_CLIENT_USER%% +@group %%BOINC_CLIENT_GROUP%% +@cwd %%BOINC_CLIENT_HOME%% +projects/%%SETI_SITE%%/%%AP_BINARY%% +%%X11%%projects/%%SETI_SITE%%/ap_graphics +@dirrmtry projects/%%SETI_SITE%% +@dirrmtry projects +@exec chown -R %%BOINC_CLIENT_USER%%:%%BOINC_CLIENT_GROUP%% projects/ From owner-svn-ports-branches@FreeBSD.ORG Tue Dec 24 12:50:18 2013 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 1493C983; Tue, 24 Dec 2013 12:50:18 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id F389F1E94; Tue, 24 Dec 2013 12:50:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBOCoHD7084124; Tue, 24 Dec 2013 12:50:17 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBOCoH8E084116; Tue, 24 Dec 2013 12:50:17 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312241250.rBOCoH8E084116@svn.freebsd.org> From: Mathieu Arnold Date: Tue, 24 Dec 2013 12:50:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337344 - in branches/2014Q1/audio/ardour: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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: Tue, 24 Dec 2013 12:50:18 -0000 Author: mat Date: Tue Dec 24 12:50:16 2013 New Revision: 337344 URL: http://svnweb.freebsd.org/changeset/ports/337344 Log: MFH: r337311 - Fix several C++ issues with modern compilers - While here, stagify and mute REINPLACE_CMD's Approved by: portmgr (implicit) Added: branches/2014Q1/audio/ardour/files/patch-gtk2_ardour-SConscript - copied unchanged from r337311, head/audio/ardour/files/patch-gtk2_ardour-SConscript branches/2014Q1/audio/ardour/files/patch-libs-ardour-session.cc - copied unchanged from r337311, head/audio/ardour/files/patch-libs-ardour-session.cc branches/2014Q1/audio/ardour/files/patch-libs-pbd-mountpoint.cc - copied unchanged from r337311, head/audio/ardour/files/patch-libs-pbd-mountpoint.cc branches/2014Q1/audio/ardour/files/patch-libs-pbd-pbd-stl_delete.h - copied unchanged from r337311, head/audio/ardour/files/patch-libs-pbd-pbd-stl_delete.h Modified: branches/2014Q1/audio/ardour/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/audio/ardour/Makefile ============================================================================== --- branches/2014Q1/audio/ardour/Makefile Tue Dec 24 12:48:52 2013 (r337343) +++ branches/2014Q1/audio/ardour/Makefile Tue Dec 24 12:50:16 2013 (r337344) @@ -20,14 +20,13 @@ LIB_DEPENDS= liblo.so:${PORTSDIR}/audio/ libgnomecanvasmm-2.6.so:${PORTSDIR}/graphics/libgnomecanvasmm26 USE_BZIP2= yes -NO_STAGE= yes USES= gettext pkgconfig USE_SCONS= yes SCONS_ENV+= SYSLIBS=yes PREFIX=${PREFIX} NLS=yes CFLAGS+= -I${LOCALBASE}/include USE_GNOME= libxslt USE_LDCONFIG= ${PREFIX}/lib/ardour2 ${PREFIX}/lib/ardour2/surfaces -TEMPLATESDIR= ${PREFIX}/share/ardour2/templates + PLIST_SUB= DISTVERSION=${DISTVERSION} OPTIONS_DEFINE= OPTIMIZED_CFLAGS VST @@ -67,11 +66,15 @@ SCONS_ENV+= FPU_OPTIMIZATION=0 .endif post-patch: - ${REINPLACE_CMD} -e 's|%%CFLAGS%%|${CFLAGS}|' ${WRKSRC}/SConstruct - ${REINPLACE_CMD} -e 's|alsa_pcm|oss|g' ${WRKSRC}/templates/*.template + @${REINPLACE_CMD} -e 's|%%CFLAGS%%|${CFLAGS}|' ${WRKSRC}/SConstruct + @${REINPLACE_CMD} -e 's|alsa_pcm|oss|g' ${WRKSRC}/templates/*.template + +pre-build: + @${MKDIR} ${STAGEDIR} post-install: - @${MKDIR} ${TEMPLATESDIR} - ${INSTALL_DATA} ${WRKSRC}/templates/*.template ${TEMPLATESDIR} + @${MKDIR} ${STAGEDIR}${PREFIX}/share/ardour2/templates + ${INSTALL_DATA} ${WRKSRC}/templates/*.template \ + ${STAGEDIR}${PREFIX}/share/ardour2/templates .include Copied: branches/2014Q1/audio/ardour/files/patch-gtk2_ardour-SConscript (from r337311, head/audio/ardour/files/patch-gtk2_ardour-SConscript) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/audio/ardour/files/patch-gtk2_ardour-SConscript Tue Dec 24 12:50:16 2013 (r337344, copy of r337311, head/audio/ardour/files/patch-gtk2_ardour-SConscript) @@ -0,0 +1,14 @@ +--- gtk2_ardour/SConscript.orig ++++ gtk2_ardour/SConscript +@@ -411,9 +411,9 @@ for style in ['', 'BOLD', 'ITALIC']: + # + + if env['GTKOSX']: +- ardour_menus = env.Command ('ardour.menus', 'ardour.menus.in', "cpp -E -P -DGTKOSX -DTOP_MENUBAR ardour.menus.in ardour.menus", chdir=1) ++ ardour_menus = env.Command ('ardour.menus', 'ardour.menus.in', "cpp -E -P -DGTKOSX -DTOP_MENUBAR -o ardour.menus ardour.menus.in", chdir=1) + else: +- ardour_menus = env.Command ('ardour.menus', 'ardour.menus.in', "cpp -E -P ardour.menus.in ardour.menus", chdir=1) ++ ardour_menus = env.Command ('ardour.menus', 'ardour.menus.in', "cpp -E -P -o ardour.menus ardour.menus.in", chdir=1) + + ardour_dark_theme = env.SubstInFile ('ardour2_ui_dark.rc', 'ardour2_ui_dark.rc.in', SUBST_DICT = my_font_dict) + ardour_light_theme = env.SubstInFile ('ardour2_ui_light.rc', 'ardour2_ui_light.rc.in', SUBST_DICT = my_font_dict) Copied: branches/2014Q1/audio/ardour/files/patch-libs-ardour-session.cc (from r337311, head/audio/ardour/files/patch-libs-ardour-session.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/audio/ardour/files/patch-libs-ardour-session.cc Tue Dec 24 12:50:16 2013 (r337344, copy of r337311, head/audio/ardour/files/patch-libs-ardour-session.cc) @@ -0,0 +1,359 @@ +--- libs/ardour/session.cc.orig ++++ libs/ardour/session.cc +@@ -79,7 +79,6 @@ + using namespace std; + using namespace ARDOUR; + using namespace PBD; +-using boost::shared_ptr; + + #ifdef __x86_64__ + static const int CPU_CACHE_ALIGN = 64; +@@ -399,14 +398,14 @@ Session::Session (AudioEngine &eng, + int control_id = 1; + + if (control_out_channels) { +- shared_ptr r (new Route (*this, _("monitor"), -1, control_out_channels, -1, control_out_channels, Route::ControlOut)); ++ boost::shared_ptr r (new Route (*this, _("monitor"), -1, control_out_channels, -1, control_out_channels, Route::ControlOut)); + r->set_remote_control_id (control_id++); + + rl.push_back (r); + } + + if (master_out_channels) { +- shared_ptr r (new Route (*this, _("master"), -1, master_out_channels, -1, master_out_channels, Route::MasterOut)); ++ boost::shared_ptr r (new Route (*this, _("master"), -1, master_out_channels, -1, master_out_channels, Route::MasterOut)); + r->set_remote_control_id (control_id); + + rl.push_back (r); +@@ -984,8 +983,8 @@ Session::hookup_io () + boost::shared_ptr + Session::get_routes_with_regions_at (nframes64_t const p) const + { +- shared_ptr r = routes.reader (); +- shared_ptr rl (new RouteList); ++ boost::shared_ptr r = routes.reader (); ++ boost::shared_ptr rl (new RouteList); + + for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { + boost::shared_ptr tr = boost::dynamic_pointer_cast (*i); +@@ -1590,9 +1589,9 @@ struct RouteSorter { + }; + + static void +-trace_terminal (shared_ptr r1, shared_ptr rbase) ++trace_terminal (boost::shared_ptr r1, boost::shared_ptr rbase) + { +- shared_ptr r2; ++ boost::shared_ptr r2; + + if ((r1->fed_by.find (rbase) != r1->fed_by.end()) && (rbase->fed_by.find (r1) != rbase->fed_by.end())) { + info << string_compose(_("feedback loop setup between %1 and %2"), r1->name(), rbase->name()) << endmsg; +@@ -1601,13 +1600,13 @@ trace_terminal (shared_ptr r1, sh + + /* make a copy of the existing list of routes that feed r1 */ + +- set > existing = r1->fed_by; ++ set > existing = r1->fed_by; + + /* for each route that feeds r1, recurse, marking it as feeding + rbase as well. + */ + +- for (set >::iterator i = existing.begin(); i != existing.end(); ++i) { ++ for (set >::iterator i = existing.begin(); i != existing.end(); ++i) { + r2 =* i; + + /* r2 is a route that feeds r1 which somehow feeds base. mark +@@ -1651,14 +1650,14 @@ Session::resort_routes () + { + + RCUWriter writer (routes); +- shared_ptr r = writer.get_copy (); ++ boost::shared_ptr r = writer.get_copy (); + resort_routes_using (r); + /* writer goes out of scope and forces update */ + } + } + + void +-Session::resort_routes_using (shared_ptr r) ++Session::resort_routes_using (boost::shared_ptr r) + { + RouteList::iterator i, j; + +@@ -1723,7 +1722,7 @@ Session::new_audio_track (int input_chan + /* count existing audio tracks */ + + { +- shared_ptr r = routes.reader (); ++ boost::shared_ptr r = routes.reader (); + + for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { + if (dynamic_cast((*i).get()) != 0) { +@@ -1776,7 +1775,7 @@ Session::new_audio_track (int input_chan + nphysical_out = 0; + } + +- shared_ptr track; ++ boost::shared_ptr track; + + try { + track = boost::shared_ptr((new AudioTrack (*this, track_name, Route::Flag (0), mode))); +@@ -1884,7 +1883,7 @@ Session::set_remote_control_ids () + { + RemoteModel m = Config->get_remote_model(); + +- shared_ptr r = routes.reader (); ++ boost::shared_ptr r = routes.reader (); + + for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { + if ( MixerOrdered == m) { +@@ -1913,7 +1912,7 @@ Session::new_audio_route (int input_chan + /* count existing audio busses */ + + { +- shared_ptr r = routes.reader (); ++ boost::shared_ptr r = routes.reader (); + + for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { + if (dynamic_cast((*i).get()) == 0) { +@@ -1945,7 +1944,7 @@ Session::new_audio_route (int input_chan + } while (bus_id < (UINT_MAX-1)); + + try { +- shared_ptr bus (new Route (*this, bus_name, -1, -1, -1, -1, Route::Flag(0), DataType::AUDIO)); ++ boost::shared_ptr bus (new Route (*this, bus_name, -1, -1, -1, -1, Route::Flag(0), DataType::AUDIO)); + + if (bus->ensure_io (input_channels, output_channels, false, this)) { + error << string_compose (_("cannot configure %1 in/%2 out configuration for new audio track"), +@@ -2060,7 +2059,7 @@ Session::new_route_from_template (uint32 + Track::zero_diskstream_id_in_xml (node_copy); + + try { +- shared_ptr route (XMLRouteFactory (node_copy)); ++ boost::shared_ptr route (XMLRouteFactory (node_copy)); + + if (route == 0) { + error << _("Session: cannot create track/bus from template description") << endmsg; +@@ -2107,7 +2106,7 @@ boost::shared_ptr + Session::new_video_track (string name) + { + uint32_t control_id = ntracks() + nbusses() + 1; +- shared_ptr new_route ( ++ boost::shared_ptr new_route ( + new Route ( *this, name, -1, -1, -1, -1, Route::Flag(0), ARDOUR::DataType::NIL)); + new_route->set_remote_control_id (control_id); + +@@ -2115,7 +2114,7 @@ Session::new_video_track (string name) + rl.push_back (new_route); + { + RCUWriter writer (routes); +- shared_ptr r = writer.get_copy (); ++ boost::shared_ptr r = writer.get_copy (); + r->insert (r->end(), rl.begin(), rl.end()); + resort_routes_using (r); + } +@@ -2127,7 +2126,7 @@ Session::add_routes (RouteList& new_rout + { + { + RCUWriter writer (routes); +- shared_ptr r = writer.get_copy (); ++ boost::shared_ptr r = writer.get_copy (); + r->insert (r->end(), new_routes.begin(), new_routes.end()); + resort_routes_using (r); + } +@@ -2198,14 +2197,14 @@ Session::add_diskstream (boost::shared_p + } + + void +-Session::remove_route (shared_ptr route) ++Session::remove_route (boost::shared_ptr route) + { + //clear solos before removing the route + route->set_solo ( false, this); + + { + RCUWriter writer (routes); +- shared_ptr rs = writer.get_copy (); ++ boost::shared_ptr rs = writer.get_copy (); + + rs->remove (route); + +@@ -2215,11 +2214,11 @@ Session::remove_route (shared_ptr + */ + + if (route == _master_out) { +- _master_out = shared_ptr (); ++ _master_out = boost::shared_ptr (); + } + + if (route == _control_out) { +- _control_out = shared_ptr (); ++ _control_out = boost::shared_ptr (); + + /* cancel control outs for all routes */ + +@@ -2308,7 +2307,7 @@ Session::route_solo_changed (void* src, + + is_track = (boost::dynamic_pointer_cast(route) != 0); + +- shared_ptr r = routes.reader (); ++ boost::shared_ptr r = routes.reader (); + + for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { + +@@ -2404,7 +2403,7 @@ Session::update_route_solo_state () + the solo mute setting of each track. + */ + +- shared_ptr r = routes.reader (); ++ boost::shared_ptr r = routes.reader (); + + for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { + if ((*i)->soloed()) { +@@ -2446,7 +2445,7 @@ Session::update_route_solo_state () + void + Session::modify_solo_mute (bool is_track, bool mute) + { +- shared_ptr r = routes.reader (); ++ boost::shared_ptr r = routes.reader (); + + for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { + +@@ -2511,7 +2510,7 @@ Session::catch_up_on_solo_mute_override + /* this is called whenever the param solo-mute-override is + changed. + */ +- shared_ptr r = routes.reader (); ++ boost::shared_ptr r = routes.reader (); + + for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { + (*i)->catch_up_on_solo_mute_override (); +@@ -2521,7 +2520,7 @@ Session::catch_up_on_solo_mute_override + bool + Session::io_name_is_legal (const std::string& name) + { +- shared_ptr r = routes.reader (); ++ boost::shared_ptr r = routes.reader (); + + for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { + if ((*i)->name() == name) { +@@ -2536,10 +2535,10 @@ Session::io_name_is_legal (const std::st + return true; + } + +-shared_ptr ++boost::shared_ptr + Session::route_by_name (const std::string& name) + { +- shared_ptr r = routes.reader (); ++ boost::shared_ptr r = routes.reader (); + + for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { + if ((*i)->name() == name) { +@@ -2547,13 +2546,13 @@ Session::route_by_name (const std::strin + } + } + +- return shared_ptr ((Route*) 0); ++ return boost::shared_ptr ((Route*) 0); + } + +-shared_ptr ++boost::shared_ptr + Session::route_by_id (PBD::ID id) + { +- shared_ptr r = routes.reader (); ++ boost::shared_ptr r = routes.reader (); + + for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { + if ((*i)->id() == id) { +@@ -2561,13 +2560,13 @@ Session::route_by_id (PBD::ID id) + } + } + +- return shared_ptr ((Route*) 0); ++ return boost::shared_ptr ((Route*) 0); + } + +-shared_ptr ++boost::shared_ptr + Session::route_by_remote_id (uint32_t id) + { +- shared_ptr r = routes.reader (); ++ boost::shared_ptr r = routes.reader (); + + for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { + if ((*i)->remote_control_id() == id) { +@@ -2575,7 +2574,7 @@ Session::route_by_remote_id (uint32_t id + } + } + +- return shared_ptr ((Route*) 0); ++ return boost::shared_ptr ((Route*) 0); + } + + void +@@ -3595,7 +3594,7 @@ Session::is_auditioning () const + void + Session::set_all_solo (bool yn) + { +- shared_ptr r = routes.reader (); ++ boost::shared_ptr r = routes.reader (); + + for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { + if (!(*i)->hidden()) { +@@ -3609,7 +3608,7 @@ Session::set_all_solo (bool yn) + void + Session::set_all_mute (bool yn) + { +- shared_ptr r = routes.reader (); ++ boost::shared_ptr r = routes.reader (); + + for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { + if (!(*i)->hidden()) { +@@ -3680,7 +3679,7 @@ Session::record_enable_all () + void + Session::record_enable_change_all (bool yn) + { +- shared_ptr r = routes.reader (); ++ boost::shared_ptr r = routes.reader (); + + for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { + AudioTrack* at; +@@ -4071,7 +4070,7 @@ Session::reset_native_file_format () + bool + Session::route_name_unique (string n) const + { +- shared_ptr r = routes.reader (); ++ boost::shared_ptr r = routes.reader (); + + for (RouteList::const_iterator i = r->begin(); i != r->end(); ++i) { + if ((*i)->name() == n) { +@@ -4117,7 +4116,7 @@ Session::allocate_pan_automation_buffers + int + Session::freeze (InterThreadInfo& itt) + { +- shared_ptr r = routes.reader (); ++ boost::shared_ptr r = routes.reader (); + + for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { + +@@ -4355,7 +4354,7 @@ uint32_t + Session::ntracks () const + { + uint32_t n = 0; +- shared_ptr r = routes.reader (); ++ boost::shared_ptr r = routes.reader (); + + for (RouteList::const_iterator i = r->begin(); i != r->end(); ++i) { + if (dynamic_cast ((*i).get())) { +@@ -4370,7 +4369,7 @@ uint32_t + Session::nbusses () const + { + uint32_t n = 0; +- shared_ptr r = routes.reader (); ++ boost::shared_ptr r = routes.reader (); + + for (RouteList::const_iterator i = r->begin(); i != r->end(); ++i) { + if (dynamic_cast ((*i).get()) == 0) { Copied: branches/2014Q1/audio/ardour/files/patch-libs-pbd-mountpoint.cc (from r337311, head/audio/ardour/files/patch-libs-pbd-mountpoint.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/audio/ardour/files/patch-libs-pbd-mountpoint.cc Tue Dec 24 12:50:16 2013 (r337344, copy of r337311, head/audio/ardour/files/patch-libs-pbd-mountpoint.cc) @@ -0,0 +1,11 @@ +--- libs/pbd/mountpoint.cc.orig ++++ libs/pbd/mountpoint.cc +@@ -19,7 +19,7 @@ + */ + + #include +-#include ++#include + #include + #include + #include Copied: branches/2014Q1/audio/ardour/files/patch-libs-pbd-pbd-stl_delete.h (from r337311, head/audio/ardour/files/patch-libs-pbd-pbd-stl_delete.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/audio/ardour/files/patch-libs-pbd-pbd-stl_delete.h Tue Dec 24 12:50:16 2013 (r337344, copy of r337311, head/audio/ardour/files/patch-libs-pbd-pbd-stl_delete.h) @@ -0,0 +1,20 @@ +--- libs/pbd/pbd/stl_delete.h.orig ++++ libs/pbd/pbd/stl_delete.h +@@ -23,7 +23,7 @@ + /* To actually use any of these deletion functions, you need to + first include the revelant container type header. + */ +-#if defined(_CPP_VECTOR) || defined(_GLIBCXX_VECTOR) || defined(__SGI_STL_VECTOR) ++#if defined(_LIBCPP_VECTOR) || defined(_GLIBCXX_VECTOR) || defined(__SGI_STL_VECTOR) + template void vector_delete (std::vector *vec) + { + typename std::vector::iterator i; +@@ -33,7 +33,7 @@ template void vector_delete (st + } + vec->clear (); + } +-#endif // _CPP_VECTOR || _GLIBCXX_VECTOR || __SGI_STL_VECTOR ++#endif // _LIBCPP_VECTOR || _GLIBCXX_VECTOR || __SGI_STL_VECTOR + + #if defined(_CPP_MAP) || defined(_GLIBCXX_MAP) || defined(__SGI_STL_MAP) + template void map_delete (std::map *m) From owner-svn-ports-branches@FreeBSD.ORG Tue Dec 24 12:53:41 2013 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 A4A54AA4; Tue, 24 Dec 2013 12:53:41 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 83ED51EF3; Tue, 24 Dec 2013 12:53:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBOCrfj2087012; Tue, 24 Dec 2013 12:53:41 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBOCrcxh086995; Tue, 24 Dec 2013 12:53:38 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312241253.rBOCrcxh086995@svn.freebsd.org> From: Mathieu Arnold Date: Tue, 24 Dec 2013 12:53:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337345 - in branches/2014Q1/games/kiki: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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: Tue, 24 Dec 2013 12:53:41 -0000 Author: mat Date: Tue Dec 24 12:53:38 2013 New Revision: 337345 URL: http://svnweb.freebsd.org/changeset/ports/337345 Log: MFH: r337313 - Fix build on 10.x - Fix build with freeglut - Fix segfaults on 64 bit - Support staging - Convert USE_GMAKE to USES Approved by: portmgr (implicit) Added: branches/2014Q1/games/kiki/files/patch-SWIG-KikiText.i - copied unchanged from r337313, head/games/kiki/files/patch-SWIG-KikiText.i branches/2014Q1/games/kiki/files/patch-kodilib-src-handler-KPickable.h - copied unchanged from r337313, head/games/kiki/files/patch-kodilib-src-handler-KPickable.h branches/2014Q1/games/kiki/files/patch-kodilib-src-tools-KFileTools.cpp - copied unchanged from r337313, head/games/kiki/files/patch-kodilib-src-tools-KFileTools.cpp branches/2014Q1/games/kiki/files/patch-kodilib-src-tools-KIntrospection.h - copied unchanged from r337313, head/games/kiki/files/patch-kodilib-src-tools-KIntrospection.h branches/2014Q1/games/kiki/files/patch-kodilib-src-tools-KKeyTools.cpp - copied unchanged from r337313, head/games/kiki/files/patch-kodilib-src-tools-KKeyTools.cpp branches/2014Q1/games/kiki/files/patch-kodilib-src-tools-KStringTools.cpp - copied unchanged from r337313, head/games/kiki/files/patch-kodilib-src-tools-KStringTools.cpp branches/2014Q1/games/kiki/files/patch-kodilib-src-tools-KStringTools.h - copied unchanged from r337313, head/games/kiki/files/patch-kodilib-src-tools-KStringTools.h branches/2014Q1/games/kiki/files/patch-kodilib-src-tools-KXMLTools.cpp - copied unchanged from r337313, head/games/kiki/files/patch-kodilib-src-tools-KXMLTools.cpp branches/2014Q1/games/kiki/files/patch-kodilib-src-types-KKey.cpp - copied unchanged from r337313, head/games/kiki/files/patch-kodilib-src-types-KKey.cpp branches/2014Q1/games/kiki/files/patch-kodilib-src-widgets-KFileNameField.cpp - copied unchanged from r337313, head/games/kiki/files/patch-kodilib-src-widgets-KFileNameField.cpp branches/2014Q1/games/kiki/files/patch-src-gui-KikiMenu.cpp - copied unchanged from r337313, head/games/kiki/files/patch-src-gui-KikiMenu.cpp branches/2014Q1/games/kiki/files/patch-src-gui-KikiTextLine.cpp - copied unchanged from r337313, head/games/kiki/files/patch-src-gui-KikiTextLine.cpp branches/2014Q1/games/kiki/files/patch-src-main-main.cpp - copied unchanged from r337313, head/games/kiki/files/patch-src-main-main.cpp Deleted: branches/2014Q1/games/kiki/pkg-plist Modified: branches/2014Q1/games/kiki/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/games/kiki/Makefile ============================================================================== --- branches/2014Q1/games/kiki/Makefile Tue Dec 24 12:50:16 2013 (r337344) +++ branches/2014Q1/games/kiki/Makefile Tue Dec 24 12:53:38 2013 (r337345) @@ -3,7 +3,7 @@ PORTNAME= kiki PORTVERSION= 1.0.2 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-src/${PORTVERSION} EXTRACT_SUFX= -src.tgz @@ -14,15 +14,18 @@ COMMENT= Kiki the nanobot is a 3-D puzzl BUILD_DEPENDS= swig:${PORTSDIR}/devel/swig13 USE_PYTHON= 2.5+ -USE_GMAKE= yes +USES= gmake dos2unix USE_GL= gl glu glut USE_SDL= sdl mixer image -USE_DOS2UNIX= kodilib/linux/Makefile src/main/KikiController.cpp linux/Makefile kodilib/src/types/KVector.h src/main/KikiPythonWidget.h +DOS2UNIX_REGEX= .*/(Makefile|.*\.cpp|.*\.h|.*\.i)$ MAKE_ENV= PYTHON_VER=${PYTHON_VERSION:C/^python//} -USE_GCC= any # swig produces clang-incompatible code +CXXFLAGS+= -include sys/limits.h -fpermissive WRKSRC= ${WRKDIR}/kiki +PLIST_FILES= bin/${PORTNAME} +PORTDATA= * + DESKTOP_ENTRIES="kiki the nanobot" \ "3-D puzzle game" \ "" \ @@ -30,7 +33,13 @@ DESKTOP_ENTRIES="kiki the nanobot" \ "Game;LogicGame;" \ false -NO_STAGE= yes +.include + +.if ${OSVERSION} >= 1000000 +# these are critical, detect them if possible +CXXFLAGS+= -Werror=tautological-constant-out-of-range-compare +.endif + post-patch: @${REINPLACE_CMD} -e '/^CXXFLAGS/ s|.*|CXXFLAGS+=$$(KODI_INCLUDES) -I${LOCALBASE}/include `${SDL_CONFIG} --cflags`|' ${WRKSRC}/kodilib/linux/Makefile @${REINPLACE_CMD} -e 's|getenv("KIKI_HOME")|"${DATADIR}"|' ${WRKSRC}/src/main/KikiController.cpp @@ -41,8 +50,8 @@ do-build: cd ${WRKSRC}/linux && ${SETENV} ${MAKE_ENV} ${GMAKE} ${_MAKE_JOBS} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/linux/kiki ${PREFIX}/bin - ${MKDIR} ${DATADIR} - cd ${WRKSRC} && ${COPYTREE_SHARE} "py sound" ${DATADIR}/ + ${INSTALL_PROGRAM} ${WRKSRC}/linux/kiki ${STAGEDIR}${PREFIX}/bin/ + ${MKDIR} ${STAGEDIR}${DATADIR} + cd ${WRKSRC} && ${COPYTREE_SHARE} "py sound" ${STAGEDIR}${DATADIR}/ .include Copied: branches/2014Q1/games/kiki/files/patch-SWIG-KikiText.i (from r337313, head/games/kiki/files/patch-SWIG-KikiText.i) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/kiki/files/patch-SWIG-KikiText.i Tue Dec 24 12:53:38 2013 (r337345, copy of r337313, head/games/kiki/files/patch-SWIG-KikiText.i) @@ -0,0 +1,11 @@ +--- SWIG/KikiText.i.orig 2003-04-09 06:58:32.000000000 +0400 ++++ SWIG/KikiText.i 2013-12-18 23:22:07.556750393 +0400 +@@ -10,7 +10,7 @@ + KikiText ( const std::string & = "", bool center = true, int colorIndex = 0 ); + + void setText ( const std::string & str, int colorIndex = base_color ); +- const std::string & getText () const; ++ std::string getText () const; + + void clear (); + bool isEmpty () const; Copied: branches/2014Q1/games/kiki/files/patch-kodilib-src-handler-KPickable.h (from r337313, head/games/kiki/files/patch-kodilib-src-handler-KPickable.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/kiki/files/patch-kodilib-src-handler-KPickable.h Tue Dec 24 12:53:38 2013 (r337345, copy of r337313, head/games/kiki/files/patch-kodilib-src-handler-KPickable.h) @@ -0,0 +1,10 @@ +--- kodilib/src/handler/KPickable.h.orig 2003-04-09 06:56:01.000000000 +0400 ++++ kodilib/src/handler/KPickable.h 2013-12-18 23:15:04.454779490 +0400 +@@ -7,6 +7,7 @@ + #define __KPickable + + #include "KIntrospection.h" ++#include + #include + + #define DEBUG_PICKING false Copied: branches/2014Q1/games/kiki/files/patch-kodilib-src-tools-KFileTools.cpp (from r337313, head/games/kiki/files/patch-kodilib-src-tools-KFileTools.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/kiki/files/patch-kodilib-src-tools-KFileTools.cpp Tue Dec 24 12:53:38 2013 (r337345, copy of r337313, head/games/kiki/files/patch-kodilib-src-tools-KFileTools.cpp) @@ -0,0 +1,31 @@ +--- kodilib/src/tools/KFileTools.cpp.orig 2004-06-30 20:03:38.000000000 +0400 ++++ kodilib/src/tools/KFileTools.cpp 2013-12-24 05:02:16.028538916 +0400 +@@ -214,8 +214,8 @@ + // -------------------------------------------------------------------------------------------------------- + string kFileSuffix ( const string & path ) + { +- unsigned int lastDotPos = path.rfind("."); +- unsigned int lastSlashPos = path.rfind(kPathSep); ++ size_t lastDotPos = path.rfind("."); ++ size_t lastSlashPos = path.rfind(kPathSep); + + if (lastDotPos < path.size() - 1 && (lastDotPos > lastSlashPos || lastSlashPos == string::npos)) + { +@@ -228,7 +228,7 @@ + string kFileDirName ( const string & path ) + { + string native = kFileNativePath(path); +- unsigned int lastSlashPos = native.rfind(kPathSep); ++ size_t lastSlashPos = native.rfind(kPathSep); + if (lastSlashPos < native.size()) + { + return native.substr(0, lastSlashPos+1); +@@ -241,7 +241,7 @@ + { + string native = kFileNativePath(path); + string baseName = native; +- unsigned int lastSlashPos = native.rfind(kPathSep); ++ size_t lastSlashPos = native.rfind(kPathSep); + if (lastSlashPos < native.size() - 1) + { + baseName = native.substr(lastSlashPos+1); Copied: branches/2014Q1/games/kiki/files/patch-kodilib-src-tools-KIntrospection.h (from r337313, head/games/kiki/files/patch-kodilib-src-tools-KIntrospection.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/kiki/files/patch-kodilib-src-tools-KIntrospection.h Tue Dec 24 12:53:38 2013 (r337345, copy of r337313, head/games/kiki/files/patch-kodilib-src-tools-KIntrospection.h) @@ -0,0 +1,10 @@ +--- kodilib/src/tools/KIntrospection.h.orig 2003-04-09 06:56:03.000000000 +0400 ++++ kodilib/src/tools/KIntrospection.h 2013-12-18 23:04:00.089825283 +0400 +@@ -11,6 +11,7 @@ + #endif + + #include ++#include + + // -------------------------------------------------------------------------------------------------------- + class KClassInfo Copied: branches/2014Q1/games/kiki/files/patch-kodilib-src-tools-KKeyTools.cpp (from r337313, head/games/kiki/files/patch-kodilib-src-tools-KKeyTools.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/kiki/files/patch-kodilib-src-tools-KKeyTools.cpp Tue Dec 24 12:53:38 2013 (r337345, copy of r337313, head/games/kiki/files/patch-kodilib-src-tools-KKeyTools.cpp) @@ -0,0 +1,29 @@ +--- ./kodilib/src/tools/KKeyTools.cpp.orig 2003-04-09 06:56:03.000000000 +0400 ++++ ./kodilib/src/tools/KKeyTools.cpp 2013-12-24 04:49:24.796993556 +0400 +@@ -170,7 +170,7 @@ + // -------------------------------------------------------------------------------------------------------- + int kKeyGetDisplayWidthForKey ( const std::string & keyName ) + { +- unsigned int keyPos = keyName.find('_', 0); ++ size_t keyPos = keyName.find('_', 0); + if (keyPos == std::string::npos) + { + return kKeyGetDisplayWidthForPureKey(keyName) + KDL_MOD_KEY_SPACING; +@@ -313,7 +313,7 @@ + int kKeyDisplayKey ( const std::string & keyName, const KPosition & pos ) + { + KPosition start = pos; +- unsigned int keyPos = keyName.find('_', 0); ++ size_t keyPos = keyName.find('_', 0); + if (keyPos == std::string::npos) + { + return start.x + kKeyDisplayPureKey(keyName, start) + KDL_MOD_KEY_SPACING; +@@ -380,7 +380,7 @@ + // -------------------------------------------------------------------------------------------------------- + SDL_keysym kKeyGetKeysymForKeyName ( const std::string & keyName ) + { +- unsigned int pos = keyName.find('_'); ++ size_t pos = keyName.find('_'); + + std::string modString; + std::string symString = keyName; Copied: branches/2014Q1/games/kiki/files/patch-kodilib-src-tools-KStringTools.cpp (from r337313, head/games/kiki/files/patch-kodilib-src-tools-KStringTools.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/kiki/files/patch-kodilib-src-tools-KStringTools.cpp Tue Dec 24 12:53:38 2013 (r337345, copy of r337313, head/games/kiki/files/patch-kodilib-src-tools-KStringTools.cpp) @@ -0,0 +1,107 @@ +--- kodilib/src/tools/KStringTools.cpp.orig 2003-04-14 01:42:13.000000000 +0400 ++++ kodilib/src/tools/KStringTools.cpp 2013-12-24 05:02:41.644525164 +0400 +@@ -13,7 +13,7 @@ + void kStringInsertStringBehindTags ( std::string & str, const std::string & insertString, + const std::string & tag ) + { +- unsigned int oldPos = 0; ++ size_t oldPos = 0; + while ((oldPos = str.find(tag, oldPos)) != std::string::npos) + { + oldPos += tag.size(); +@@ -34,8 +34,8 @@ + { + std::vector components; + +- unsigned int dividerLength = divider.size(); +- unsigned int oldpos = 0, pos; ++ size_t dividerLength = divider.size(); ++ size_t oldpos = 0, pos; + + while ((pos = str.find(divider, oldpos)) != std::string::npos) + { +@@ -50,7 +50,7 @@ + // -------------------------------------------------------------------------------------------------------- + void kStringReplace ( std::string & str, const std::string & toReplace, const std::string & replacement ) + { +- unsigned int pos = 0, chars = toReplace.size(); ++ size_t pos = 0, chars = toReplace.size(); + while ((pos = str.find(toReplace, pos)) != std::string::npos) + { + str.replace(pos, chars, replacement); +@@ -60,11 +60,11 @@ + // -------------------------------------------------------------------------------------------------------- + void kStringReplaceTabs ( std::string & str, unsigned int tabWidth ) + { +- unsigned int tabPos; ++ size_t tabPos; + while ((tabPos = str.find('\t')) != std::string::npos) + { +- unsigned int lastNewlinePos = str.rfind('\n', tabPos-1); +- unsigned int relPos = (lastNewlinePos == std::string::npos) ? tabPos : tabPos - lastNewlinePos; ++ size_t lastNewlinePos = str.rfind('\n', tabPos-1); ++ size_t relPos = (lastNewlinePos == std::string::npos) ? tabPos : tabPos - lastNewlinePos; + str.replace(tabPos, 1, std::string(tabWidth-(relPos % tabWidth), ' ')); + } + } +@@ -114,7 +114,7 @@ + // -------------------------------------------------------------------------------------------------------- + unsigned int kStringNthCharPos ( const std::string & str, unsigned int n, char c ) + { +- unsigned int loc = n, oloc = 0; ++ size_t loc = n, oloc = 0; + while (n > 0 && (loc = str.find(c, oloc)) != std::string::npos) + { + n--; +@@ -138,7 +138,7 @@ + // -------------------------------------------------------------------------------------------------------- + void kStringCropCols ( std::string & str, unsigned int columns ) + { +- unsigned int oloc = 0, nloc = 0; ++ size_t oloc = 0, nloc = 0; + while ((nloc = str.find('\n', oloc)) != std::string::npos) + { + if ((nloc - oloc) > columns) +@@ -160,10 +160,10 @@ + unsigned int kStringCols ( const std::string & str ) + { + if (str.size() == 0) return 0; +- int oloc = 0, nloc; ++ size_t oloc = 0, nloc; + std::string substring; +- int maxlength = 0, length; +- while ((nloc = str.find('\n', oloc)) != (int)std::string::npos) ++ size_t maxlength = 0, length; ++ while ((nloc = str.find('\n', oloc)) != std::string::npos) + { + substring = str.substr(oloc, nloc - oloc); + length = substring.size(); +@@ -181,7 +181,7 @@ + unsigned int kStringRows ( const std::string & str ) + { + if (str.size() == 0) return 1; +- unsigned int loc = 0, lines = 0; ++ size_t loc = 0, lines = 0; + while ((loc = str.find('\n', loc)) != std::string::npos) { lines++; loc++; } + if (str[str.size()-1] == '\n') return lines; + return lines+1; +@@ -204,8 +204,8 @@ + { + static char str[256]; + std::string format(fmt), subformat, text; +- unsigned int oloc = 0; +- unsigned int nloc = 0; ++ size_t oloc = 0; ++ size_t nloc = 0; + + kStringReplaceTabs(format); + +@@ -260,7 +260,7 @@ + // -------------------------------------------------------------------------------------------------------- + bool kStringHasSuffix ( const std::string & str, const std::string & suffix ) + { +- unsigned int result = str.rfind(suffix); ++ size_t result = str.rfind(suffix); + if (result == std::string::npos) return false; + return (result == str.size()-suffix.size()); + } Copied: branches/2014Q1/games/kiki/files/patch-kodilib-src-tools-KStringTools.h (from r337313, head/games/kiki/files/patch-kodilib-src-tools-KStringTools.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/kiki/files/patch-kodilib-src-tools-KStringTools.h Tue Dec 24 12:53:38 2013 (r337345, copy of r337313, head/games/kiki/files/patch-kodilib-src-tools-KStringTools.h) @@ -0,0 +1,10 @@ +--- kodilib/src/tools/KStringTools.h.orig 2003-04-09 06:56:04.000000000 +0400 ++++ kodilib/src/tools/KStringTools.h 2013-12-18 23:05:02.025190391 +0400 +@@ -7,6 +7,7 @@ + #define __KStringTools + + #include ++#include + #include + #include + Copied: branches/2014Q1/games/kiki/files/patch-kodilib-src-tools-KXMLTools.cpp (from r337313, head/games/kiki/files/patch-kodilib-src-tools-KXMLTools.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/kiki/files/patch-kodilib-src-tools-KXMLTools.cpp Tue Dec 24 12:53:38 2013 (r337345, copy of r337313, head/games/kiki/files/patch-kodilib-src-tools-KXMLTools.cpp) @@ -0,0 +1,89 @@ +--- kodilib/src/tools/KXMLTools.cpp.orig 2003-04-14 01:42:13.000000000 +0400 ++++ kodilib/src/tools/KXMLTools.cpp 2013-12-24 04:55:39.915558213 +0400 +@@ -7,6 +7,7 @@ + #include "KConsole.h" + #include "KSeparatedMatrix.h" + #include ++#include + + // -------------------------------------------------------------------------------------------------------- + std::string kXMLTag ( const std::string & name, const std::string & attributes, int depth ) +@@ -58,11 +59,11 @@ + std::string kXMLParseToTagsInVector ( std::string & xml, const std::vector & tags ) + { + std::string open("<"); +- unsigned int minLoc = std::string::npos; ++ size_t minLoc = std::string::npos; + std::vector::const_iterator iter = tags.begin(); + while (iter != tags.end()) + { +- unsigned int loc = xml.find(open+(*iter)); ++ size_t loc = xml.find(open+(*iter)); + if (loc < minLoc) minLoc = loc; + iter++; + } +@@ -77,7 +78,7 @@ + std::string value; + std::string nameStr(name); + nameStr += "='"; +- unsigned int loc = xml.find(nameStr); ++ size_t loc = xml.find(nameStr); + if (loc != std::string::npos) + { + loc += nameStr.size(); +@@ -90,7 +91,7 @@ + // -------------------------------------------------------------------------------------------------------- + bool kXMLParseNamedCloseTag ( std::string & xml, const std::string & name, bool printError ) + { +- unsigned int loc = xml.find('<'); ++ size_t loc = xml.find('<'); + if (loc == std::string::npos) + { + if (printError) KConsole::printError(kStringPrintf("invalid XML:\nmissing close tag '%s'", +@@ -117,7 +118,7 @@ + // -------------------------------------------------------------------------------------------------------- + bool kXMLReadNamedOpenTag ( const std::string & xml, const std::string & name, std::string * attributes ) + { +- unsigned int loc = xml.find('<'), endloc; ++ size_t loc = xml.find('<'), endloc; + + if (loc == std::string::npos || xml[loc+1] == '/') return false; + +@@ -140,7 +141,7 @@ + // -------------------------------------------------------------------------------------------------------- + std::string kXMLParseNamedOpenTag ( std::string & xml, const std::string & name, std::string * attributes, bool printError ) + { +- unsigned int loc = xml.find('<'); ++ size_t loc = xml.find('<'); + if (loc == std::string::npos || xml[loc+1] == '/') + { + if (printError) KConsole::printError(kStringPrintf("invalid XML:\nmissing tag '%s'", name.c_str())); +@@ -191,7 +192,7 @@ + // -------------------------------------------------------------------------------------------------------- + bool kXMLParseOpenTag ( std::string & xml, std::string & name, std::string * attributes, bool printError ) + { +- unsigned int loc = xml.find('<'); ++ size_t loc = xml.find('<'); + if (loc == std::string::npos || xml[loc+1] == '/') + { + if (printError) KConsole::printError("invalid XML:\nmissing open tag"); +@@ -295,7 +296,7 @@ + // -------------------------------------------------------------------------------------------------------- + bool kXMLParseValue( std::string & xml, const std::string & name, int type, void * value, bool printError ) + { +- unsigned int loc = xml.find('<'); ++ size_t loc = xml.find('<'); + if (loc == std::string::npos || xml[loc+1] == '/') + { + if (printError) KConsole::printError(kStringPrintf("invalid XML:\nmissing value '%s'", name.c_str())); +@@ -379,8 +380,8 @@ + } + else if (typeString == "string") + { +- unsigned int first = substring.find("\"")+1; +- unsigned int last = substring.rfind("\"", std::string::npos); ++ size_t first = substring.find("\"")+1; ++ size_t last = substring.rfind("\"", std::string::npos); + *((std::string*)value) = substring.substr(first, last-first); + } + Copied: branches/2014Q1/games/kiki/files/patch-kodilib-src-types-KKey.cpp (from r337313, head/games/kiki/files/patch-kodilib-src-types-KKey.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/kiki/files/patch-kodilib-src-types-KKey.cpp Tue Dec 24 12:53:38 2013 (r337345, copy of r337313, head/games/kiki/files/patch-kodilib-src-types-KKey.cpp) @@ -0,0 +1,20 @@ +--- ./kodilib/src/types/KKey.cpp.orig 2003-04-09 06:56:05.000000000 +0400 ++++ ./kodilib/src/types/KKey.cpp 2013-12-24 04:48:44.925583387 +0400 +@@ -31,7 +31,7 @@ + // -------------------------------------------------------------------------------------------------------- + std::string KKey::getUnmodifiedName () const + { +- unsigned int keyPos = name.find('_', 0); ++ size_t keyPos = name.find('_', 0); + if (keyPos == std::string::npos) + { + return name; +@@ -42,7 +42,7 @@ + // -------------------------------------------------------------------------------------------------------- + std::string KKey::getModifierName () const + { +- unsigned int keyPos = name.find('_', 0); ++ size_t keyPos = name.find('_', 0); + if (keyPos == std::string::npos) + { + return ""; Copied: branches/2014Q1/games/kiki/files/patch-kodilib-src-widgets-KFileNameField.cpp (from r337313, head/games/kiki/files/patch-kodilib-src-widgets-KFileNameField.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/kiki/files/patch-kodilib-src-widgets-KFileNameField.cpp Tue Dec 24 12:53:38 2013 (r337345, copy of r337313, head/games/kiki/files/patch-kodilib-src-widgets-KFileNameField.cpp) @@ -0,0 +1,11 @@ +--- kodilib/src/widgets/KFileNameField.cpp.orig 2003-04-14 01:53:22.000000000 +0400 ++++ kodilib/src/widgets/KFileNameField.cpp 2013-12-24 04:54:19.830560677 +0400 +@@ -41,7 +41,7 @@ + std::string restPath; // path behind cursor + + // map cropped path to current directory and rest path to file prefix +- unsigned int lastSlashPos = croppedPath.rfind("/"); ++ size_t lastSlashPos = croppedPath.rfind("/"); + if (lastSlashPos < croppedPath.size()-1) + { + restPath = croppedPath.substr(lastSlashPos+1); Copied: branches/2014Q1/games/kiki/files/patch-src-gui-KikiMenu.cpp (from r337313, head/games/kiki/files/patch-src-gui-KikiMenu.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/kiki/files/patch-src-gui-KikiMenu.cpp Tue Dec 24 12:53:38 2013 (r337345, copy of r337313, head/games/kiki/files/patch-src-gui-KikiMenu.cpp) @@ -0,0 +1,11 @@ +--- ./src/gui/KikiMenu.cpp.orig 2005-10-23 17:02:17.000000000 +0400 ++++ ./src/gui/KikiMenu.cpp 2013-12-24 04:48:05.662585645 +0400 +@@ -54,7 +54,7 @@ + { + std::string item_text (itemText); + std::string event_name (itemText); +- unsigned int pos; ++ size_t pos; + float scale_factor = 1.0; + + KikiMenuItem * menu_item = new KikiMenuItem (); Copied: branches/2014Q1/games/kiki/files/patch-src-gui-KikiTextLine.cpp (from r337313, head/games/kiki/files/patch-src-gui-KikiTextLine.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/kiki/files/patch-src-gui-KikiTextLine.cpp Tue Dec 24 12:53:38 2013 (r337345, copy of r337313, head/games/kiki/files/patch-src-gui-KikiTextLine.cpp) @@ -0,0 +1,11 @@ +--- ./src/gui/KikiTextLine.cpp.orig 2005-10-02 18:07:54.000000000 +0400 ++++ ./src/gui/KikiTextLine.cpp 2013-12-24 04:48:17.413608892 +0400 +@@ -46,7 +46,7 @@ + void KikiTextLine::setText ( const std::string & str ) + { + text = str; +- unsigned int pos; ++ size_t pos; + + if ((pos = text.find ("$scale(")) != std::string::npos) + { Copied: branches/2014Q1/games/kiki/files/patch-src-main-main.cpp (from r337313, head/games/kiki/files/patch-src-main-main.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/kiki/files/patch-src-main-main.cpp Tue Dec 24 12:53:38 2013 (r337345, copy of r337313, head/games/kiki/files/patch-src-main-main.cpp) @@ -0,0 +1,19 @@ +--- src/main/main.cpp.orig 2003-04-11 17:42:29.000000000 +0400 ++++ src/main/main.cpp 2013-12-24 05:06:01.864511655 +0400 +@@ -9,6 +9,7 @@ + #include + + #include ++#include + #include "KikiController.h" + + // __________________________________________________________________________________________________ +@@ -19,6 +20,8 @@ + int width, height; + SDL_Surface * screen; + ++ glutInit(&argc, argv); ++ + // initialize SDL + if ( SDL_Init(SDL_INIT_VIDEO | SDL_INIT_VIDEO) < 0 ) // SDL_INIT_TIMER + { From owner-svn-ports-branches@FreeBSD.ORG Tue Dec 24 12:54:35 2013 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 60C12B9B; Tue, 24 Dec 2013 12:54:35 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 40D8B1F02; Tue, 24 Dec 2013 12:54:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBOCsZmq087281; Tue, 24 Dec 2013 12:54:35 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBOCsX8C087273; Tue, 24 Dec 2013 12:54:33 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312241254.rBOCsX8C087273@svn.freebsd.org> From: Mathieu Arnold Date: Tue, 24 Dec 2013 12:54:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337346 - branches/2014Q1/audio/ardour/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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: Tue, 24 Dec 2013 12:54:35 -0000 Author: mat Date: Tue Dec 24 12:54:33 2013 New Revision: 337346 URL: http://svnweb.freebsd.org/changeset/ports/337346 Log: MFH: r337319 - Add a proxy method to access protected IO::connecting_legal field from Session::add_routes(); no idea why it worked before with GCC 4.2 - Switch from using non-standard STL slist container (which is not available with libc++) to the one provided by boost::container::slist, it allows to build Ardour on all supported FreeBSD versions/compilers - Fix remaining cases of boost::shared_ptr to fix the build against Clang Approved by: portmgr (implicit) Added: branches/2014Q1/audio/ardour/files/patch-gtk2_ardour-connection_editor.cc - copied unchanged from r337319, head/audio/ardour/files/patch-gtk2_ardour-connection_editor.cc branches/2014Q1/audio/ardour/files/patch-gtk2_ardour-connection_editor.h - copied unchanged from r337319, head/audio/ardour/files/patch-gtk2_ardour-connection_editor.h branches/2014Q1/audio/ardour/files/patch-gtk2_ardour-io_selector.cc - copied unchanged from r337319, head/audio/ardour/files/patch-gtk2_ardour-io_selector.cc branches/2014Q1/audio/ardour/files/patch-gtk2_ardour-io_selector.h - copied unchanged from r337319, head/audio/ardour/files/patch-gtk2_ardour-io_selector.h branches/2014Q1/audio/ardour/files/patch-libs-ardour-ardour-io.h - copied unchanged from r337319, head/audio/ardour/files/patch-libs-ardour-ardour-io.h branches/2014Q1/audio/ardour/files/patch-libs-surfaces-mackie-mackie_control_protocol.cc - copied unchanged from r337319, head/audio/ardour/files/patch-libs-surfaces-mackie-mackie_control_protocol.cc Modified: branches/2014Q1/audio/ardour/files/patch-libs-ardour-session.cc Directory Properties: branches/2014Q1/ (props changed) Copied: branches/2014Q1/audio/ardour/files/patch-gtk2_ardour-connection_editor.cc (from r337319, head/audio/ardour/files/patch-gtk2_ardour-connection_editor.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/audio/ardour/files/patch-gtk2_ardour-connection_editor.cc Tue Dec 24 12:54:33 2013 (r337346, copy of r337319, head/audio/ardour/files/patch-gtk2_ardour-connection_editor.cc) @@ -0,0 +1,23 @@ +--- gtk2_ardour/connection_editor.cc.orig ++++ gtk2_ardour/connection_editor.cc +@@ -502,9 +502,9 @@ ConnectionEditor::display_connection_sta + frame_label += _("\""); + port_frame.set_label (frame_label); + +- for (slist::iterator i = port_displays.begin(); i != port_displays.end(); ) { ++ for (boost::container::slist::iterator i = port_displays.begin(); i != port_displays.end(); ) { + +- slist::iterator tmp; ++ boost::container::slist::iterator tmp; + + tmp = i; + tmp++; +@@ -612,7 +612,7 @@ ConnectionEditor::connection_port_button + + tview->set_name ("ConnectionEditorPortListSelected"); + +- for (slist::iterator i = port_displays.begin(); i != port_displays.end(); ++i) { ++ for (boost::container::slist::iterator i = port_displays.begin(); i != port_displays.end(); ++i) { + + Widget *child = (*i)->get_child(); + Copied: branches/2014Q1/audio/ardour/files/patch-gtk2_ardour-connection_editor.h (from r337319, head/audio/ardour/files/patch-gtk2_ardour-connection_editor.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/audio/ardour/files/patch-gtk2_ardour-connection_editor.h Tue Dec 24 12:54:33 2013 (r337346, copy of r337319, head/audio/ardour/files/patch-gtk2_ardour-connection_editor.h) @@ -0,0 +1,25 @@ +--- gtk2_ardour/connection_editor.h.orig ++++ gtk2_ardour/connection_editor.h +@@ -20,12 +20,7 @@ + #ifndef __ardour_gtk_connection_editor_h__ + #define __ardour_gtk_connection_editor_h__ + +-#if __GNUC__ >= 3 +-#include +-using __gnu_cxx::slist; +-#else +-#include +-#endif ++#include + + #include + #include +@@ -116,7 +111,7 @@ class ConnectionEditor : public ArdourDi + Gtk::Button add_port_button; + + Glib::Mutex port_display_lock; +- slist port_displays; ++ boost::container::slist port_displays; + + Gtk::Button ok_button; + Gtk::Button cancel_button; Copied: branches/2014Q1/audio/ardour/files/patch-gtk2_ardour-io_selector.cc (from r337319, head/audio/ardour/files/patch-gtk2_ardour-io_selector.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/audio/ardour/files/patch-gtk2_ardour-io_selector.cc Tue Dec 24 12:54:33 2013 (r337346, copy of r337319, head/audio/ardour/files/patch-gtk2_ardour-io_selector.cc) @@ -0,0 +1,39 @@ +--- gtk2_ardour/io_selector.cc.orig ++++ gtk2_ardour/io_selector.cc +@@ -389,9 +389,9 @@ IOSelector::display_ports () + limit = io->n_outputs(); + } + +- for (slist::iterator i = port_displays.begin(); i != port_displays.end(); ) { ++ for (boost::container::slist::iterator i = port_displays.begin(); i != port_displays.end(); ) { + +- slist::iterator tmp; ++ boost::container::slist::iterator tmp; + + tmp = i; + ++tmp; +@@ -632,13 +632,13 @@ IOSelector::connection_button_release (G + void + IOSelector::select_next_treeview () + { +- slist::iterator next; ++ boost::container::slist::iterator next; + + if (port_displays.empty() || port_displays.size() == 1) { + return; + } + +- for (slist::iterator i = port_displays.begin(); i != port_displays.end(); ++i) { ++ for (boost::container::slist::iterator i = port_displays.begin(); i != port_displays.end(); ++i) { + + if ((*i)->get_name() == "IOSelectorPortListSelected") { + +@@ -681,7 +681,7 @@ IOSelector::select_treeview (TreeView* t + gtk_widget_queue_draw (ccol->button); + } + +- for (slist::iterator i = port_displays.begin(); i != port_displays.end(); ++i) { ++ for (boost::container::slist::iterator i = port_displays.begin(); i != port_displays.end(); ++i) { + if (*i == tview) { + continue; + } Copied: branches/2014Q1/audio/ardour/files/patch-gtk2_ardour-io_selector.h (from r337319, head/audio/ardour/files/patch-gtk2_ardour-io_selector.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/audio/ardour/files/patch-gtk2_ardour-io_selector.h Tue Dec 24 12:54:33 2013 (r337346, copy of r337319, head/audio/ardour/files/patch-gtk2_ardour-io_selector.h) @@ -0,0 +1,25 @@ +--- gtk2_ardour/io_selector.h.orig ++++ gtk2_ardour/io_selector.h +@@ -20,12 +20,7 @@ + #ifndef __ardour_ui_io_selector_h__ + #define __ardour_ui_io_selector_h__ + +-#if __GNUC__ >= 3 +-#include +-using __gnu_cxx::slist; +-#else +-#include +-#endif ++#include + + #include + +@@ -110,7 +105,7 @@ class IOSelector : public Gtk::VBox { + Gtk::ScrolledWindow port_display_scroller; + + Glib::Mutex port_display_lock; +- slist port_displays; ++ boost::container::slist port_displays; + void display_ports (); + + void rescan (); Copied: branches/2014Q1/audio/ardour/files/patch-libs-ardour-ardour-io.h (from r337319, head/audio/ardour/files/patch-libs-ardour-ardour-io.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/audio/ardour/files/patch-libs-ardour-ardour-io.h Tue Dec 24 12:54:33 2013 (r337346, copy of r337319, head/audio/ardour/files/patch-libs-ardour-ardour-io.h) @@ -0,0 +1,13 @@ +--- libs/ardour/ardour/io.h.orig ++++ libs/ardour/ardour/io.h +@@ -288,6 +288,10 @@ class IO : public PBD::StatefulDestructi + XMLNode *pending_state_node; + int ports_became_legal (); + ++ static bool connecting_is_legal() { ++ return connecting_legal; ++ } ++ + private: + mutable Glib::Mutex io_lock; + Modified: branches/2014Q1/audio/ardour/files/patch-libs-ardour-session.cc ============================================================================== --- branches/2014Q1/audio/ardour/files/patch-libs-ardour-session.cc Tue Dec 24 12:53:38 2013 (r337345) +++ branches/2014Q1/audio/ardour/files/patch-libs-ardour-session.cc Tue Dec 24 12:54:33 2013 (r337346) @@ -162,6 +162,15 @@ r->insert (r->end(), new_routes.begin(), new_routes.end()); resort_routes_using (r); } +@@ -2150,7 +2149,7 @@ Session::add_routes (RouteList& new_rout + } + } + +- if (_control_out && IO::connecting_legal) { ++ if (_control_out && IO::connecting_is_legal()) { + + vector cports; + uint32_t ni = _control_out->n_inputs(); @@ -2198,14 +2197,14 @@ Session::add_diskstream (boost::shared_p } Copied: branches/2014Q1/audio/ardour/files/patch-libs-surfaces-mackie-mackie_control_protocol.cc (from r337319, head/audio/ardour/files/patch-libs-surfaces-mackie-mackie_control_protocol.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/audio/ardour/files/patch-libs-surfaces-mackie-mackie_control_protocol.cc Tue Dec 24 12:54:33 2013 (r337346, copy of r337319, head/audio/ardour/files/patch-libs-surfaces-mackie-mackie_control_protocol.cc) @@ -0,0 +1,29 @@ +--- libs/surfaces/mackie/mackie_control_protocol.cc.orig ++++ libs/surfaces/mackie/mackie_control_protocol.cc +@@ -64,8 +64,6 @@ using namespace sigc; + using namespace Mackie; + using namespace PBD; + +-using boost::shared_ptr; +- + #include "i18n.h" + + MackieMidiBuilder builder; +@@ -200,7 +198,7 @@ MackieControlProtocol::port_for_id( uint + // predicate for sort call in get_sorted_routes + struct RouteByRemoteId + { +- bool operator () ( const shared_ptr & a, const shared_ptr & b ) const { ++ bool operator () ( const boost::shared_ptr & a, const boost::shared_ptr & b ) const { + return a->remote_control_id() < b->remote_control_id(); + } + +@@ -680,7 +678,7 @@ MackieControlProtocol::create_ports() + } + } + +-shared_ptr ++boost::shared_ptr + MackieControlProtocol::master_route() + { + boost::shared_ptr mo = session->master_out (); From owner-svn-ports-branches@FreeBSD.ORG Tue Dec 24 12:56:13 2013 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 670DDC7F; Tue, 24 Dec 2013 12:56:13 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 467AB1F0D; Tue, 24 Dec 2013 12:56:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBOCuDR0087667; Tue, 24 Dec 2013 12:56:13 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBOCuCs1087662; Tue, 24 Dec 2013 12:56:12 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312241256.rBOCuCs1087662@svn.freebsd.org> From: Mathieu Arnold Date: Tue, 24 Dec 2013 12:56:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337347 - in branches/2014Q1/games/icbm3d: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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: Tue, 24 Dec 2013 12:56:13 -0000 Author: mat Date: Tue Dec 24 12:56:11 2013 New Revision: 337347 URL: http://svnweb.freebsd.org/changeset/ports/337347 Log: MFH: r337322 - Bump PORTREVISION - Change master sites and icon - Support STAGEDIR - Add DOCS Option - Add Desktop entry file - Simplify Makefile - Add patches, fix bad C++ code Approved by: pawel / wg (mentors, implicit) Approved by: portmgr (implicit) Added: branches/2014Q1/games/icbm3d/files/patch-randnum.c - copied unchanged from r337322, head/games/icbm3d/files/patch-randnum.c branches/2014Q1/games/icbm3d/files/patch-text.c - copied unchanged from r337322, head/games/icbm3d/files/patch-text.c Modified: branches/2014Q1/games/icbm3d/Makefile branches/2014Q1/games/icbm3d/distinfo (contents, props changed) branches/2014Q1/games/icbm3d/files/patch-makefile (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/games/icbm3d/Makefile ============================================================================== --- branches/2014Q1/games/icbm3d/Makefile Tue Dec 24 12:54:33 2013 (r337346) +++ branches/2014Q1/games/icbm3d/Makefile Tue Dec 24 12:56:11 2013 (r337347) @@ -3,43 +3,40 @@ PORTNAME= icbm3d PORTVERSION= 0.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= ftp://ftp.tuxpaint.org/unix/x/icbm3d/ \ ftp://ftp.billsgames.com/unix/x/icbm3d/ \ - http://www.newbreedsoftware.com/images/prodicons/:icons + SF/nemysisfreebsdp/games/${PORTNAME}/:icons DISTFILES= ${PORTNAME}.${DISTVERSION}${EXTRACT_SUFX} \ - ${PORTNAME}.gif:icons + ${PORTNAME}.png:icons EXTRACT_ONLY= ${PORTNAME}.${DISTVERSION}${EXTRACT_SUFX} MAINTAINER= nemysis@gmx.ch COMMENT= Inter-Continental Ballistic Missiles, 3D -WRKSRC= ${WRKDIR}/icbm3d +WRKSRC= ${WRKDIR}/${PORTNAME} USE_XORG= x11 MAKEFILE= makefile ALL_TARGET= ${PORTNAME} PLIST_FILES= bin/${PORTNAME} \ - share/pixmaps/${PORTNAME}.gif + share/pixmaps/${PORTNAME}.png PORTDOCS= README.txt -NO_STAGE= yes -.include +OPTIONS_DEFINE= DOCS -do-install: -# Executable - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin +DESKTOP_ENTRIES="ICBM3D" "" "${PORTNAME}" \ + "${PORTNAME}" "Game;ArcadeGame;" "" -# Pixmaps - ${INSTALL_DATA} ${DISTDIR}/${PORTNAME}.gif ${PREFIX}/share/pixmaps/ +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ + ${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \ + ${STAGEDIR}${PREFIX}/share/pixmaps/ -# Documentation -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README.txt ${DOCSDIR} -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include Modified: branches/2014Q1/games/icbm3d/distinfo ============================================================================== --- branches/2014Q1/games/icbm3d/distinfo Tue Dec 24 12:54:33 2013 (r337346) +++ branches/2014Q1/games/icbm3d/distinfo Tue Dec 24 12:56:11 2013 (r337347) @@ -1,4 +1,4 @@ SHA256 (icbm3d.0.4.tar.gz) = 9ad41c154ef47695771a26875d5415bcedcb139352b1e2175f386d206b0038fd SIZE (icbm3d.0.4.tar.gz) = 31187 -SHA256 (icbm3d.gif) = e5d6d45ee11ff669414ac2e22943a0786b62b72035884a06abd5f12dcd0d5f15 -SIZE (icbm3d.gif) = 1024 +SHA256 (icbm3d.png) = 993ef04425b4211a699437076386f27368abf5a3d660194c1d800e20fcd1517c +SIZE (icbm3d.png) = 877 Modified: branches/2014Q1/games/icbm3d/files/patch-makefile ============================================================================== --- branches/2014Q1/games/icbm3d/files/patch-makefile Tue Dec 24 12:54:33 2013 (r337346) +++ branches/2014Q1/games/icbm3d/files/patch-makefile Tue Dec 24 12:56:11 2013 (r337347) @@ -1,13 +1,13 @@ ---- makefile.orig 1998-07-31 06:41:20.000000000 +0200 -+++ makefile 2012-09-02 23:21:36.000000000 +0200 +--- ./makefile.orig 1998-07-31 06:41:20.000000000 +0200 ++++ ./makefile 2013-12-24 08:28:45.000000000 +0100 @@ -9,14 +9,16 @@ # Makefile user-definable variables------------------------------------------ -CC=gcc -+CC?=g++ -+PREFIX?=/usr/local -+LOCALBASE?=/usr/local ++CC?=${CC} ++PREFIX?=${PREFIX} ++LOCALBASE?=${PREFIX} MATHLIB=-lm INSTALLROOT=$(PREFIX) Copied: branches/2014Q1/games/icbm3d/files/patch-randnum.c (from r337322, head/games/icbm3d/files/patch-randnum.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/icbm3d/files/patch-randnum.c Tue Dec 24 12:56:11 2013 (r337347, copy of r337322, head/games/icbm3d/files/patch-randnum.c) @@ -0,0 +1,10 @@ +--- ./randnum.c.orig 1998-07-29 23:25:59.000000000 +0200 ++++ ./randnum.c 2013-12-24 08:33:46.000000000 +0100 +@@ -11,6 +11,7 @@ + #include + #include + #include "randnum.h" ++#include + + void randinit() + { Copied: branches/2014Q1/games/icbm3d/files/patch-text.c (from r337322, head/games/icbm3d/files/patch-text.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/icbm3d/files/patch-text.c Tue Dec 24 12:56:11 2013 (r337347, copy of r337322, head/games/icbm3d/files/patch-text.c) @@ -0,0 +1,10 @@ +--- ./text.c.orig 1998-07-29 23:25:59.000000000 +0200 ++++ ./text.c 2013-12-24 08:28:45.000000000 +0100 +@@ -7,6 +7,7 @@ + + #include + #include "text.h" ++#include + + int FontHeight(XFontStruct *font_struct) + { From owner-svn-ports-branches@FreeBSD.ORG Tue Dec 24 12:57:11 2013 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 61AC3D5F; Tue, 24 Dec 2013 12:57:11 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4CB781F14; Tue, 24 Dec 2013 12:57:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBOCvBv1087892; Tue, 24 Dec 2013 12:57:11 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBOCvAjZ087890; Tue, 24 Dec 2013 12:57:10 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312241257.rBOCvAjZ087890@svn.freebsd.org> From: Mathieu Arnold Date: Tue, 24 Dec 2013 12:57:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337348 - in branches/2014Q1/devel/urjtag: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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: Tue, 24 Dec 2013 12:57:11 -0000 Author: mat Date: Tue Dec 24 12:57:10 2013 New Revision: 337348 URL: http://svnweb.freebsd.org/changeset/ports/337348 Log: MFH: r337328 - Fix build on current - Support STAGE PR: ports/184810 Submitted by: KATO Tsuguru Approved by: portmgr (implicit) Deleted: branches/2014Q1/devel/urjtag/files/ Modified: branches/2014Q1/devel/urjtag/Makefile branches/2014Q1/devel/urjtag/pkg-plist (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/devel/urjtag/Makefile ============================================================================== --- branches/2014Q1/devel/urjtag/Makefile Tue Dec 24 12:56:11 2013 (r337347) +++ branches/2014Q1/devel/urjtag/Makefile Tue Dec 24 12:57:10 2013 (r337348) @@ -3,7 +3,7 @@ PORTNAME= urjtag PORTVERSION= 0.10 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel MASTER_SITES= SF @@ -12,26 +12,24 @@ COMMENT= Extended utility to work with J LICENSE= GPLv2 -BUILD_DEPENDS= flex:${PORTSDIR}/textproc/flex +RUN_DEPENDS= bash:${PORTSDIR}/shells/bash USE_BZIP2= yes -USE_GMAKE= yes +USES= gmake readline shebangfix +SHEBANG_FILES= src/bsdl2jtag +USE_CSTD= c99 GNU_CONFIGURE= yes -CONFIGURE_ENV= LEX=${LOCALBASE}/bin/flex CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CFLAGS+= --std=c99 - -MAN1= jtag.1 bsdl2jtag.1 OPTIONS_DEFINE= USB FTDI JEDEC NLS OPTIONS_DEFAULT= USB FTDI +OPTIONS_SUB= yes USB_DESC= Build support for USB JTAG adapters FTDI_DESC= Build support for FTDI-based USB JTAG adapters JEDEC_DESC= Enable experimental JEDEC flash detection -NO_STAGE= yes .include .if ${PORT_OPTIONS:MJEDEC} @@ -39,29 +37,34 @@ CONFIGURE_ARGS+= --enable-jedec .endif .if ${PORT_OPTIONS:MUSB} -CONFIGURE_ARGS+= --with-libusb -EXTRA_PATCHES= ${FILESDIR}/extra-patch-usb -.endif - -.if ${PORT_OPTIONS:MFTDI} -CONFIGURE_ARGS+= --with-libftdi -LIB_DEPENDS+= ftdi:${PORTSDIR}/devel/libftdi +CONFIGURE_ARGS+= --with-libusb=/usr .endif -.if exists(${LOCALBASE}/lib/libreadline.so.6) -LIB_DEPENDS+= readline.6:${PORTSDIR}/devel/readline +.if ! ${PORT_OPTIONS:MFTDI} +CONFIGURE_ARGS+= --without-libftdi +.else +LIB_DEPENDS+= libftdi.so:${PORTSDIR}/devel/libftdi .endif .if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_SUB+= NLS="" +USES+= gettext .else -PLIST_SUB+= NLS="@comment " CONFIGURE_ARGS+=--disable-nls .endif +.include + +.if ${OSVERSION} < 1000033 +BUILD_DEPENDS+= flex>0:${PORTSDIR}/textproc/flex +CONFIGURE_ENV+= LEX=${LOCALBASE}/bin/flex +.endif + post-patch: # Suppress svn(1) binary detection - @${REINPLACE_CMD} -e 's|^SVN=.*|SVN=''|' ${WRKSRC}/configure + @${REINPLACE_CMD} -e \ + 's|^SVN=.*|SVN=''| ; \ + s|-Lwith_libusb |-L$$with_libusb/lib | ; \ + s|-I$$with_libusb"|-I$$with_libusb/include"|' \ + ${WRKSRC}/configure -.include +.include Modified: branches/2014Q1/devel/urjtag/pkg-plist ============================================================================== --- branches/2014Q1/devel/urjtag/pkg-plist Tue Dec 24 12:56:11 2013 (r337347) +++ branches/2014Q1/devel/urjtag/pkg-plist Tue Dec 24 12:57:10 2013 (r337348) @@ -1,5 +1,7 @@ bin/bsdl2jtag bin/jtag +man/man1/bsdl2jtag.1.gz +man/man1/jtag.1.gz %%NLS%%share/locale/fr/LC_MESSAGES/urjtag.mo %%NLS%%share/locale/rw/LC_MESSAGES/urjtag.mo %%NLS%%share/locale/sk/LC_MESSAGES/urjtag.mo From owner-svn-ports-branches@FreeBSD.ORG Tue Dec 24 12:58:05 2013 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 62EA6E46; Tue, 24 Dec 2013 12:58:05 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 433141F20; Tue, 24 Dec 2013 12:58:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBOCw5cC088096; Tue, 24 Dec 2013 12:58:05 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBOCw5TH088095; Tue, 24 Dec 2013 12:58:05 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312241258.rBOCw5TH088095@svn.freebsd.org> From: Mathieu Arnold Date: Tue, 24 Dec 2013 12:58:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337349 - in branches/2014Q1/databases/dbf: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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: Tue, 24 Dec 2013 12:58:05 -0000 Author: mat Date: Tue Dec 24 12:58:04 2013 New Revision: 337349 URL: http://svnweb.freebsd.org/changeset/ports/337349 Log: MFH: r337338 - Fix build with gcc on 8.x and 9.x - Use option subs - Support staging, strip library PR: ports/184896 Submitted by: KATO Tsuguru Approved by: portmgr (implicit) Added: branches/2014Q1/databases/dbf/files/ - copied from r337338, head/databases/dbf/files/ Modified: branches/2014Q1/databases/dbf/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/databases/dbf/Makefile ============================================================================== --- branches/2014Q1/databases/dbf/Makefile Tue Dec 24 12:57:10 2013 (r337348) +++ branches/2014Q1/databases/dbf/Makefile Tue Dec 24 12:58:04 2013 (r337349) @@ -3,6 +3,7 @@ PORTNAME= dbf PORTVERSION= 0.9.0 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= SF/${PORTNAME}.berlios DISTFILES= ${PORTNAME}-core-${PORTVERSION}.src.zip \ @@ -12,6 +13,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Show and convert the content of dBASE III, IV, and 5.0 files OPTIONS_DEFINE= NLS +OPTIONS_SUB= yes WRKSRC= ${WRKDIR}/lib${PORTNAME} @@ -22,21 +24,16 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= ac_cv_prog_DOC_TO_MAN="" USE_LDCONFIG= yes -NO_STAGE= yes .include .if ${PORT_OPTIONS:MNLS} USES+= gettext CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -lintl -PLIST_SUB+= NLS="" .else CONFIGURE_ENV+= ac_cv_header_libintl_h=no -PLIST_SUB+= NLS="@comment " .endif -_make_jobs= -j${MAKE_JOBS_NUMBER} - post-extract: @${FIND} ${WRKDIR} -name "configure" -or -name "install-sh" | \ ${XARGS} ${CHMOD} ${BINMODE} @@ -49,8 +46,8 @@ post-configure: @(cd ${WRKDIR}/${PORTNAME}-core && ${SETENV} ${CONFIGURE_ENV} \ CC="${CC}" CXX="${CXX}" \ CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \ - CPPFLAGS="-I${WRKSRC}/include" \ - LDFLAGS="-L${WRKSRC}/src/.libs" \ + CPPFLAGS="-I${WRKSRC}/include ${CPPFLAGS}" \ + LDFLAGS="-L${WRKSRC}/src/.libs ${LDFLAGS}" \ INSTALL_DATA="${INSTALL_DATA}" \ INSTALL_LIB="${INSTALL_LIB}" \ INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ @@ -59,11 +56,14 @@ post-configure: ./configure --prefix=${PREFIX}) post-build: - @(cd ${WRKDIR}/${PORTNAME}-core && ${SETENV} ${MAKE_ENV} ${MAKE} \ - ${MAKE_FLAGS} ${MAKEFILE} ${_make_jobs} ${ALL_TARGET}) + @(cd ${WRKDIR}/${PORTNAME}-core && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ + ${MAKE_FLAGS} ${MAKEFILE} -j${MAKE_JOBS_NUMBER} ${MAKE_ARGS} \ + ${ALL_TARGET}) post-install: - @(cd ${WRKDIR}/${PORTNAME}-core && ${SETENV} ${MAKE_ENV} ${MAKE} \ - ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET}) + @(cd ${WRKDIR}/${PORTNAME}-core && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ + ${MAKE_FLAGS} ${MAKEFILE} -j${MAKE_JOBS_NUMBER} ${MAKE_ARGS} \ + ${INSTALL_TARGET}) + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libdbf.so.0 .include From owner-svn-ports-branches@FreeBSD.ORG Tue Dec 24 13:01:06 2013 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 D1FA8F92; Tue, 24 Dec 2013 13:01:06 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BE0A21F8E; Tue, 24 Dec 2013 13:01:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBOD16vd091065; Tue, 24 Dec 2013 13:01:06 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBOD16kM091061; Tue, 24 Dec 2013 13:01:06 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312241301.rBOD16kM091061@svn.freebsd.org> From: Mathieu Arnold Date: Tue, 24 Dec 2013 13:01:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337350 - in branches/2014Q1/devel/pcre++: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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: Tue, 24 Dec 2013 13:01:07 -0000 Author: mat Date: Tue Dec 24 13:01:05 2013 New Revision: 337350 URL: http://svnweb.freebsd.org/changeset/ports/337350 Log: MFH: r337339 - Fix build with clang - Respect CXXFLAGS - Add LICENSE - Support staging, strip library PR: ports/184897 Submitted by: KATO Tsuguru Approved by: portmgr (implicit) Added: branches/2014Q1/devel/pcre++/files/patch-libpcre++__pcre++.h - copied unchanged from r337339, head/devel/pcre++/files/patch-libpcre++__pcre++.h Deleted: branches/2014Q1/devel/pcre++/files/patch-doc::Makefile.in branches/2014Q1/devel/pcre++/files/patch-ltmain.sh Modified: branches/2014Q1/devel/pcre++/Makefile (contents, props changed) branches/2014Q1/devel/pcre++/pkg-plist (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/devel/pcre++/Makefile ============================================================================== --- branches/2014Q1/devel/pcre++/Makefile Tue Dec 24 12:58:04 2013 (r337349) +++ branches/2014Q1/devel/pcre++/Makefile Tue Dec 24 13:01:05 2013 (r337350) @@ -3,31 +3,39 @@ PORTNAME= pcre++ PORTVERSION= 0.9.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= http://www.daemon.de/idisk/Apps/pcre++/ MAINTAINER= ports@FreeBSD.org -COMMENT= A wrapper class around the pcre library +COMMENT= Wrapper class around the pcre library -LIB_DEPENDS= pcre.3:${PORTSDIR}/devel/pcre +LICENSE= LGPL21 -PCRE_CONFIG?= ${LOCALBASE}/bin/pcre-config +LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre +USES= gmake USE_AUTOTOOLS= libtool -USE_GMAKE= yes -GNU_CONFIGURE= yes -CPPFLAGS+= `${PCRE_CONFIG} --cflags` -LDFLAGS+= `${PCRE_CONFIG} --libs` USE_LDCONFIG= yes -MAN3= Pcre.3 -PLIST_SUB= VERSION=${PORTVERSION} +CPPFLAGS+= $$(${PCRE_CONFIG} --cflags) +LDFLAGS+= $$(${PCRE_CONFIG} --libs) DOCSDIR= ${PREFIX}/share/doc/lib${PORTNAME}-${PORTVERSION} -NO_STAGE= yes +PCRE_CONFIG?= ${LOCALBASE}/bin/pcre-config + post-patch: - @${REINPLACE_CMD} -e 's|-O -g|\@CXXFLAGS\@|g' ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e \ + 's| ../COPYING|| ; \ + s| $$(prefix)/doc| $${DESTDIR}$$(prefix)/share/doc|' \ + ${WRKSRC}/doc/Makefile.in +.for i in examples/Makefile.in libpcre++/Makefile.in test/Makefile.in + @${REINPLACE_CMD} -e \ + 's|-O -g|@CXXFLAGS@|' ${WRKSRC}/${i} +.endfor + +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpcre++.so.0 .include Copied: branches/2014Q1/devel/pcre++/files/patch-libpcre++__pcre++.h (from r337339, head/devel/pcre++/files/patch-libpcre++__pcre++.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/devel/pcre++/files/patch-libpcre++__pcre++.h Tue Dec 24 13:01:05 2013 (r337350, copy of r337339, head/devel/pcre++/files/patch-libpcre++__pcre++.h) @@ -0,0 +1,15 @@ +--- libpcre++/pcre++.h.orig ++++ libpcre++/pcre++.h +@@ -47,11 +47,11 @@ + #include + #include + #include ++#include + + + extern "C" { + #include +- #include + } + + namespace pcrepp { Modified: branches/2014Q1/devel/pcre++/pkg-plist ============================================================================== --- branches/2014Q1/devel/pcre++/pkg-plist Tue Dec 24 12:58:04 2013 (r337349) +++ branches/2014Q1/devel/pcre++/pkg-plist Tue Dec 24 13:01:05 2013 (r337350) @@ -4,8 +4,8 @@ lib/libpcre++.a lib/libpcre++.la lib/libpcre++.so lib/libpcre++.so.0 +man/man3/Pcre.3.gz %%DOCSDIR%%/AUTHORS -%%DOCSDIR%%/COPYING %%DOCSDIR%%/ChangeLog %%DOCSDIR%%/INSTALL %%DOCSDIR%%/README From owner-svn-ports-branches@FreeBSD.ORG Tue Dec 24 13:50:24 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 1033) id 17321B35; Tue, 24 Dec 2013 13:50:24 +0000 (UTC) Date: Tue, 24 Dec 2013 13:50:24 +0000 From: Alexey Dokuchaev To: Mathieu Arnold Subject: Re: svn commit: r337346 - branches/2014Q1/audio/ardour/files Message-ID: <20131224135023.GA94117@FreeBSD.org> References: <201312241254.rBOCsX8C087273@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201312241254.rBOCsX8C087273@svn.freebsd.org> User-Agent: Mutt/1.5.22 (2013-10-16) Cc: svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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: Tue, 24 Dec 2013 13:50:24 -0000 On Tue, Dec 24, 2013 at 12:54:33PM +0000, Mathieu Arnold wrote: > New Revision: 337346 > URL: http://svnweb.freebsd.org/changeset/ports/337346 > > Log: > MFH: r337319 IMHO it should've been committed as part of r337343. There is nothing wrong with separating complicated fix into several commits (in head/), but if they are related, it makes more sense to merge them together, no? ./danfe From owner-svn-ports-branches@FreeBSD.ORG Tue Dec 24 14:18:56 2013 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 6630216E; Tue, 24 Dec 2013 14:18:56 +0000 (UTC) Received: from prod2.absolight.net (mx3.absolight.net [IPv6:2a01:678:2:100::25]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1FF441434; Tue, 24 Dec 2013 14:18:56 +0000 (UTC) Received: from prod2.absolight.net (localhost [127.0.0.1]) by prod2.absolight.net (Postfix) with ESMTP id 72E18BDC2E; Tue, 24 Dec 2013 15:18:52 +0100 (CET) Received: from gw.in.absolight.net (gw-ecl.in.absolight.net [79.143.241.69]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "gw.in.absolight.net", Issuer "CA Cert Signing Authority" (not verified)) by prod2.absolight.net (Postfix) with ESMTPSA id 5FA90BDC24; Tue, 24 Dec 2013 15:18:52 +0100 (CET) Received: from ogg.in.absolight.net (ogg.in.absolight.net [79.143.241.239]) by gw.in.absolight.net (Postfix) with ESMTP id B3F826113; Tue, 24 Dec 2013 15:18:51 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by ogg.in.absolight.net (Postfix) with ESMTP id 50C7466D4515; Tue, 24 Dec 2013 15:18:51 +0100 (CET) Date: Tue, 24 Dec 2013 15:18:51 +0100 From: Mathieu Arnold To: Alexey Dokuchaev , Mathieu Arnold Subject: Re: svn commit: r337346 - branches/2014Q1/audio/ardour/files Message-ID: <5B9F108459A3A26926CBB6AE@ogg.in.absolight.net> In-Reply-To: <20131224135023.GA94117@FreeBSD.org> References: <201312241254.rBOCsX8C087273@svn.freebsd.org> <20131224135023.GA94117@FreeBSD.org> X-Mailer: Mulberry/4.0.8 (Mac OS X) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Cc: svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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: Tue, 24 Dec 2013 14:18:56 -0000 +--On 24 d=C3=A9cembre 2013 13:50:24 +0000 Alexey Dokuchaev = wrote: | On Tue, Dec 24, 2013 at 12:54:33PM +0000, Mathieu Arnold wrote: |> New Revision: 337346 |> URL: http://svnweb.freebsd.org/changeset/ports/337346 |>=20 |> Log: |> MFH: r337319 |=20 | IMHO it should've been committed as part of r337343. There is nothing | wrong with separating complicated fix into several commits (in head/), | but if they are related, it makes more sense to merge them together, no? Yes, I could have done that, but the mfh script doesn't take more than one revision to merge at a time, and I did not notice until after the facts that there were two commits to the same port. If the original committer had asked for the merge, had gotten approval, and had done it himself, he sure would have done it like you said ;-) --=20 Mathieu Arnold From owner-svn-ports-branches@FreeBSD.ORG Tue Dec 24 15:55:36 2013 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 3A1C01FB; Tue, 24 Dec 2013 15:55:36 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1B9441CA8; Tue, 24 Dec 2013 15:55:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBOFtZEW057064; Tue, 24 Dec 2013 15:55:35 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBOFtZZQ057059; Tue, 24 Dec 2013 15:55:35 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312241555.rBOFtZZQ057059@svn.freebsd.org> From: Mathieu Arnold Date: Tue, 24 Dec 2013 15:55:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337363 - in branches/2014Q1/devel/cccc: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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: Tue, 24 Dec 2013 15:55:36 -0000 Author: mat Date: Tue Dec 24 15:55:35 2013 New Revision: 337363 URL: http://svnweb.freebsd.org/changeset/ports/337363 Log: MFH: r337352 - Respect CXX/CXXFLAGS (fixes build with clang) - Remove unnecessary BUILD_DEPENDS - Add LICENSE PR: ports/184898 Submitted by: KATO Tsuguru Approved by: portmgr (implicit) Deleted: branches/2014Q1/devel/cccc/files/patch-makefile branches/2014Q1/devel/cccc/files/patch-pccts_makefile Modified: branches/2014Q1/devel/cccc/Makefile (contents, props changed) branches/2014Q1/devel/cccc/pkg-descr (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/devel/cccc/Makefile ============================================================================== --- branches/2014Q1/devel/cccc/Makefile Tue Dec 24 15:45:28 2013 (r337362) +++ branches/2014Q1/devel/cccc/Makefile Tue Dec 24 15:55:35 2013 (r337363) @@ -3,28 +3,45 @@ PORTNAME= cccc PORTVERSION= 3.1.4 +PORTREVISION= 1 CATEGORIES= devel textproc www MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= C and C++ Code Counter -BUILD_DEPENDS= antlr:${PORTSDIR}/devel/pccts \ - dlg:${PORTSDIR}/devel/pccts +LICENSE= GPLv2 # (or later) USES= gmake MAKEFILE= makefile +MAKE_ENV= CCC="${CXX}" LD="${CXX}" CFLAGS_DEBUG="${CXXFLAGS}" MAKE_JOBS_UNSAFE= yes -MAKE_ARGS= CCC="${CXX}" PORTDOCS= readme.txt changes.txt PLIST_FILES= bin/cccc +post-patch: + @${REINPLACE_CMD} -e \ + '/^all/s|install|| ; \ + s| make| $$(MAKE)| ; \ + s|su root -c|| ; \ + s|"make|"$$(MAKE)|' ${WRKSRC}/makefile + @${REINPLACE_CMD} -e \ + 's|^CCC=|CCC?=| ; \ + s|^LD=|LD?=|' ${WRKSRC}/cccc/posixgcc.mak + @${REINPLACE_CMD} -e \ + 's| make| $$(MAKE)|' ${WRKSRC}/pccts/makefile +.for i in antlr dlg + @${REINPLACE_CMD} -e \ + 's|^CC=|CC?=| ; \ + s|^CFLAGS= -O |CFLAGS +=|' ${WRKSRC}/pccts/${i}/makefile +.endfor + do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/cccc/cccc ${STAGEDIR}${PREFIX}/bin + (cd ${WRKSRC}/cccc && ${INSTALL_PROGRAM} cccc ${STAGEDIR}${PREFIX}/bin) @${MKDIR} ${STAGEDIR}${DOCSDIR} -.for f in ${PORTDOCS} - @${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} +.for i in ${PORTDOCS} + (cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR}) .endfor .include Modified: branches/2014Q1/devel/cccc/pkg-descr ============================================================================== --- branches/2014Q1/devel/cccc/pkg-descr Tue Dec 24 15:45:28 2013 (r337362) +++ branches/2014Q1/devel/cccc/pkg-descr Tue Dec 24 15:55:35 2013 (r337363) @@ -1,6 +1,6 @@ -Source code metric analyser for C, C++ and Java. +Source code metric analyser for C, C++, Java and Ada Presents a report in HTML with figures for Lines of Code, McCabes Complexity, Ratio of Comments -to Lines of Code and McCabe, module Fan-In and Fan-Out. +to Lines of Code and McCabe, module Fan-In and Fan-Out WWW: http://cccc.sourceforge.net/ From owner-svn-ports-branches@FreeBSD.ORG Tue Dec 24 15:56:50 2013 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 BBD0047E; Tue, 24 Dec 2013 15:56:50 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9DC981CC0; Tue, 24 Dec 2013 15:56:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBOFuo2O057436; Tue, 24 Dec 2013 15:56:50 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBOFuoGl057434; Tue, 24 Dec 2013 15:56:50 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312241556.rBOFuoGl057434@svn.freebsd.org> From: Mathieu Arnold Date: Tue, 24 Dec 2013 15:56:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337364 - branches/2014Q1/mail/wmmaiload X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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: Tue, 24 Dec 2013 15:56:50 -0000 Author: mat Date: Tue Dec 24 15:56:50 2013 New Revision: 337364 URL: http://svnweb.freebsd.org/changeset/ports/337364 Log: MFH: r337354 - Fix build on -current - Convert to new options framework - Support staging PR: ports/184899 Submitted by: KATO Tsuguru Approved by: portmgr (implicit) Modified: branches/2014Q1/mail/wmmaiload/Makefile (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/mail/wmmaiload/Makefile ============================================================================== --- branches/2014Q1/mail/wmmaiload/Makefile Tue Dec 24 15:55:35 2013 (r337363) +++ branches/2014Q1/mail/wmmaiload/Makefile Tue Dec 24 15:56:50 2013 (r337364) @@ -10,37 +10,45 @@ MASTER_SITES= http://tnemeth.free.fr/pro MAINTAINER= ports@FreeBSD.org COMMENT= Incoming mail monitor dockapp with a similar look to wmcpuload +OPTIONS_DEFINE= GTK2 + USES= gmake pkgconfig USE_XORG= xpm USE_OPENSSL= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} -MAKE_ARGS= CC="${CC}" \ - CFLAGS="${CFLAGS} -D_GNU_SOURCE ${PTHREAD_CFLAGS}" \ - CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" \ - LIB_SSL="-lssl -lcrypto" \ - LIB_THREADS="${PTHREAD_LIBS}" \ - DEBUG_CFLAGS="-I${OPENSSLINC}" \ +MAKE_ENV= DEBUG_CFLAGS="-I${OPENSSLINC}" \ DEBUG_LDFLAGS="-L${OPENSSLLIB}" -MAN1= ${PORTNAME}.1 ${PORTNAME}-config.1 -PLIST_FILES= bin/wmmaiload bin/wmmaiload-config +CFLAGS+= -D_GNU_SOURCE +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib + +PLIST_FILES= bin/wmmaiload bin/wmmaiload-config \ + man/man1/wmmaiload.1.gz man/man1/wmmaiload-config.1.gz + +.include -.if defined(WITH_GTK2) +.if ${PORT_OPTIONS:MGTK2} USE_GNOME+= gtk20 -MAKE_ARGS+= GTK_CFLAGS="pkg-config --cflags gtk+-2.0" \ +MAKE_ENV+= GTK_CFLAGS="pkg-config --cflags gtk+-2.0" \ GTK_LIBS="pkg-config --libs gtk+-2.0" .else USE_GNOME+= gtk12 -MAKE_ARGS+= GTK_CFLAGS="pkg-config --cflags gtk+" \ +MAKE_ENV+= GTK_CFLAGS="pkg-config --cflags gtk+" \ GTK_LIBS="pkg-config --libs gtk+" .endif -NO_STAGE= yes +.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64" +BROKEN= Does not compile on ia64, powerpc, or sparc64 +.endif + post-patch: + @${FIND} ${WRKSRC} -name "Makefile" | ${XARGS} ${REINPLACE_CMD} -e \ + 's| =| ?=|' .for i in wmmaiload/Init.make - @${REINPLACE_CMD} -e 's|-L/usr/X11R6/lib||g' ${WRKSRC}/${i} + @${REINPLACE_CMD} -e 's|-L/usr/X11R6/lib||g ; \ + s|-lpthread|-pthread|g' ${WRKSRC}/${i} .endfor .for i in wmmaiload/checkthread.c @${REINPLACE_CMD} -e 's|isnumber(|isnum(|g' ${WRKSRC}/${i} @@ -63,14 +71,10 @@ post-patch: do-install: .for i in wmmaiload wmmaiload-config - ${INSTALL_PROGRAM} ${WRKSRC}/${i}/${i} ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/doc/${i}.1 ${MANPREFIX}/man/man1 + (cd ${WRKSRC}/${i} && ${INSTALL_PROGRAM} ${i} \ + ${STAGEDIR}${PREFIX}/bin) + (cd ${WRKSRC}/doc && ${INSTALL_MAN} ${i}.1 \ + ${STAGEDIR}${MANPREFIX}/man/man1) .endfor -.include - -.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64" -BROKEN= Does not compile on ia64, powerpc, or sparc64 -.endif - -.include +.include From owner-svn-ports-branches@FreeBSD.ORG Tue Dec 24 15:57:56 2013 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 5F6CA572; Tue, 24 Dec 2013 15:57:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 400E21CCE; Tue, 24 Dec 2013 15:57:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBOFvuAR057839; Tue, 24 Dec 2013 15:57:56 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBOFvsJC057826; Tue, 24 Dec 2013 15:57:54 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312241557.rBOFvsJC057826@svn.freebsd.org> From: Mathieu Arnold Date: Tue, 24 Dec 2013 15:57:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337365 - in branches/2014Q1/japanese/prn: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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: Tue, 24 Dec 2013 15:57:56 -0000 Author: mat Date: Tue Dec 24 15:57:54 2013 New Revision: 337365 URL: http://svnweb.freebsd.org/changeset/ports/337365 Log: MFH: r337355 - Fix build with clang - Remove leading article from COMMENT - Support staging PR: ports/184900 Submitted by: KATO Tsuguru Approved by: portmgr (implicit) Added: branches/2014Q1/japanese/prn/files/patch-defs.c - copied unchanged from r337355, head/japanese/prn/files/patch-defs.c branches/2014Q1/japanese/prn/files/patch-euc.c - copied unchanged from r337355, head/japanese/prn/files/patch-euc.c branches/2014Q1/japanese/prn/files/patch-psconv.c - copied unchanged from r337355, head/japanese/prn/files/patch-psconv.c Modified: branches/2014Q1/japanese/prn/Makefile (contents, props changed) branches/2014Q1/japanese/prn/files/patch-aa (contents, props changed) branches/2014Q1/japanese/prn/files/patch-cmt.c (contents, props changed) branches/2014Q1/japanese/prn/files/patch-prn.c (contents, props changed) branches/2014Q1/japanese/prn/files/patch-reg.y (contents, props changed) branches/2014Q1/japanese/prn/pkg-plist (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/japanese/prn/Makefile ============================================================================== --- branches/2014Q1/japanese/prn/Makefile Tue Dec 24 15:56:50 2013 (r337364) +++ branches/2014Q1/japanese/prn/Makefile Tue Dec 24 15:57:54 2013 (r337365) @@ -3,19 +3,28 @@ PORTNAME= prn PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= japanese print MASTER_SITES= ${MASTER_SITE_PORTS_JP} DISTNAME= ${PORTNAME} MAINTAINER= ports@FreeBSD.org -COMMENT= A yet another converter from text file to postscript (with Japanese support) +COMMENT= Yet another converter from text file to postscript (with Japanese support) RUN_DEPENDS= kcc:${PORTSDIR}/japanese/kcc -INSTALL_TARGET= install install.man -MANLANG= ja -MAN1= prn.1 cprn.1 cmt.1 psconv.1 -MAN5= cmtdefs.5 +do-install: +.for i in cmt prn psconv + (cd ${WRKSRC} && ${INSTALL_PROGRAM} ${i} ${STAGEDIR}${PREFIX}/bin) +.endfor + ${LN} -sf prn ${STAGEDIR}${PREFIX}/bin/cprn + @${MKDIR} ${STAGEDIR}${DATADIR} + (cd ${WRKSRC} && ${INSTALL_DATA} cmtdefs ${STAGEDIR}${DATADIR}) +.for i in cmt cprn prn psconv + (cd ${WRKSRC} && ${INSTALL_MAN} ${i}.jman \ + ${STAGEDIR}${MANPREFIX}/man/man1/${i}.1) +.endfor + (cd ${WRKSRC} && ${INSTALL_MAN} cmtdefs.jman \ + ${STAGEDIR}${MAN5PREFIX}/man/man5/cmtdefs.5) -NO_STAGE= yes .include Modified: branches/2014Q1/japanese/prn/files/patch-aa ============================================================================== --- branches/2014Q1/japanese/prn/files/patch-aa Tue Dec 24 15:56:50 2013 (r337364) +++ branches/2014Q1/japanese/prn/files/patch-aa Tue Dec 24 15:57:54 2013 (r337365) @@ -19,10 +19,10 @@ ! PREFIX?=/usr/local ! BINPATH = ${PREFIX}/bin -! LIBPATH = ${PREFIX}/lib/prn +! LIBPATH = ${PREFIX}/share/prn ! MANPATH = ${PREFIX}/man ! JMANDIR = ja -! CFLAGS = -O \ +! CFLAGS += \ ! -DKCCPATH=\"${PREFIX}/bin/kcc\" \ ! -DCMTPATH=\"${PREFIX}/bin/cmt\" \ ! -DPSPATH=\"${PREFIX}/bin/psconv\" Modified: branches/2014Q1/japanese/prn/files/patch-cmt.c ============================================================================== --- branches/2014Q1/japanese/prn/files/patch-cmt.c Tue Dec 24 15:56:50 2013 (r337364) +++ branches/2014Q1/japanese/prn/files/patch-cmt.c Tue Dec 24 15:57:54 2013 (r337365) @@ -1,6 +1,16 @@ --- cmt.c.orig Mon Apr 25 16:26:57 1994 +++ cmt.c Fri Feb 6 00:18:46 2004 -@@ -352,16 +352,15 @@ +@@ -27,7 +27,9 @@ + #endif + + #include ++#include + #include ++#include + #include + #include + #include "cmt.h" +@@ -352,16 +354,15 @@ error(format, arg1, arg2, ...) char *format; ---------------------------------------------------------------------*/ Copied: branches/2014Q1/japanese/prn/files/patch-defs.c (from r337355, head/japanese/prn/files/patch-defs.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/japanese/prn/files/patch-defs.c Tue Dec 24 15:57:54 2013 (r337365, copy of r337355, head/japanese/prn/files/patch-defs.c) @@ -0,0 +1,10 @@ +--- defs.c.orig ++++ defs.c +@@ -26,6 +26,7 @@ + #endif + + #include ++#include + #include + #include "euc.h" + #include "cmt.h" Copied: branches/2014Q1/japanese/prn/files/patch-euc.c (from r337355, head/japanese/prn/files/patch-euc.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/japanese/prn/files/patch-euc.c Tue Dec 24 15:57:54 2013 (r337365, copy of r337355, head/japanese/prn/files/patch-euc.c) @@ -0,0 +1,12 @@ +--- euc.c.orig ++++ euc.c +@@ -26,6 +26,9 @@ + #endif + + #include ++#include ++#include ++#include + #include "euc.h" + + #if defined EUC Modified: branches/2014Q1/japanese/prn/files/patch-prn.c ============================================================================== --- branches/2014Q1/japanese/prn/files/patch-prn.c Tue Dec 24 15:56:50 2013 (r337364) +++ branches/2014Q1/japanese/prn/files/patch-prn.c Tue Dec 24 15:57:54 2013 (r337365) @@ -1,7 +1,18 @@ --- prn.c.orig Thu May 26 11:37:45 1994 +++ prn.c Fri Feb 6 00:18:11 2004 -@@ -34,8 +34,13 @@ +@@ -26,16 +26,24 @@ + #endif + + #include ++#include + #include + #include + #include + #include ++#include + #include #include ++#include #include "euc.h" +#if !defined KCCPATH @@ -15,7 +26,7 @@ #define LPRPATH "/usr/bin/lpr" #else #define LPRPATH "/usr/ucb/lpr" -@@ -48,8 +53,12 @@ +@@ -48,8 +56,12 @@ #else @@ -28,7 +39,7 @@ #endif -@@ -96,7 +105,7 @@ +@@ -96,7 +108,7 @@ static char *filename; /* name of the file being processed */ static char *modtime; /* the last modification time */ @@ -37,7 +48,7 @@ static char *basename(); static bool formatopt(); static bool rangeopt(); -@@ -498,16 +507,15 @@ +@@ -498,16 +510,15 @@ error(format, arg1, arg2, ...) char *format; ---------------------------------------------------------------------*/ Copied: branches/2014Q1/japanese/prn/files/patch-psconv.c (from r337355, head/japanese/prn/files/patch-psconv.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/japanese/prn/files/patch-psconv.c Tue Dec 24 15:57:54 2013 (r337365, copy of r337355, head/japanese/prn/files/patch-psconv.c) @@ -0,0 +1,14 @@ +--- psconv.c.orig ++++ psconv.c +@@ -64,9 +64,11 @@ + */ + + #include ++#include + #include + #include + #include ++#include + #include + #include + Modified: branches/2014Q1/japanese/prn/files/patch-reg.y ============================================================================== --- branches/2014Q1/japanese/prn/files/patch-reg.y Tue Dec 24 15:56:50 2013 (r337364) +++ branches/2014Q1/japanese/prn/files/patch-reg.y Tue Dec 24 15:57:54 2013 (r337365) @@ -1,12 +1,19 @@ --- reg.y.org Mon Nov 29 18:43:56 1993 +++ reg.y Thu Jan 20 12:29:44 2005 -@@ -286,7 +286,7 @@ +@@ -20,6 +20,7 @@ + #endif + + #include ++#include + #include + #include "cmt.h" + #include "euc.h" +@@ -286,7 +287,7 @@ * Node Creation Functions * * * **********************************************************************/ -extern void error(); +extern void error(char *, ...); - /*--------------------------------------------------------------------- NAME Modified: branches/2014Q1/japanese/prn/pkg-plist ============================================================================== --- branches/2014Q1/japanese/prn/pkg-plist Tue Dec 24 15:56:50 2013 (r337364) +++ branches/2014Q1/japanese/prn/pkg-plist Tue Dec 24 15:57:54 2013 (r337365) @@ -1,6 +1,11 @@ -bin/prn -bin/cprn bin/cmt +bin/cprn +bin/prn bin/psconv -lib/prn/cmtdefs -@dirrm lib/prn +man/man1/cmt.1.gz +man/man1/cprn.1.gz +man/man1/prn.1.gz +man/man1/psconv.1.gz +man/man5/cmtdefs.5.gz +%%DATADIR%%/cmtdefs +@dirrm %%DATADIR%% From owner-svn-ports-branches@FreeBSD.ORG Tue Dec 24 15:58:59 2013 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 89AED662; Tue, 24 Dec 2013 15:58:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5BB1D1CDA; Tue, 24 Dec 2013 15:58:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBOFwxuZ058162; Tue, 24 Dec 2013 15:58:59 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBOFwwve058156; Tue, 24 Dec 2013 15:58:58 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312241558.rBOFwwve058156@svn.freebsd.org> From: Mathieu Arnold Date: Tue, 24 Dec 2013 15:58:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337366 - in branches/2014Q1/www/bookmarkbridge: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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: Tue, 24 Dec 2013 15:58:59 -0000 Author: mat Date: Tue Dec 24 15:58:58 2013 New Revision: 337366 URL: http://svnweb.freebsd.org/changeset/ports/337366 Log: MFH: r337356 - Fix build with clang - Add desktop entry file - Use shebangfix - Support staging PR: ports/184901 Submitted by: KATO Tsuguru Approved by: portmgr (implicit) Added: branches/2014Q1/www/bookmarkbridge/files/patch-bookmarkbridge__bridgecfg.h - copied unchanged from r337356, head/www/bookmarkbridge/files/patch-bookmarkbridge__bridgecfg.h Modified: branches/2014Q1/www/bookmarkbridge/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/www/bookmarkbridge/Makefile ============================================================================== --- branches/2014Q1/www/bookmarkbridge/Makefile Tue Dec 24 15:57:54 2013 (r337365) +++ branches/2014Q1/www/bookmarkbridge/Makefile Tue Dec 24 15:58:58 2013 (r337366) @@ -3,24 +3,22 @@ PORTNAME= bookmarkbridge PORTVERSION= 0.76 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= www MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Synchronize bookmarks between multiple browsers -LIB_DEPENDS= xml2:${PORTSDIR}/textproc/libxml2 - -USE_PERL5= build +USES= gmake perl5 pkgconfig shebangfix +SHEBANG_FILES= bookmarkbridge/docs/autodocs.pl +USE_PERL5= yes USE_XORG= x11 ice xext -USE_QT4= corelib gui moc_build rcc_build uic_build qt3support +USE_QT4= corelib gui qt3support moc_build rcc_build uic_build USE_GNOME= libxml2 -USE_GMAKE= yes -USES= pkgconfig perl5 USE_AUTOTOOLS= aclocal automake autoconf -ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal AUTOMAKE_ARGS= --add-missing -NO_STAGE= yes +DESKTOP_ENTRIES="BookmarkBridge" "" "" "${PORTNAME}" "Qt;Network;" "" + .include Copied: branches/2014Q1/www/bookmarkbridge/files/patch-bookmarkbridge__bridgecfg.h (from r337356, head/www/bookmarkbridge/files/patch-bookmarkbridge__bridgecfg.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/www/bookmarkbridge/files/patch-bookmarkbridge__bridgecfg.h Tue Dec 24 15:58:58 2013 (r337366, copy of r337356, head/www/bookmarkbridge/files/patch-bookmarkbridge__bridgecfg.h) @@ -0,0 +1,9 @@ +--- bookmarkbridge/bridgecfg.h.orig 2013-12-06 03:29:29.000000000 +0900 ++++ bookmarkbridge/bridgecfg.h 2013-12-06 03:29:46.000000000 +0900 +@@ -31,6 +31,7 @@ + #include "bknode.h" + #include "bkexcept.h" + ++#include + #include + #include From owner-svn-ports-branches@FreeBSD.ORG Tue Dec 24 16:04:54 2013 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 0DCE5965; Tue, 24 Dec 2013 16:04:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D42DB1D77; Tue, 24 Dec 2013 16:04:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBOG4r9Q062223; Tue, 24 Dec 2013 16:04:53 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBOG4rJK062220; Tue, 24 Dec 2013 16:04:53 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312241604.rBOG4rJK062220@svn.freebsd.org> From: Mathieu Arnold Date: Tue, 24 Dec 2013 16:04:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337368 - in branches/2014Q1/textproc/humanzip: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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: Tue, 24 Dec 2013 16:04:54 -0000 Author: mat Date: Tue Dec 24 16:04:53 2013 New Revision: 337368 URL: http://svnweb.freebsd.org/changeset/ports/337368 Log: MFH: r337357 - Fix biuld with clang - Add LICENSE - Support staging PR: ports/184904 Submitted by: KATO Tsuguru Approved by: portmgr (implicit) Added: branches/2014Q1/textproc/humanzip/files/ - copied from r337357, head/textproc/humanzip/files/ Modified: branches/2014Q1/textproc/humanzip/Makefile (contents, props changed) branches/2014Q1/textproc/humanzip/pkg-descr (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/textproc/humanzip/Makefile ============================================================================== --- branches/2014Q1/textproc/humanzip/Makefile Tue Dec 24 16:03:44 2013 (r337367) +++ branches/2014Q1/textproc/humanzip/Makefile Tue Dec 24 16:04:53 2013 (r337368) @@ -9,22 +9,27 @@ MASTER_SITES= SAVANNAH CENKES MAINTAINER= ports@FreeBSD.org COMMENT= Compresses text to human readable output -NO_STAGE= yes -post-patch: - @${REINPLACE_CMD} -e 's|g++|${CXX}|;s|-O2|${CFLAGS}|' \ - ${WRKSRC}/${MAKEFILE} +LICENSE= GPLv2 # (or later) -MAN1= ${PORTNAME}.1 -MLINKS= ${PORTNAME}.1 humanunzip.1 -PLIST_FILES= bin/${PORTNAME} bin/humanunzip PORTDOCS= CHANGELOG README TODO +PLIST_FILES= bin/humanunzip bin/humanzip \ + man/man1/humanunzip.1.gz man/man1/humanzip.1.gz + +post-patch: + @${REINPLACE_CMD} -e \ + 's|g++|$${CXX}| ; \ + s|-O2|$${CFLAGS}|' ${WRKSRC}/${MAKEFILE} do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/human*zip ${PREFIX}/bin/ - @${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MAN1PREFIX}/man/man1/ -.ifndef NOPORTDOCS - @${INSTALL} -d ${DOCSDIR}/ - @cd ${WRKSRC}/&&${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/ -.endif +.for i in humanzip humanunzip + (cd ${WRKSRC} && ${INSTALL_PROGRAM} ${i} ${STAGEDIR}${PREFIX}/bin) +.endfor + (cd ${WRKSRC} && ${INSTALL_MAN} humanzip.1 \ + ${STAGEDIR}${MAN1PREFIX}/man/man1) + ${LN} -sf humanzip.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/humanunzip.1 + @${MKDIR} ${STAGEDIR}${DOCSDIR} +.for i in ${PORTDOCS} + (cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR}) +.endfor .include Modified: branches/2014Q1/textproc/humanzip/pkg-descr ============================================================================== --- branches/2014Q1/textproc/humanzip/pkg-descr Tue Dec 24 16:03:44 2013 (r337367) +++ branches/2014Q1/textproc/humanzip/pkg-descr Tue Dec 24 16:04:53 2013 (r337368) @@ -9,5 +9,4 @@ print size of documents. Humanzip does size of the file as measured in bytes, although this usually happens incidentally. -Author: Matthew Strait WWW: http://savannah.nongnu.org/projects/humanzip/ From owner-svn-ports-branches@FreeBSD.ORG Tue Dec 24 16:05:55 2013 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 9337BA57; Tue, 24 Dec 2013 16:05:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7E3A71D8B; Tue, 24 Dec 2013 16:05:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBOG5tRU062677; Tue, 24 Dec 2013 16:05:55 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBOG5s7j062664; Tue, 24 Dec 2013 16:05:54 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312241605.rBOG5s7j062664@svn.freebsd.org> From: Mathieu Arnold Date: Tue, 24 Dec 2013 16:05:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337369 - in branches/2014Q1/games/gma: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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: Tue, 24 Dec 2013 16:05:55 -0000 Author: mat Date: Tue Dec 24 16:05:54 2013 New Revision: 337369 URL: http://svnweb.freebsd.org/changeset/ports/337369 Log: MFH: r337358 - Fix build with clang - Add LICENSE - Switch to PLIST_FILES PR: ports/184905 Submitted by: KATO Tsuguru Approved by: portmgr (implicit) Added: branches/2014Q1/games/gma/files/patch-apprentice.cc - copied unchanged from r337358, head/games/gma/files/patch-apprentice.cc Deleted: branches/2014Q1/games/gma/files/patch-aa branches/2014Q1/games/gma/files/patch-configure branches/2014Q1/games/gma/pkg-plist Modified: branches/2014Q1/games/gma/Makefile (contents, props changed) branches/2014Q1/games/gma/files/patch-moves.h (contents, props changed) branches/2014Q1/games/gma/files/patch-scores.h (contents, props changed) branches/2014Q1/games/gma/pkg-descr (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/games/gma/Makefile ============================================================================== --- branches/2014Q1/games/gma/Makefile Tue Dec 24 16:04:53 2013 (r337368) +++ branches/2014Q1/games/gma/Makefile Tue Dec 24 16:05:54 2013 (r337369) @@ -9,6 +9,15 @@ MASTER_SITES= http://www.student.nada.kt MAINTAINER= ports@FreeBSD.org COMMENT= Go-moku game which learns playing the game from studying its opponent +LICENSE= GPLv2 # (or later) + GNU_CONFIGURE= yes +PLIST_FILES= bin/apprentice.gmaplayer bin/gma-console + +post-patch: + @${REINPLACE_CMD} -e \ + 's|stl\.h|map| ; \ + s|^CXXFLAGS|#CXXFLAGS|' ${WRKSRC}/configure + .include Copied: branches/2014Q1/games/gma/files/patch-apprentice.cc (from r337358, head/games/gma/files/patch-apprentice.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/gma/files/patch-apprentice.cc Tue Dec 24 16:05:54 2013 (r337369, copy of r337358, head/games/gma/files/patch-apprentice.cc) @@ -0,0 +1,11 @@ +--- src/apprentice.cc.orig ++++ src/apprentice.cc +@@ -32,6 +32,8 @@ + #include "moves.h" + #include "gma.h" + ++using std::string; ++ + #define BOARD_SIZE 50 + #define MAX_DEPTH 2 + Modified: branches/2014Q1/games/gma/files/patch-moves.h ============================================================================== --- branches/2014Q1/games/gma/files/patch-moves.h Tue Dec 24 16:04:53 2013 (r337368) +++ branches/2014Q1/games/gma/files/patch-moves.h Tue Dec 24 16:05:54 2013 (r337369) @@ -1,11 +1,13 @@ ---- src/moves.h.orig Sun May 18 19:18:04 2003 -+++ src/moves.h Sun May 18 19:18:19 2003 -@@ -24,7 +24,7 @@ +--- src/moves.h.orig ++++ src/moves.h +@@ -24,7 +24,9 @@ #include "pattern.h" -#include -+#include ++#include ++ ++using std::map; class Moves:map { Modified: branches/2014Q1/games/gma/files/patch-scores.h ============================================================================== --- branches/2014Q1/games/gma/files/patch-scores.h Tue Dec 24 16:04:53 2013 (r337368) +++ branches/2014Q1/games/gma/files/patch-scores.h Tue Dec 24 16:05:54 2013 (r337369) @@ -1,15 +1,16 @@ --- src/scores.h.orig Mon Apr 17 02:52:22 2000 +++ src/scores.h Sun May 18 19:19:41 2003 -@@ -22,9 +22,11 @@ +@@ -22,10 +22,12 @@ #ifndef SCORES_H #define SCORES_H -#include -+#include ++#include #include #include "pattern.h" -+ -+using namespace std; ++using std::map; ++ class Scores { + public: Modified: branches/2014Q1/games/gma/pkg-descr ============================================================================== --- branches/2014Q1/games/gma/pkg-descr Tue Dec 24 16:04:53 2013 (r337368) +++ branches/2014Q1/games/gma/pkg-descr Tue Dec 24 16:05:54 2013 (r337369) @@ -1,8 +1,9 @@ -GMA or "The Go-Moku Apprentice" is a computerized go-moku player that learns -playing the game entirely from its opponent. It was written for fun by -Johan Walles (d92-jwa@nada.kth.se) in October 1998. +GMA or "The Go-Moku Apprentice" is a computerized go-moku player that +learns playing the game entirely from its opponent. It was written for +fun by Johan Walles (d92-jwa@nada.kth.se) in October 1998. -The goal of Go-Moku is to get five (or more) marks in a row (horisontally, -vertically or diagonally). You get to put one mark each time it is your turn. +The goal of Go-Moku is to get five (or more) marks in a row +(horizontally, vertically or diagonally). You get to put one mark each +time it is your turn. WWW: http://www.student.nada.kth.se/~d92-jwa/code/ From owner-svn-ports-branches@FreeBSD.ORG Tue Dec 24 16:07:22 2013 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 6B8E1B4E; Tue, 24 Dec 2013 16:07:22 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4BE831DA1; Tue, 24 Dec 2013 16:07:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBOG7M6R063166; Tue, 24 Dec 2013 16:07:22 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBOG7LjT063159; Tue, 24 Dec 2013 16:07:21 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312241607.rBOG7LjT063159@svn.freebsd.org> From: Mathieu Arnold Date: Tue, 24 Dec 2013 16:07:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337370 - in branches/2014Q1/audio/osd-lyrics: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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: Tue, 24 Dec 2013 16:07:22 -0000 Author: mat Date: Tue Dec 24 16:07:21 2013 New Revision: 337370 URL: http://svnweb.freebsd.org/changeset/ports/337370 Log: MFH: r337367 - Fix build on -current - Rescpect CXXFLAGS - Use desktop-file-utils/pathfix - Support staging PR: ports/184909 Submitted by: KATO Tsuguru Approved by: portmgr (implicit) Added: branches/2014Q1/audio/osd-lyrics/files/patch-lib__chardetect__src__entry__impl.cpp - copied unchanged from r337367, head/audio/osd-lyrics/files/patch-lib__chardetect__src__entry__impl.cpp branches/2014Q1/audio/osd-lyrics/files/patch-lib__chardetect__src__prmem.h - copied unchanged from r337367, head/audio/osd-lyrics/files/patch-lib__chardetect__src__prmem.h Deleted: branches/2014Q1/audio/osd-lyrics/files/patch-free-visibility Modified: branches/2014Q1/audio/osd-lyrics/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/audio/osd-lyrics/Makefile ============================================================================== --- branches/2014Q1/audio/osd-lyrics/Makefile Tue Dec 24 16:05:54 2013 (r337369) +++ branches/2014Q1/audio/osd-lyrics/Makefile Tue Dec 24 16:07:21 2013 (r337370) @@ -3,7 +3,7 @@ PORTNAME= osdlyrics PORTVERSION= 0.4.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio deskutils MASTER_SITES= GOOGLE_CODE PROJECTHOST= osd-lyrics @@ -17,36 +17,48 @@ LIB_DEPENDS= libnotify.so:${PORTSDIR}/de libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ libcurl.so:${PORTSDIR}/ftp/curl +USES= desktop-file-utils gettext gmake iconv pathfix pkgconfig +USE_GNOME= gtk20 +USE_SQLITE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= DATADIRNAME=share # Cannot enable -Werror yet: Clang does not like the code `printf(_("..."))', # see this bug for details: http://llvm.org/bugs/show_bug.cgi?id=3814 #CONFIGURE_ARGS= --with-werror -USES= gettext gmake iconv pkgconfig -NO_STAGE= yes -USE_GNOME= gtk20 -USE_SQLITE= yes INSTALLS_ICONS= yes PORTDOCS= AUTHORS ChangeLog NEWS README -LDFLAGS= -L${LOCALBASE}/lib ${ICONV_LIB} + +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} OPTIONS_DEFINE= DOCS MPD XMMS2 AMAROK -MPD_DESC= Enable MPD support -XMMS2_DESC= Enable XMMS2 support -AMAROK_DESC= Enable Amarok 1.4 support +MPD_DESC= MPD support +XMMS2_DESC= XMMS2 support +AMAROK_DESC= Amarok 1.4 support MPD_LIB_DEPENDS= libmpd.so:${PORTSDIR}/audio/libmpd MPD_CONFIGURE_OFF= --disable-mpd + XMMS2_LIB_DEPENDS= libxmmsclient.so:${PORTSDIR}/audio/xmms2 XMMS2_CONFIGURE_OFF= --disable-xmms2 + AMAROK_CONFIGURE_ENABLE= amarok1 .include +post-patch: +.for i in src/Makefile.in src/tests/Makefile.in + @${REINPLACE_CMD} -e \ + '/-lstdc++/d' ${WRKSRC}/${i} +.endfor +.for i in lib/chardetect/Makefile.in + @${REINPLACE_CMD} -e \ + '/-O2/d' ${WRKSRC}/${i} +.endfor + post-install: -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} +.for i in AUTHORS ChangeLog NEWS README + (cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR}) +.endfor .include Copied: branches/2014Q1/audio/osd-lyrics/files/patch-lib__chardetect__src__entry__impl.cpp (from r337367, head/audio/osd-lyrics/files/patch-lib__chardetect__src__entry__impl.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/audio/osd-lyrics/files/patch-lib__chardetect__src__entry__impl.cpp Tue Dec 24 16:07:21 2013 (r337370, copy of r337367, head/audio/osd-lyrics/files/patch-lib__chardetect__src__entry__impl.cpp) @@ -0,0 +1,13 @@ +--- lib/chardetect/src/entry/impl.cpp.orig ++++ lib/chardetect/src/entry/impl.cpp +@@ -41,8 +41,10 @@ + #include "chardetect.h" + #include "nscore.h" + #include "nsUniversalDetector.h" ++#pragma GCC visibility push(default) + #include + #include ++#pragma GCC visibility pop + + #ifdef _WIN32 + # include Copied: branches/2014Q1/audio/osd-lyrics/files/patch-lib__chardetect__src__prmem.h (from r337367, head/audio/osd-lyrics/files/patch-lib__chardetect__src__prmem.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/audio/osd-lyrics/files/patch-lib__chardetect__src__prmem.h Tue Dec 24 16:07:21 2013 (r337370, copy of r337367, head/audio/osd-lyrics/files/patch-lib__chardetect__src__prmem.h) @@ -0,0 +1,12 @@ +--- lib/chardetect/src/prmem.h.orig ++++ lib/chardetect/src/prmem.h +@@ -37,7 +37,9 @@ + #ifndef nsDummyPrmem_h__ + #define nsDummyPrmem_h__ + ++#pragma GCC visibility push(default) + #include ++#pragma GCC visibility pop + + inline void* PR_Malloc(size_t len) + { From owner-svn-ports-branches@FreeBSD.ORG Tue Dec 24 16:48:34 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 1033) id 44CED713; Tue, 24 Dec 2013 16:48:34 +0000 (UTC) Date: Tue, 24 Dec 2013 16:48:34 +0000 From: Alexey Dokuchaev To: Mathieu Arnold Subject: Re: svn commit: r337346 - branches/2014Q1/audio/ardour/files Message-ID: <20131224164834.GA42174@FreeBSD.org> References: <201312241254.rBOCsX8C087273@svn.freebsd.org> <20131224135023.GA94117@FreeBSD.org> <5B9F108459A3A26926CBB6AE@ogg.in.absolight.net> MIME-Version: 1.0 Content-Type: text/plain; charset=koi8-r Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <5B9F108459A3A26926CBB6AE@ogg.in.absolight.net> User-Agent: Mutt/1.5.22 (2013-10-16) Cc: svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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: Tue, 24 Dec 2013 16:48:34 -0000 On Tue, Dec 24, 2013 at 03:18:51PM +0100, Mathieu Arnold wrote: > +--On 24 décembre 2013 13:50:24 +0000 Alexey Dokuchaev > | IMHO it should've been committed as part of r337343. There is nothing > | wrong with separating complicated fix into several commits (in head/), > | but if they are related, it makes more sense to merge them together, no? > > Yes, I could have done that, but the mfh script doesn't take more than one > revision to merge at a time, and I did not notice until after the facts > that there were two commits to the same port. > > If the original committer had asked for the merge, had gotten approval, and > had done it himself, he sure would have done it like you said ;-) Hehe, fair enough. As someone who was against branching the Ports Tree, my initial feeling was "fine, folks want to play with their new toy, why would I care?", hence I did not even check quarterly branch out. Perhaps I will reconsider, but hardly before I fix all my ports in head/. ./danfe P.S. It would still be nice to have that script fixed though. ;-) From owner-svn-ports-branches@FreeBSD.ORG Tue Dec 24 16:56:23 2013 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 1D4C7A11; Tue, 24 Dec 2013 16:56:23 +0000 (UTC) Received: from prod2.absolight.net (mx3.absolight.net [IPv6:2a01:678:2:100::25]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CC94C10DA; Tue, 24 Dec 2013 16:56:22 +0000 (UTC) Received: from prod2.absolight.net (localhost [127.0.0.1]) by prod2.absolight.net (Postfix) with ESMTP id 73FAABDC5A; Tue, 24 Dec 2013 17:56:21 +0100 (CET) Received: from gw.in.absolight.net (gw-ecl.in.absolight.net [79.143.241.69]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "gw.in.absolight.net", Issuer "CA Cert Signing Authority" (not verified)) by prod2.absolight.net (Postfix) with ESMTPSA id 50894BDC56; Tue, 24 Dec 2013 17:56:21 +0100 (CET) Received: from ogg.in.absolight.net (ogg.in.absolight.net [79.143.241.239]) by gw.in.absolight.net (Postfix) with ESMTP id 805C66113; Tue, 24 Dec 2013 17:56:20 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by ogg.in.absolight.net (Postfix) with ESMTP id 0F7F866D9631; Tue, 24 Dec 2013 17:56:19 +0100 (CET) Date: Tue, 24 Dec 2013 17:56:19 +0100 From: Mathieu Arnold To: Alexey Dokuchaev Subject: Re: svn commit: r337346 - branches/2014Q1/audio/ardour/files Message-ID: <34E34C6573E1677025A06948@ogg.in.absolight.net> In-Reply-To: <20131224164834.GA42174@FreeBSD.org> References: <201312241254.rBOCsX8C087273@svn.freebsd.org> <20131224135023.GA94117@FreeBSD.org> <5B9F108459A3A26926CBB6AE@ogg.in.absolight.net> <20131224164834.GA42174@FreeBSD.org> X-Mailer: Mulberry/4.0.8 (Mac OS X) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Cc: svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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: Tue, 24 Dec 2013 16:56:23 -0000 +--On 24 d=C3=A9cembre 2013 16:48:34 +0000 Alexey Dokuchaev = wrote: | Hehe, fair enough. As someone who was against branching the Ports Tree, | my initial feeling was "fine, folks want to play with their new toy, why | would I care?", hence I did not even check quarterly branch out. Perhaps | I will reconsider, but hardly before I fix all my ports in head/. We do get that it's something that can be a bit of a pain, but it's something people have been wanting for a long time, so, we're trying it :-) | P.S. It would still be nice to have that script fixed though. ;-) Well, it's in ports/Tools/scripts/mfh, patchs welcome :-p --=20 Mathieu Arnold From owner-svn-ports-branches@FreeBSD.ORG Thu Dec 26 13:02:52 2013 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 0EF9F77E; Thu, 26 Dec 2013 13:02:52 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id EEDDA1E88; Thu, 26 Dec 2013 13:02:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBQD2pIF083547; Thu, 26 Dec 2013 13:02:51 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBQD2pfh083546; Thu, 26 Dec 2013 13:02:51 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312261302.rBQD2pfh083546@svn.freebsd.org> From: Mathieu Arnold Date: Thu, 26 Dec 2013 13:02:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337488 - branches/2014Q1/graphics/ipe X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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, 26 Dec 2013 13:02:52 -0000 Author: mat Date: Thu Dec 26 13:02:51 2013 New Revision: 337488 URL: http://svnweb.freebsd.org/changeset/ports/337488 Log: MFH: r337380 graphics/ipe: Unbreak by using new library specification Approved by: portmgr (implicit) Modified: branches/2014Q1/graphics/ipe/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/graphics/ipe/Makefile ============================================================================== --- branches/2014Q1/graphics/ipe/Makefile Thu Dec 26 12:53:24 2013 (r337487) +++ branches/2014Q1/graphics/ipe/Makefile Thu Dec 26 13:02:51 2013 (r337488) @@ -12,8 +12,8 @@ COMMENT= Extensible vector graphics edit LICENSE= GPLv3 # (or later) -LIB_DEPENDS= cairo:${PORTSDIR}/graphics/cairo \ - lua-5.2:${PORTSDIR}/lang/lua52 +LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo \ + liblua-5.2.so:${PORTSDIR}/lang/lua52 RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils OPTIONS_DEFINE= DOCS From owner-svn-ports-branches@FreeBSD.ORG Thu Dec 26 13:03:51 2013 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 3833386E; Thu, 26 Dec 2013 13:03:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0A5151E98; Thu, 26 Dec 2013 13:03:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBQD3o4P083864; Thu, 26 Dec 2013 13:03:50 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBQD3ovu083862; Thu, 26 Dec 2013 13:03:50 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312261303.rBQD3ovu083862@svn.freebsd.org> From: Mathieu Arnold Date: Thu, 26 Dec 2013 13:03:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337489 - branches/2014Q1/ftp/ftpproxy/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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, 26 Dec 2013 13:03:51 -0000 Author: mat Date: Thu Dec 26 13:03:50 2013 New Revision: 337489 URL: http://svnweb.freebsd.org/changeset/ports/337489 Log: MFH: r337387 ftp/ftpproxy: Unbreak on FreeBSD 10+ The breakage was caused by processing makefiles with bmake instead of the specified gmake. PR: ports/184616 Approved by: maintainer timeout Approved by: portmgr (implicit) Added: branches/2014Q1/ftp/ftpproxy/files/ - copied from r337387, head/ftp/ftpproxy/files/ Modified: Directory Properties: branches/2014Q1/ (props changed) From owner-svn-ports-branches@FreeBSD.ORG Thu Dec 26 13:05:03 2013 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 B6418957; Thu, 26 Dec 2013 13:05:03 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A22261EAB; Thu, 26 Dec 2013 13:05:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBQD531H084256; Thu, 26 Dec 2013 13:05:03 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBQD53ga084255; Thu, 26 Dec 2013 13:05:03 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312261305.rBQD53ga084255@svn.freebsd.org> From: Mathieu Arnold Date: Thu, 26 Dec 2013 13:05:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337490 - branches/2014Q1/sysutils/hdup/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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, 26 Dec 2013 13:05:03 -0000 Author: mat Date: Thu Dec 26 13:05:03 2013 New Revision: 337490 URL: http://svnweb.freebsd.org/changeset/ports/337490 Log: MFH: r337389 sysutils/hdup: Unbreak on FreeBSD 10+ The breakage was caused by processing makefiles with bmake instead of the specified gmake. PR: ports/184617 Approved by: maintainer timeout Approved by: portmgr (implicit) Added: branches/2014Q1/sysutils/hdup/files/patch-Makefile.in - copied unchanged from r337389, head/sysutils/hdup/files/patch-Makefile.in Modified: Directory Properties: branches/2014Q1/ (props changed) Copied: branches/2014Q1/sysutils/hdup/files/patch-Makefile.in (from r337389, head/sysutils/hdup/files/patch-Makefile.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/sysutils/hdup/files/patch-Makefile.in Thu Dec 26 13:05:03 2013 (r337490, copy of r337389, head/sysutils/hdup/files/patch-Makefile.in) @@ -0,0 +1,12 @@ +--- Makefile.in.orig 2005-12-09 19:19:50.000000000 +0000 ++++ Makefile.in +@@ -32,7 +32,7 @@ docclean: + @echo "done" + + uninstall: +- @(cd src ; make uninstall ) ++ @(cd src ; $(MAKE) uninstall ) + + install: +- @(cd src ; make install ) ++ @(cd src ; $(MAKE) install ) From owner-svn-ports-branches@FreeBSD.ORG Thu Dec 26 13:05:52 2013 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 88D01B12; Thu, 26 Dec 2013 13:05:52 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 74C021EB8; Thu, 26 Dec 2013 13:05:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBQD5qQh084522; Thu, 26 Dec 2013 13:05:52 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBQD5qVU084521; Thu, 26 Dec 2013 13:05:52 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312261305.rBQD5qVU084521@svn.freebsd.org> From: Mathieu Arnold Date: Thu, 26 Dec 2013 13:05:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337491 - branches/2014Q1/math/parmgridgen X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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, 26 Dec 2013 13:05:52 -0000 Author: mat Date: Thu Dec 26 13:05:51 2013 New Revision: 337491 URL: http://svnweb.freebsd.org/changeset/ports/337491 Log: MFH: r337390 math/parmgridgen: Unbreak on FreeBSD 10+ The breakage was caused by processing makefiles with bmake instead of the specified gmake. PR: ports/184618 Approved by: maintainer timeout Approved by: portmgr (implicit) Modified: branches/2014Q1/math/parmgridgen/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/math/parmgridgen/Makefile ============================================================================== --- branches/2014Q1/math/parmgridgen/Makefile Thu Dec 26 13:05:03 2013 (r337490) +++ branches/2014Q1/math/parmgridgen/Makefile Thu Dec 26 13:05:51 2013 (r337491) @@ -21,6 +21,7 @@ MAKE_JOBS_UNSAFE= yes NO_STAGE= yes post-patch: + @${REINPLACE_CMD} 's|make|$$(MAKE)|g' ${WRKSRC}/Makefile #respect CFLAGS . for f in IMlib Lib Programs @${REINPLACE_CMD} 's|CFLAGS =|CFLAGS+=|g' ${WRKSRC}/MGridGen/${f}/Makefile From owner-svn-ports-branches@FreeBSD.ORG Thu Dec 26 13:07:55 2013 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 2C2DEC8A; Thu, 26 Dec 2013 13:07:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 17FC51ECA; Thu, 26 Dec 2013 13:07:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBQD7sBK085047; Thu, 26 Dec 2013 13:07:54 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBQD7sE0085046; Thu, 26 Dec 2013 13:07:54 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312261307.rBQD7sE0085046@svn.freebsd.org> From: Mathieu Arnold Date: Thu, 26 Dec 2013 13:07:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337492 - branches/2014Q1/math/sdpara/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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, 26 Dec 2013 13:07:55 -0000 Author: mat Date: Thu Dec 26 13:07:54 2013 New Revision: 337492 URL: http://svnweb.freebsd.org/changeset/ports/337492 Log: MFH: r337391 math/sdpara: Unbreak on FreeBSD 10+ The breakage was caused by processing makefiles with bmake instead of the specified gmake. PR: ports/184619 Approved by: maintainer timeout Approved by: portmgr (implicit) Modified: branches/2014Q1/math/sdpara/files/patch-Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/math/sdpara/files/patch-Makefile ============================================================================== --- branches/2014Q1/math/sdpara/files/patch-Makefile Thu Dec 26 13:05:51 2013 (r337491) +++ branches/2014Q1/math/sdpara/files/patch-Makefile Thu Dec 26 13:07:54 2013 (r337492) @@ -1,5 +1,5 @@ ---- Makefile.orig 2009-01-09 11:26:29.000000000 +0900 -+++ Makefile 2009-02-17 14:11:48.000000000 +0900 +--- Makefile.orig 2009-01-09 02:26:29.000000000 +0000 ++++ Makefile @@ -4,20 +4,20 @@ # you edit here along your environment ############################################################ @@ -35,3 +35,16 @@ # F77_FUNC DEF_F77_FUNC = -DF77_FUNC\(name,NAME\)=name\ \#\#\ _ +@@ -82,10 +82,10 @@ cleanall: clean mumps-clean + force: cleanall all + + mumps: +- cd mumps; make ++ cd mumps; $(MAKE) + + mumps-clean: +- cd mumps; make distclean ++ cd mumps; $(MAKE) distclean + + update_make_headers: + g++ -MM *.cpp > make.headers From owner-svn-ports-branches@FreeBSD.ORG Thu Dec 26 13:09:00 2013 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 259E8D6A; Thu, 26 Dec 2013 13:09:00 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id EB9C41ED2; Thu, 26 Dec 2013 13:08:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBQD8xIi085392; Thu, 26 Dec 2013 13:08:59 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBQD8xbp085390; Thu, 26 Dec 2013 13:08:59 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312261308.rBQD8xbp085390@svn.freebsd.org> From: Mathieu Arnold Date: Thu, 26 Dec 2013 13:08:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337493 - branches/2014Q1/graphics/chbg X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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, 26 Dec 2013 13:09:00 -0000 Author: mat Date: Thu Dec 26 13:08:59 2013 New Revision: 337493 URL: http://svnweb.freebsd.org/changeset/ports/337493 Log: MFH: r337392 - Fix build with clang - Add LICENSE - Support staging PR: ports/184834 Submitted by: KATO Tsuguru Approved by: portmgr (implicit) Modified: branches/2014Q1/graphics/chbg/Makefile branches/2014Q1/graphics/chbg/pkg-plist (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/graphics/chbg/Makefile ============================================================================== --- branches/2014Q1/graphics/chbg/Makefile Thu Dec 26 13:07:54 2013 (r337492) +++ branches/2014Q1/graphics/chbg/Makefile Thu Dec 26 13:08:59 2013 (r337493) @@ -11,23 +11,20 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= Change Background Picture with time period -LIB_DEPENDS= png15:${PORTSDIR}/graphics/png +LICENSE= GPLv2 # (or later) +LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png + +USES= gmake gettext pathfix USE_GNOME= gdkpixbuf -USE_GMAKE= yes -USES= gettext GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" -CPPFLAGS+= -I${LOCALBASE}/include CONFIGURE_ARGS= --disable-gnome -NO_STAGE= yes -.include - -MAN1= chbg.1 +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e \ + 's|^guint argc|gint argc|' ${WRKSRC}/src/chbg.c -.include +.include Modified: branches/2014Q1/graphics/chbg/pkg-plist ============================================================================== --- branches/2014Q1/graphics/chbg/pkg-plist Thu Dec 26 13:07:54 2013 (r337492) +++ branches/2014Q1/graphics/chbg/pkg-plist Thu Dec 26 13:08:59 2013 (r337493) @@ -1,4 +1,5 @@ bin/chbg +man/man1/chbg.1.gz share/locale/de/LC_MESSAGES/chbg.mo share/locale/fr/LC_MESSAGES/chbg.mo share/locale/sk/LC_MESSAGES/chbg.mo From owner-svn-ports-branches@FreeBSD.ORG Thu Dec 26 13:09:59 2013 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 628D1F1B; Thu, 26 Dec 2013 13:09:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 43CC51EDB; Thu, 26 Dec 2013 13:09:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBQD9xN9085751; Thu, 26 Dec 2013 13:09:59 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBQD9wLT085743; Thu, 26 Dec 2013 13:09:58 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312261309.rBQD9wLT085743@svn.freebsd.org> From: Mathieu Arnold Date: Thu, 26 Dec 2013 13:09:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337494 - in branches/2014Q1/audio/rezound: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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, 26 Dec 2013 13:09:59 -0000 Author: mat Date: Thu Dec 26 13:09:58 2013 New Revision: 337494 URL: http://svnweb.freebsd.org/changeset/ports/337494 Log: MFH: r337406 Fix compilation problems with Clang (inaccurate usage of type qualifiers, lack of this->, some missing #include's) that could be patched via simple sed(1) calls and one trivial patch. Linking still fails, and so does the build with GCC 4.6+; this would be fixed in a separate commit, along with other issues with the port (dependency on restricted LAME codec, usage of somewhat old FOX v1.4). While here, convert large number of optional LIB_DEPENDS conditionals to helper knobs, reword LARGEFILE_DESC, do not bogusly augment CONFIGURE_ENV, and stagify. For users that have ReZound package installed, this commit does not bring any visible changes, and should not be merged to any "stable" or quarterly branches alone. Approved by: portmgr (implicit) Added: branches/2014Q1/audio/rezound/files/patch-missing-includes - copied unchanged from r337406, head/audio/rezound/files/patch-missing-includes branches/2014Q1/audio/rezound/files/patch-src-PoolFile-TStaticPoolAccesser.h - copied unchanged from r337406, head/audio/rezound/files/patch-src-PoolFile-TStaticPoolAccesser.h Modified: branches/2014Q1/audio/rezound/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/audio/rezound/Makefile ============================================================================== --- branches/2014Q1/audio/rezound/Makefile Thu Dec 26 13:08:59 2013 (r337493) +++ branches/2014Q1/audio/rezound/Makefile Thu Dec 26 13:09:58 2013 (r337494) @@ -15,75 +15,38 @@ LICENSE= GPLv2 LIB_DEPENDS= libFOX-1.4.so:${PORTSDIR}/x11-toolkits/fox14 USES= bison -NO_STAGE= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --disable-alsa -CONFIGURE_ENV+= ac_cv_path_RESWRAP=${LOCALBASE}/bin/fox-1.4/reswrap MAKE_JOBS_UNSAFE= yes +CONFIGURE_ENV= ac_cv_path_RESWRAP=${LOCALBASE}/bin/fox-1.4/reswrap OPTIONS_DEFINE= LARGEFILE JACK AUDIOFILE PORTAUDIO OGG VORBIS FLAC FFTW \ SOUNDTOUCH LADSPA LAME CDRDAO DOCS BROKEN_NLS OPTIONS_DEFAULT= AUDIOFILE PORTAUDIO OGG VORBIS FLAC SOUNDTOUCH \ LADSPA LAME -LARGEFILE_DESC= 64-bit file I/O support +LARGEFILE_DESC= Use 64-bit file I/O FFTW_DESC= Use fast Fourier transform routines CDRDAO_DESC= Burning audio files to CD support BROKEN_NLS_DESC= ${NLS_DESC} (broken!) -.include - -.if ${PORT_OPTIONS:MLARGEFILE} -CONFIGURE_ARGS+= --enable-largefile -.endif - -.if ${PORT_OPTIONS:MJACK} -LIB_DEPENDS+= libjack.so:${PORTSDIR}/audio/jack -.endif - -.if ${PORT_OPTIONS:MAUDIOFILE} -LIB_DEPENDS+= libaudiofile.so:${PORTSDIR}/audio/libaudiofile -.endif - -.if ${PORT_OPTIONS:MPORTAUDIO} -LIB_DEPENDS+= libportaudio.so:${PORTSDIR}/audio/portaudio -.endif - -.if ${PORT_OPTIONS:MOGG} -LIB_DEPENDS+= libogg.so:${PORTSDIR}/audio/libogg -.endif - -.if ${PORT_OPTIONS:MVORBIS} -LIB_DEPENDS+= libvorbis.so:${PORTSDIR}/audio/libvorbis -.endif +LARGEFILE_CONFIGURE_ON= --enable-largefile +JACK_LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack +AUDIOFILE_LIB_DEPENDS= libaudiofile.so:${PORTSDIR}/audio/libaudiofile +PORTAUDIO_LIB_DEPENDS= libportaudio.so:${PORTSDIR}/audio/portaudio +OGG_LIB_DEPENDS= libogg.so:${PORTSDIR}/audio/libogg +VORBIS_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis +FLAC_LIB_DEPENDS= libFLAC.so:${PORTSDIR}/audio/flac +FFTW_LIB_DEPENDS= libfftw.so:${PORTSDIR}/math/fftw +SOUNDTOUCH_LIB_DEPENDS= libSoundTouch.so:${PORTSDIR}/audio/soundtouch +LADSPA_RUN_DEPENDS= ${LOCALBASE}/lib/ladspa/amp.so:${PORTSDIR}/audio/ladspa +LADSPA_CONFIGURE_OFF= --disable-ladspa +LAME_RUN_DEPENDS= lame:${PORTSDIR}/audio/lame +CDRDAO_RUN_DEPENDS= cdrdao:${PORTSDIR}/sysutils/cdrdao -.if ${PORT_OPTIONS:MFLAC} -LIB_DEPENDS+= libFLAC.so:${PORTSDIR}/audio/flac -.endif - -.if ${PORT_OPTIONS:MFFTW} -LIB_DEPENDS+= libfftw.so:${PORTSDIR}/math/fftw -.endif - -.if ${PORT_OPTIONS:MSOUNDTOUCH} -LIB_DEPENDS+= libSoundTouch.so:${PORTSDIR}/audio/soundtouch -.endif - -.if ${PORT_OPTIONS:MLADSPA} -RUN_DEPENDS+= ${LOCALBASE}/lib/ladspa/amp.so:${PORTSDIR}/audio/ladspa -.else -CONFIGURE_ARGS+= --disable-ladspa -.endif - -.if ${PORT_OPTIONS:MLAME} -RUN_DEPENDS+= lame:${PORTSDIR}/audio/lame -.endif - -.if ${PORT_OPTIONS:MCDRDAO} -RUN_DEPENDS+= cdrdao:${PORTSDIR}/sysutils/cdrdao -.endif +.include # NLS support is broken as of recent versions of libstdc++; rezound dies at # startup with "locale::facet::_S_create_c_locale name not valid" exception @@ -120,6 +83,15 @@ post-patch: .SILENT ${WRKSRC}/src/backend/Remaster/Makefile.in \ ${WRKSRC}/src/backend/LADSPA/Makefile.in \ ${WRKSRC}/src/frontend_fox/Makefile.in +# Fix some sloppy C++ coding which upsets Clang + ${REINPLACE_CMD} -e '/&string_to_anytype/s,static ,,' \ + ${WRKSRC}/src/misc/CNestedDataFile/anytype.h + ${REINPLACE_CMD} -e 's,push_back((,this->&,' \ + ${WRKSRC}/src/misc/auto_array.h + ${REINPLACE_CMD} -e 's,overflowWrite(,this->&,' \ + ${WRKSRC}/src/PoolFile/TPoolAccesser.cpp + ${REINPLACE_CMD} -e 's,map ++#include + + #include + +--- src/backend/CPortAudioSoundRecorder.cpp.orig ++++ src/backend/CPortAudioSoundRecorder.cpp +@@ -22,6 +22,8 @@ + + #ifdef ENABLE_PORTAUDIO + ++#include ++ + #include + + #include "settings.h" +--- src/backend/Generate/CGenerateNoiseAction.cpp.orig ++++ src/backend/Generate/CGenerateNoiseAction.cpp +@@ -23,6 +23,8 @@ + + #include "../CActionParameters.h" + ++#include ++ + CGenerateNoiseAction::CGenerateNoiseAction(const AActionFactory *factory,const CActionSound *actionSound,const double _noiseLength,const double _volume,const NoiseTypes _noiseType,const StereoImage _stereoImage,const double _maxParticleVelocity): + AAction(factory,actionSound), + noiseLength(_noiseLength), // seconds +--- src/backend/Remaster/CAdaptiveNormalizeAction.cpp.orig ++++ src/backend/Remaster/CAdaptiveNormalizeAction.cpp +@@ -20,6 +20,7 @@ + + #include "CAdaptiveNormalizeAction.h" + ++#include + #include + + #include "../CActionParameters.h" Copied: branches/2014Q1/audio/rezound/files/patch-src-PoolFile-TStaticPoolAccesser.h (from r337406, head/audio/rezound/files/patch-src-PoolFile-TStaticPoolAccesser.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/audio/rezound/files/patch-src-PoolFile-TStaticPoolAccesser.h Thu Dec 26 13:09:58 2013 (r337494, copy of r337406, head/audio/rezound/files/patch-src-PoolFile-TStaticPoolAccesser.h) @@ -0,0 +1,20 @@ +--- src/PoolFile/TStaticPoolAccesser.h.orig ++++ src/PoolFile/TStaticPoolAccesser.h +@@ -43,7 +43,7 @@ public: + + + // stream-like access methods +- void read(pool_element_t buffer[],const l_addr_t count) const; ++ void read(pool_element_t buffer[],l_addr_t count) const; + void write(const pool_element_t buffer[],const l_addr_t count); + + void seek(const l_addr_t where); +@@ -112,7 +112,7 @@ public: + mutable l_addr_t position; + + +- void overflowWrite(const pool_element_t buffer[],const l_addr_t count,const bool append); ++ void overflowWrite(const pool_element_t buffer[],l_addr_t count,const bool append); + + void cacheBlock(const l_addr_t where) const; + From owner-svn-ports-branches@FreeBSD.ORG Thu Dec 26 13:10:50 2013 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 7B502CD; Thu, 26 Dec 2013 13:10:50 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4DBC91EF5; Thu, 26 Dec 2013 13:10:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBQDAoM4086382; Thu, 26 Dec 2013 13:10:50 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBQDAoBc086381; Thu, 26 Dec 2013 13:10:50 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312261310.rBQDAoBc086381@svn.freebsd.org> From: Mathieu Arnold Date: Thu, 26 Dec 2013 13:10:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337495 - branches/2014Q1/net/netscript X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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, 26 Dec 2013 13:10:50 -0000 Author: mat Date: Thu Dec 26 13:10:49 2013 New Revision: 337495 URL: http://svnweb.freebsd.org/changeset/ports/337495 Log: MFH: r337410 - Fix build on -current - Convert to new options framework - Use shebangfix for rulesets - Support staging - Switch to PLIST_FILES PR: ports/184842 Submitted by: KATO Tsuguru Approved by: portmgr (implicit) Deleted: branches/2014Q1/net/netscript/pkg-plist Modified: branches/2014Q1/net/netscript/Makefile (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/net/netscript/Makefile ============================================================================== --- branches/2014Q1/net/netscript/Makefile Thu Dec 26 13:09:58 2013 (r337494) +++ branches/2014Q1/net/netscript/Makefile Thu Dec 26 13:10:49 2013 (r337495) @@ -3,41 +3,48 @@ PORTNAME= netscript PORTVERSION= 1.7.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MASTER_SITES= SF \ http://fakehalo.deadpig.org/%SUBDIR%/ - EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= Portable/multi-platform lightweight TCP socket scripting -WANT_GNOME= yes - -NO_STAGE= yes -.include - -.if ${HAVE_GNOME:Mgtk12}!="" -USE_GNOME+= gtk12 -PKGNAMESUFFIX= -gtk -ALL_TARGET= gbsd -.else -ALL_TARGET= bsd -.endif +OPTIONS_DEFINE= DOCS EXAMPLES GTK1 -post-patch: - @${REINPLACE_CMD} -e "s,gtk-config,${GTK_CONFIG},g" ${WRKSRC}/Makefile +USES= ncurses shebangfix +SHEBANG_FILES= examples/*.ruleset examples/gui/*.ruleset \ + examples/ncurses/*.ruleset +SHEBANG_LANG= netscript +netscript_OLD_CMD= /usr/bin/netscript +netscript_CMD= ${LOCALBASE}/bin/netscript + +CFLAGS+= -DNCURSES -DARPA -DBSD_T -Wl,--export-dynamic +LDFLAGS+= -lcurses + +PORTDOCS= * +PORTEXAMPLES= * +PLIST_FILES= bin/netscript + +GTK1_USE= GNOME=gtk12 +GTK1_CFLAGS= -DGTK +GTK1_CPPFLAGS= $$(gtk-config --cflags gthread) +GTK1_LDFLAGS= $$(gtk-config --libs gthread) + +do-build: + (cd ${WRKSRC} && ${CC} ${CFLAGS} ${CPPFLAGS} netscript.c \ + -o netscript ${LDFLAGS}) do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/netscript ${PREFIX}/bin -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} - @${MKDIR} ${EXAMPLESDIR} - ${CP} -R ${WRKSRC}/examples/* ${EXAMPLESDIR} - @${CHMOD} -R og+r ${EXAMPLESDIR} - @${CHMOD} og+x ${EXAMPLESDIR}/gui ${EXAMPLESDIR}/ncurses -.endif + (cd ${WRKSRC} && ${INSTALL_PROGRAM} netscript \ + ${STAGEDIR}${PREFIX}/bin) + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} README \ + ${STAGEDIR}${DOCSDIR}) + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + (cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . \ + ${STAGEDIR}${EXAMPLESDIR}) -.include +.include From owner-svn-ports-branches@FreeBSD.ORG Thu Dec 26 13:11:45 2013 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 CD6781AB; Thu, 26 Dec 2013 13:11:45 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B8B5E1F49; Thu, 26 Dec 2013 13:11:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBQDBjdg088960; Thu, 26 Dec 2013 13:11:45 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBQDBj8D088957; Thu, 26 Dec 2013 13:11:45 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312261311.rBQDBj8D088957@svn.freebsd.org> From: Mathieu Arnold Date: Thu, 26 Dec 2013 13:11:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337496 - in branches/2014Q1/x11/keyboardcast: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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, 26 Dec 2013 13:11:46 -0000 Author: mat Date: Thu Dec 26 13:11:44 2013 New Revision: 337496 URL: http://svnweb.freebsd.org/changeset/ports/337496 Log: MFH: r337411 - Fix build on 10.x - Support staging - Respect CC, CFLAGS and PREFIX PR: 185018 Submitted by: Eimar Koort (maintainer) Approved by: portmgr (implicit) Added: branches/2014Q1/x11/keyboardcast/files/patch-keyboardcast.c - copied unchanged from r337411, head/x11/keyboardcast/files/patch-keyboardcast.c Modified: branches/2014Q1/x11/keyboardcast/Makefile branches/2014Q1/x11/keyboardcast/files/patch-Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/x11/keyboardcast/Makefile ============================================================================== --- branches/2014Q1/x11/keyboardcast/Makefile Thu Dec 26 13:10:49 2013 (r337495) +++ branches/2014Q1/x11/keyboardcast/Makefile Thu Dec 26 13:11:44 2013 (r337496) @@ -3,7 +3,7 @@ PORTNAME= keyboardcast PORTVERSION= 0.1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= GOOGLE_CODE \ http://desrt.mcmaster.ca/code/keyboardcast/ @@ -11,13 +11,9 @@ MASTER_SITES= GOOGLE_CODE \ MAINTAINER= eimar.koort@gmail.com COMMENT= Broadcast keystrokes to multiple X windows for Gnome2 -USE_XORG= xmu +USE_XORG= xmu x11 USE_GNOME= libwnck libglade2 gtk20 USES= pkgconfig INSTALLS_ICONS= yes -NO_STAGE= yes -post-install: - @${CAT} ${PKGMESSAGE} - .include Modified: branches/2014Q1/x11/keyboardcast/files/patch-Makefile ============================================================================== --- branches/2014Q1/x11/keyboardcast/files/patch-Makefile Thu Dec 26 13:10:49 2013 (r337495) +++ branches/2014Q1/x11/keyboardcast/files/patch-Makefile Thu Dec 26 13:11:44 2013 (r337496) @@ -1,13 +1,19 @@ ---- Makefile.orig 2005-12-06 19:29:22.000000000 +0200 -+++ Makefile 2010-01-12 12:17:24.000000000 +0200 -@@ -1,3 +1,4 @@ -+CC = cc - PREFIX = /usr/local +--- Makefile.orig 2005-12-06 20:29:22.000000000 +0300 ++++ Makefile 2013-12-25 05:28:09.226755504 +0400 +@@ -1,15 +1,17 @@ +-PREFIX = /usr/local SHAREDIR = $(PREFIX)/share/keyboardcast APPSDIR = $(PREFIX)/share/applications -@@ -9,7 +10,10 @@ - LDLIBS += -lXmu - CFLAGS += -Wall -O2 -DPREFIX=\"$(PREFIX)\" + BINDIR = $(PREFIX)/bin + + PKGS = gtk+-2.0 libwnck-1.0 libglade-2.0 +-CFLAGS = `pkg-config --cflags $(PKGS)` ++CFLAGS += `pkg-config --cflags $(PKGS)` + LDLIBS = `pkg-config --libs $(PKGS)` +-LDLIBS += -lXmu +-CFLAGS += -Wall -O2 -DPREFIX=\"$(PREFIX)\" ++LDLIBS += -lXmu -lX11 ++CFLAGS += -Wall -DPREFIX=\"$(PREFIX)\" -keyboardcast: keyboardcast.o window-list.o grab-window.o +all: keyboardcast Copied: branches/2014Q1/x11/keyboardcast/files/patch-keyboardcast.c (from r337411, head/x11/keyboardcast/files/patch-keyboardcast.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/x11/keyboardcast/files/patch-keyboardcast.c Thu Dec 26 13:11:44 2013 (r337496, copy of r337411, head/x11/keyboardcast/files/patch-keyboardcast.c) @@ -0,0 +1,11 @@ +--- keyboardcast.orig 2013-12-20 10:06:27.000000000 +0200 ++++ keyboardcast.c 2013-12-20 10:07:10.000000000 +0200 +@@ -242,7 +242,7 @@ + "text", 2, NULL ); + + glade_xml_signal_connect( xml, "key_event", G_CALLBACK( key_event ) ); +- glade_xml_signal_connect( xml, "gtk_exit", G_CALLBACK( gtk_exit ) ); ++ glade_xml_signal_connect( xml, "gtk_main_quit", G_CALLBACK( gtk_main_quit ) ); + glade_xml_signal_connect_data( xml, "expanded", + G_CALLBACK( expanded ), window ); + glade_xml_signal_connect_data( xml, "button_clicked", From owner-svn-ports-branches@FreeBSD.ORG Thu Dec 26 13:13:31 2013 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 A449828D; Thu, 26 Dec 2013 13:13:31 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 766AB1F52; Thu, 26 Dec 2013 13:13:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBQDDVFv089468; Thu, 26 Dec 2013 13:13:31 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBQDDVOP089467; Thu, 26 Dec 2013 13:13:31 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312261313.rBQDDVOP089467@svn.freebsd.org> From: Mathieu Arnold Date: Thu, 26 Dec 2013 13:13:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337497 - branches/2014Q1/games/netspades X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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, 26 Dec 2013 13:13:31 -0000 Author: mat Date: Thu Dec 26 13:13:30 2013 New Revision: 337497 URL: http://svnweb.freebsd.org/changeset/ports/337497 Log: MFH: r337413 - Fix build with clang - Update MASTER_SITES - Add LICENSE, desktop entry file - Add OPTIONS for GTK1 and SLANG support - Support staging - Switch to PLIST_FILES PR: ports/184843 Submitted by: KATO Tsuguru Approved by: portmgr (implicit) Deleted: branches/2014Q1/games/netspades/pkg-plist Modified: branches/2014Q1/games/netspades/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/games/netspades/Makefile ============================================================================== --- branches/2014Q1/games/netspades/Makefile Thu Dec 26 13:11:44 2013 (r337496) +++ branches/2014Q1/games/netspades/Makefile Thu Dec 26 13:13:30 2013 (r337497) @@ -3,22 +3,64 @@ PORTNAME= NetSpades PORTVERSION= 4.2.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= games -MASTER_SITES= http://www.ece.rice.edu/~brentmh/spades/ +MASTER_SITES= TUCOWS/x11/entertain \ + http://www.ece.rice.edu/~brentmh/spades/ MAINTAINER= ports@FreeBSD.org COMMENT= Very popular card game for 1-4 players over a network -LIB_DEPENDS= slang.2:${PORTSDIR}/devel/libslang2 +LICENSE= GPLv2 # (or later) +OPTIONS_DEFINE= GTK1 SLANG +OPTIONS_DEFAULT= GTK1 SLANG GNU_CONFIGURE= yes -USE_GNOME= gtk12 + CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -ltermcap +LDFLAGS+= -L${LOCALBASE}/lib + +PLIST_FILES= bin/spadesd man/man6/spadesd.6.gz -MAN6= gspades.6 slspades.6 spadesd.6 +GTK1_USE= GNOME=gtk12 +GTK1_CONFIGURE_OFF= --without-gtk +GTK1_PLIST_FILES= bin/gspades man/man6/gspades.6.gz + +SLANG_USES= readline +SLANG_CONFIGURE_OFF= --without-slang +SLANG_LIB_DEPENDS= libslang.so:${PORTSDIR}/devel/libslang2 +SLANG_LDFLAGS= -ltermcap +SLANG_PLIST_FILES= bin/slspades man/man6/slspades.6.gz + +.include + +.if ${PORT_OPTIONS:MGTK1} +DESKTOP_ENTRIES="GSpades" "" "" "gspades" "" "" +.endif + +post-patch: +.for i in engine_func.c gtk_connect.c listen.c sl_io.c + @${REINPLACE_CMD} -e \ + 's| log| ns_log|g' ${WRKSRC}/src/${i} +.endfor + +do-install: + (cd ${WRKSRC}/src && ${INSTALL_PROGRAM} spadesd \ + ${STAGEDIR}${PREFIX}/bin) + (cd ${WRKSRC} && ${INSTALL_MAN} spadesd.6 \ + ${STAGEDIR}${MANPREFIX}/man/man6) +.if ${PORT_OPTIONS:MGTK1} + (cd ${WRKSRC}/src && ${INSTALL_PROGRAM} gspades \ + ${STAGEDIR}${PREFIX}/bin) + (cd ${WRKSRC} && ${INSTALL_MAN} gspades.6 \ + ${STAGEDIR}${MANPREFIX}/man/man6) +.endif +.if ${PORT_OPTIONS:MSLANG} + (cd ${WRKSRC}/src && ${INSTALL_PROGRAM} slspades \ + ${STAGEDIR}${PREFIX}/bin) + (cd ${WRKSRC} && ${INSTALL_MAN} slspades.6 \ + ${STAGEDIR}${MANPREFIX}/man/man6) +.endif -NO_STAGE= yes .include From owner-svn-ports-branches@FreeBSD.ORG Thu Dec 26 13:15:07 2013 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 337AE377; Thu, 26 Dec 2013 13:15:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0585F1F5C; Thu, 26 Dec 2013 13:15:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBQDF6Xj089989; Thu, 26 Dec 2013 13:15:06 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBQDF6L4089987; Thu, 26 Dec 2013 13:15:06 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312261315.rBQDF6L4089987@svn.freebsd.org> From: Mathieu Arnold Date: Thu, 26 Dec 2013 13:15:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337498 - in branches/2014Q1/games/openglad: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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, 26 Dec 2013 13:15:07 -0000 Author: mat Date: Thu Dec 26 13:15:06 2013 New Revision: 337498 URL: http://svnweb.freebsd.org/changeset/ports/337498 Log: MFH: r337417 - Fix build on 8.x and 9.x - Add LICENSE, desktop entry file - Support staging PR: ports/184848 Submitted by: KATO Tsuguru Approved by: portmgr (implicit) Deleted: branches/2014Q1/games/openglad/files/patch-Makefile.in Modified: branches/2014Q1/games/openglad/Makefile (contents, props changed) branches/2014Q1/games/openglad/pkg-plist (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/games/openglad/Makefile ============================================================================== --- branches/2014Q1/games/openglad/Makefile Thu Dec 26 13:13:30 2013 (r337497) +++ branches/2014Q1/games/openglad/Makefile Thu Dec 26 13:15:06 2013 (r337498) @@ -3,29 +3,30 @@ PORTNAME= openglad PORTVERSION= 0.98 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= games MASTER_SITES= SF/snowstorm/OpenGlad/Openglad-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= SDL port of an old DOS game called Gladiator -USE_GMAKE= yes -GNU_CONFIGURE= yes +LICENSE= GPLv2 # (or later) + +USES= gmake USE_SDL= sdl mixer +GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib + +DESKTOP_ENTRIES="OpenGlad" "" "" "${PORTNAME}" "" "" NOT_FOR_ARCHS= sparc64 -.if defined(NOPORTDOCS) -NO_STAGE= yes post-patch: - @${REINPLACE_CMD} -e 's|^docs_DOCS = |nono&|' ${WRKSRC}/Makefile.in -.endif - -post-configure: - ${REINPLACE_CMD} -e 's|/path/to/data/dir|${LOCALBASE}/share/openglad|g' \ - ${WRKSRC}/openglad.cfg + @${REINPLACE_CMD} -e \ + 's|COPYING INSTALL|INSTALL|' ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e \ + 's|/path/to/data/dir|${DATADIR}|' ${WRKSRC}/openglad.cfg .include Modified: branches/2014Q1/games/openglad/pkg-plist ============================================================================== --- branches/2014Q1/games/openglad/pkg-plist Thu Dec 26 13:13:30 2013 (r337497) +++ branches/2014Q1/games/openglad/pkg-plist Thu Dec 26 13:15:06 2013 (r337498) @@ -1,7 +1,6 @@ bin/openglad bin/openscen %%PORTDOCS%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/NEWS From owner-svn-ports-branches@FreeBSD.ORG Thu Dec 26 13:15:43 2013 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 EF111461; Thu, 26 Dec 2013 13:15:42 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CF55A1F69; Thu, 26 Dec 2013 13:15:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBQDFgxd090232; Thu, 26 Dec 2013 13:15:42 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBQDFg1r090223; Thu, 26 Dec 2013 13:15:42 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312261315.rBQDFg1r090223@svn.freebsd.org> From: Mathieu Arnold Date: Thu, 26 Dec 2013 13:15:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337499 - in branches/2014Q1/games/znibbles: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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, 26 Dec 2013 13:15:43 -0000 Author: mat Date: Thu Dec 26 13:15:41 2013 New Revision: 337499 URL: http://svnweb.freebsd.org/changeset/ports/337499 Log: MFH: r337419 - Fix build with clang - Rephrase pkg-descr PR: ports/184861 Submitted by: KATO Tsuguru Approved by: portmgr (implicit) Added: branches/2014Q1/games/znibbles/files/patch-src__Motif__MotifInterface.C - copied unchanged from r337419, head/games/znibbles/files/patch-src__Motif__MotifInterface.C branches/2014Q1/games/znibbles/files/patch-src__Motif__textarea.C - copied unchanged from r337419, head/games/znibbles/files/patch-src__Motif__textarea.C Modified: branches/2014Q1/games/znibbles/Makefile branches/2014Q1/games/znibbles/pkg-descr (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/games/znibbles/Makefile ============================================================================== --- branches/2014Q1/games/znibbles/Makefile Thu Dec 26 13:15:06 2013 (r337498) +++ branches/2014Q1/games/znibbles/Makefile Thu Dec 26 13:15:41 2013 (r337499) @@ -11,14 +11,12 @@ MASTER_SITES= http://old.koalateam.com/f MAINTAINER= ports@FreeBSD.org COMMENT= Multi-player networked nibbles game -LICENSE= GPLv2 GPLv3 -LICENSE_COMB= dual +LICENSE= GPLv2 # (or later) OPTIONS_DEFINE= GTK1 OPTIONS_DEFAULT= GTK1 USES= motif -WANT_GNOME= yes GNU_CONFIGURE= yes PLIST_FILES= bin/nibbles bin/znibbles bin/znibblesX \ @@ -26,14 +24,11 @@ PLIST_FILES= bin/nibbles bin/znibbles bi man/man6/znibblesX.6.gz GTK1_USE= GNOME=gtk12 -GTK1_PLIST_FILES= man/man6/gznibbles.6.gz bin/gznibbles +GTK1_PLIST_FILES= bin/gznibbles man/man6/gznibbles.6.gz GTK1_CONFIGURE_ENABLE= gtk -.include - post-extract: @${RM} -f ${WRKSRC}/src/getopt.h -# @${LN} -sf /usr/include/getopt.h ${WRKSRC}/src post-patch: @${REINPLACE_CMD} -e \ @@ -48,11 +43,7 @@ post-patch: .endfor post-install: - ${INSTALL_MAN} ${WRKSRC}/doc/nibbles.6 ${STAGEDIR}${MAN6PREFIX}/man/man6 - ${INSTALL_MAN} ${WRKSRC}/doc/znibbles.6 ${STAGEDIR}${MAN6PREFIX}/man/man6 - ${INSTALL_MAN} ${WRKSRC}/doc/znibblesX.6 ${STAGEDIR}${MAN6PREFIX}/man/man6 -.if ${PORT_OPTIONS:MGTK1} - ${INSTALL_MAN} ${WRKSRC}/doc/gznibbles.6 ${STAGEDIR}${MAN6PREFIX}/man/man6 -.endif + (cd ${WRKSRC}/doc && ${INSTALL_MAN} nibbles.6 znibbles.6 znibblesX.6 \ + gznibbles.6 ${STAGEDIR}${MAN6PREFIX}/man/man6) .include Copied: branches/2014Q1/games/znibbles/files/patch-src__Motif__MotifInterface.C (from r337419, head/games/znibbles/files/patch-src__Motif__MotifInterface.C) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/znibbles/files/patch-src__Motif__MotifInterface.C Thu Dec 26 13:15:41 2013 (r337499, copy of r337419, head/games/znibbles/files/patch-src__Motif__MotifInterface.C) @@ -0,0 +1,214 @@ +--- src/Motif/MotifInterface.C.orig ++++ src/Motif/MotifInterface.C +@@ -32,7 +32,7 @@ + # include + #endif + +-#include ++#include + + #include + #include +@@ -131,7 +131,7 @@ + display_version(); + + if (two_key) +- cout << "Two-key mode enabled" << endl; ++ std::cout << "Two-key mode enabled" << std::endl; + + + // connect pipe_handler to SIGPIPE signal +@@ -147,8 +147,8 @@ + exit(2); + } + +- cout << "Connecting to ZNibbles server: " \ +- << options.get_host_name() << ":" << options.get_port() << "... " << endl; ++ std::cout << "Connecting to ZNibbles server: " \ ++ << options.get_host_name() << ":" << options.get_port() << "... " << std::endl; + + // create and bind socket to any port + port = 0; +@@ -158,7 +158,7 @@ + } + + if (debug) +- cout << "Client socket created on port: " << ntohs(client_address.sin_port) << endl; ++ std::cout << "Client socket created on port: " << ntohs(client_address.sin_port) << std::endl; + + // Build server address + server_address.sin_family = AF_INET; +@@ -175,7 +175,7 @@ + + display_play_help(); + +- cout << "Connection accepted\n" << endl; ++ std::cout << "Connection accepted\n" << std::endl; + + hack_socket_client = socket_client; // hack for signal handling + action.sa_handler = stop_handler; +@@ -185,7 +185,7 @@ + + init_messages(options.get_message_file()); + +- cout << "initializing interface..." << endl; ++ std::cout << "initializing interface..." << std::endl; + make(argc, argv); + } + +@@ -262,54 +262,54 @@ + + void MotifInterface::display_version() + { +- cerr << "ZNibbles v" VERSION " - A little silly game - " ++ std::cerr << "ZNibbles v" VERSION " - A little silly game - " + << "(c) Vincent Mallet 1997, 1998, 1999 - vmallet@enst.fr" +- << endl << endl; ++ << std::endl << std::endl; + } + + void MotifInterface::display_version_short() + { +- cout << "ZNibbles Motif Client " VERSION << endl; ++ std::cout << "ZNibbles Motif Client " VERSION << std::endl; + } + + void MotifInterface::display_help(char *name) + { +- cout << "Usage: " << name << " [OPTION].. PLAYERNAME" << endl; +- cout << endl; +- cout << "Start a ZNibbles Motif client and connect to the specified nibbles server." << endl; +- cout << endl; +- cout << " -n, --host-name=HOST connect to server HOST [default is localhost]" << endl; +- cout << " -p, --port=NUM connect to port NUM of server [default is 5051]" << endl; +- cout << " -m, --message-file=FILE load predefined messages from file FILE" << endl; +- cout << " -t, --twokey control worm with only two keys, LEFT and RIGHT" << endl; +- cout << " -i, --enable-stdin enable standard input for sending messages" << endl; +- cout << " -d, --debug enable debug output" << endl; +- cout << " -V, --version print version number, then exit" << endl; +- cout << " -h, --help show this message and exit" << endl; +- cout << endl; +- cout << "Report bugs to ." << endl; ++ std::cout << "Usage: " << name << " [OPTION].. PLAYERNAME" << std::endl; ++ std::cout << std::endl; ++ std::cout << "Start a ZNibbles Motif client and connect to the specified nibbles server." << std::endl; ++ std::cout << std::endl; ++ std::cout << " -n, --host-name=HOST connect to server HOST [default is localhost]" << std::endl; ++ std::cout << " -p, --port=NUM connect to port NUM of server [default is 5051]" << std::endl; ++ std::cout << " -m, --message-file=FILE load predefined messages from file FILE" << std::endl; ++ std::cout << " -t, --twokey control worm with only two keys, LEFT and RIGHT" << std::endl; ++ std::cout << " -i, --enable-stdin enable standard input for sending messages" << std::endl; ++ std::cout << " -d, --debug enable debug output" << std::endl; ++ std::cout << " -V, --version print version number, then exit" << std::endl; ++ std::cout << " -h, --help show this message and exit" << std::endl; ++ std::cout << std::endl; ++ std::cout << "Report bugs to ." << std::endl; + } + + + + void MotifInterface::display_play_help() + { +- cout << endl; +- cout << "Welcome to ZNibbles!" << endl; +- cout << endl; +- cout << "Valid keys while playing:" << endl +- << endl +- << " Up, Down, Left, Right: move worm 1" << endl +- << endl +- << " p/u : pause/unpause game" << endl +- << endl +- << " P/U : pause/unpause _your_ worm" << endl +- << endl +- << " 1, 2, ... 0 : send predefined messages to other players" << endl +- << endl +- << " Ctrl+Q : quit game" << endl +- << endl +- << " Have fun!" << endl; ++ std::cout << std::endl; ++ std::cout << "Welcome to ZNibbles!" << std::endl; ++ std::cout << std::endl; ++ std::cout << "Valid keys while playing:" << std::endl ++ << std::endl ++ << " Up, Down, Left, Right: move worm 1" << std::endl ++ << std::endl ++ << " p/u : pause/unpause game" << std::endl ++ << std::endl ++ << " P/U : pause/unpause _your_ worm" << std::endl ++ << std::endl ++ << " 1, 2, ... 0 : send predefined messages to other players" << std::endl ++ << std::endl ++ << " Ctrl+Q : quit game" << std::endl ++ << std::endl ++ << " Have fun!" << std::endl; + } + + +@@ -318,7 +318,7 @@ + + void MotifInterface::pipe_handler(int sig) + { +- cerr << "--- Lost Server Connection! ---" << endl; ++ std::cerr << "--- Lost Server Connection! ---" << std::endl; + sig++; // warnings.. + dead_server = 1; + } +@@ -326,7 +326,7 @@ + + void MotifInterface::stop_handler(int sig) + { +- cerr << "--- Quitting game! ---" << endl; ++ std::cerr << "--- Quitting game! ---" << std::endl; + + if (hack_socket_client) { + struct timeval tv; +@@ -391,11 +391,11 @@ + char buf[300]; + + if (priv) { +- // cout << "Got *private* Message: '" << msg << "'" << endl; ++ // std::cout << "Got *private* Message: '" << msg << "'" << std::endl; + sprintf(buf, "[Private] %s> %s\n", from.get_name(), msg); + } + else { +- // cout << "Message: " << from.name << "> " << msg << endl; ++ // std::cout << "Message: " << from.name << "> " << msg << std::endl; + sprintf(buf, "%s> %s\n", from.get_name(), msg); + } + textarea.add_line(buf); +@@ -545,7 +545,7 @@ + case VOID_TRAME: + { + if (mythis.debug) +- cout << "got VOID_TRAME " << endl; ++ std::cout << "got VOID_TRAME " << std::endl; + mt.get_char(); + char *p = mt.get_string(); + if (p && strcmp(p, "w") == 0) +@@ -595,14 +595,14 @@ + + case QUIT_GAME: + if (mythis.debug) +- cout << "Got QUIT_GAME" << endl; +- cout << "Client shutting down.... " << endl; ++ std::cout << "Got QUIT_GAME" << std::endl; ++ std::cout << "Client shutting down.... " << std::endl; + done = 1; + break; + + default: + if (mythis.debug) +- cout << "got unknown frame type: " << (int) mt.peek_char() << endl; ++ std::cout << "got unknown frame type: " << (int) mt.peek_char() << std::endl; + break; + } + } +@@ -661,7 +661,7 @@ + void MotifInterface::join_game() + { + if (debug) +- cout << "Sending welcome message..." << endl; ++ std::cout << "Sending welcome message..." << std::endl; + + t.put_char(JOIN_GAME); + t.put_string(own_name); Copied: branches/2014Q1/games/znibbles/files/patch-src__Motif__textarea.C (from r337419, head/games/znibbles/files/patch-src__Motif__textarea.C) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/znibbles/files/patch-src__Motif__textarea.C Thu Dec 26 13:15:41 2013 (r337499, copy of r337419, head/games/znibbles/files/patch-src__Motif__textarea.C) @@ -0,0 +1,20 @@ +--- src/Motif/textarea.C.orig ++++ src/Motif/textarea.C +@@ -33,7 +33,7 @@ + #include + #include + +-#include ++#include + #include "string.h" + + #include "motifutil.H" +@@ -92,7 +92,7 @@ + XmTextSetCursorPosition(widget, XmTextGetLastPosition(widget)); + XmTextShowPosition(widget, XmTextGetLastPosition(widget)); + if (length > 9500) { +- cout << "textarea warning!" << endl; ++ std::cout << "textarea warning!" << std::endl; + bbuf[0] = '\0'; + } + } Modified: branches/2014Q1/games/znibbles/pkg-descr ============================================================================== --- branches/2014Q1/games/znibbles/pkg-descr Thu Dec 26 13:15:06 2013 (r337498) +++ branches/2014Q1/games/znibbles/pkg-descr Thu Dec 26 13:15:41 2013 (r337499) @@ -1,14 +1,15 @@ -ZNibbles is a multi-player networked game. It is based on the old nibbles -game: you've got a worm, eat nibbles and get your worm growing. Several -players can play together, each of them controlling its own worm on its own -computer. +ZNibbles is a multi-player networked game. It is based on the old +nibbles game: you've got a worm, eat nibbles and get your worm growing. +Several players can play together, each of them controlling its own worm +on its own computer. -There is theoretically an unlimited number of simultaneous players, it's more -a matter of network speed. It has been tested with more than 10 players and it -was real fun :) ZNibbles is written for unix. It has been tested under Linux, -SunOS, Solaris and Irix. The game can run either directly on top of X11, use -the GTK+ toolkit (get it on the GTK+ site) or use the Motif toolkit (get a good -Motif free implementation called LessTif) +There is theoretically an unlimited number of simultaneous players, it's +more a matter of network speed. It has been tested with more than 10 +players and it was real fun :) ZNibbles is written for unix. It has been +tested under Linux, SunOS, Solaris and Irix. The game can run either +directly on top of X11, use the GTK+ toolkit (get it on the GTK+ site) +or use the Motif toolkit (get a good Motif free implementation called +LessTif) Once compiled, you get the files: @@ -16,6 +17,7 @@ Once compiled, you get the files: gznibbles : the ZNibbles GTK+ client znibblesX : the ZNibbless X11-only client (poor) -Run "nibbles" first as the ZNibbles server, and then run its clients to play. +Run "nibbles" first as the ZNibbles server, and then run its clients to +play. WWW: http://www.jfouffa.com/vmallet/ZNibbles.html From owner-svn-ports-branches@FreeBSD.ORG Thu Dec 26 13:15:51 2013 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 95761539; Thu, 26 Dec 2013 13:15:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 80CA21F6C; Thu, 26 Dec 2013 13:15:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBQDFpgJ090395; Thu, 26 Dec 2013 13:15:51 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBQDFoWR090392; Thu, 26 Dec 2013 13:15:50 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312261315.rBQDFoWR090392@svn.freebsd.org> From: Mathieu Arnold Date: Thu, 26 Dec 2013 13:15:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337500 - in branches/2014Q1/games/xinvaders: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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, 26 Dec 2013 13:15:51 -0000 Author: mat Date: Thu Dec 26 13:15:50 2013 New Revision: 337500 URL: http://svnweb.freebsd.org/changeset/ports/337500 Log: MFH: r337432 - Fix build with clang [1] - Add desktop entry file [1] - Support staging [1] - Save highscores in /var/games PR: ports/184876 [1] Submitted by: KATO Tsuguru Approved by: portmgr (implicit) Added: branches/2014Q1/games/xinvaders/files/patch-main.c - copied unchanged from r337432, head/games/xinvaders/files/patch-main.c Deleted: branches/2014Q1/games/xinvaders/files/patch-aa Modified: branches/2014Q1/games/xinvaders/Makefile branches/2014Q1/games/xinvaders/pkg-plist (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/games/xinvaders/Makefile ============================================================================== --- branches/2014Q1/games/xinvaders/Makefile Thu Dec 26 13:15:41 2013 (r337499) +++ branches/2014Q1/games/xinvaders/Makefile Thu Dec 26 13:15:50 2013 (r337500) @@ -3,36 +3,37 @@ PORTNAME= xinvaders PORTVERSION= 2.1.1 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_SUNSITE} -MASTER_SITE_SUBDIR= games/arcade/invaders +MASTER_SITES= SUNSITE/games/arcade/invaders MAINTAINER= ports@FreeBSD.org COMMENT= Shoot-em-up them nasty little bugs -ONLY_FOR_ARCHS= i386 - NO_CDROM= don't sell for profit USES= gettext USE_XORG= x11 xmu xaw xt -USE_AUTOTOOLS= automake14 autoconf213 -AUTOMAKE_ARGS= --include-deps -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lintl" +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-scorefile=/var/games/xinvaders.scores + CPPFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ARGS= --enable-scorefile=${PREFIX}/share/xinvaders/xinvaders.scores +LDFLAGS+= -L${LOCALBASE}/lib -lintl + +DESKTOP_ENTRIES="XInvaders" "Space Invaders game for X" \ + "${PREFIX}/share/pixmaps/${PORTNAME}.xpm" "${PORTNAME}" "" "" -MAN6= xinvaders.6 +post-patch: + @${REINPLACE_CMD} -e \ + 's|$$(prefix)/games|$$(prefix)/bin| ; \ + /install-exec-am:/s|install-exec-local|| ; \ + /install-data-am:/s|install-data-local||' ${WRKSRC}/Makefile.in -NO_STAGE= yes post-install: - ${INSTALL_DATA} ${FILESDIR}/Vaders.ad ${PREFIX}/lib/X11/app-defaults/Vaders - @${MKDIR} ${PREFIX}/share/xinvaders - @${ECHO_CMD} '0' > ${PREFIX}/share/xinvaders/xinvaders.scores - @${CHOWN} root:games ${PREFIX}/bin/xinvaders - @${CHMOD} 2555 ${PREFIX}/bin/xinvaders - @${CHOWN} root:games ${PREFIX}/share/xinvaders/xinvaders.scores - @${CHMOD} 0660 ${PREFIX}/share/xinvaders/xinvaders.scores + (cd ${FILESDIR} && ${INSTALL_DATA} Vaders.ad \ + ${STAGEDIR}${PREFIX}/lib/X11/app-defaults/Vaders) + (cd ${WRKSRC} && ${INSTALL_DATA} icon.xpm \ + ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.xpm) + @${MKDIR} ${STAGEDIR}${DATADIR} .include Copied: branches/2014Q1/games/xinvaders/files/patch-main.c (from r337432, head/games/xinvaders/files/patch-main.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/xinvaders/files/patch-main.c Thu Dec 26 13:15:50 2013 (r337500, copy of r337432, head/games/xinvaders/files/patch-main.c) @@ -0,0 +1,122 @@ +--- main.c.orig ++++ main.c +@@ -38,55 +38,6 @@ + {"-debug", "*debug", XrmoptionNoArg, NULL}, + }; + +-static XtResource resources[] = { +- {XtNwidth, XtCWidth, XtRInt, sizeof(int), +- (Cardinal)&width, XtRImmediate, (caddr_t) VWIDTH}, +- {XtNheight, XtCHeight, XtRInt, sizeof(int), +- (Cardinal)&height, XtRImmediate, (caddr_t) VHEIGHT}, +- {"debug", "Debug", XtRBoolean, sizeof(Boolean), +- (Cardinal)&debug, XtRString, "off"}, +- {"font", "Font", XtRString, sizeof(String), +- (Cardinal)&vaderfont, XtRString, (String)"9x15"}, +- {"scale", "Scale", XtRInt, sizeof(int), +- (Cardinal)&scale, XtRImmediate, (caddr_t) 2}, +- {"basewait", "BaseWait", XtRInt, sizeof(int), +- (Cardinal)&basewait, XtRImmediate, (caddr_t) 10}, +- {"vaderwait", "VaderWait", XtRInt, sizeof(int), +- (Cardinal)&vaderwait, XtRImmediate, (caddr_t) 300}, +- {"spacerwait", "SpacerWait", XtRInt, sizeof(int), +- (Cardinal)&spacerwait, XtRImmediate, (caddr_t) 50}, +- {"shotwait", "ShotWait", XtRInt, sizeof(int), +- (Cardinal)&shotwait, XtRImmediate, (caddr_t) 10}, +- {"vshotwait", "VshotWait", XtRInt, sizeof(int), +- (Cardinal)&vshotwait, XtRImmediate, (caddr_t) 30}, +- {"basecolor", "BaseColor", XtRPixel, sizeof(Pixel), +- (Cardinal)&basepixel, XtRString, "cyan"}, +- {"spacercolor", "SpacerColor", XtRPixel, sizeof(Pixel), +- (Cardinal)&spacerpixel, XtRString, "gray"}, +- {"buildingcolor", "BuildingColor", XtRPixel, sizeof(Pixel), +- (Cardinal)&buildingpixel, XtRString, "yellow"}, +- {"vader1color", "Vader1Color", XtRPixel, sizeof(Pixel), +- (Cardinal)&vader1pixel, XtRString, "blue"}, +- {"vader2color", "Vader2Color", XtRPixel, sizeof(Pixel), +- (Cardinal)&vader2pixel, XtRString, "green"}, +- {"vader3color", "Vader3Color", XtRPixel, sizeof(Pixel), +- (Cardinal)&vader3pixel, XtRString, "red"}, +- {"shotcolor", "ShotColor", XtRPixel, sizeof(Pixel), +- (Cardinal)&shotpixel, XtRString, "lavender"}, +- {"vshotcolor", "VshotColor", XtRPixel, sizeof(Pixel), +- (Cardinal)&vshotpixel, XtRString, "orange"}, +- {"scorecolor", "ScoreColor", XtRPixel, sizeof(Pixel), +- (Cardinal)&scorepixel, XtRString, "white"}, +- {"maxshots", "MaxShots", XtRInt, sizeof(int), +- (Cardinal) &maxshots, XtRImmediate, (caddr_t) 1}, +- {"maxvshots", "MaxVshots", XtRInt, sizeof(int), +- (Cardinal) &maxvshots, XtRImmediate, (caddr_t) 6}, +- {"defaultfore", "DefaultFore", XtRPixel, sizeof(Pixel), +- (Cardinal) &defaultfore, XtRString, "white"}, +- {"defaultback", "DefaultBack", XtRPixel, sizeof(Pixel), +- (Cardinal) &defaultback, XtRString, "black"}, +-}; +- + + /*ARGSUSED*/ + static void CvtStringToFloat(args, num_args, fromVal, toVal) +@@ -141,13 +92,62 @@ + return w; + } + +-int main(Cardinal argc, char **argv) ++int main(int argc, char **argv) + { + static Arg args[10]; + int n; + Widget form, button; + /* extern WidgetClass labelwidgetclass; */ + ++ XtResource resources[] = { ++ {XtNwidth, XtCWidth, XtRInt, sizeof(int), ++ (Cardinal)&width, XtRImmediate, (caddr_t) VWIDTH}, ++ {XtNheight, XtCHeight, XtRInt, sizeof(int), ++ (Cardinal)&height, XtRImmediate, (caddr_t) VHEIGHT}, ++ {"debug", "Debug", XtRBoolean, sizeof(Boolean), ++ (Cardinal)&debug, XtRString, "off"}, ++ {"font", "Font", XtRString, sizeof(String), ++ (Cardinal)&vaderfont, XtRString, (String)"9x15"}, ++ {"scale", "Scale", XtRInt, sizeof(int), ++ (Cardinal)&scale, XtRImmediate, (caddr_t) 2}, ++ {"basewait", "BaseWait", XtRInt, sizeof(int), ++ (Cardinal)&basewait, XtRImmediate, (caddr_t) 10}, ++ {"vaderwait", "VaderWait", XtRInt, sizeof(int), ++ (Cardinal)&vaderwait, XtRImmediate, (caddr_t) 300}, ++ {"spacerwait", "SpacerWait", XtRInt, sizeof(int), ++ (Cardinal)&spacerwait, XtRImmediate, (caddr_t) 50}, ++ {"shotwait", "ShotWait", XtRInt, sizeof(int), ++ (Cardinal)&shotwait, XtRImmediate, (caddr_t) 10}, ++ {"vshotwait", "VshotWait", XtRInt, sizeof(int), ++ (Cardinal)&vshotwait, XtRImmediate, (caddr_t) 30}, ++ {"basecolor", "BaseColor", XtRPixel, sizeof(Pixel), ++ (Cardinal)&basepixel, XtRString, "cyan"}, ++ {"spacercolor", "SpacerColor", XtRPixel, sizeof(Pixel), ++ (Cardinal)&spacerpixel, XtRString, "gray"}, ++ {"buildingcolor", "BuildingColor", XtRPixel, sizeof(Pixel), ++ (Cardinal)&buildingpixel, XtRString, "yellow"}, ++ {"vader1color", "Vader1Color", XtRPixel, sizeof(Pixel), ++ (Cardinal)&vader1pixel, XtRString, "blue"}, ++ {"vader2color", "Vader2Color", XtRPixel, sizeof(Pixel), ++ (Cardinal)&vader2pixel, XtRString, "green"}, ++ {"vader3color", "Vader3Color", XtRPixel, sizeof(Pixel), ++ (Cardinal)&vader3pixel, XtRString, "red"}, ++ {"shotcolor", "ShotColor", XtRPixel, sizeof(Pixel), ++ (Cardinal)&shotpixel, XtRString, "lavender"}, ++ {"vshotcolor", "VshotColor", XtRPixel, sizeof(Pixel), ++ (Cardinal)&vshotpixel, XtRString, "orange"}, ++ {"scorecolor", "ScoreColor", XtRPixel, sizeof(Pixel), ++ (Cardinal)&scorepixel, XtRString, "white"}, ++ {"maxshots", "MaxShots", XtRInt, sizeof(int), ++ (Cardinal) &maxshots, XtRImmediate, (caddr_t) 1}, ++ {"maxvshots", "MaxVshots", XtRInt, sizeof(int), ++ (Cardinal) &maxvshots, XtRImmediate, (caddr_t) 6}, ++ {"defaultfore", "DefaultFore", XtRPixel, sizeof(Pixel), ++ (Cardinal) &defaultfore, XtRString, "white"}, ++ {"defaultback", "DefaultBack", XtRPixel, sizeof(Pixel), ++ (Cardinal) &defaultback, XtRString, "black"}, ++}; ++ + setlocale(LC_ALL, ""); + textdomain(PACKAGE); + Modified: branches/2014Q1/games/xinvaders/pkg-plist ============================================================================== --- branches/2014Q1/games/xinvaders/pkg-plist Thu Dec 26 13:15:41 2013 (r337499) +++ branches/2014Q1/games/xinvaders/pkg-plist Thu Dec 26 13:15:50 2013 (r337500) @@ -1,5 +1,12 @@ +@group games +@mode 2555 bin/xinvaders +@mode +@group lib/X11/app-defaults/Vaders +man/man6/xinvaders.6.gz share/locale/es/LC_MESSAGES/xinvaders.mo -share/xinvaders/xinvaders.scores -@dirrm share/xinvaders +share/pixmaps/xinvaders.xpm +@exec if [ ! -e /var/games/xinvaders.scores ]; then echo "0" > /var/games/xinvaders.scores; fi +@exec chmod 0660 /var/games/xinvaders.scores +@exec chgrp games /var/games/xinvaders.scores From owner-svn-ports-branches@FreeBSD.ORG Thu Dec 26 13:15:59 2013 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 CB494614; Thu, 26 Dec 2013 13:15:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9F5C21F71; Thu, 26 Dec 2013 13:15:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBQDFxoR090541; Thu, 26 Dec 2013 13:15:59 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBQDFxtB090538; Thu, 26 Dec 2013 13:15:59 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312261315.rBQDFxtB090538@svn.freebsd.org> From: Mathieu Arnold Date: Thu, 26 Dec 2013 13:15:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337501 - in branches/2014Q1/shells: bash bash-devel X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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, 26 Dec 2013 13:15:59 -0000 Author: mat Date: Thu Dec 26 13:15:58 2013 New Revision: 337501 URL: http://svnweb.freebsd.org/changeset/ports/337501 Log: MFH: r337433 Fix inconsistency in building bash Ensure the configure script always activate the same features wether or not fdescfs is mounted: Always consider /dev/fd as absent Bump portrevision as packages on the cluster are built with fdescfs mounted. With hat: portmgr Reported: Derek Schrock (skered- via #poudriere) Approved by: portmgr (implicit) Modified: branches/2014Q1/shells/bash-devel/Makefile branches/2014Q1/shells/bash/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/shells/bash-devel/Makefile ============================================================================== --- branches/2014Q1/shells/bash-devel/Makefile Thu Dec 26 13:15:50 2013 (r337500) +++ branches/2014Q1/shells/bash-devel/Makefile Thu Dec 26 13:15:58 2013 (r337501) @@ -4,7 +4,7 @@ PORTNAME= bash PATCHLEVEL= 45 PORTVERSION= 4.2.${PATCHLEVEL:S/^0//g} -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= shells MASTER_SITES= GNU MASTER_SITE_SUBDIR= ${PORTNAME} @@ -82,7 +82,9 @@ CPPFLAGS+= ${PTHREAD_CFLAGS} \ -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV= YACC="bison -y" +CONFIGURE_ENV= YACC="bison -y" \ + bash_cv_dev_fd=absent + post-patch: @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/doc/bash.1 Modified: branches/2014Q1/shells/bash/Makefile ============================================================================== --- branches/2014Q1/shells/bash/Makefile Thu Dec 26 13:15:50 2013 (r337500) +++ branches/2014Q1/shells/bash/Makefile Thu Dec 26 13:15:58 2013 (r337501) @@ -4,7 +4,7 @@ PORTNAME= bash PATCHLEVEL= 45 PORTVERSION= 4.2.${PATCHLEVEL:S/^0//g} -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= shells MASTER_SITES= ${MASTER_SITE_GNU:S/$/:bash/} \ ftp://ftp.cwru.edu/pub/%SUBDIR%/:faq @@ -91,7 +91,8 @@ CPPFLAGS+= ${PTHREAD_CFLAGS} \ -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV= YACC="bison -y" +CONFIGURE_ENV= YACC="bison -y" \ + bash_cv_dev_fd=absent post-patch: @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/doc/bash.1 From owner-svn-ports-branches@FreeBSD.ORG Thu Dec 26 13:16:07 2013 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 81F3C6D1; Thu, 26 Dec 2013 13:16:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6EDBC1F75; Thu, 26 Dec 2013 13:16:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBQDG71Y090684; Thu, 26 Dec 2013 13:16:07 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBQDG7q1090683; Thu, 26 Dec 2013 13:16:07 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312261316.rBQDG7q1090683@svn.freebsd.org> From: Mathieu Arnold Date: Thu, 26 Dec 2013 13:16:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337502 - branches/2014Q1/graphics/qslim X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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, 26 Dec 2013 13:16:07 -0000 Author: mat Date: Thu Dec 26 13:16:06 2013 New Revision: 337502 URL: http://svnweb.freebsd.org/changeset/ports/337502 Log: MFH: r337434 - Fix build on -current - Convert LIB_DEPENDS to new format - Support staging PR: ports/184241 Submitted by: KATO Tsuguru Approved by: portmgr (implicit) Modified: branches/2014Q1/graphics/qslim/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/graphics/qslim/Makefile ============================================================================== --- branches/2014Q1/graphics/qslim/Makefile Thu Dec 26 13:15:58 2013 (r337501) +++ branches/2014Q1/graphics/qslim/Makefile Thu Dec 26 13:16:06 2013 (r337502) @@ -9,31 +9,32 @@ MASTER_SITES= http://mgarland.org/files/ CENKES MAINTAINER= ports@FreeBSD.org -COMMENT= SlimKit Surface Modeling Tools +COMMENT= SlimKit surface modeling tools LICENSE= GPLv2 -LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ - tiff.4:${PORTSDIR}/graphics/tiff \ - gfx.0:${PORTSDIR}/graphics/libgfx \ - forms.2:${PORTSDIR}/x11-toolkits/xforms +LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png \ + libtiff.so:${PORTSDIR}/graphics/tiff \ + libgfx.so:${PORTSDIR}/graphics/libgfx \ + libforms.so:${PORTSDIR}/x11-toolkits/xforms CONFIGURE_WRKSRC= ${WRKSRC}/mixkit BUILD_WRKSRC= ${WRKSRC}/mixkit/src +USES= gmake USE_GL= glu -USE_GMAKE= yes GNU_CONFIGURE= yes -MAKE_ENV= FLTKCONFIG="${LOCALBASE}/bin/fltk-config" +MAKE_ENV= FLTKCONFIG="${FLTK_CONFIG}" GUI_LIBS="${GUI_LIBS}" MAKE_ARGS= CC="${CC}" CXX="${CXX}" ALL_TARGET= # none USE_LDCONFIG= yes -CFLAGS+= -DMIX_ANSI_IOSTREAMS -fpermissive -fPIC ${CPPFLAGS} -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -DHAVE_BOOL -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CFLAGS+= -DMIX_ANSI_IOSTREAMS -DHAVE_BOOL -fPIC -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib + +FLTK_CONFIG= ${LOCALBASE}/bin/fltk-config +GUI_LIBS= $$(${FLTK_CONFIG} --use-gl --ldflags) -NO_STAGE= yes post-extract: @${RM} -rf ${WRKSRC}/libgfx/ @@ -42,21 +43,26 @@ post-patch: @${REINPLACE_CMD} -e 's/\.\..*mix\.a//' ${WRKSRC}/tools/qslim/Makefile @${REINPLACE_CMD} -e '/gfx-config/d;s/\.a/.so/g;s/[(]AR[)] cru/(CXX) \ $$(CXXFLAGS) -shared -o/;/RANLIB/d' ${BUILD_WRKSRC}/${MAKEFILE} - @for f in ${BUILD_WRKSRC}/Makefile ${WRKSRC}/tools/qslim/Makefile;do\ - ${ECHO_CMD} '.SUFFIXES: .fl .c .cc .cxx .o' >> $$f;\ - ${ECHO_CMD} '.cxx.o:' >> $$f;\ - ${ECHO_CMD} ' $$(CXX) -c $$(CXXFLAGS) $$<' >> $$f;done +.for i in mixkit/src/Makefile tools/qslim/Makefile + @${ECHO_CMD} '.SUFFIXES: .fl .c .cc .cxx .o' >> ${WRKSRC}/${i} + @${ECHO_CMD} '.cxx.o:' >> ${WRKSRC}/${i} + @${ECHO_CMD} ' $$(CXX) -c $$(CXXFLAGS) $$<' >> ${WRKSRC}/${i} +.endfor post-build: @(cd ${BUILD_WRKSRC}/../../tools/qslim && ${SETENV} ${MAKE_ENV} \ - ${GMAKE} ${MAKE_ARGS} ${ALL_TARGET}) + ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET}) do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/mixkit/src/libmix.so ${PREFIX}/lib/ - @${LN} -sf libmix.so ${PREFIX}/lib/libmix.so.0 - @${INSTALL_PROGRAM} ${WRKSRC}/tools/qslim/qslim ${PREFIX}/bin/ - @${INSTALL_PROGRAM} ${WRKSRC}/tools/qslim/qvis ${PREFIX}/bin/ - @${INSTALL} -d ${PREFIX}/include/mixkit/ - @${INSTALL_DATA} ${WRKSRC}/mixkit/src/*.h ${PREFIX}/include/mixkit/ +.for i in qslim qvis + (cd ${WRKSRC}/tools/qslim && ${INSTALL_PROGRAM} ${i} \ + ${STAGEDIR}${PREFIX}/bin) +.endfor + @${MKDIR} ${STAGEDIR}${PREFIX}/include/mixkit + (cd ${WRKSRC}/mixkit/src && ${INSTALL_DATA} *.h \ + ${STAGEDIR}${PREFIX}/include/mixkit) + (cd ${WRKSRC}/mixkit/src && ${INSTALL_PROGRAM} libmix.so \ + ${STAGEDIR}${PREFIX}/lib) + @${LN} -sf libmix.so ${STAGEDIR}${PREFIX}/lib/libmix.so.0 .include From owner-svn-ports-branches@FreeBSD.ORG Thu Dec 26 13:16:17 2013 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 3F85E7AF; Thu, 26 Dec 2013 13:16:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 20F4E1F7A; Thu, 26 Dec 2013 13:16:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBQDGHmQ090887; Thu, 26 Dec 2013 13:16:17 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBQDGFsO090881; Thu, 26 Dec 2013 13:16:15 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312261316.rBQDGFsO090881@svn.freebsd.org> From: Mathieu Arnold Date: Thu, 26 Dec 2013 13:16:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337503 - in branches/2014Q1/graphics/rayshade: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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, 26 Dec 2013 13:16:17 -0000 Author: mat Date: Thu Dec 26 13:16:15 2013 New Revision: 337503 URL: http://svnweb.freebsd.org/changeset/ports/337503 Log: MFH: r337436 - Fix build on -current - Remove leading article from COMMENT - Support staging PR: ports/184236 Submitted by: KATO Tsuguru Approved by: portmgr (implicit) Added: branches/2014Q1/graphics/rayshade/files/patch-etc__rsconvert__lex.l - copied unchanged from r337436, head/graphics/rayshade/files/patch-etc__rsconvert__lex.l branches/2014Q1/graphics/rayshade/files/patch-etc__rsconvert__yacc.y - copied unchanged from r337436, head/graphics/rayshade/files/patch-etc__rsconvert__yacc.y branches/2014Q1/graphics/rayshade/files/patch-libray__libtext__texture.c - copied unchanged from r337436, head/graphics/rayshade/files/patch-libray__libtext__texture.c branches/2014Q1/graphics/rayshade/files/patch-libshade__lex.l - copied unchanged from r337436, head/graphics/rayshade/files/patch-libshade__lex.l branches/2014Q1/graphics/rayshade/files/patch-libshade__yacc.y - copied unchanged from r337436, head/graphics/rayshade/files/patch-libshade__yacc.y Deleted: branches/2014Q1/graphics/rayshade/files/patch-ab Modified: branches/2014Q1/graphics/rayshade/Makefile (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/graphics/rayshade/Makefile ============================================================================== --- branches/2014Q1/graphics/rayshade/Makefile Thu Dec 26 13:16:06 2013 (r337502) +++ branches/2014Q1/graphics/rayshade/Makefile Thu Dec 26 13:16:15 2013 (r337503) @@ -8,20 +8,18 @@ CATEGORIES= graphics MASTER_SITES= http://ccl.net/cca/software/SOURCES/C/rayshade/ \ http://www.mirrorservice.org/sites/graphics.stanford.edu/pub/rayshade/ \ ftp://graphics.stanford.edu/pub/rayshade/ -DISTNAME= ${PORTNAME}.${PORTVERSION} -EXTRACT_SUFX= .tar.Z -.if !defined(NOPORTDOCS) -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} guide.ps.Z -.endif -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} +DISTFILES= ${PORTNAME}.${PORTVERSION}.tar.Z ${GUIDE_PS_Z} DIST_SUBDIR= rayshade +EXTRACT_ONLY= ${PORTNAME}.${PORTVERSION}.tar.Z MAINTAINER= ports@FreeBSD.org -COMMENT= An extensible system for creating ray-traced images +COMMENT= Extensible system for creating ray-traced images BUILD_DEPENDS= $(LOCALBASE)/lib/librle.a:${PORTSDIR}/graphics/urt -WRKSRC= ${WRKDIR}/${PORTNAME}.4.0 +OPTIONS_DEFINE= DOCS EXAMPLES + +WRKSRC= ${WRKDIR}/${PORTNAME}.${PORTVERSION:R} HAS_CONFIGURE= yes CONFIGURE_SCRIPT= Configure @@ -31,11 +29,16 @@ PORTDOCS= * PORTEXAMPLES= * PLIST_FILES= bin/rayshade +.include + +.if ${PORT_OPTIONS:MDOCS} +GUIDE_PS_Z= guide.ps.Z +.endif + .if defined(BATCH) || defined(PACKAGE_BUILDING) CONFIGURE_ARGS= < ${WRKDIR}/config.ans .endif -NO_STAGE= yes pre-configure: @${SED} -e \ "s,@CFLAGS@,${CFLAGS},g ; \ @@ -45,14 +48,15 @@ pre-configure: < ${FILESDIR}/config.ans > ${WRKDIR}/config.ans do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/rayshade/rayshade ${PREFIX}/bin -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/guide.ps.Z ${DOCSDIR} -.endif -.if !defined(NOPORTEXAMPLES) - @${MKDIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/Examples/* ${EXAMPLESDIR} + (cd ${WRKSRC}/rayshade && ${INSTALL_PROGRAM} rayshade \ + ${STAGEDIR}${PREFIX}/bin) +.if ${PORT_OPTIONS:MDOCS} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${GUIDE_PS_Z} \ + ${STAGEDIR}${DOCSDIR}) .endif + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + (cd ${WRKSRC}/Examples && ${INSTALL_DATA} * \ + ${STAGEDIR}${EXAMPLESDIR}) .include Copied: branches/2014Q1/graphics/rayshade/files/patch-etc__rsconvert__lex.l (from r337436, head/graphics/rayshade/files/patch-etc__rsconvert__lex.l) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/graphics/rayshade/files/patch-etc__rsconvert__lex.l Thu Dec 26 13:16:15 2013 (r337503, copy of r337436, head/graphics/rayshade/files/patch-etc__rsconvert__lex.l) @@ -0,0 +1,19 @@ +--- etc/rsconvert/lex.l.orig 1992-02-10 12:03:54.000000000 +0900 ++++ etc/rsconvert/lex.l 2013-05-28 22:55:24.000000000 +0900 +@@ -22,6 +22,7 @@ + #include "libcommon/common.h" + #include "y.tab.h" + %} ++%option yylineno + alpha [a-zA-Z] + special [\.\_-] + digit [0-9] +@@ -113,7 +114,7 @@ + if ((c = input()) == '/') { + WriteChar(c); + WriteNewline(); +- return; ++ return FALSE; + } + unput(c); + } Copied: branches/2014Q1/graphics/rayshade/files/patch-etc__rsconvert__yacc.y (from r337436, head/graphics/rayshade/files/patch-etc__rsconvert__yacc.y) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/graphics/rayshade/files/patch-etc__rsconvert__yacc.y Thu Dec 26 13:16:15 2013 (r337503, copy of r337436, head/graphics/rayshade/files/patch-etc__rsconvert__yacc.y) @@ -0,0 +1,10 @@ +--- etc/rsconvert/yacc.y.orig ++++ etc/rsconvert/yacc.y +@@ -14,6 +14,7 @@ + /* $Id: yacc.y,v 4.0.1.3 92/02/07 11:05:21 cek Exp Locker: cek $ */ + %{ + #include ++#include + #include "libcommon/common.h" + + #define NEWLINE() WriteNewline() Copied: branches/2014Q1/graphics/rayshade/files/patch-libray__libtext__texture.c (from r337436, head/graphics/rayshade/files/patch-libray__libtext__texture.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/graphics/rayshade/files/patch-libray__libtext__texture.c Thu Dec 26 13:16:15 2013 (r337503, copy of r337436, head/graphics/rayshade/files/patch-libray__libtext__texture.c) @@ -0,0 +1,11 @@ +--- libray/libtext/texture.c.orig 1992-02-10 12:04:02.000000000 +0900 ++++ libray/libtext/texture.c 2013-05-28 22:41:59.000000000 +0900 +@@ -162,7 +162,7 @@ + *u = ptmp.x; + *v = ptmp.y; + if (dpdu == (Vector *)NULL || dpdv == (Vector *)NULL) +- return; ++ return FALSE; + /* + * Here's the ugly part. + * Build initial UVN-->XYZ matrix... Copied: branches/2014Q1/graphics/rayshade/files/patch-libshade__lex.l (from r337436, head/graphics/rayshade/files/patch-libshade__lex.l) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/graphics/rayshade/files/patch-libshade__lex.l Thu Dec 26 13:16:15 2013 (r337503, copy of r337436, head/graphics/rayshade/files/patch-libshade__lex.l) @@ -0,0 +1,19 @@ +--- libshade/lex.l.orig 1992-02-10 12:04:02.000000000 +0900 ++++ libshade/lex.l 2013-05-28 22:45:54.000000000 +0900 +@@ -29,6 +29,7 @@ + #include "y.tab.h" + extern char *strsave(); + %} ++%option yylineno + alpha [a-zA-Z] + special [\.\_-] + digit [0-9] +@@ -171,7 +172,7 @@ + while (input() != '*') + ; + if ((c = input()) == '/') +- return; ++ return FALSE; + unput(c); + } + } Copied: branches/2014Q1/graphics/rayshade/files/patch-libshade__yacc.y (from r337436, head/graphics/rayshade/files/patch-libshade__yacc.y) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/graphics/rayshade/files/patch-libshade__yacc.y Thu Dec 26 13:16:15 2013 (r337503, copy of r337436, head/graphics/rayshade/files/patch-libshade__yacc.y) @@ -0,0 +1,11 @@ +--- libshade/yacc.y.orig ++++ libshade/yacc.y +@@ -13,6 +13,8 @@ + /* for any purpose. It is provided solely "as is". */ + /* $Id: yacc.y,v 4.0.1.4 92/01/10 16:29:55 cek Exp Locker: cek $ */ + %{ ++#include ++#include + #include "rayshade.h" + + #include "symtab.h" From owner-svn-ports-branches@FreeBSD.ORG Thu Dec 26 13:16:25 2013 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 1658E876; Thu, 26 Dec 2013 13:16:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BAA041F80; Thu, 26 Dec 2013 13:16:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBQDGOV0091017; Thu, 26 Dec 2013 13:16:24 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBQDGO2c091016; Thu, 26 Dec 2013 13:16:24 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312261316.rBQDGO2c091016@svn.freebsd.org> From: Mathieu Arnold Date: Thu, 26 Dec 2013 13:16:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337504 - branches/2014Q1/www/cntlm X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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, 26 Dec 2013 13:16:25 -0000 Author: mat Date: Thu Dec 26 13:16:24 2013 New Revision: 337504 URL: http://svnweb.freebsd.org/changeset/ports/337504 Log: MFH: r337439 Fix build on -current PR: ports/184902 Submitted by: KATO Tsuguru Approved by: portmgr (implicit) Modified: branches/2014Q1/www/cntlm/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/www/cntlm/Makefile ============================================================================== --- branches/2014Q1/www/cntlm/Makefile Thu Dec 26 13:16:15 2013 (r337503) +++ branches/2014Q1/www/cntlm/Makefile Thu Dec 26 13:16:24 2013 (r337504) @@ -17,14 +17,29 @@ HAS_CONFIGURE= yes ALL_TARGET= cntlm post-patch: - @${REINPLACE_CMD} -e 's|DESTDIR=|DESTDIR=${PREFIX}|' \ - -e 's|CC=|CC?=|' \ - -e 's|-Wno-unused-but-set-variable -pedantic -O3||' \ - ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e \ + 's|$$(DESTDIR)/etc|$$(PREFIX)/etc| ; \ + s|^CC=|CC?=| ; \ + s| -Wno-unused-but-set-variable | | ; \ + s| -pedantic | | ; \ + s| -O3 | | ; \ + s|@$$(CC)|$$(CC)| ; \ + s|@if|if| ; \ + s|-lpthread|-pthread|' ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e \ + 's|^CCS=|#CCS=| ; \ + s|mv |: | ; \ + s|ln |: |' ${WRKSRC}/configure + +post-build: + @${LN} -sf cntlm.conf ${WRKSRC}/doc/cntlm.conf.sample do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/cntlm ${STAGEDIR}${PREFIX}/bin/ - ${INSTALL_DATA} ${WRKSRC}/doc/cntlm.conf ${STAGEDIR}${PREFIX}/etc/cntlm.conf.sample - ${INSTALL_MAN} ${WRKSRC}/doc/cntlm.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 + (cd ${WRKSRC} && ${INSTALL_PROGRAM} cntlm \ + ${STAGEDIR}${PREFIX}/bin) + (cd ${WRKSRC}/doc && ${INSTALL_DATA} cntlm.conf.sample \ + ${STAGEDIR}${PREFIX}/etc) + (cd ${WRKSRC}/doc && ${INSTALL_MAN} cntlm.1 \ + ${STAGEDIR}${MANPREFIX}/man/man1) .include From owner-svn-ports-branches@FreeBSD.ORG Thu Dec 26 13:16:35 2013 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 80862960; Thu, 26 Dec 2013 13:16:35 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6C5221F82; Thu, 26 Dec 2013 13:16:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBQDGZav091196; Thu, 26 Dec 2013 13:16:35 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBQDGYfE091192; Thu, 26 Dec 2013 13:16:34 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312261316.rBQDGYfE091192@svn.freebsd.org> From: Mathieu Arnold Date: Thu, 26 Dec 2013 13:16:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337505 - in branches/2014Q1/devel/regexx: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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, 26 Dec 2013 13:16:35 -0000 Author: mat Date: Thu Dec 26 13:16:34 2013 New Revision: 337505 URL: http://svnweb.freebsd.org/changeset/ports/337505 Log: MFH: r337440 - Fix build on -current - Depend on pcre from ports instead of bundled one - Strip library file PR: ports/184229 Submitted by: KATO Tsuguru Approved by: portmgr (implicit) Added: branches/2014Q1/devel/regexx/files/patch-src__Makefile.in - copied unchanged from r337440, head/devel/regexx/files/patch-src__Makefile.in branches/2014Q1/devel/regexx/files/patch-src__regexx.hh - copied unchanged from r337440, head/devel/regexx/files/patch-src__regexx.hh Deleted: branches/2014Q1/devel/regexx/files/patch-libtool22 Modified: branches/2014Q1/devel/regexx/Makefile (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/devel/regexx/Makefile ============================================================================== --- branches/2014Q1/devel/regexx/Makefile Thu Dec 26 13:16:24 2013 (r337504) +++ branches/2014Q1/devel/regexx/Makefile Thu Dec 26 13:16:34 2013 (r337505) @@ -3,27 +3,31 @@ PORTNAME= regexx PORTVERSION= 0.98.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org -COMMENT= A complete regular expressions C++ solution +COMMENT= Complete regular expressions C++ solution -USE_GMAKE= yes +LICENSE= LGPL21 + +LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre + +USES= gmake pkgconfig USE_AUTOTOOLS= libtool +MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOHEADER="${TRUE}" \ + AUTOMAKE="${TRUE}" USE_LDCONFIG= yes -MAKE_ENV+= INCLUDES="-I${WRKSRC}/pcre" -NO_STAGE= yes +CPPFLAGS+= $$(pkg-config --cflags libpcre) +LDFLAGS+= $$(pkg-config --libs libpcre) + post-patch: - @${REINPLACE_CMD} -e 's|@LIBTOOL@|${LIBTOOL}|g ; \ - s| \./libtool|${LIBTOOL}|g ; \ - s|\(DEFS.*\)|\1 -I${LOCALBASE}/include|' \ - ${WRKSRC}/src/Makefile.in ${WRKSRC}/pcre/Makefile.in - @${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \ - ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's| examples||g' \ - ${WRKSRC}/Makefile.am + @${REINPLACE_CMD} -e \ + 's|"pcre"||' ${WRKSRC}/configure + +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libregexx.so.2 .include Copied: branches/2014Q1/devel/regexx/files/patch-src__Makefile.in (from r337440, head/devel/regexx/files/patch-src__Makefile.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/devel/regexx/files/patch-src__Makefile.in Thu Dec 26 13:16:34 2013 (r337505, copy of r337440, head/devel/regexx/files/patch-src__Makefile.in) @@ -0,0 +1,11 @@ +--- src/Makefile.in.orig 2013-11-15 21:03:55.000000000 +0900 ++++ src/Makefile.in 2013-11-15 21:04:18.000000000 +0900 +@@ -74,7 +74,7 @@ + + lib_LTLIBRARIES = libregexx.la + libregexx_la_SOURCES = regexx.cc regexx.hh split.cc split.hh +-libregexx_la_LDFLAGS = -version-info 2:0:1 ../pcre/maketables.lo ../pcre/get.lo ../pcre/study.lo ../pcre/pcre.lo ++libregexx_la_LDFLAGS = -version-info 2:0:1 + include_HEADERS = regexx.hh split.hh + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_CLEAN_FILES = Copied: branches/2014Q1/devel/regexx/files/patch-src__regexx.hh (from r337440, head/devel/regexx/files/patch-src__regexx.hh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/devel/regexx/files/patch-src__regexx.hh Thu Dec 26 13:16:34 2013 (r337505, copy of r337440, head/devel/regexx/files/patch-src__regexx.hh) @@ -0,0 +1,10 @@ +--- src/regexx.hh.orig 2013-11-15 21:02:42.000000000 +0900 ++++ src/regexx.hh 2013-11-15 21:03:03.000000000 +0900 +@@ -29,6 +29,7 @@ + #ifndef REGEXX_HH + #define REGEXX_HH + ++#include + #include + #include + #include From owner-svn-ports-branches@FreeBSD.ORG Thu Dec 26 13:16:44 2013 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 7F175A3E; Thu, 26 Dec 2013 13:16:44 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6A66F1F87; Thu, 26 Dec 2013 13:16:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBQDGiCC091337; Thu, 26 Dec 2013 13:16:44 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBQDGilf091335; Thu, 26 Dec 2013 13:16:44 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312261316.rBQDGilf091335@svn.freebsd.org> From: Mathieu Arnold Date: Thu, 26 Dec 2013 13:16:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337506 - in branches/2014Q1/comms/usrp: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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, 26 Dec 2013 13:16:44 -0000 Author: mat Date: Thu Dec 26 13:16:43 2013 New Revision: 337506 URL: http://svnweb.freebsd.org/changeset/ports/337506 Log: MFH: r337458 - Fix usrp on 10.0 New make on 10 and HEAD does not behave the same way as previous make, this masked an incorrect make use. Submitted by: myself Approved by: Maintainer (adrian@) Approved by: portmgr (implicit) Modified: branches/2014Q1/comms/usrp/files/patch-images_Makefile (contents, props changed) branches/2014Q1/comms/usrp/pkg-plist (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/comms/usrp/files/patch-images_Makefile ============================================================================== --- branches/2014Q1/comms/usrp/files/patch-images_Makefile Thu Dec 26 13:16:34 2013 (r337505) +++ branches/2014Q1/comms/usrp/files/patch-images_Makefile Thu Dec 26 13:16:43 2013 (r337506) @@ -1,5 +1,5 @@ ---- images/Makefile.orig 2012-07-30 14:09:48.000000000 -0500 -+++ images/Makefile 2012-10-27 08:32:32.000000000 -0500 +--- images/Makefile.orig 2013-12-22 13:39:06.675009366 -0500 ++++ images/Makefile 2013-12-25 16:43:43.362707751 -0500 @@ -29,6 +29,8 @@ ##filled in below @@ -9,7 +9,7 @@ ##little rule to make the images directory $(BUILT_IMAGES_DIR): -@@ -61,6 +63,7 @@ +@@ -61,12 +63,13 @@ _usrp1_fw_ihx = $(BUILT_IMAGES_DIR)/usrp1_fw.ihx _usrp_b100_fw_ihx = $(BUILT_IMAGES_DIR)/usrp_b100_fw.ihx IMAGES_LIST += $(_usrp1_fw_ihx) $(_usrp_b100_fw_ihx) @@ -17,6 +17,13 @@ $(_usrp1_fw_ihx): $(GLOBAL_DEPS) cd $(_usrp1_fw_dir) && rm -rf build + cd $(_usrp1_fw_dir) && mkdir build + cd $(_usrp1_fw_dir)/build && cmake ../ +- cd $(_usrp1_fw_dir)/build && make ++ cd $(_usrp1_fw_dir)/build && gmake + cp $(_usrp1_fw_dir)/build/usrp1/usrp1_fw.ihx $@ + + $(_usrp_b100_fw_ihx): $(_usrp1_fw_ihx) @@ -81,6 +84,7 @@ _usrp1_fpga_rbf = $(BUILT_IMAGES_DIR)/usrp1_fpga.rbf _usrp1_fpga_4rx_rbf = $(BUILT_IMAGES_DIR)/usrp1_fpga_4rx.rbf @@ -25,15 +32,21 @@ $(_usrp1_fpga_rbf): $(GLOBAL_DEPS) cp $(_usrp1_fpga_dir)/std_2rxhb_2tx.rbf $@ -@@ -96,6 +100,7 @@ +@@ -96,10 +100,11 @@ _usrp_b100_fpga_dir = $(TOP_FPGA_DIR)/usrp2/top/B100 _usrp_b100_fpga_bin = $(BUILT_IMAGES_DIR)/usrp_b100_fpga.bin IMAGES_LIST += $(_usrp_b100_fpga_bin) +USRP1_LIST += $(_usrp_b100_fpga_bin) $(_usrp_b100_fpga_bin): $(GLOBAL_DEPS) - cd $(_usrp_b100_fpga_dir) && make -f Makefile.B100 clean -@@ -114,6 +119,7 @@ +- cd $(_usrp_b100_fpga_dir) && make -f Makefile.B100 clean +- cd $(_usrp_b100_fpga_dir) && make -f Makefile.B100 bin ++ cd $(_usrp_b100_fpga_dir) && gmake -f Makefile.B100 clean ++ cd $(_usrp_b100_fpga_dir) && gmake -f Makefile.B100 bin + cp $(_usrp_b100_fpga_dir)/build-B100/B100.bin $@ + + endif +@@ -114,12 +119,13 @@ _usrp_n200_fw_bin = $(BUILT_IMAGES_DIR)/usrp_n200_fw.bin _usrp_n210_fw_bin = $(BUILT_IMAGES_DIR)/usrp_n210_fw.bin IMAGES_LIST += $(_usrp2_fw_bin) $(_usrp_n200_fw_bin) $(_usrp_n210_fw_bin) @@ -41,63 +54,126 @@ $(_usrp2_fw_bin): $(GLOBAL_DEPS) cd $(_usrp2_fw_dir) && rm -rf build -@@ -138,6 +144,7 @@ + cd $(_usrp2_fw_dir) && mkdir build + cd $(_usrp2_fw_dir)/build && cmake ../ +- cd $(_usrp2_fw_dir)/build && make ++ cd $(_usrp2_fw_dir)/build && gmake + cp $(_usrp2_fw_dir)/build/usrp2/usrp2_txrx_uhd.bin $@ + + $(_usrp_n200_fw_bin): $(_usrp2_fw_bin) +@@ -138,10 +144,11 @@ _usrp2_fpga_dir = $(TOP_FPGA_DIR)/usrp2/top/USRP2 _usrp2_fpga_bin = $(BUILT_IMAGES_DIR)/usrp2_fpga.bin IMAGES_LIST += $(_usrp2_fpga_bin) +USRP2_LIST += $(_usrp2_fpga_bin) $(_usrp2_fpga_bin): $(GLOBAL_DEPS) - cd $(_usrp2_fpga_dir) && make clean -@@ -155,6 +162,7 @@ +- cd $(_usrp2_fpga_dir) && make clean +- cd $(_usrp2_fpga_dir) && make bin ++ cd $(_usrp2_fpga_dir) && gmake clean ++ cd $(_usrp2_fpga_dir) && gmake bin + cp $(_usrp2_fpga_dir)/build/u2_rev3.bin $@ + + endif +@@ -155,18 +162,20 @@ _usrp_n200_r3_fpga_bin = $(BUILT_IMAGES_DIR)/usrp_n200_r3_fpga.bin _usrp_n200_r3_fpga_bit = $(BUILT_IMAGES_DIR)/bit/usrp_n200_r3_fpga.bit IMAGES_LIST += $(_usrp_n200_r3_fpga_bin) $(_usrp_n200_r3_fpga_bit) +USRP2_LIST += $(_usrp_n200_r3_fpga_bin) $(_usrp_n200_r3_fpga_bit) $(_usrp_n200_r3_fpga_bin): $(GLOBAL_DEPS) - cd $(_usrp_n200_r3_fpga_dir) && make -f Makefile.N200R3 clean -@@ -167,6 +175,7 @@ - #its called r2 on the silkscreen, so make an r2 +- cd $(_usrp_n200_r3_fpga_dir) && make -f Makefile.N200R3 clean +- cd $(_usrp_n200_r3_fpga_dir) && make -f Makefile.N200R3 bin ++ cd $(_usrp_n200_r3_fpga_dir) && gmake -f Makefile.N200R3 clean ++ cd $(_usrp_n200_r3_fpga_dir) && gmake -f Makefile.N200R3 bin + cp $(_usrp_n200_r3_fpga_dir)/build-N200R3/u2plus.bin $@ + + $(_usrp_n200_r3_fpga_bit): $(_usrp_n200_r3_fpga_bin) + cp $(_usrp_n200_r3_fpga_dir)/build-N200R3/u2plus.bit $@ + +-#its called r2 on the silkscreen, so make an r2 ++#its called r2 on the silkscreen, so gmake an r2 _usrp_n200_r2_fpga_bin = $(BUILT_IMAGES_DIR)/usrp_n200_r2_fpga.bin IMAGES_LIST += $(_usrp_n200_r2_fpga_bin) +USRP2_LIST += $(_usrp_n200_r2_fpga_bin) $(_usrp_n200_r2_fpga_bin): $(_usrp_n200_r3_fpga_bin) cp $< $@ -@@ -181,6 +190,7 @@ +@@ -181,18 +190,20 @@ _usrp_n210_r3_fpga_bin = $(BUILT_IMAGES_DIR)/usrp_n210_r3_fpga.bin _usrp_n210_r3_fpga_bit = $(BUILT_IMAGES_DIR)/bit/usrp_n210_r3_fpga.bit IMAGES_LIST += $(_usrp_n210_r3_fpga_bin) $(_usrp_n210_r3_fpga_bit) +USRP2_LIST += $(_usrp_n210_r3_fpga_bin) $(_usrp_n210_r3_fpga_bit) $(_usrp_n210_r3_fpga_bin): $(GLOBAL_DEPS) - cd $(_usrp_n210_r3_fpga_dir) && make -f Makefile.N210R3 clean -@@ -193,6 +203,7 @@ - #its called r2 on the silkscreen, so make an r2 +- cd $(_usrp_n210_r3_fpga_dir) && make -f Makefile.N210R3 clean +- cd $(_usrp_n210_r3_fpga_dir) && make -f Makefile.N210R3 bin ++ cd $(_usrp_n210_r3_fpga_dir) && gmake -f Makefile.N210R3 clean ++ cd $(_usrp_n210_r3_fpga_dir) && gmake -f Makefile.N210R3 bin + cp $(_usrp_n210_r3_fpga_dir)/build-N210R3/u2plus.bin $@ + + $(_usrp_n210_r3_fpga_bit): $(_usrp_n210_r3_fpga_bin) + cp $(_usrp_n210_r3_fpga_dir)/build-N210R3/u2plus.bit $@ + +-#its called r2 on the silkscreen, so make an r2 ++#its called r2 on the silkscreen, so gmake an r2 _usrp_n210_r2_fpga_bin = $(BUILT_IMAGES_DIR)/usrp_n210_r2_fpga.bin IMAGES_LIST += $(_usrp_n210_r2_fpga_bin) +USRP2_LIST += $(_usrp_n210_r2_fpga_bin) $(_usrp_n210_r2_fpga_bin): $(_usrp_n210_r3_fpga_bin) cp $< $@ -@@ -207,6 +218,7 @@ +@@ -207,10 +218,11 @@ _usrp_n200_r4_fpga_bin = $(BUILT_IMAGES_DIR)/usrp_n200_r4_fpga.bin _usrp_n200_r4_fpga_bit = $(BUILT_IMAGES_DIR)/bit/usrp_n200_r4_fpga.bit IMAGES_LIST += $(_usrp_n200_r4_fpga_bin) $(_usrp_n200_r4_fpga_bit) +USRP2_LIST += $(_usrp_n200_r4_fpga_bin) $(_usrp_n200_r4_fpga_bit) $(_usrp_n200_r4_fpga_bin): $(GLOBAL_DEPS) - cd $(_usrp_n200_r4_fpga_dir) && make -f Makefile.N200R4 clean -@@ -227,6 +239,7 @@ +- cd $(_usrp_n200_r4_fpga_dir) && make -f Makefile.N200R4 clean +- cd $(_usrp_n200_r4_fpga_dir) && make -f Makefile.N200R4 bin ++ cd $(_usrp_n200_r4_fpga_dir) && gmake -f Makefile.N200R4 clean ++ cd $(_usrp_n200_r4_fpga_dir) && gmake -f Makefile.N200R4 bin + cp $(_usrp_n200_r4_fpga_dir)/build-N200R4/u2plus.bin $@ + + $(_usrp_n200_r4_fpga_bit): $(_usrp_n200_r4_fpga_bin) +@@ -227,10 +239,11 @@ _usrp_n210_r4_fpga_bin = $(BUILT_IMAGES_DIR)/usrp_n210_r4_fpga.bin _usrp_n210_r4_fpga_bit = $(BUILT_IMAGES_DIR)/bit/usrp_n210_r4_fpga.bit IMAGES_LIST += $(_usrp_n210_r4_fpga_bin) $(_usrp_n210_r4_fpga_bit) +USRP2_LIST += $(_usrp_n210_r4_fpga_bin) $(_usrp_n210_r4_fpga_bit) $(_usrp_n210_r4_fpga_bin): $(GLOBAL_DEPS) - cd $(_usrp_n210_r4_fpga_dir) && make -f Makefile.N210R4 clean -@@ -275,7 +288,13 @@ +- cd $(_usrp_n210_r4_fpga_dir) && make -f Makefile.N210R4 clean +- cd $(_usrp_n210_r4_fpga_dir) && make -f Makefile.N210R4 bin ++ cd $(_usrp_n210_r4_fpga_dir) && gmake -f Makefile.N210R4 clean ++ cd $(_usrp_n210_r4_fpga_dir) && gmake -f Makefile.N210R4 bin + cp $(_usrp_n210_r4_fpga_dir)/build-N210R4/u2plus.bin $@ + + $(_usrp_n210_r4_fpga_bit): $(_usrp_n210_r4_fpga_bin) +@@ -248,8 +261,8 @@ + IMAGES_LIST += $(_usrp_e100_fpga_bin) + + $(_usrp_e100_fpga_bin): $(GLOBAL_DEPS) +- cd $(_usrp_e100_fpga_dir) && make -f Makefile.E100 clean +- cd $(_usrp_e100_fpga_dir) && make -f Makefile.E100 bin ++ cd $(_usrp_e100_fpga_dir) && gmake -f Makefile.E100 clean ++ cd $(_usrp_e100_fpga_dir) && gmake -f Makefile.E100 bin + cp $(_usrp_e100_fpga_dir)/build-E100/u1e.bin $@ + + endif +@@ -264,8 +277,8 @@ + IMAGES_LIST += $(_usrp_e110_fpga_bin) + + $(_usrp_e110_fpga_bin): $(GLOBAL_DEPS) +- cd $(_usrp_e110_fpga_dir) && make -f Makefile.E110 clean +- cd $(_usrp_e110_fpga_dir) && make -f Makefile.E110 bin ++ cd $(_usrp_e110_fpga_dir) && gmake -f Makefile.E110 clean ++ cd $(_usrp_e110_fpga_dir) && gmake -f Makefile.E110 bin + cp $(_usrp_e110_fpga_dir)/build-E110/u1e.bin $@ + + endif +@@ -275,13 +288,19 @@ ######################################################################## images: $(IMAGES_LIST) find $(BUILT_IMAGES_DIR) -type f | xargs chmod -x @@ -112,3 +188,11 @@ package: mkdir -p $(CMAKE_BUILD_DIR) + cd $(CMAKE_BUILD_DIR) && cmake -DUHD_RELEASE_MODE=OFF .. +- cd $(CMAKE_BUILD_DIR) && cmake -DCPACK_GENERATOR=TGZ .. && make package +- cd $(CMAKE_BUILD_DIR) && cmake -DCPACK_GENERATOR=ZIP .. && make package ++ cd $(CMAKE_BUILD_DIR) && cmake -DCPACK_GENERATOR=TGZ .. && gmake package ++ cd $(CMAKE_BUILD_DIR) && cmake -DCPACK_GENERATOR=ZIP .. && gmake package + + clean: + $(RM) -rf $(BUILT_IMAGES_DIR) Modified: branches/2014Q1/comms/usrp/pkg-plist ============================================================================== --- branches/2014Q1/comms/usrp/pkg-plist Thu Dec 26 13:16:34 2013 (r337505) +++ branches/2014Q1/comms/usrp/pkg-plist Thu Dec 26 13:16:43 2013 (r337506) @@ -894,7 +894,6 @@ share/uhd/utils/usrp_n2xx_net_burner_gui %%PUSRP1%%@dirrm share/uhd/fpga/usrp1/rev4 %%PUSRP1%%@dirrm share/uhd/fpga/usrp1 %%PUSRP1%%@dirrm share/uhd/fpga -@dirrm share/uhd @dirrm share/uhd/examples @dirrm share/uhd/tests @dirrm share/uhd/utils From owner-svn-ports-branches@FreeBSD.ORG Thu Dec 26 13:16:52 2013 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 5227EB2F; Thu, 26 Dec 2013 13:16:52 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3F3661F8A; Thu, 26 Dec 2013 13:16:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBQDGq1q091469; Thu, 26 Dec 2013 13:16:52 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBQDGqwF091468; Thu, 26 Dec 2013 13:16:52 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312261316.rBQDGqwF091468@svn.freebsd.org> From: Mathieu Arnold Date: Thu, 26 Dec 2013 13:16:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337507 - branches/2014Q1/science/chemtool-devel X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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, 26 Dec 2013 13:16:52 -0000 Author: mat Date: Thu Dec 26 13:16:51 2013 New Revision: 337507 URL: http://svnweb.freebsd.org/changeset/ports/337507 Log: MFH: r337459 science/chemtool-devel: Unbreak on FreeBSD 10+ The breakage was caused by processing makefiles with bmake instead of the specified gmake. PR: ports/184693 Approved by: maintainer timeout Approved by: portmgr (implicit) Modified: branches/2014Q1/science/chemtool-devel/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/science/chemtool-devel/Makefile ============================================================================== --- branches/2014Q1/science/chemtool-devel/Makefile Thu Dec 26 13:16:43 2013 (r337506) +++ branches/2014Q1/science/chemtool-devel/Makefile Thu Dec 26 13:16:51 2013 (r337507) @@ -23,7 +23,8 @@ GNU_CONFIGURE= yes USES= gettext gmake pkgconfig CONFIGURE_ARGS= --enable-emf=yes PKGNAMESUFFIX= -devel -MAN1= chemtool.1 cht.1 +MAN1= chemtool.1 cht.1 +MAKE_ARGS+= MAKE=${GMAKE} MAKE_JOBS_UNSAFE= yes #to include emf CFLAGS+= -I${LOCALBASE}/include/libEMF From owner-svn-ports-branches@FreeBSD.ORG Thu Dec 26 13:17:01 2013 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 86E79C12; Thu, 26 Dec 2013 13:17:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 737621F90; Thu, 26 Dec 2013 13:17:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBQDH1pU091608; Thu, 26 Dec 2013 13:17:01 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBQDH1Qq091607; Thu, 26 Dec 2013 13:17:01 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312261317.rBQDH1Qq091607@svn.freebsd.org> From: Mathieu Arnold Date: Thu, 26 Dec 2013 13:17:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337508 - branches/2014Q1/lang/gcc34 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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, 26 Dec 2013 13:17:01 -0000 Author: mat Date: Thu Dec 26 13:17:00 2013 New Revision: 337508 URL: http://svnweb.freebsd.org/changeset/ports/337508 Log: MFH: r337468 Fix usage of USES=perl5 Approved by: portmgr (implicit) Modified: branches/2014Q1/lang/gcc34/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/lang/gcc34/Makefile ============================================================================== --- branches/2014Q1/lang/gcc34/Makefile Thu Dec 26 13:16:51 2013 (r337507) +++ branches/2014Q1/lang/gcc34/Makefile Thu Dec 26 13:17:00 2013 (r337508) @@ -19,7 +19,7 @@ COMMENT= GNU Compiler Collection 3.4 SUFFIX= 34 USES= bison gmake iconv perl5 USE_BZIP2= yes -USE_PERL= build +USE_PERL5= build SSP_UNSAFE= yes PATCH_WRKSRC= ${SRCDIR} From owner-svn-ports-branches@FreeBSD.ORG Thu Dec 26 13:17:10 2013 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 2BA01CEC; Thu, 26 Dec 2013 13:17:10 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0C6281F96; Thu, 26 Dec 2013 13:17:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBQDH97U091750; Thu, 26 Dec 2013 13:17:09 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBQDH9M0091748; Thu, 26 Dec 2013 13:17:09 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312261317.rBQDH9M0091748@svn.freebsd.org> From: Mathieu Arnold Date: Thu, 26 Dec 2013 13:17:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337509 - branches/2014Q1/textproc/sphinxsearch X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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, 26 Dec 2013 13:17:10 -0000 Author: mat Date: Thu Dec 26 13:17:09 2013 New Revision: 337509 URL: http://svnweb.freebsd.org/changeset/ports/337509 Log: MFH: r337476 - Fix installation when DOCS or EXAMPLES are unset by always installing docs and examples unconditionally to staging. The packaging step will not include them in the package generated from stagingif DOCS or EXAMPLES is unset. - List EXAMPLES explicitly in pkg-plist PR: 185194 Submitted by: Miroslav Lachman <000.fbsd@quip.cz> Approved by: portmgr (implicit) Modified: branches/2014Q1/textproc/sphinxsearch/Makefile branches/2014Q1/textproc/sphinxsearch/pkg-plist Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/textproc/sphinxsearch/Makefile ============================================================================== --- branches/2014Q1/textproc/sphinxsearch/Makefile Thu Dec 26 13:17:00 2013 (r337508) +++ branches/2014Q1/textproc/sphinxsearch/Makefile Thu Dec 26 13:17:09 2013 (r337509) @@ -108,15 +108,10 @@ SUB_LIST+= PORTNAME=${PORTNAME} \ SPHINX_LOG=${SPHINX_LOG} SUB_FILES+= pkg-deinstall -.if ${PORT_OPTIONS:MEXAMPLES} EXAMPLES= example.sql api -PORTEXAMPLES= * -.endif -.if ${PORT_OPTIONS:MDOCS} DOCS= doc/sphinx.css doc/sphinx.html doc/sphinx.txt doc/sphinx.xml DOCSRC= ${WRKSRC}/doc -.endif MAN1SRC= indexer.1 indextool.1 search.1 spelldump.1 MAN8SRC= searchd.8 Modified: branches/2014Q1/textproc/sphinxsearch/pkg-plist ============================================================================== --- branches/2014Q1/textproc/sphinxsearch/pkg-plist Thu Dec 26 13:17:00 2013 (r337508) +++ branches/2014Q1/textproc/sphinxsearch/pkg-plist Thu Dec 26 13:17:09 2013 (r337509) @@ -15,4 +15,135 @@ etc/sphinx.conf.sample %%PORTDOCS%%%%DOCSDIR%%/sphinx.html %%PORTDOCS%%%%DOCSDIR%%/sphinx.txt %%PORTDOCS%%%%DOCSDIR%%/sphinx.xml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/java/MANIFEST.MF +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/java/Makefile +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/java/README +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/java/SphinxClient.java +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/java/SphinxException.java +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/java/SphinxMatch.java +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/java/SphinxResult.java +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/java/SphinxWordInfo.java +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/java/mk.cmd +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/java/mkdoc.cmd +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/java/test.java +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/libsphinxclient/COPYING +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/libsphinxclient/Makefile.am +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/libsphinxclient/Makefile.in +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/libsphinxclient/README +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/libsphinxclient/build.mk +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/libsphinxclient/buildconf.sh +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/libsphinxclient/config.guess +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/libsphinxclient/config.sub +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/libsphinxclient/configure +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/libsphinxclient/configure.in +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/libsphinxclient/install-sh +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/libsphinxclient/libsphinxclient.vcproj +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/libsphinxclient/ltmain.sh +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/libsphinxclient/missing +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/libsphinxclient/smoke_ref.txt +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/libsphinxclient/smoke_test.conf +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/libsphinxclient/smoke_test.sh +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/libsphinxclient/sphinxclient.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/libsphinxclient/sphinxclient.h +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/libsphinxclient/sphinxclient_config.h.in +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/libsphinxclient/test.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/libsphinxclient/test.sln +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/libsphinxclient/test.vcproj +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/libsphinxclient/test03.sln +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/libsphinxclient/test03.vcproj +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/README.rdoc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/Rakefile +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/init.rb +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/install.rb +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/lib/sphinx.rb +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/lib/sphinx/client.rb +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/lib/sphinx/request.rb +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/lib/sphinx/response.rb +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/client_response_spec.rb +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/client_spec.rb +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/default_search.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/default_search_index.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/excerpt_custom.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/excerpt_default.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/excerpt_flags.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/field_weights.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/filter.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/filter_exclude.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/filter_float_range.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/filter_float_range_exclude.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/filter_range.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/filter_range_exclude.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/filter_range_int64.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/filter_ranges.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/filters.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/filters_different.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/geo_anchor.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/group_by_attr.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/group_by_attrpair.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/group_by_day.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/group_by_day_sort.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/group_by_month.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/group_by_week.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/group_by_year.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/group_distinct.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/id_range.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/id_range64.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/index_weights.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/keywords.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/limits.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/limits_cutoff.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/limits_max.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/limits_max_cutoff.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/match_all.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/match_any.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/match_boolean.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/match_extended.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/match_extended2.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/match_fullscan.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/match_phrase.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/max_query_time.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/miltiple_queries.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/ranking_bm25.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/ranking_none.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/ranking_proximity.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/ranking_proximity_bm25.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/ranking_wordcount.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/retries.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/retries_delay.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/select.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/set_override.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/sort_attr_asc.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/sort_attr_desc.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/sort_expr.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/sort_extended.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/sort_relevance.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/sort_time_segments.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/sphinxapi.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/update_attributes.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/update_attributes_mva.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/fixtures/weights.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/sphinx/sphinx-id64.conf +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/sphinx/sphinx.conf +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/spec/sphinx/sphinx_test.sql +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/sphinx.yml.tpl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/tasks/sphinx.rake +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/ruby/test.rb +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/sphinxapi.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/sphinxapi.py +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/test.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/test.py +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/test2.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/api/test2.py +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example.sql +%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/api/ruby/tasks +%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/api/ruby/spec/sphinx +%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/api/ruby/spec/fixtures +%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/api/ruby/spec +%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/api/ruby/lib/sphinx +%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/api/ruby/lib +%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/api/ruby +%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/api/libsphinxclient +%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/api/java +%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/api +%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%% From owner-svn-ports-branches@FreeBSD.ORG Thu Dec 26 13:17:18 2013 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 CF0AAD9C; Thu, 26 Dec 2013 13:17:16 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5461C1F99; Thu, 26 Dec 2013 13:17:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBQDHGI4091873; Thu, 26 Dec 2013 13:17:16 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBQDHGlB091872; Thu, 26 Dec 2013 13:17:16 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312261317.rBQDHGlB091872@svn.freebsd.org> From: Mathieu Arnold Date: Thu, 26 Dec 2013 13:17:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337510 - branches/2014Q1/shells/bash-static X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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, 26 Dec 2013 13:17:18 -0000 Author: mat Date: Thu Dec 26 13:17:15 2013 New Revision: 337510 URL: http://svnweb.freebsd.org/changeset/ports/337510 Log: MFH: r337477 Fix packaging, (the master port is now staged) Approved by: portmgr (implicit) Modified: branches/2014Q1/shells/bash-static/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/shells/bash-static/Makefile ============================================================================== --- branches/2014Q1/shells/bash-static/Makefile Thu Dec 26 13:17:09 2013 (r337509) +++ branches/2014Q1/shells/bash-static/Makefile Thu Dec 26 13:17:15 2013 (r337510) @@ -5,5 +5,4 @@ MASTERDIR= ${.CURDIR}/../../shells/bash OPTIONS_SLAVE= STATIC -NO_STAGE= yes .include "${MASTERDIR}/Makefile" From owner-svn-ports-branches@FreeBSD.ORG Thu Dec 26 13:17:26 2013 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 C5C5DE9C; Thu, 26 Dec 2013 13:17:26 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B29731F9C; Thu, 26 Dec 2013 13:17:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBQDHQZN092017; Thu, 26 Dec 2013 13:17:26 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBQDHQHH092014; Thu, 26 Dec 2013 13:17:26 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312261317.rBQDHQHH092014@svn.freebsd.org> From: Mathieu Arnold Date: Thu, 26 Dec 2013 13:17:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337511 - branches/2014Q1/net-mgmt/nagios X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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, 26 Dec 2013 13:17:26 -0000 Author: mat Date: Thu Dec 26 13:17:26 2013 New Revision: 337511 URL: http://svnweb.freebsd.org/changeset/ports/337511 Log: MFH: r337483 Do not overwrite config.inc.php; Convert to staging; Use new LIB_DEPENDS format. PR: 185187 Submitted by: mat Approved by: portmgr (implicit) Modified: branches/2014Q1/net-mgmt/nagios/Makefile branches/2014Q1/net-mgmt/nagios/pkg-plist Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/net-mgmt/nagios/Makefile ============================================================================== --- branches/2014Q1/net-mgmt/nagios/Makefile Thu Dec 26 13:17:15 2013 (r337510) +++ branches/2014Q1/net-mgmt/nagios/Makefile Thu Dec 26 13:17:26 2013 (r337511) @@ -11,10 +11,10 @@ COMMENT= Extremely powerful network moni LICENSE= GPLv2 -LIB_DEPENDS= gd:${PORTSDIR}/graphics/gd +LIB_DEPENDS= libgd.so:${PORTSDIR}/graphics/gd RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagios-plugins -USES= iconv perl5 +USES= iconv perl5 uidfix USE_PERL5= build USE_AUTOTOOLS= autoconf libltdl USE_PHP= yes @@ -83,41 +83,27 @@ NANOSLEEP_DESC= Use nanosleep in event EVENT_BROKER_DESC= Enable event broker functionality UNHANDLED_HACK_DESC= Display passive checks in unhandled queries -NO_STAGE= yes -.include - -.if ${PORT_OPTIONS:MEMBEDDED_PERL} -USE_PERL5+= run -CONFIGURE_ARGS+=--enable-embedded-perl \ - --with-perlcache -PLIST_SUB+= EMBEDDED_PERL="" -.else -PLIST_SUB+= EMBEDDED_PERL="@comment " -.endif - -.if ${PORT_OPTIONS:MNANOSLEEP} -CONFIGURE_ARGS+=--enable-nanosleep -.endif +OPTIONS_SUB= -.if ${PORT_OPTIONS:MEVENT_BROKER} -CONFIGURE_ARGS+=--enable-event-broker -.else -CONFIGURE_ARGS+=--disable-event-broker -.endif +EMBEDDED_PERL_USE= perl5=run +EMBEDDED_PERL_CONFIGURE_ENABLE= embedded-perl +EMBEDDED_PERL_CONFIGURE_WITH= perlcache +NANOSLEEP_CONFIGURE_ENABLE= nanosleep +EVENT_BROKER_CONFIGURE_ENABLE= event-broker post-extract: @${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC} +.include + post-patch: + @${REINPLACE_CMD} -e '/^INSTALL_OPTS=/d' `${FIND} ${WRKSRC} -name Makefile.in` .if ${PORT_OPTIONS:MUNHANDLED_HACK} @${REINPLACE_CMD} -e 's#;serviceprops=42\&#;serviceprops=10\&#g' \ -e 's#;hostprops=42\"#;hostprops=10\"#g' ${WRKSRC}/html/side.php .endif post-install: - @${CHMOD} 775 ${NAGIOSDIR} ${NAGIOSDIR}/archives ${NAGIOSDIR}/checkresults ${NAGIOSDIR}/rw - @${CHOWN} ${NAGIOSUSER}:${NAGIOSGROUP} ${NAGIOSDIR} ${NAGIOSDIR}/archives ${NAGIOSDIR}/checkresults - @${CHOWN} ${NAGIOSUSER}:${WWWGRP} ${NAGIOSDIR}/rw - @${CAT} ${PKGMESSAGE} + @${MV} ${STAGEDIR}${PREFIX}/${NAGIOSWWWDIR}/config.inc.php ${STAGEDIR}${PREFIX}/${NAGIOSWWWDIR}/config.inc.php.sample .include Modified: branches/2014Q1/net-mgmt/nagios/pkg-plist ============================================================================== --- branches/2014Q1/net-mgmt/nagios/pkg-plist Thu Dec 26 13:17:15 2013 (r337510) +++ branches/2014Q1/net-mgmt/nagios/pkg-plist Thu Dec 26 13:17:26 2013 (r337511) @@ -33,7 +33,9 @@ etc/nagios/resource.cfg-sample %%NAGIOSWWWDIR%%/cgi-bin/summary.cgi %%NAGIOSWWWDIR%%/cgi-bin/tac.cgi %%NAGIOSWWWDIR%%/cgi-bin/trends.cgi -%%NAGIOSWWWDIR%%/config.inc.php +@unexec if cmp -s %D/%%NAGIOSWWWDIR%%/config.inc.php.sample %D/%%NAGIOSWWWDIR%%/config.inc.php; then rm -f %D/%%NAGIOSWWWDIR%%/config.inc.php; fi +%%NAGIOSWWWDIR%%/config.inc.php.sample +@exec if [ ! -f %D/%%NAGIOSWWWDIR%%/config.inc.php ] ; then cp -p %D/%F %B/config.inc.php; fi %%NAGIOSWWWDIR%%/contexthelp/A1.html %%NAGIOSWWWDIR%%/contexthelp/A2.html %%NAGIOSWWWDIR%%/contexthelp/A3.html From owner-svn-ports-branches@FreeBSD.ORG Thu Dec 26 14:28:48 2013 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 09D68548; Thu, 26 Dec 2013 14:28:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E993814BE; Thu, 26 Dec 2013 14:28:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBQESlVf019049; Thu, 26 Dec 2013 14:28:47 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBQESlA5019048; Thu, 26 Dec 2013 14:28:47 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201312261428.rBQESlA5019048@svn.freebsd.org> From: William Grzybowski Date: Thu, 26 Dec 2013 14:28:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337516 - branches/2014Q1/multimedia/xbmc X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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, 26 Dec 2013 14:28:48 -0000 Author: wg Date: Thu Dec 26 14:28:47 2013 New Revision: 337516 URL: http://svnweb.freebsd.org/changeset/ports/337516 Log: MFH: r337512 multimedia/xbmc: ffmpeg does not exist anymore PR: ports/184532 Submitted by: gjb Approved by: portmgr (lukers, mat), maintainer (timeout) Modified: branches/2014Q1/multimedia/xbmc/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/multimedia/xbmc/Makefile ============================================================================== --- branches/2014Q1/multimedia/xbmc/Makefile Thu Dec 26 13:49:10 2013 (r337515) +++ branches/2014Q1/multimedia/xbmc/Makefile Thu Dec 26 14:28:47 2013 (r337516) @@ -2,7 +2,7 @@ PORTNAME= xbmc DISTVERSION= 12.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia MASTER_SITES= http://mirrors.xbmc.org/releases/source/ @@ -149,7 +149,7 @@ CONFIGURE_ARGS+= --disable-libcec .if ${PORT_OPTIONS:MEXTERNAL_FFMPEG} CONFIGURE_ARGS+= --enable-external-ffmpeg -FFMPEG_SUFFIX= 1 +FFMPEG_SUFFIX= 0 CONFIGURE_ENV+= FFMPEG_SUFFIX="${FFMPEG_SUFFIX}" PLIST_SUB+= EXTERNAL_FFMPEG="@comment " BUILD_DEPENDS+= ffmpeg${FFMPEG_SUFFIX}>0.11:${PORTSDIR}/multimedia/ffmpeg${FFMPEG_SUFFIX} From owner-svn-ports-branches@FreeBSD.ORG Thu Dec 26 15:15:26 2013 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 480DEB4C; Thu, 26 Dec 2013 15:15:26 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 34320182E; Thu, 26 Dec 2013 15:15:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBQFFQSR038498; Thu, 26 Dec 2013 15:15:26 GMT (envelope-from rm@svn.freebsd.org) Received: (from rm@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBQFFPnh038496; Thu, 26 Dec 2013 15:15:25 GMT (envelope-from rm@svn.freebsd.org) Message-Id: <201312261515.rBQFFPnh038496@svn.freebsd.org> From: Ruslan Makhmatkhanov Date: Thu, 26 Dec 2013 15:15:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337535 - branches/2014Q1/graphics/gimp-gmic-plugin X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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, 26 Dec 2013 15:15:26 -0000 Author: rm Date: Thu Dec 26 15:15:25 2013 New Revision: 337535 URL: http://svnweb.freebsd.org/changeset/ports/337535 Log: MFH: r337236 - update to 1.5.8.1 - use options helper - support staging This commit also fixing build on -head, so it's a reason for MFH. Approved by: portmgr-lurkers (mat) Deleted: branches/2014Q1/graphics/gimp-gmic-plugin/pkg-plist Modified: branches/2014Q1/graphics/gimp-gmic-plugin/Makefile branches/2014Q1/graphics/gimp-gmic-plugin/distinfo Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/graphics/gimp-gmic-plugin/Makefile ============================================================================== --- branches/2014Q1/graphics/gimp-gmic-plugin/Makefile Thu Dec 26 15:03:41 2013 (r337534) +++ branches/2014Q1/graphics/gimp-gmic-plugin/Makefile Thu Dec 26 15:15:25 2013 (r337535) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= gmic -PORTVERSION= 1.5.7.1 -PORTREVISION= 2 +PORTVERSION= 1.5.8.1 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME} \ SF/${PORTNAME}/old @@ -21,7 +20,9 @@ LIB_DEPENDS= libGraphicsMagick++.so:${PO libgimp-2.0.so:${PORTSDIR}/graphics/gimp-app OPTIONS_DEFINE= BASH +OPTIONS_SUB= yes BASH_DESC= Install programmable completions for Bash +BASH_RUN_DEPENDS= ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash OPTIONS_EXCLUDE=NLS DOCS WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src @@ -38,31 +39,27 @@ LDFLAGS+= -L${LOCALBASE}/lib CFLAGS:= ${CFLAGS:N-O*:N-pipe} CXXFLAGS:= ${CXXFLAGS:N-O*:N-pipe} -MAN1= gmic.1 -MANCOMPRESSED= yes -NO_STAGE= yes +PLIST_FILES= bin/gmic \ + man/man1/gmic.1.gz \ + %%BASH%%etc/bash_completion.d/gmic_bashcompletion.sh \ + %%PLUGIN_DIR%%/gmic_gimp +PLIST_DIRSTRY= %%PLUGIN_DIR%% .include -.if ${PORT_OPTIONS:MBASH} -RUN_DEPENDS+= ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash -PLIST_SUB+= BASH="" -.else -PLIST_SUB+= BASH="@comment " -.endif - post-patch: @${REINPLACE_CMD} -e 's#/usr/X11R6#${PREFIX}#g' \ ${WRKSRC}/Makefile do-install: - @${MKDIR} ${PREFIX}/${PLUGIN_DIR} - ${INSTALL_PROGRAM} ${WRKSRC}/gmic_gimp ${PREFIX}/${PLUGIN_DIR} - ${INSTALL_PROGRAM} ${WRKSRC}/gmic ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/../man/gmic.1.gz ${MAN1PREFIX}/man/man1 + @${MKDIR} ${STAGEDIR}${PREFIX}/${PLUGIN_DIR} + ${INSTALL_PROGRAM} ${WRKSRC}/gmic_gimp ${STAGEDIR}${PREFIX}/${PLUGIN_DIR} + ${INSTALL_PROGRAM} ${WRKSRC}/gmic ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/../man/gmic.1.gz ${STAGEDIR}${MAN1PREFIX}/man/man1 .if ${PORT_OPTIONS:MBASH} + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d ${INSTALL_SCRIPT} ${WRKSRC}/gmic_bashcompletion.sh \ - ${PREFIX}/etc/bash_completion.d/gmic_bashcompletion.sh + ${STAGEDIR}${PREFIX}/etc/bash_completion.d .endif .include Modified: branches/2014Q1/graphics/gimp-gmic-plugin/distinfo ============================================================================== --- branches/2014Q1/graphics/gimp-gmic-plugin/distinfo Thu Dec 26 15:03:41 2013 (r337534) +++ branches/2014Q1/graphics/gimp-gmic-plugin/distinfo Thu Dec 26 15:15:25 2013 (r337535) @@ -1,2 +1,2 @@ -SHA256 (gmic_1.5.7.1.tar.gz) = bc55fe0309c08fd4b4d97c37704db77965316c818c169ac573b8b12a5a44d42f -SIZE (gmic_1.5.7.1.tar.gz) = 2174947 +SHA256 (gmic_1.5.8.1.tar.gz) = 2b0b813253e8c409a8535d350894245b35836cd849af31986055e0a09b8d1cea +SIZE (gmic_1.5.8.1.tar.gz) = 2265467 From owner-svn-ports-branches@FreeBSD.ORG Thu Dec 26 15:42:31 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 1033) id 59869733; Thu, 26 Dec 2013 15:42:31 +0000 (UTC) Date: Thu, 26 Dec 2013 15:42:31 +0000 From: Alexey Dokuchaev To: Mathieu Arnold Subject: Re: svn commit: r337494 - in branches/2014Q1/audio/rezound: . files Message-ID: <20131226154231.GA16194@FreeBSD.org> References: <201312261309.rBQD9wLT085743@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201312261309.rBQD9wLT085743@svn.freebsd.org> User-Agent: Mutt/1.5.22 (2013-10-16) Cc: svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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, 26 Dec 2013 15:42:31 -0000 On Thu, Dec 26, 2013 at 01:09:58PM +0000, Mathieu Arnold wrote: > New Revision: 337494 > URL: http://svnweb.freebsd.org/changeset/ports/337494 > > Log: > MFH: r337406 > [...] > For users that have ReZound package installed, this commit does not bring > any visible changes, and should not be merged to any "stable" or quarterly > branches alone. Oh.. Does it mean that almost all commits are going to be merged, even when advised of their nature in the commit log? ./danfe From owner-svn-ports-branches@FreeBSD.ORG Thu Dec 26 16:05:04 2013 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 79D96CD3; Thu, 26 Dec 2013 16:05:04 +0000 (UTC) Received: from prod2.absolight.net (mx3.absolight.net [IPv6:2a01:678:2:100::25]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3739D1B63; Thu, 26 Dec 2013 16:05:04 +0000 (UTC) Received: from prod2.absolight.net (localhost [127.0.0.1]) by prod2.absolight.net (Postfix) with ESMTP id D5334BDC3E; Thu, 26 Dec 2013 17:05:02 +0100 (CET) Received: from gw.in.absolight.net (gw-ecl.in.absolight.net [79.143.241.69]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "gw.in.absolight.net", Issuer "CA Cert Signing Authority" (not verified)) by prod2.absolight.net (Postfix) with ESMTPSA id 8D5C8BDC24; Thu, 26 Dec 2013 17:05:02 +0100 (CET) Received: from ogg.in.absolight.net (ogg.in.absolight.net [79.143.241.239]) by gw.in.absolight.net (Postfix) with ESMTP id E533F6113; Thu, 26 Dec 2013 17:05:01 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by ogg.in.absolight.net (Postfix) with ESMTP id 7AA1E66EB1EC; Thu, 26 Dec 2013 17:05:01 +0100 (CET) Date: Thu, 26 Dec 2013 17:05:00 +0100 From: Mathieu Arnold To: Alexey Dokuchaev Subject: Re: svn commit: r337494 - in branches/2014Q1/audio/rezound: . files Message-ID: <1577371CF29F9E97146B1C92@ogg.in.absolight.net> In-Reply-To: <20131226154231.GA16194@FreeBSD.org> References: <201312261309.rBQD9wLT085743@svn.freebsd.org> <20131226154231.GA16194@FreeBSD.org> X-Mailer: Mulberry/4.0.8 (Mac OS X) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Cc: svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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, 26 Dec 2013 16:05:04 -0000 +--On 26 d=C3=A9cembre 2013 15:42:31 +0000 Alexey Dokuchaev = wrote: | On Thu, Dec 26, 2013 at 01:09:58PM +0000, Mathieu Arnold wrote: |> New Revision: 337494 |> URL: http://svnweb.freebsd.org/changeset/ports/337494 |>=20 |> Log: |> MFH: r337406 |> [...] |> For users that have ReZound package installed, this commit does not |> bring any visible changes, and should not be merged to any "stable" or |> quarterly branches alone. |=20 | Oh.. Does it mean that almost all commits are going to be merged, even | when advised of their nature in the commit log? Nope, it means I read the beginning, which was "Fix compilation problems with Clang" stopped there, noted that commit for merge and went on to the next commit :-) --=20 Mathieu Arnold From owner-svn-ports-branches@FreeBSD.ORG Thu Dec 26 17:22:49 2013 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 5B743B01; Thu, 26 Dec 2013 17:22:49 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 442811243; Thu, 26 Dec 2013 17:22:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBQHMnBk090353; Thu, 26 Dec 2013 17:22:49 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBQHMTQV090241; Thu, 26 Dec 2013 17:22:29 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312261722.rBQHMTQV090241@svn.freebsd.org> From: Baptiste Daroussin Date: Thu, 26 Dec 2013 17:22:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337563 - in branches/2014Q1: databases/libdrizzle databases/pear-Doctrine12 databases/pecl-drizzle databases/sqlite-ext-miscfuncs devel/cvs-syncmail devel/cvsbook devel/cvschangelogbui... X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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, 26 Dec 2013 17:22:49 -0000 Author: bapt Date: Thu Dec 26 17:22:28 2013 New Revision: 337563 URL: http://svnweb.freebsd.org/changeset/ports/337563 Log: MFH: r336656 [Errno 11] Resource Temporarily Unavailable Reassigning my ports back to the pool with the hope of freeing up to do more FreeBSD work in the future. Submitted by: glarkin Modified: branches/2014Q1/databases/libdrizzle/Makefile branches/2014Q1/databases/pear-Doctrine12/Makefile branches/2014Q1/databases/pecl-drizzle/Makefile branches/2014Q1/databases/sqlite-ext-miscfuncs/Makefile branches/2014Q1/devel/cvs-syncmail/Makefile branches/2014Q1/devel/cvsbook/Makefile branches/2014Q1/devel/cvschangelogbuilder/Makefile branches/2014Q1/devel/cvsstat/Makefile branches/2014Q1/devel/cvstrac/Makefile branches/2014Q1/devel/eventxx/Makefile branches/2014Q1/devel/gearmand-devel/Makefile branches/2014Q1/devel/gearmand/Makefile branches/2014Q1/devel/p5-Data-HashArray/Makefile branches/2014Q1/devel/p5-JIRA-Client/Makefile branches/2014Q1/devel/p5-MooseX-StrictConstructor/Makefile branches/2014Q1/devel/p5-SVN-Access/Makefile branches/2014Q1/devel/p5-SVN-Dumpfile/Makefile branches/2014Q1/devel/p5-SVN-Hook/Makefile branches/2014Q1/devel/p5-SVN-Hooks/Makefile branches/2014Q1/devel/p5-SVN-Look/Makefile branches/2014Q1/devel/p5-SVN-Notify-Config/Makefile branches/2014Q1/devel/p5-SVN-Notify-Filter-AuthZMail/Makefile branches/2014Q1/devel/p5-SVN-Notify-Filter-EmailFlatFileDB/Makefile branches/2014Q1/devel/p5-SVN-Notify-Filter-Markdown/Makefile branches/2014Q1/devel/p5-SVN-Notify-Filter-Watchers/Makefile branches/2014Q1/devel/p5-SVN-Notify-Mirror/Makefile branches/2014Q1/devel/p5-SVN-Notify-Snapshot/Makefile branches/2014Q1/devel/p5-XML-Pastor/Makefile branches/2014Q1/devel/patch/Makefile branches/2014Q1/devel/pear-VersionControl_SVN/Makefile branches/2014Q1/devel/pecl-spl_types/Makefile branches/2014Q1/devel/rsvndump/Makefile branches/2014Q1/devel/ruby-cvs/Makefile branches/2014Q1/devel/rubygem-childprocess/Makefile branches/2014Q1/devel/statcvs/Makefile branches/2014Q1/devel/statsvn/Makefile branches/2014Q1/devel/zthread/Makefile branches/2014Q1/graphics/GraphicsMagick/Makefile branches/2014Q1/graphics/GraphicsMagick12/Makefile branches/2014Q1/graphics/GraphicsMagick13/Makefile branches/2014Q1/lang/pecl-perl/Makefile branches/2014Q1/mail/ezmlm-idx/Makefile branches/2014Q1/mail/nullmailer/Makefile branches/2014Q1/mail/smtptrapd/Makefile branches/2014Q1/math/freemat/Makefile branches/2014Q1/math/pecl-bitset/Makefile branches/2014Q1/math/py-numeric/Makefile branches/2014Q1/net/easysoap/Makefile branches/2014Q1/net/p5-Amazon-SQS-Simple/Makefile branches/2014Q1/net/p5-Net-Amazon-EC2/Makefile branches/2014Q1/net/p5-Net-Amazon-MechanicalTurk/Makefile branches/2014Q1/net/p5-Net-Amazon-Signature/Makefile branches/2014Q1/net/p5-Net-Amazon-Thumbnail/Makefile branches/2014Q1/net/p5-Net-Mosso-CloudFiles/Makefile branches/2014Q1/net/rubygem-rightaws/Makefile branches/2014Q1/net/rubygem-rightflexiscale/Makefile branches/2014Q1/net/rubygem-rightgogrid/Makefile branches/2014Q1/net/rubygem-righthttpconnection/Makefile branches/2014Q1/net/rubygem-rightslicehost/Makefile branches/2014Q1/print/pdftk/Makefile branches/2014Q1/security/libksba/Makefile branches/2014Q1/security/logcheck/Makefile branches/2014Q1/security/ossec-hids-server/Makefile branches/2014Q1/security/p5-Apache-Htpasswd/Makefile branches/2014Q1/security/phpdeadlock/Makefile branches/2014Q1/security/rubygem-gpgr/Makefile branches/2014Q1/sysutils/aimage/Makefile branches/2014Q1/sysutils/feather/Makefile branches/2014Q1/sysutils/pmt/Makefile branches/2014Q1/sysutils/rubygem-hiera-json/Makefile branches/2014Q1/sysutils/rubygem-hiera-puppet/Makefile branches/2014Q1/textproc/docbook2X/Makefile branches/2014Q1/textproc/p5-File-Inplace/Makefile branches/2014Q1/www/cakephp11/Makefile branches/2014Q1/www/cakephp12/Makefile branches/2014Q1/www/codeigniter17/Makefile branches/2014Q1/www/dojo-shrinksafe/Makefile branches/2014Q1/www/p5-LWP-ConnCache-MaxKeepAliveRequests/Makefile branches/2014Q1/www/p5-Template-GD/Makefile branches/2014Q1/www/prado/Makefile branches/2014Q1/www/smarty2/Makefile branches/2014Q1/www/trac-batchmodify/Makefile branches/2014Q1/www/trac-calendar/Makefile branches/2014Q1/www/trac-ccselector/Makefile branches/2014Q1/www/trac-codetags/Makefile branches/2014Q1/www/trac-customfieldadmin/Makefile branches/2014Q1/www/trac-estimator/Makefile branches/2014Q1/www/trac-hierwiki/Makefile branches/2014Q1/www/trac-ldap/Makefile branches/2014Q1/www/trac-macropost/Makefile branches/2014Q1/www/trac-mastertickets/Makefile branches/2014Q1/www/trac-nav/Makefile branches/2014Q1/www/trac-pagelist/Makefile branches/2014Q1/www/trac-pagetopdf/Makefile branches/2014Q1/www/trac-pendingticket/Makefile branches/2014Q1/www/trac-remind/Makefile branches/2014Q1/www/trac-revtree/Makefile branches/2014Q1/www/trac-scrumburndown/Makefile branches/2014Q1/www/trac-simpleticket/Makefile branches/2014Q1/www/trac-timingandestimation/Makefile branches/2014Q1/www/trac-tocmacro/Makefile branches/2014Q1/www/trac-tweakui/Makefile branches/2014Q1/www/trac-wantedpages/Makefile branches/2014Q1/www/trac-wikinegotiator/Makefile branches/2014Q1/www/trac-wikinotification/Makefile branches/2014Q1/www/trac-wikitemplates/Makefile branches/2014Q1/www/trac-wysiwyg/Makefile branches/2014Q1/www/trac-xmlrpc/Makefile branches/2014Q1/www/webcalendar-devel/Makefile branches/2014Q1/www/webcalendar/Makefile branches/2014Q1/www/yahoo-ui/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/databases/libdrizzle/Makefile ============================================================================== --- branches/2014Q1/databases/libdrizzle/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/databases/libdrizzle/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -8,7 +8,7 @@ CATEGORIES= databases MASTER_SITES= http://launchpadlibrarian.net/41155299/ \ LOCAL/glarkin -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Client and protocol library for the Drizzle database LIB_DEPENDS= libsqlite3.so:${PORTSDIR}/databases/sqlite3 Modified: branches/2014Q1/databases/pear-Doctrine12/Makefile ============================================================================== --- branches/2014Q1/databases/pear-Doctrine12/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/databases/pear-Doctrine12/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -7,7 +7,7 @@ CATEGORIES= databases pear MASTER_SITES= http://www.doctrine-project.org/downloads/ \ LOCAL/glarkin -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Doctrine is a PHP object relational mapper LICENSE= LGPL21 Modified: branches/2014Q1/databases/pecl-drizzle/Makefile ============================================================================== --- branches/2014Q1/databases/pecl-drizzle/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/databases/pecl-drizzle/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -9,7 +9,7 @@ PKGNAMEPREFIX= pecl- EXTRACT_SUFX= .tgz DIST_SUBDIR= PECL -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= A PHP wrapper for the libdrizzle library LIB_DEPENDS= libdrizzle.so:${PORTSDIR}/databases/libdrizzle Modified: branches/2014Q1/databases/sqlite-ext-miscfuncs/Makefile ============================================================================== --- branches/2014Q1/databases/sqlite-ext-miscfuncs/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/databases/sqlite-ext-miscfuncs/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -9,7 +9,7 @@ MASTER_SITES= http://www.sourcehosting.n DISTNAME= ${SRCFILE} EXTRACT_SUFX= -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Math, string, and aggregate function library for SQLite USE_SQLITE= yes Modified: branches/2014Q1/devel/cvs-syncmail/Makefile ============================================================================== --- branches/2014Q1/devel/cvs-syncmail/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/devel/cvs-syncmail/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -8,7 +8,7 @@ MASTER_SITES= SF DISTNAME= syncmail EXTRACT_SUFX= -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= CVS notification tool .if defined(WITH_CVSNT) Modified: branches/2014Q1/devel/cvsbook/Makefile ============================================================================== --- branches/2014Q1/devel/cvsbook/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/devel/cvsbook/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -8,7 +8,7 @@ CATEGORIES= devel MASTER_SITES= http://cvsbook.red-bean.com/ DISTNAME= ${PORTNAME}-${PORTVERSION}-all -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= A tutorial and reference for CVS OPTIONS_MULTI= CVSBOOK Modified: branches/2014Q1/devel/cvschangelogbuilder/Makefile ============================================================================== --- branches/2014Q1/devel/cvschangelogbuilder/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/devel/cvschangelogbuilder/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -6,7 +6,7 @@ PORTVERSION= 2.5 CATEGORIES= devel MASTER_SITES= SF/cvschangelogb/CVSChangelogBuilder/${PORTVERSION} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Utility to generate changelogs and reports from a CVS repository LICENSE= GPLv2 Modified: branches/2014Q1/devel/cvsstat/Makefile ============================================================================== --- branches/2014Q1/devel/cvsstat/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/devel/cvsstat/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -10,7 +10,7 @@ EXTRACT_SUFX= # empty DIST_SUBDIR= ${PORTNAME}-${PORTVERSION} EXTRACT_ONLY= # empty -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Transforms the output of 'cvs status' to a sorted ASCII table USES= perl5 Modified: branches/2014Q1/devel/cvstrac/Makefile ============================================================================== --- branches/2014Q1/devel/cvstrac/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/devel/cvstrac/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -7,7 +7,7 @@ CATEGORIES= devel MASTER_SITES= http://www.cvstrac.org/ DISTNAME= cvstrac-${PORTVERSION} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT?= Web-Based Bug And Patch-Set Tracking System For CVS WRKSRC= ${WRKDIR}/cvstrac-${PORTVERSION} Modified: branches/2014Q1/devel/eventxx/Makefile ============================================================================== --- branches/2014Q1/devel/eventxx/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/devel/eventxx/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -9,7 +9,7 @@ MASTER_SITES= http://proj.llucax.com.ar/ LOCAL/glarkin MASTER_SITE_SUBDIR= gahr -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= A C++ wrapper for libevent LIB_DEPENDS= event-1.4:${PORTSDIR}/devel/libevent Modified: branches/2014Q1/devel/gearmand-devel/Makefile ============================================================================== --- branches/2014Q1/devel/gearmand-devel/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/devel/gearmand-devel/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -6,7 +6,7 @@ PORTVERSION= 1.1.8 CATEGORIES= devel MASTER_SITES= http://launchpad.net/gearmand/1.2/${PORTVERSION}/+download/ -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Gearman C Server and Library BUILD_DEPENDS= boost-libs>=0:${PORTSDIR}/devel/boost-libs \ Modified: branches/2014Q1/devel/gearmand/Makefile ============================================================================== --- branches/2014Q1/devel/gearmand/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/devel/gearmand/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -6,7 +6,7 @@ PORTVERSION= 1.0.6 CATEGORIES= devel MASTER_SITES= http://launchpad.net/gearmand/1.0/${PORTVERSION}/+download/ -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Gearman C Server and Library BUILD_DEPENDS= boost-libs>=0:${PORTSDIR}/devel/boost-libs \ Modified: branches/2014Q1/devel/p5-Data-HashArray/Makefile ============================================================================== --- branches/2014Q1/devel/p5-Data-HashArray/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/devel/p5-Data-HashArray/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -7,7 +7,7 @@ CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Array class of hashes with properties via overloading and AUTOLOAD USES= perl5 Modified: branches/2014Q1/devel/p5-JIRA-Client/Makefile ============================================================================== --- branches/2014Q1/devel/p5-JIRA-Client/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/devel/p5-JIRA-Client/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -8,7 +8,7 @@ MASTER_SITES= GOOGLE_CODE \ LOCAL/glarkin PKGNAMEPREFIX= p5- -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= An extended interface to JIRA's SOAP API RUN_DEPENDS= p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite Modified: branches/2014Q1/devel/p5-MooseX-StrictConstructor/Makefile ============================================================================== --- branches/2014Q1/devel/p5-MooseX-StrictConstructor/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/devel/p5-MooseX-StrictConstructor/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -7,7 +7,7 @@ CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Make your MooseX object constructors blow up on unknown attributes BUILD_DEPENDS= p5-Moose>=0.94:${PORTSDIR}/devel/p5-Moose \ Modified: branches/2014Q1/devel/p5-SVN-Access/Makefile ============================================================================== --- branches/2014Q1/devel/p5-SVN-Access/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/devel/p5-SVN-Access/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -7,7 +7,7 @@ CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Perl extension to manipulate SVN Access files BUILD_DEPENDS= p5-subversion>=0:${PORTSDIR}/devel/p5-subversion \ Modified: branches/2014Q1/devel/p5-SVN-Dumpfile/Makefile ============================================================================== --- branches/2014Q1/devel/p5-SVN-Dumpfile/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/devel/p5-SVN-Dumpfile/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -8,7 +8,7 @@ CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Perl extension to access and manipulate Subversion dumpfiles BUILD_DEPENDS= p5-Data-GUID>=0:${PORTSDIR}/devel/p5-Data-GUID \ Modified: branches/2014Q1/devel/p5-SVN-Hook/Makefile ============================================================================== --- branches/2014Q1/devel/p5-SVN-Hook/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/devel/p5-SVN-Hook/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -7,7 +7,7 @@ CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Perl module for managing Subversion hook scripts RUN_DEPENDS= p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \ Modified: branches/2014Q1/devel/p5-SVN-Hooks/Makefile ============================================================================== --- branches/2014Q1/devel/p5-SVN-Hooks/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/devel/p5-SVN-Hooks/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -7,7 +7,7 @@ CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= A framework for implementing Subversion hooks BUILD_DEPENDS= p5-Data-Util>=0:${PORTSDIR}/devel/p5-Data-Util \ Modified: branches/2014Q1/devel/p5-SVN-Look/Makefile ============================================================================== --- branches/2014Q1/devel/p5-SVN-Look/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/devel/p5-SVN-Look/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -7,7 +7,7 @@ CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Caching wrapper around the svnlook command BUILD_DEPENDS= subversion>=1.7.0:${PORTSDIR}/devel/subversion \ Modified: branches/2014Q1/devel/p5-SVN-Notify-Config/Makefile ============================================================================== --- branches/2014Q1/devel/p5-SVN-Notify-Config/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/devel/p5-SVN-Notify-Config/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -9,7 +9,7 @@ CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Perl module for config-driven Subversion notification RUN_DEPENDS= ${LOCALBASE}/bin/svnlook:${PORTSDIR}/devel/subversion \ Modified: branches/2014Q1/devel/p5-SVN-Notify-Filter-AuthZMail/Makefile ============================================================================== --- branches/2014Q1/devel/p5-SVN-Notify-Filter-AuthZMail/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/devel/p5-SVN-Notify-Filter-AuthZMail/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -8,7 +8,7 @@ CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Determines Subversion accounts to receive email via the authz file RUN_DEPENDS= p5-SVN-Notify>=2.72:${PORTSDIR}/devel/p5-SVN-Notify \ Modified: branches/2014Q1/devel/p5-SVN-Notify-Filter-EmailFlatFileDB/Makefile ============================================================================== --- branches/2014Q1/devel/p5-SVN-Notify-Filter-EmailFlatFileDB/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/devel/p5-SVN-Notify-Filter-EmailFlatFileDB/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -7,7 +7,7 @@ CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Converts account names to email address based on a flat-file database RUN_DEPENDS= p5-SVN-Notify>=2.72:${PORTSDIR}/devel/p5-SVN-Notify Modified: branches/2014Q1/devel/p5-SVN-Notify-Filter-Markdown/Makefile ============================================================================== --- branches/2014Q1/devel/p5-SVN-Notify-Filter-Markdown/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/devel/p5-SVN-Notify-Filter-Markdown/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -7,7 +7,7 @@ CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Perl module to convert SVN::Notify log messages from Markdown to HTML RUN_DEPENDS= p5-SVN-Notify>=2.70:${PORTSDIR}/devel/p5-SVN-Notify \ Modified: branches/2014Q1/devel/p5-SVN-Notify-Filter-Watchers/Makefile ============================================================================== --- branches/2014Q1/devel/p5-SVN-Notify-Filter-Watchers/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/devel/p5-SVN-Notify-Filter-Watchers/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -7,7 +7,7 @@ CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Subscribe to SVN::Notify commits with a Subversion property RUN_DEPENDS= p5-SVN-Notify>=2.72:${PORTSDIR}/devel/p5-SVN-Notify Modified: branches/2014Q1/devel/p5-SVN-Notify-Mirror/Makefile ============================================================================== --- branches/2014Q1/devel/p5-SVN-Notify-Mirror/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/devel/p5-SVN-Notify-Mirror/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -8,7 +8,7 @@ CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Keep a mirrored working copy of a repository path BUILD_DEPENDS= p5-SVN-Notify>=2.83:${PORTSDIR}/devel/p5-SVN-Notify \ Modified: branches/2014Q1/devel/p5-SVN-Notify-Snapshot/Makefile ============================================================================== --- branches/2014Q1/devel/p5-SVN-Notify-Snapshot/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/devel/p5-SVN-Notify-Snapshot/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -7,7 +7,7 @@ CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Take snapshots from Subversion activity BUILD_DEPENDS= ${LOCALBASE}/bin/svnnotify:${PORTSDIR}/devel/p5-SVN-Notify Modified: branches/2014Q1/devel/p5-XML-Pastor/Makefile ============================================================================== --- branches/2014Q1/devel/p5-XML-Pastor/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/devel/p5-XML-Pastor/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -7,7 +7,7 @@ CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Generate Perl classes with XML bindings from a W3C XSD schema BUILD_DEPENDS= p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \ Modified: branches/2014Q1/devel/patch/Makefile ============================================================================== --- branches/2014Q1/devel/patch/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/devel/patch/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -8,7 +8,7 @@ CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= patch -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= GNU patch utility LICENSE= GPLv3 Modified: branches/2014Q1/devel/pear-VersionControl_SVN/Makefile ============================================================================== --- branches/2014Q1/devel/pear-VersionControl_SVN/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/devel/pear-VersionControl_SVN/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -5,7 +5,7 @@ PORTNAME= VersionControl_SVN PORTVERSION= 0.5.0 CATEGORIES= devel pear -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Wrapper interface for the Subversion command-line client BUILD_DEPENDS= pear>=1.9.4:${PORTSDIR}/devel/pear \ Modified: branches/2014Q1/devel/pecl-spl_types/Makefile ============================================================================== --- branches/2014Q1/devel/pecl-spl_types/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/devel/pecl-spl_types/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -11,7 +11,7 @@ DISTNAME= SPL_Types-${PORTVERSION} EXTRACT_SUFX= .tgz DIST_SUBDIR= PECL -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= A PECL extension of a collection of special typehandling classes LICENSE= PHP301 Modified: branches/2014Q1/devel/rsvndump/Makefile ============================================================================== --- branches/2014Q1/devel/rsvndump/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/devel/rsvndump/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -6,7 +6,7 @@ PORTVERSION= 0.5.8 CATEGORIES= devel MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Remote Subversion repository dumpfile generator GNU_CONFIGURE= yes Modified: branches/2014Q1/devel/ruby-cvs/Makefile ============================================================================== --- branches/2014Q1/devel/ruby-cvs/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/devel/ruby-cvs/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -9,7 +9,7 @@ PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} DISTNAME= ruby-${PORTNAME}.tar.gz\?only_with_tag=ruby-${PORTNAME}-${PORTVERSION:S/./_/g}\&view=tar DIST_SUBDIR= ruby -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= A Ruby library to provide a high level interface to a CVS repository DEPRECATED= Broken for more than 6 month Modified: branches/2014Q1/devel/rubygem-childprocess/Makefile ============================================================================== --- branches/2014Q1/devel/rubygem-childprocess/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/devel/rubygem-childprocess/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -6,7 +6,7 @@ PORTVERSION= 0.3.9 CATEGORIES= devel rubygems MASTER_SITES= RG -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= External background process controller RUN_DEPENDS= rubygem-ffi>=1.0.11:${PORTSDIR}/devel/rubygem-ffi Modified: branches/2014Q1/devel/statcvs/Makefile ============================================================================== --- branches/2014Q1/devel/statcvs/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/devel/statcvs/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -7,7 +7,7 @@ CATEGORIES= devel java MASTER_SITES= SF/${PORTNAME}/Download%20StatCVS/${PORTVERSION} DISTNAME= ${PORTNAME}-${PORTVERSION}-source -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= CVS repository activity report generator RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper Modified: branches/2014Q1/devel/statsvn/Makefile ============================================================================== --- branches/2014Q1/devel/statsvn/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/devel/statsvn/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -8,7 +8,7 @@ CATEGORIES= devel java MASTER_SITES= SF DISTNAME= ${PORTNAME}-${PORTVERSION}-source -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Subversion repository activity report generator RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper \ Modified: branches/2014Q1/devel/zthread/Makefile ============================================================================== --- branches/2014Q1/devel/zthread/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/devel/zthread/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -8,7 +8,7 @@ CATEGORIES= devel MASTER_SITES= SF/${PORTNAME}/ZThread/${PORTVERSION} DISTNAME= ZThread-${PORTVERSION} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= A platform-independent object-oriented C++ threading library USE_AUTOTOOLS= libtool Modified: branches/2014Q1/graphics/GraphicsMagick/Makefile ============================================================================== --- branches/2014Q1/graphics/GraphicsMagick/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/graphics/GraphicsMagick/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -10,7 +10,7 @@ MASTER_SITES= SF \ ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/1.1/ PORTSCOUT= limit:^1\.1\. -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Fast image processing tools based on ImageMagick CONFLICTS= GraphicsMagick-1.[23].* GraphicsMagick1[23]-* Modified: branches/2014Q1/graphics/GraphicsMagick12/Makefile ============================================================================== --- branches/2014Q1/graphics/GraphicsMagick12/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/graphics/GraphicsMagick12/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -10,7 +10,7 @@ MASTER_SITES= SF \ PORTSCOUT= limit:^1\.2\. PKGNAMESUFFIX= 12 -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Fast image processing tools based on ImageMagick CONFLICTS= GraphicsMagick-1.[13].* GraphicsMagick13-* Modified: branches/2014Q1/graphics/GraphicsMagick13/Makefile ============================================================================== --- branches/2014Q1/graphics/GraphicsMagick13/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/graphics/GraphicsMagick13/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -9,7 +9,7 @@ MASTER_SITES= SF \ MASTER_SITE_SUBDIR= ${PORTNAME:L}/${PORTNAME:L}/${PORTVERSION} PKGNAMESUFFIX= 13 -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Fast image processing tools based on ImageMagick LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 \ Modified: branches/2014Q1/lang/pecl-perl/Makefile ============================================================================== --- branches/2014Q1/lang/pecl-perl/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/lang/pecl-perl/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -9,7 +9,7 @@ PKGNAMEPREFIX= pecl- EXTRACT_SUFX= .tgz DIST_SUBDIR= PECL -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Embedded Perl USE_PHP= yes Modified: branches/2014Q1/mail/ezmlm-idx/Makefile ============================================================================== --- branches/2014Q1/mail/ezmlm-idx/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/mail/ezmlm-idx/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -8,7 +8,7 @@ CATEGORIES= mail MASTER_SITES= http://www.ezmlm.org/archive/${PORTVERSION}/ \ http://ezmlm.sericyb.com.au/archive/${PORTVERSION}/ -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Improved version of the ezmlm mailing list manager MAKE_JOBS_UNSAFE= yes Modified: branches/2014Q1/mail/nullmailer/Makefile ============================================================================== --- branches/2014Q1/mail/nullmailer/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/mail/nullmailer/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -9,7 +9,7 @@ MASTER_SITES= http://untroubled.org/null http://untroubled.org/nullmailer/archive/ MASTER_SITE_SUBDIR= ${PORTVERSION} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= MTA for hosts which relay to a fixed set of smart relays LICENSE= GPLv2 Modified: branches/2014Q1/mail/smtptrapd/Makefile ============================================================================== --- branches/2014Q1/mail/smtptrapd/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/mail/smtptrapd/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -6,7 +6,7 @@ PORTVERSION= 1.6 CATEGORIES= mail MASTER_SITES= SF -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= RFC 2821 compliant SMTP service that always returns a 4xx soft error CFLAGS+= ${PTHREAD_CFLAGS} ${PTHREAD_LIBS} Modified: branches/2014Q1/math/freemat/Makefile ============================================================================== --- branches/2014Q1/math/freemat/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/math/freemat/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -12,7 +12,7 @@ MASTER_SITE_SUBDIR= freemat/FreeMat4 PKGNAMESUFFIX= -mpi .endif -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= An environment for rapid engineering and scientific processing LIB_DEPENDS= lapack.4:${PORTSDIR}/math/lapack \ Modified: branches/2014Q1/math/pecl-bitset/Makefile ============================================================================== --- branches/2014Q1/math/pecl-bitset/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/math/pecl-bitset/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -9,7 +9,7 @@ PKGNAMEPREFIX= pecl- EXTRACT_SUFX= .tgz DIST_SUBDIR= PECL -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= A PECL extension for manipulating bitsets USE_PHP= yes Modified: branches/2014Q1/math/py-numeric/Makefile ============================================================================== --- branches/2014Q1/math/py-numeric/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/math/py-numeric/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -12,7 +12,7 @@ DISTFILES= Numeric-${PORTVERSION}${EXTRA numpy.pdf:doc EXTRACT_ONLY= Numeric-${PORTVERSION}${EXTRACT_SUFX} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= The Numeric Extension to Python USE_PYTHON= yes Modified: branches/2014Q1/net/easysoap/Makefile ============================================================================== --- branches/2014Q1/net/easysoap/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/net/easysoap/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -8,7 +8,7 @@ CATEGORIES= net MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/SWANSONG DISTNAME= EasySoap++-${PORTVERSION} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= C++ SOAP Library based on expat LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 Modified: branches/2014Q1/net/p5-Amazon-SQS-Simple/Makefile ============================================================================== --- branches/2014Q1/net/p5-Amazon-SQS-Simple/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/net/p5-Amazon-SQS-Simple/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -8,7 +8,7 @@ MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:SWHITAKER PKGNAMEPREFIX= p5- -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= OO API for accessing the Amazon Simple Queue Service BUILD_DEPENDS= p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \ Modified: branches/2014Q1/net/p5-Net-Amazon-EC2/Makefile ============================================================================== --- branches/2014Q1/net/p5-Net-Amazon-EC2/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/net/p5-Net-Amazon-EC2/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -7,7 +7,7 @@ CATEGORIES= net perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Perl interface to the Amazon Elastic Compute Cloud RUN_DEPENDS= p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \ Modified: branches/2014Q1/net/p5-Net-Amazon-MechanicalTurk/Makefile ============================================================================== --- branches/2014Q1/net/p5-Net-Amazon-MechanicalTurk/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/net/p5-Net-Amazon-MechanicalTurk/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -7,7 +7,7 @@ CATEGORIES= net perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Perl interface to the Amazon Mechanical Turk RUN_DEPENDS= p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \ Modified: branches/2014Q1/net/p5-Net-Amazon-Signature/Makefile ============================================================================== --- branches/2014Q1/net/p5-Net-Amazon-Signature/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/net/p5-Net-Amazon-Signature/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -7,7 +7,7 @@ CATEGORIES= net perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Perl interface to create Amazon AWS signatures TEST_DEPENDS= p5-Spiffy>=0:${PORTSDIR}/devel/p5-Spiffy \ Modified: branches/2014Q1/net/p5-Net-Amazon-Thumbnail/Makefile ============================================================================== --- branches/2014Q1/net/p5-Net-Amazon-Thumbnail/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/net/p5-Net-Amazon-Thumbnail/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -8,7 +8,7 @@ CATEGORIES= net perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Perl interface to Amazon Alexa Site Thumbnail web service RUN_DEPENDS= p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \ Modified: branches/2014Q1/net/p5-Net-Mosso-CloudFiles/Makefile ============================================================================== --- branches/2014Q1/net/p5-Net-Mosso-CloudFiles/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/net/p5-Net-Mosso-CloudFiles/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -7,7 +7,7 @@ CATEGORIES= net perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Perl interface to the Mosso CloudFiles service RUN_DEPENDS= p5-Digest-MD5-File>=0:${PORTSDIR}/security/p5-Digest-MD5-File \ Modified: branches/2014Q1/net/rubygem-rightaws/Makefile ============================================================================== --- branches/2014Q1/net/rubygem-rightaws/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/net/rubygem-rightaws/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -7,7 +7,7 @@ CATEGORIES= net rubygems MASTER_SITES= RG DISTNAME= right_aws-${PORTVERSION} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Provides access to Amazon EC2, S3, SQS, and SDB web services LICENSE= MIT Modified: branches/2014Q1/net/rubygem-rightflexiscale/Makefile ============================================================================== --- branches/2014Q1/net/rubygem-rightflexiscale/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/net/rubygem-rightflexiscale/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -7,7 +7,7 @@ CATEGORIES= net rubygems MASTER_SITES= RG DISTNAME= right_flexiscale-${PORTVERSION} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Provides Ruby access to the Flexiscale API RUN_DEPENDS= rubygem-righthttpconnection>=1.2.4:${PORTSDIR}/net/rubygem-righthttpconnection \ Modified: branches/2014Q1/net/rubygem-rightgogrid/Makefile ============================================================================== --- branches/2014Q1/net/rubygem-rightgogrid/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/net/rubygem-rightgogrid/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -7,7 +7,7 @@ CATEGORIES= net rubygems MASTER_SITES= RG DISTNAME= right_gogrid-${PORTVERSION} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Provides Ruby access to the GoGrid API RUN_DEPENDS= rubygem-righthttpconnection>=1.2.4:${PORTSDIR}/net/rubygem-righthttpconnection Modified: branches/2014Q1/net/rubygem-righthttpconnection/Makefile ============================================================================== --- branches/2014Q1/net/rubygem-righthttpconnection/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/net/rubygem-righthttpconnection/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -7,7 +7,7 @@ CATEGORIES= net rubygems MASTER_SITES= RG DISTNAME= right_http_connection-${PORTVERSION} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Persistent HTTP/HTTPS connections with error retries USE_RUBY= yes Modified: branches/2014Q1/net/rubygem-rightslicehost/Makefile ============================================================================== --- branches/2014Q1/net/rubygem-rightslicehost/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/net/rubygem-rightslicehost/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -7,7 +7,7 @@ CATEGORIES= net rubygems MASTER_SITES= RG DISTNAME= right_slicehost-${PORTVERSION} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Provides Ruby access to the Slicehost API RUN_DEPENDS= rubygem-righthttpconnection>=1.2.4:${PORTSDIR}/net/rubygem-righthttpconnection Modified: branches/2014Q1/print/pdftk/Makefile ============================================================================== --- branches/2014Q1/print/pdftk/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/print/pdftk/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -7,7 +7,7 @@ CATEGORIES= print MASTER_SITES= http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/ DISTNAME= ${PORTNAME}-${PORTVERSION}-src -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Simple tool for doing everyday things with PDF documents LICENSE= GPLv2 Modified: branches/2014Q1/security/libksba/Makefile ============================================================================== --- branches/2014Q1/security/libksba/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/security/libksba/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -9,7 +9,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= KSBA is an X.509 Library BUILD_DEPENDS+= libgpg-error>=1.10:${PORTSDIR}/security/libgpg-error Modified: branches/2014Q1/security/logcheck/Makefile ============================================================================== --- branches/2014Q1/security/logcheck/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/security/logcheck/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -8,7 +8,7 @@ CATEGORIES= security MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL} DISTNAME= ${PORTNAME}_${PORTVERSION} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Auditing tool for system logs on Unix boxes RUN_DEPENDS= mime-construct:${PORTSDIR}/mail/mime-construct \ Modified: branches/2014Q1/security/ossec-hids-server/Makefile ============================================================================== --- branches/2014Q1/security/ossec-hids-server/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/security/ossec-hids-server/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -9,7 +9,7 @@ MASTER_SITES= http://www.ossec.net/files http://www.ossec.net/files/old/ PKGNAMESUFFIX= -server -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT?= A security tool to monitor and check logs and intrusions USE_RC_SUBR= ossec-hids Modified: branches/2014Q1/security/p5-Apache-Htpasswd/Makefile ============================================================================== --- branches/2014Q1/security/p5-Apache-Htpasswd/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/security/p5-Apache-Htpasswd/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -7,7 +7,7 @@ CATEGORIES= security perl5 www MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Manage Unix crypt-style password file BUILD_DEPENDS= p5-Crypt-PasswdMD5>=0:${PORTSDIR}/security/p5-Crypt-PasswdMD5 \ Modified: branches/2014Q1/security/phpdeadlock/Makefile ============================================================================== --- branches/2014Q1/security/phpdeadlock/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/security/phpdeadlock/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -8,7 +8,7 @@ CATEGORIES= security www MASTER_SITES= SF/${PORTNAME}/Deadlock/${PORTVERSION}%20Stable DISTNAME= Deadlock-${PORTVERSION}-Stable -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Web-based user authentication/password protection system WRKSRC= ${WRKDIR}/Deadlock-1.01 Modified: branches/2014Q1/security/rubygem-gpgr/Makefile ============================================================================== --- branches/2014Q1/security/rubygem-gpgr/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/security/rubygem-gpgr/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -7,7 +7,7 @@ PORTREVISION= 1 CATEGORIES= security rubygems MASTER_SITES= RG -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Very light interface to the command-line GPG tool RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg Modified: branches/2014Q1/sysutils/aimage/Makefile ============================================================================== --- branches/2014Q1/sysutils/aimage/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/sysutils/aimage/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -6,7 +6,7 @@ PORTVERSION= 3.2.5 CATEGORIES= sysutils MASTER_SITES= http://digitalcorpora.org/downloads/ -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Advanced Disk Imager LIB_DEPENDS= afflib:${PORTSDIR}/sysutils/afflib Modified: branches/2014Q1/sysutils/feather/Makefile ============================================================================== --- branches/2014Q1/sysutils/feather/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/sysutils/feather/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -7,7 +7,7 @@ CATEGORIES= sysutils python MASTER_SITES= http://www.sourcehosting.net/freebsd/distfiles/ \ LOCAL/glarkin -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= A Python script for managing tarsnap backups RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=0:${PORTSDIR}/devel/py-yaml \ Modified: branches/2014Q1/sysutils/pmt/Makefile ============================================================================== --- branches/2014Q1/sysutils/pmt/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/sysutils/pmt/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -7,7 +7,7 @@ CATEGORIES= sysutils MASTER_SITES= http://hansmi.ch/download/pmt/ \ LOCAL/glarkin -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= A small collection of filters which can be added to UNIX pipes USE_BZIP2= yes Modified: branches/2014Q1/sysutils/rubygem-hiera-json/Makefile ============================================================================== --- branches/2014Q1/sysutils/rubygem-hiera-json/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/sysutils/rubygem-hiera-json/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -6,7 +6,7 @@ PORTVERSION= 0.4.0 CATEGORIES= sysutils rubygems MASTER_SITES= RG -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= A backend for Hiera that queries JSON data RUN_DEPENDS= puppet>=0:${PORTSDIR}/sysutils/puppet \ Modified: branches/2014Q1/sysutils/rubygem-hiera-puppet/Makefile ============================================================================== --- branches/2014Q1/sysutils/rubygem-hiera-puppet/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/sysutils/rubygem-hiera-puppet/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -7,7 +7,7 @@ PORTREVISION= 1 CATEGORIES= sysutils rubygems MASTER_SITES= RG -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= A data backend for Hiera that queries the Puppet scope for data RUN_DEPENDS= puppet>=0:${PORTSDIR}/sysutils/puppet27 \ Modified: branches/2014Q1/textproc/docbook2X/Makefile ============================================================================== --- branches/2014Q1/textproc/docbook2X/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/textproc/docbook2X/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -7,7 +7,7 @@ PORTREVISION= 3 CATEGORIES= textproc MASTER_SITES= SF -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Convert DocBook documents into UNIX man page and GNU Texinfo formats BUILD_DEPENDS= p5-XML-NamespaceSupport>=0:${PORTSDIR}/textproc/p5-XML-NamespaceSupport \ Modified: branches/2014Q1/textproc/p5-File-Inplace/Makefile ============================================================================== --- branches/2014Q1/textproc/p5-File-Inplace/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/textproc/p5-File-Inplace/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -7,7 +7,7 @@ CATEGORIES= textproc perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Perl module for in-place editing of files USES= perl5 Modified: branches/2014Q1/www/cakephp11/Makefile ============================================================================== --- branches/2014Q1/www/cakephp11/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/www/cakephp11/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -10,7 +10,7 @@ MASTER_SITES= http://www.sourcehosting.n PKGNAMESUFFIX= 11 DISTNAME= cake_${PORTVERSION} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= A framework for developing PHP web applications USE_BZIP2= yes Modified: branches/2014Q1/www/cakephp12/Makefile ============================================================================== --- branches/2014Q1/www/cakephp12/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/www/cakephp12/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -9,7 +9,7 @@ MASTER_SITES= https://github.com/${PORTN PKGNAMESUFFIX= 12 DISTNAME= ${PORTNAME}-${PORTNAME}-${PORTVERSION}-${GITVERSION} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= A framework for developing PHP web applications GITVERSION= 0-ge6e50e8 Modified: branches/2014Q1/www/codeigniter17/Makefile ============================================================================== --- branches/2014Q1/www/codeigniter17/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/www/codeigniter17/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -8,7 +8,7 @@ MASTER_SITES= http://codeigniter.com/dow LOCAL/glarkin DISTNAME= CodeIgniter_${PORTVERSION} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= A framework for developing PHP web applications USE_ZIP= yes Modified: branches/2014Q1/www/dojo-shrinksafe/Makefile ============================================================================== --- branches/2014Q1/www/dojo-shrinksafe/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/www/dojo-shrinksafe/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -9,7 +9,7 @@ MASTER_SITES= http://download.dojotoolk PKGNAMEPREFIX= dojo- DISTNAME= ${PKGNAMEPREFIX}release-${PORTVERSION}-${PORTNAME} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= JavaScript code compressor USE_JAVA= yes Modified: branches/2014Q1/www/p5-LWP-ConnCache-MaxKeepAliveRequests/Makefile ============================================================================== --- branches/2014Q1/www/p5-LWP-ConnCache-MaxKeepAliveRequests/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/www/p5-LWP-ConnCache-MaxKeepAliveRequests/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -7,7 +7,7 @@ CATEGORIES= www perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= A connection cache that enforces a max keep alive limit RUN_DEPENDS= p5-libwww>=0:${PORTSDIR}/www/p5-libwww \ Modified: branches/2014Q1/www/p5-Template-GD/Makefile ============================================================================== --- branches/2014Q1/www/p5-Template-GD/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/www/p5-Template-GD/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -7,7 +7,7 @@ CATEGORIES= www textproc perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Template Toolkit plugin to interface with GD modules BUILD_DEPENDS= p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit Modified: branches/2014Q1/www/prado/Makefile ============================================================================== --- branches/2014Q1/www/prado/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/www/prado/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -9,7 +9,7 @@ MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} PROJECTHOST= prado3 DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= A framework for developing PHP web applications WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} Modified: branches/2014Q1/www/smarty2/Makefile ============================================================================== --- branches/2014Q1/www/smarty2/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/www/smarty2/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -8,7 +8,7 @@ MASTER_SITES= http://www.smarty.net/file http://www.smarty.net/files/docs/:manual DISTFILES= Smarty-${PORTVERSION}${EXTRACT_SUFX} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= The PHP compiling template engine USE_ZIP= yes Modified: branches/2014Q1/www/trac-batchmodify/Makefile ============================================================================== --- branches/2014Q1/www/trac-batchmodify/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/www/trac-batchmodify/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -9,7 +9,7 @@ MASTER_SITES= http://www.sourcehosting.n PKGNAMEPREFIX= trac- DISTNAME= ${PORTNAME}plugin-${PORTVERSION} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Enables users to modify several tickets together at once RUN_DEPENDS+= trac>=0.12:${PORTSDIR}/www/trac Modified: branches/2014Q1/www/trac-calendar/Makefile ============================================================================== --- branches/2014Q1/www/trac-calendar/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/www/trac-calendar/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -9,7 +9,7 @@ MASTER_SITES= http://www.gerritbeine.de/ PKGNAMEPREFIX= trac- DISTNAME= ${PORTNAME}plugin-${PORTVERSION} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Calendar plugin for trac RUN_DEPENDS+= tracd:${PORTSDIR}/www/trac Modified: branches/2014Q1/www/trac-ccselector/Makefile ============================================================================== --- branches/2014Q1/www/trac-ccselector/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/www/trac-ccselector/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -10,7 +10,7 @@ MASTER_SITES= http://www.sourcehosting.n PKGNAMEPREFIX= trac- DISTNAME= ${PORTNAME}plugin-${PORTVERSION} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Visually edit the Trac ticket CC field RUN_DEPENDS+= tracd:${PORTSDIR}/www/trac Modified: branches/2014Q1/www/trac-codetags/Makefile ============================================================================== --- branches/2014Q1/www/trac-codetags/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/www/trac-codetags/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -9,7 +9,7 @@ MASTER_SITES= http://www.gerritbeine.de/ PKGNAMEPREFIX= trac- DISTNAME= ${PORTNAME}plugin-${PORTVERSION} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Plugin for displaying code tags RUN_DEPENDS+= tracd:${PORTSDIR}/www/trac Modified: branches/2014Q1/www/trac-customfieldadmin/Makefile ============================================================================== --- branches/2014Q1/www/trac-customfieldadmin/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/www/trac-customfieldadmin/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -11,7 +11,7 @@ MASTER_SITES= http://www.sourcehosting.n PKGNAMEPREFIX= trac- DISTNAME= ${PORTNAME}plugin-${PORTVERSION} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Web interface to administer Trac ticket custom fields RUN_DEPENDS+= tracd:${PORTSDIR}/www/trac Modified: branches/2014Q1/www/trac-estimator/Makefile ============================================================================== --- branches/2014Q1/www/trac-estimator/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/www/trac-estimator/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -9,7 +9,7 @@ MASTER_SITES= http://www.sourcehosting.n PKGNAMEPREFIX= trac- DISTNAME= ${PORTNAME}plugin-${PORTVERSION} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Produce detailed range-based estimations for Trac tickets RUN_DEPENDS+= tracd:${PORTSDIR}/www/trac Modified: branches/2014Q1/www/trac-hierwiki/Makefile ============================================================================== --- branches/2014Q1/www/trac-hierwiki/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/www/trac-hierwiki/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -9,7 +9,7 @@ MASTER_SITES= http://www.gerritbeine.de/ PKGNAMEPREFIX= trac- DISTNAME= ${PORTNAME}plugin-${PORTVERSION} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Dealing with the trac wiki as a hierarchy RUN_DEPENDS+= tracd:${PORTSDIR}/www/trac Modified: branches/2014Q1/www/trac-ldap/Makefile ============================================================================== --- branches/2014Q1/www/trac-ldap/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/www/trac-ldap/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -9,7 +9,7 @@ MASTER_SITES= http://www.gerritbeine.de/ PKGNAMEPREFIX= trac- DISTNAME= ${PORTNAME}plugin-${PORTVERSION} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= LDAP extensions for Trac RUN_DEPENDS+= tracd:${PORTSDIR}/www/trac \ Modified: branches/2014Q1/www/trac-macropost/Makefile ============================================================================== --- branches/2014Q1/www/trac-macropost/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/www/trac-macropost/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -9,7 +9,7 @@ MASTER_SITES= http://www.gerritbeine.de/ PKGNAMEPREFIX= trac- DISTNAME= ${PORTNAME}plugin-${PORTVERSION} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Allows Macros to use POST in forms RUN_DEPENDS+= tracd:${PORTSDIR}/www/trac Modified: branches/2014Q1/www/trac-mastertickets/Makefile ============================================================================== --- branches/2014Q1/www/trac-mastertickets/Makefile Thu Dec 26 17:18:39 2013 (r337562) +++ branches/2014Q1/www/trac-mastertickets/Makefile Thu Dec 26 17:22:28 2013 (r337563) @@ -9,7 +9,7 @@ MASTER_SITES= http://mirrors.redv.com/pu PKGNAMEPREFIX= trac- DISTNAME= coderanger-trac-${PORTNAME}-43a7537 -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Support for ticket dependencies *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 27 09:57:19 2013 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 42D1538F; Fri, 27 Dec 2013 09:57:19 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 164BE115C; Fri, 27 Dec 2013 09:57:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBR9vIXH063962; Fri, 27 Dec 2013 09:57:18 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBR9vIcZ063960; Fri, 27 Dec 2013 09:57:18 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312270957.rBR9vIcZ063960@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 27 Dec 2013 09:57:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337674 - in branches/2014Q1/shells/rssh: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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: Fri, 27 Dec 2013 09:57:19 -0000 Author: bapt Date: Fri Dec 27 09:57:18 2013 New Revision: 337674 URL: http://svnweb.freebsd.org/changeset/ports/337674 Log: MFH: r337656 Support stage Fix build with clang on head (symbol collision) Added: branches/2014Q1/shells/rssh/files/ - copied from r337656, head/shells/rssh/files/ Modified: branches/2014Q1/shells/rssh/Makefile branches/2014Q1/shells/rssh/pkg-plist (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/shells/rssh/Makefile ============================================================================== --- branches/2014Q1/shells/rssh/Makefile Fri Dec 27 09:54:22 2013 (r337673) +++ branches/2014Q1/shells/rssh/Makefile Fri Dec 27 09:57:18 2013 (r337674) @@ -11,29 +11,15 @@ COMMENT= Restricted Secure SHell only fo GNU_CONFIGURE= yes -MAN1= rssh.1 -MAN5= rssh.conf.5 - +USE_CSTD= gnu89 OPTIONS_DEFINE= RDIST RDIST_DESC= rdist support - -NO_STAGE= yes -.include - -.if ${PORT_OPTIONS:MRDIST} -RUN_DEPENDS+= ${LOCALBASE}/bin/rdist6:${PORTSDIR}/net/rdist6 -CONFIGURE_ARGS+=--with-rdist=${LOCALBASE}/bin/rdist6 -.endif +RDIST_RUN_DEPENDS= rdist6:${PORTSDIR}/net/rdist6 +RDIST_CONFIGURE_ON= --with-rdist=${LOCALBASE}/bin/rdist6 post-patch: @${REINPLACE_CMD} -E -e 's,(\$$\(DESTDIR\)\$$\(sysconfdir\)/\$$\$$f),\1.dist,g' \ + -e 's,u\+s ,u+s $$\(DESTDIR\),g' \ ${WRKSRC}/Makefile.in -post-install: - @${ECHO_MSG} "updating /etc/shells" - @${CP} /etc/shells /etc/shells.bak - @(${GREP} -v ${PREFIX}/bin/${PORTNAME} /etc/shells.bak; \ - ${ECHO_CMD} ${PREFIX}/bin/${PORTNAME}) > /etc/shells - @${RM} /etc/shells.bak - .include Modified: branches/2014Q1/shells/rssh/pkg-plist ============================================================================== --- branches/2014Q1/shells/rssh/pkg-plist Fri Dec 27 09:54:22 2013 (r337673) +++ branches/2014Q1/shells/rssh/pkg-plist Fri Dec 27 09:57:18 2013 (r337674) @@ -1,5 +1,6 @@ -@comment $FreeBSD$ bin/rssh +man/man1/rssh.1.gz +man/man5/rssh.conf.5.gz @exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells; rm -f /etc/shells.bak @unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells; rm -f /etc/shells.bak etc/rssh.conf.default.dist From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 27 10:26:20 2013 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 E7314673; Fri, 27 Dec 2013 10:26:20 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D2F3E1331; Fri, 27 Dec 2013 10:26:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBRAQKFq076565; Fri, 27 Dec 2013 10:26:20 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBRAQKsE076564; Fri, 27 Dec 2013 10:26:20 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312271026.rBRAQKsE076564@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 27 Dec 2013 10:26:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337693 - in branches/2014Q1/news/mmail: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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: Fri, 27 Dec 2013 10:26:21 -0000 Author: bapt Date: Fri Dec 27 10:26:20 2013 New Revision: 337693 URL: http://svnweb.freebsd.org/changeset/ports/337693 Log: MFH: r337688 Support stage Fix build with modern compilers Added: branches/2014Q1/news/mmail/files/ - copied from r337688, head/news/mmail/files/ Modified: branches/2014Q1/news/mmail/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/news/mmail/Makefile ============================================================================== --- branches/2014Q1/news/mmail/Makefile Fri Dec 27 10:24:43 2013 (r337692) +++ branches/2014Q1/news/mmail/Makefile Fri Dec 27 10:26:20 2013 (r337693) @@ -12,15 +12,14 @@ COMMENT= Offline BBS mail packet reader RUN_DEPENDS= zip:${PORTSDIR}/archivers/zip \ unzip:${PORTSDIR}/archivers/unzip -USE_GMAKE= yes +USES= gmake MAKE_ARGS= OPTS="" -MAN1= mmail.1 -PLIST_FILES= bin/mmail +PLIST_FILES= bin/mmail \ + man/man1/mmail.1.gz -NO_STAGE= yes do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/mm ${PREFIX}/bin/mmail - ${INSTALL_MAN} ${WRKSRC}/mm.1 ${MANPREFIX}/man/man1/mmail.1 + ${INSTALL_PROGRAM} ${WRKSRC}/mm ${STAGEDIR}${PREFIX}/bin/mmail + ${INSTALL_MAN} ${WRKSRC}/mm.1 ${STAGEDIR}${MANPREFIX}/man/man1/mmail.1 .include From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 27 10:26:36 2013 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 EF6BF74A; Fri, 27 Dec 2013 10:26:36 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DB6971335; Fri, 27 Dec 2013 10:26:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBRAQaLX076676; Fri, 27 Dec 2013 10:26:36 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBRAQa5m076674; Fri, 27 Dec 2013 10:26:36 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312271026.rBRAQa5m076674@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 27 Dec 2013 10:26:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337694 - branches/2014Q1/news/newscache X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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: Fri, 27 Dec 2013 10:26:37 -0000 Author: bapt Date: Fri Dec 27 10:26:36 2013 New Revision: 337694 URL: http://svnweb.freebsd.org/changeset/ports/337694 Log: MFH: r337683 Support stage Fix configure script with clang Modified: branches/2014Q1/news/newscache/Makefile branches/2014Q1/news/newscache/pkg-plist Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/news/newscache/Makefile ============================================================================== --- branches/2014Q1/news/newscache/Makefile Fri Dec 27 10:26:20 2013 (r337693) +++ branches/2014Q1/news/newscache/Makefile Fri Dec 27 10:26:36 2013 (r337694) @@ -11,7 +11,7 @@ DISTNAME= NewsCache-${PORTVERSION:S/.r./ MAINTAINER= ports@FreeBSD.org COMMENT= NewsCache is a free cache server for USENET News -LIB_DEPENDS= socket[+][+].1:${PORTSDIR}/net/libsocket++ +LIB_DEPENDS= libsocket++.so:${PORTSDIR}/net/libsocket++ USE_AUTOTOOLS= automake autoheader autoconf AUTOMAKE_ARGS= --add-missing @@ -20,13 +20,12 @@ LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+=--sysconfdir=${PREFIX}/etc USE_RC_SUBR= ${PORTNAME} -MAN5= newscache.conf.5 -MAN8= newscache.8 newscacheclean.8 updatenews.8 INFO= NewsCache -NO_STAGE= yes post-patch: - ${REINPLACE_CMD} -e "s,-pedantic,," ${WRKSRC}/configure.in + ${REINPLACE_CMD} -e "s,-pedantic,," \ + -e "s,^main,int main," \ + ${WRKSRC}/configure.in pre-configure: (cd ${WRKSRC}; ${SETENV} ${SCRIPTS_ENV} ${SH} ./autogen) Modified: branches/2014Q1/news/newscache/pkg-plist ============================================================================== --- branches/2014Q1/news/newscache/pkg-plist Fri Dec 27 10:26:20 2013 (r337693) +++ branches/2014Q1/news/newscache/pkg-plist Fri Dec 27 10:26:36 2013 (r337694) @@ -3,3 +3,7 @@ etc/newscache.conf-dist etc/newscache.auth-dist sbin/newscache sbin/newscacheclean +man/man5/newscache.conf.5.gz +man/man8/newscache.8.gz +man/man8/newscacheclean.8.gz +man/man8/updatenews.8.gz From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 27 10:27:36 2013 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 C06AC82C; Fri, 27 Dec 2013 10:27:36 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id AC6771341; Fri, 27 Dec 2013 10:27:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBRARauv076877; Fri, 27 Dec 2013 10:27:36 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBRARaxX076876; Fri, 27 Dec 2013 10:27:36 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312271027.rBRARaxX076876@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 27 Dec 2013 10:27:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337695 - branches/2014Q1/news/newsfetch X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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: Fri, 27 Dec 2013 10:27:36 -0000 Author: bapt Date: Fri Dec 27 10:27:36 2013 New Revision: 337695 URL: http://svnweb.freebsd.org/changeset/ports/337695 Log: MFH: r337681 Support stage Fix build with clang Allow packaging as user Modified: branches/2014Q1/news/newsfetch/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/news/newsfetch/Makefile ============================================================================== --- branches/2014Q1/news/newsfetch/Makefile Fri Dec 27 10:26:36 2013 (r337694) +++ branches/2014Q1/news/newsfetch/Makefile Fri Dec 27 10:27:36 2013 (r337695) @@ -13,11 +13,11 @@ COMMENT= Download news articles from NNT MAKE_ENV= BINDIR="${PREFIX}/bin" MANDIR="${PREFIX}/man/man" -MAN1= newsfetch.1 -MANCOMPRESSED= maybe -PLIST_FILES= bin/newsfetch +USES= uidfix +CFLAGS+= -Wno-return-type +PLIST_FILES= bin/newsfetch \ + man/man1/newsfetch.1.gz -NO_STAGE= yes do-configure: cd ${WRKSRC} && ( \ ${ECHO_CMD} "PROG= newsfetch"; \ From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 27 12:38:02 2013 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 CA03693; Fri, 27 Dec 2013 12:38:02 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9B8B51D77; Fri, 27 Dec 2013 12:38:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBRCc2pn026860; Fri, 27 Dec 2013 12:38:02 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBRCc2ja026856; Fri, 27 Dec 2013 12:38:02 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201312271238.rBRCc2ja026856@svn.freebsd.org> From: Antoine Brodin Date: Fri, 27 Dec 2013 12:38:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337724 - in branches/2014Q1: devel/codeblocks print/scribus textproc/sigil X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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: Fri, 27 Dec 2013 12:38:02 -0000 Author: antoine Date: Fri Dec 27 12:38:01 2013 New Revision: 337724 URL: http://svnweb.freebsd.org/changeset/ports/337724 Log: MFH: r337723 Fix LIB_DEPENDS Approved by: portmgr (implicit) Modified: branches/2014Q1/devel/codeblocks/Makefile branches/2014Q1/print/scribus/Makefile branches/2014Q1/textproc/sigil/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/devel/codeblocks/Makefile ============================================================================== --- branches/2014Q1/devel/codeblocks/Makefile Fri Dec 27 12:34:09 2013 (r337723) +++ branches/2014Q1/devel/codeblocks/Makefile Fri Dec 27 12:38:01 2013 (r337724) @@ -15,7 +15,7 @@ LICENSE_COMB= multi BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip LIB_DEPENDS= libboost_system.so:${PORTSDIR}/devel/boost-libs \ - libhunspell.so:${PORTSDIR}/textproc/hunspell \ + libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell \ librsync.so:${PORTSDIR}/net/librsync RUN_DEPENDS= update-mime-database:${PORTSDIR}/misc/shared-mime-info Modified: branches/2014Q1/print/scribus/Makefile ============================================================================== --- branches/2014Q1/print/scribus/Makefile Fri Dec 27 12:34:09 2013 (r337723) +++ branches/2014Q1/print/scribus/Makefile Fri Dec 27 12:38:01 2013 (r337724) @@ -18,7 +18,7 @@ LIB_DEPENDS= libjpeg.so:${PORTSDIR}/grap libfreetype.so:${PORTSDIR}/print/freetype2 \ libpodofo.so:${PORTSDIR}/graphics/podofo \ libboost_thread.so:${PORTSDIR}/devel/boost-libs \ - libhunspell.so:${PORTSDIR}/textproc/hunspell \ + libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell \ libcairo.so:${PORTSDIR}/graphics/cairo \ libhyphen.so:${PORTSDIR}/textproc/hyphen \ libexecinfo.so:${PORTSDIR}/devel/libexecinfo \ Modified: branches/2014Q1/textproc/sigil/Makefile ============================================================================== --- branches/2014Q1/textproc/sigil/Makefile Fri Dec 27 12:34:09 2013 (r337723) +++ branches/2014Q1/textproc/sigil/Makefile Fri Dec 27 12:38:01 2013 (r337724) @@ -13,7 +13,7 @@ COMMENT= WYSIWYG ePub editor LIB_DEPENDS= libboost_thread.so:${PORTSDIR}/devel/boost-libs \ libxerces-c.so:${PORTSDIR}/textproc/xerces-c3 \ - libhunspell-1.so:${PORTSDIR}/textproc/hunspell \ + libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell \ libpcre.so:${PORTSDIR}/devel/pcre LICENSE= GPLv3 From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 27 17:33:08 2013 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 866C0DE8; Fri, 27 Dec 2013 17:33:08 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6E83C114F; Fri, 27 Dec 2013 17:33:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBRHX80t039344; Fri, 27 Dec 2013 17:33:08 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBRHX836039343; Fri, 27 Dec 2013 17:33:08 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312271733.rBRHX836039343@svn.freebsd.org> From: Mathieu Arnold Date: Fri, 27 Dec 2013 17:33:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337759 - branches/2014Q1/graphics/libecwj2/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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: Fri, 27 Dec 2013 17:33:08 -0000 Author: mat Date: Fri Dec 27 17:33:07 2013 New Revision: 337759 URL: http://svnweb.freebsd.org/changeset/ports/337759 Log: MFH: r337758 Fix build on 10. maintainer timeout. PR: ports/184724 Submitted by: mat Approved by: portmgr (implicit) Modified: branches/2014Q1/graphics/libecwj2/files/patch-Source-C-NCSnet-NCScnet3-NCSProxy.cpp Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/graphics/libecwj2/files/patch-Source-C-NCSnet-NCScnet3-NCSProxy.cpp ============================================================================== --- branches/2014Q1/graphics/libecwj2/files/patch-Source-C-NCSnet-NCScnet3-NCSProxy.cpp Fri Dec 27 17:31:10 2013 (r337758) +++ branches/2014Q1/graphics/libecwj2/files/patch-Source-C-NCSnet-NCScnet3-NCSProxy.cpp Fri Dec 27 17:33:07 2013 (r337759) @@ -1,6 +1,17 @@ --- Source/C/NCSnet/NCScnet3/NCSProxy.cpp.orig 2009-04-05 21:38:54.000000000 +0400 -+++ Source/C/NCSnet/NCScnet3/NCSProxy.cpp 2009-04-05 21:39:11.000000000 +0400 -@@ -639,7 +639,7 @@ ++++ Source/C/NCSnet/NCScnet3/NCSProxy.cpp 2013-12-12 15:30:11.000000000 +0100 +@@ -43,6 +43,10 @@ + #include // for cuserid + #endif + ++#ifdef FREEBSD ++#include ++#endif ++ + /** Dialog to prompt for Username and Password. + */ + bool NCSGetPasswordDlg( const char *pszSite, const char *pszRealm, string &sUsername, string &sPassword, bool &bRememberAuth ); +@@ -639,7 +643,7 @@ return(NCSStrDup(szNameBuf)); } #elif defined(POSIX) From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 27 21:12:49 2013 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 2CF33529; Fri, 27 Dec 2013 21:12:49 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 182A6106B; Fri, 27 Dec 2013 21:12:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBRLCmIP024850; Fri, 27 Dec 2013 21:12:48 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBRLCmjS024847; Fri, 27 Dec 2013 21:12:48 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201312272112.rBRLCmjS024847@svn.freebsd.org> From: Rene Ladan Date: Fri, 27 Dec 2013 21:12:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337808 - in branches/2014Q1: lang/bf2c misc/biosfont-demos sysutils/biosfont X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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: Fri, 27 Dec 2013 21:12:49 -0000 Author: rene Date: Fri Dec 27 21:12:48 2013 New Revision: 337808 URL: http://svnweb.freebsd.org/changeset/ports/337808 Log: MFH: r337735 rene-ladan.nl is offline for now, remove the WWW: line from pkg-descr Approved by: portmgr (mat) Modified: branches/2014Q1/lang/bf2c/pkg-descr branches/2014Q1/misc/biosfont-demos/pkg-descr branches/2014Q1/sysutils/biosfont/pkg-descr Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/lang/bf2c/pkg-descr ============================================================================== --- branches/2014Q1/lang/bf2c/pkg-descr Fri Dec 27 21:11:24 2013 (r337807) +++ branches/2014Q1/lang/bf2c/pkg-descr Fri Dec 27 21:12:48 2013 (r337808) @@ -4,5 +4,3 @@ optimizing as much as possible for speed It is written for fun, self-educating purposes and to beat existing BF compilers. - -WWW: http://rene-ladan.nl/bf2c/ Modified: branches/2014Q1/misc/biosfont-demos/pkg-descr ============================================================================== --- branches/2014Q1/misc/biosfont-demos/pkg-descr Fri Dec 27 21:11:24 2013 (r337807) +++ branches/2014Q1/misc/biosfont-demos/pkg-descr Fri Dec 27 21:12:48 2013 (r337808) @@ -1,5 +1,3 @@ Two samples for the biosfont(4) kernel module: * showchar shows a requested character on stdout * showdati is a digital clock. Best viewed on 80x25 consoles. - -WWW: http://www.rene-ladan.nl/biosfont/ Modified: branches/2014Q1/sysutils/biosfont/pkg-descr ============================================================================== --- branches/2014Q1/sysutils/biosfont/pkg-descr Fri Dec 27 21:11:24 2013 (r337807) +++ branches/2014Q1/sysutils/biosfont/pkg-descr Fri Dec 27 21:12:48 2013 (r337808) @@ -1,4 +1,2 @@ This port provides a FreeBSD kernel module that can be used to retrieve the font bitmaps stored in BIOS memory. - -WWW: http://www.rene-ladan.nl/biosfont/ From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 27 21:16:05 2013 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 952226AE; Fri, 27 Dec 2013 21:16:05 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 751C91085; Fri, 27 Dec 2013 21:16:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBRLG5xE025513; Fri, 27 Dec 2013 21:16:05 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBRLG4BR025499; Fri, 27 Dec 2013 21:16:04 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201312272116.rBRLG4BR025499@svn.freebsd.org> From: Rene Ladan Date: Fri, 27 Dec 2013 21:16:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337809 - in branches/2014Q1: astro/boinc-astropulse astro/boinc-setiathome-v7 misc/biosfont-demos net/boinc-client net/boinc_curses sysutils/biosfont www/chromium X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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: Fri, 27 Dec 2013 21:16:05 -0000 Author: rene Date: Fri Dec 27 21:16:03 2013 New Revision: 337809 URL: http://svnweb.freebsd.org/changeset/ports/337809 Log: MFH: r337736 rene-ladan.nl is offline for now, move distfiles into MASTER_SITE_LOCAL Approved by: portmgr (mat) Modified: branches/2014Q1/astro/boinc-astropulse/Makefile branches/2014Q1/astro/boinc-setiathome-v7/Makefile branches/2014Q1/misc/biosfont-demos/Makefile branches/2014Q1/net/boinc-client/Makefile branches/2014Q1/net/boinc_curses/Makefile branches/2014Q1/sysutils/biosfont/Makefile branches/2014Q1/www/chromium/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/astro/boinc-astropulse/Makefile ============================================================================== --- branches/2014Q1/astro/boinc-astropulse/Makefile Fri Dec 27 21:12:48 2013 (r337808) +++ branches/2014Q1/astro/boinc-astropulse/Makefile Fri Dec 27 21:16:03 2013 (r337809) @@ -5,8 +5,10 @@ PORTNAME= boinc-astropulse PORTVERSION= 6.01 PORTREVISION= 6 CATEGORIES= astro -MASTER_SITES= ftp://rene-ladan.nl/pub/distfiles/ +MASTER_SITES= ${MASTER_SITE_LOCAL} +#MASTER_SITES+= ftp://rene-ladan.nl/pub/distfiles/ DISTNAME= astropulse-svn-1702 # modified archive, see leftout in top directory +MASTER_SITE_SUBDIR=rene MAINTAINER= rene@FreeBSD.org COMMENT= Astropulse for BOINC Modified: branches/2014Q1/astro/boinc-setiathome-v7/Makefile ============================================================================== --- branches/2014Q1/astro/boinc-setiathome-v7/Makefile Fri Dec 27 21:12:48 2013 (r337808) +++ branches/2014Q1/astro/boinc-setiathome-v7/Makefile Fri Dec 27 21:16:03 2013 (r337809) @@ -5,8 +5,10 @@ PORTNAME= boinc-setiathome-v7 PORTVERSION= 7.00 PORTREVISION= 2 CATEGORIES= astro -MASTER_SITES= ftp://rene-ladan.nl/pub/distfiles/ +MASTER_SITES= ${MASTER_SITE_LOCAL} +#MASTER_SITES+= ftp://rene-ladan.nl/pub/distfiles/ DISTNAME= setiathome-svn-1924 # modified archive, see leftout in top directory +MASTER_SITE_SUBDIR=rene MAINTAINER= rene@FreeBSD.org COMMENT= Setiathome Enhanced for BOINC Modified: branches/2014Q1/misc/biosfont-demos/Makefile ============================================================================== --- branches/2014Q1/misc/biosfont-demos/Makefile Fri Dec 27 21:12:48 2013 (r337808) +++ branches/2014Q1/misc/biosfont-demos/Makefile Fri Dec 27 21:16:03 2013 (r337809) @@ -5,7 +5,9 @@ PORTNAME= biosfont-demos PORTVERSION= 1.1 PORTREVISION= 1 CATEGORIES= misc -MASTER_SITES= ftp://rene-ladan.nl/pub/distfiles/ +MASTER_SITES= ${MASTER_SITE_LOCAL} +#MASTER_SITES+= ftp://rene-ladan.nl/pub/distfiles/ +MASTER_SITE_SUBDIR=rene MAINTAINER= rene@FreeBSD.org COMMENT= Demos for the biosfont kernel module Modified: branches/2014Q1/net/boinc-client/Makefile ============================================================================== --- branches/2014Q1/net/boinc-client/Makefile Fri Dec 27 21:12:48 2013 (r337808) +++ branches/2014Q1/net/boinc-client/Makefile Fri Dec 27 21:16:03 2013 (r337809) @@ -5,7 +5,9 @@ PORTNAME= boinc-client PORTVERSION= 7.2.28 PORTREVISION= 1 CATEGORIES= net -MASTER_SITES= ftp://rene-ladan.nl/pub/distfiles/ +MASTER_SITES= ${MASTER_SITE_LOCAL} +#MASTER_SITES+= ftp://rene-ladan.nl/pub/distfiles/ +MASTER_SITE_SUBDIR=rene MAINTAINER= rene@FreeBSD.org COMMENT= Berkeley Open Infrastructure for Network Computing client Modified: branches/2014Q1/net/boinc_curses/Makefile ============================================================================== --- branches/2014Q1/net/boinc_curses/Makefile Fri Dec 27 21:12:48 2013 (r337808) +++ branches/2014Q1/net/boinc_curses/Makefile Fri Dec 27 21:16:03 2013 (r337809) @@ -5,7 +5,9 @@ PORTNAME= boinc_curses PORTVERSION= 0.2.2 PORTREVISION= 1 CATEGORIES= net -MASTER_SITES= http://www.oook.cz/bsd/boinc_curses/ +MASTER_SITES= ${MASTER_SITE_LOCAL} \ + http://www.oook.cz/bsd/boinc_curses/ +MASTER_SITE_SUBDIR=rene MAINTAINER= rene@FreeBSD.org COMMENT= Console, ncurses based monitor and manager for BOINC Modified: branches/2014Q1/sysutils/biosfont/Makefile ============================================================================== --- branches/2014Q1/sysutils/biosfont/Makefile Fri Dec 27 21:12:48 2013 (r337808) +++ branches/2014Q1/sysutils/biosfont/Makefile Fri Dec 27 21:16:03 2013 (r337809) @@ -4,7 +4,9 @@ PORTNAME= biosfont PORTVERSION= 1.2.1 CATEGORIES= sysutils -MASTER_SITES= ftp://rene-ladan.nl/pub/distfiles/ +MASTER_SITES= ${MASTER_SITE_LOCAL} +#MASTER_SITES+= ftp://rene-ladan.nl/pub/distfiles/ +MASTER_SITE_SUBDIR=rene MAINTAINER= rene@FreeBSD.org COMMENT= Kernel module to retrieve bitmap fonts from BIOS memory Modified: branches/2014Q1/www/chromium/Makefile ============================================================================== --- branches/2014Q1/www/chromium/Makefile Fri Dec 27 21:12:48 2013 (r337808) +++ branches/2014Q1/www/chromium/Makefile Fri Dec 27 21:16:03 2013 (r337809) @@ -9,8 +9,9 @@ DISTVERSION= 31.0.1650.63 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/:testdata \ http://download.goodking.org/downloads/:browser \ - ftp://rene-ladan.nl/pub/distfiles/:browser \ + ${MASTER_SITE_LOCAL}:browser \ http://files.etoilebsd.net/goodking/:browser +MASTER_SITE_SUBDIR=rene DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:browser MAINTAINER= chromium@FreeBSD.org From owner-svn-ports-branches@FreeBSD.ORG Sat Dec 28 17:58:10 2013 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 506AFEED; Sat, 28 Dec 2013 17:58:10 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2219F1E5C; Sat, 28 Dec 2013 17:58:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBSHwAus085536; Sat, 28 Dec 2013 17:58:10 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBSHw9hc085534; Sat, 28 Dec 2013 17:58:09 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201312281758.rBSHw9hc085534@svn.freebsd.org> From: Pawel Pekala Date: Sat, 28 Dec 2013 17:58:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337887 - in branches/2014Q1/games/tuxpuck: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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, 28 Dec 2013 17:58:10 -0000 Author: pawel Date: Sat Dec 28 17:58:09 2013 New Revision: 337887 URL: http://svnweb.freebsd.org/changeset/ports/337887 Log: MFH: r337448 Respect CC PR: ports/184231 Submitted by: KATO Tsuguru Approved by: portmgr Modified: branches/2014Q1/games/tuxpuck/Makefile branches/2014Q1/games/tuxpuck/files/patch-Makefile (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/games/tuxpuck/Makefile ============================================================================== --- branches/2014Q1/games/tuxpuck/Makefile Sat Dec 28 17:45:18 2013 (r337886) +++ branches/2014Q1/games/tuxpuck/Makefile Sat Dec 28 17:58:09 2013 (r337887) @@ -22,15 +22,19 @@ USES= gmake ALL_TARGET= ${PORTNAME} MAKE_JOBS_UNSAFE= yes -CFLAGS+= -I${LOCALBASE}/include/libpng15 - PLIST_FILES= bin/${PORTNAME} man/man6/tuxpuck.6.gz post-patch: - cd ${WRKSRC}; \ - ${REINPLACE_CMD} 's|timer_create|_timer_create|g' \ - tuxpuck.c video.c timer.c intro.c tuxpuck.h - ${REINPLACE_CMD} -e 's|sdl-config|$$(SDL_CONFIG)|g' ${WRKSRC}/utils/Makefile +.for i in intro.c timer.c tuxpuck.c tuxpuck.h video.c + @${REINPLACE_CMD} -e \ + 's|timer_create|_timer_create|g' ${WRKSRC}/${i} +.endfor +.for i in data utils + @${REINPLACE_CMD} -e \ + 's|^CC|#CC| ; \ + s|^CFLAGS|#CFLAGS| ; \ + s|sdl-config|$$(SDL_CONFIG)|' ${WRKSRC}/${i}/Makefile +.endfor do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin Modified: branches/2014Q1/games/tuxpuck/files/patch-Makefile ============================================================================== --- branches/2014Q1/games/tuxpuck/files/patch-Makefile Sat Dec 28 17:45:18 2013 (r337886) +++ branches/2014Q1/games/tuxpuck/files/patch-Makefile Sat Dec 28 17:58:09 2013 (r337887) @@ -16,12 +16,12 @@ %.o : %.c - $(CC) $(CFLAGS) `sdl-config --cflags` -c -o $@ $< -+ $(CC) $(CFLAGS) `$(SDL_CONFIG) --cflags` -c -o $@ $< ++ $(CC) $(CFLAGS) `$(SDL_CONFIG) --cflags` `libpng-config --cflags` -c -o $@ $< $(NAME) : $(OBJS) cd data; $(MAKE) - $(CC) $(CFLAGS) $(OBJS) data/libdata.a `sdl-config --libs` -lm -lpng \ -+ $(CC) $(CFLAGS) $(OBJS) data/libdata.a `$(SDL_CONFIG) --libs` -lm -lpng \ ++ $(CC) $(CFLAGS) $(OBJS) data/libdata.a `$(SDL_CONFIG) --libs` `libpng-config --libs` -lm \ -ljpeg -lz -lvorbisfile -lvorbis -logg -o $(NAME) w32icon.o : data/icons/tuxpuck.ico From owner-svn-ports-branches@FreeBSD.ORG Sat Dec 28 17:59:48 2013 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 BDE39FCE; Sat, 28 Dec 2013 17:59:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A89751E66; Sat, 28 Dec 2013 17:59:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBSHxmxG085830; Sat, 28 Dec 2013 17:59:48 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBSHxmjc085824; Sat, 28 Dec 2013 17:59:48 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201312281759.rBSHxmjc085824@svn.freebsd.org> From: Pawel Pekala Date: Sat, 28 Dec 2013 17:59:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337888 - in branches/2014Q1/graphics/gsculpt: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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, 28 Dec 2013 17:59:48 -0000 Author: pawel Date: Sat Dec 28 17:59:47 2013 New Revision: 337888 URL: http://svnweb.freebsd.org/changeset/ports/337888 Log: MFH: r337731 - Fix build with clang - Remove leading article from COMMENT - Add desktop entry file - Strip library objects - Support staging Yes, I use prefix=${STAGEDIR}${PREFIX} here, after a long while it was 5 lines of REINPLACE_CMD vs rewriting scons install script. PR: ports/184868 Submitted by: KATO Tsuguru Approved by: portmgr Added: branches/2014Q1/graphics/gsculpt/files/patch-cpp__Util__Pool.h - copied unchanged from r337731, head/graphics/gsculpt/files/patch-cpp__Util__Pool.h Modified: branches/2014Q1/graphics/gsculpt/Makefile branches/2014Q1/graphics/gsculpt/pkg-plist (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/graphics/gsculpt/Makefile ============================================================================== --- branches/2014Q1/graphics/gsculpt/Makefile Sat Dec 28 17:58:09 2013 (r337887) +++ branches/2014Q1/graphics/gsculpt/Makefile Sat Dec 28 17:59:47 2013 (r337888) @@ -3,13 +3,13 @@ PORTNAME= gsculpt PORTVERSION= 0.99.47 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTNAME:S,-src,,} DISTNAME= gSculpt-${PORTVERSION}-alpha-src MAINTAINER= ports@FreeBSD.org -COMMENT= An Opensource 3D modelling application +COMMENT= Opensource 3D modelling application LICENSE= GPLv2 @@ -19,18 +19,19 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}open WRKSRC= ${WRKDIR}/${DISTNAME:S,-src,,} -USES= pkgconfig +USES= pkgconfig scons USE_GNOME= pygtk2 USE_GL= glu USE_XORG= x11 -USE_PYTHON= 2.4+ -USE_SCONS= yes -SCONS_BUILDENV= ${SCONS_ENV} +USE_PYTHON= 2 USE_LDCONFIG= ${PREFIX}/lib/gSculpt DATADIR= ${PREFIX}/share/gSculpt -NO_STAGE= yes +DESKTOP_ENTRIES="gSculpt" "" \ + "${DATADIR}/gsimages/gSculpt_Glass_Master_by_Gary_Rose.png" \ + "${PORTNAME}" "Graphics;GTK;" "" + .include .if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64" @@ -53,11 +54,21 @@ post-patch: /^cppLibs/s|BackgroundModel|BackgroundMesh|" \ ${WRKSRC}/SConstruct @${REINPLACE_CMD} -e \ - "/^prefix/s|=.*|= '${PREFIX}'| ; \ + "/^prefix/s|=.*|= '${STAGEDIR}${PREFIX}'| ; \ /^gSculptStartDir/s|=.*|= os.path.join( pysitelibdir )|" \ ${WRKSRC}/SConstruct-install + @${REINPLACE_CMD} -e \ + "s|#GSCULPT_LIBRARY_PATH#|${LOCALBASE}/lib/gSculpt|; \ + s|python|${PYTHON_CMD}|; \ + s|#GSCULPT_START#|${PYTHONPREFIX_SITELIBDIR}/gsculpt.py|" \ + ${WRKSRC}/posixbuild/gsculpt do-install: - @cd ${WRKSRC} && ${SCONS_BIN} -f SConstruct-install ${PREFIX} + @(cd ${WRKSRC} && ${SCONS} -f SConstruct-install install) + @(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -m compileall \ + -d ${PREFIX} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}) + @${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/Britefury \ + -name "*.so" -exec ${STRIP_CMD} {} \; + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gSculpt/*.so .include Copied: branches/2014Q1/graphics/gsculpt/files/patch-cpp__Util__Pool.h (from r337731, head/graphics/gsculpt/files/patch-cpp__Util__Pool.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/graphics/gsculpt/files/patch-cpp__Util__Pool.h Sat Dec 28 17:59:47 2013 (r337888, copy of r337731, head/graphics/gsculpt/files/patch-cpp__Util__Pool.h) @@ -0,0 +1,10 @@ +--- cpp/Util/Pool.h.orig ++++ cpp/Util/Pool.h +@@ -8,6 +8,7 @@ + #ifndef POOL_H__ + #define POOL_H__ + ++#include + #include + + #include Modified: branches/2014Q1/graphics/gsculpt/pkg-plist ============================================================================== --- branches/2014Q1/graphics/gsculpt/pkg-plist Sat Dec 28 17:58:09 2013 (r337887) +++ branches/2014Q1/graphics/gsculpt/pkg-plist Sat Dec 28 17:59:47 2013 (r337888) @@ -486,6 +486,7 @@ lib/gSculpt/libView.so %%PYTHON_SITELIBDIR%%/Britefury/gSculptConfig/gSculptConfig.pyc %%PYTHON_SITELIBDIR%%/Britefury/gSculptConfig/gSculptUserConfig.pyc %%PYTHON_SITELIBDIR%%/gsculpt.py +%%PYTHON_SITELIBDIR%%/gsculpt.pyc %%DATADIR%%/gsimages/background_images.png %%DATADIR%%/gsimages/background_models.png %%DATADIR%%/gsimages/draw_backg_transparent.png From owner-svn-ports-branches@FreeBSD.ORG Sat Dec 28 18:01:27 2013 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 73E971B1; Sat, 28 Dec 2013 18:01:27 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5FD161ED2; Sat, 28 Dec 2013 18:01:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBSI1RQD088428; Sat, 28 Dec 2013 18:01:27 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBSI1Roi088089; Sat, 28 Dec 2013 18:01:27 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201312281801.rBSI1Roi088089@svn.freebsd.org> From: Pawel Pekala Date: Sat, 28 Dec 2013 18:01:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337889 - in branches/2014Q1/net-p2p/jigdo: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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, 28 Dec 2013 18:01:27 -0000 Author: pawel Date: Sat Dec 28 18:01:26 2013 New Revision: 337889 URL: http://svnweb.freebsd.org/changeset/ports/337889 Log: MFH: r337742 - Fix build with clang - Fix build when GUI=on, needs pkgconfig to find GTK libs - Use options helpers, subs, modernize descriptions - Support staging Approved by: portmgr Added: branches/2014Q1/net-p2p/jigdo/files/ - copied from r337742, head/net-p2p/jigdo/files/ Modified: branches/2014Q1/net-p2p/jigdo/Makefile branches/2014Q1/net-p2p/jigdo/pkg-plist (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/net-p2p/jigdo/Makefile ============================================================================== --- branches/2014Q1/net-p2p/jigdo/Makefile Sat Dec 28 17:59:47 2013 (r337888) +++ branches/2014Q1/net-p2p/jigdo/Makefile Sat Dec 28 18:01:26 2013 (r337889) @@ -12,8 +12,6 @@ COMMENT= Utility used to retrieve large RUN_DEPENDS= ${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget -MAN1= jigdo-file.1 jigdo-lite.1 jigdo-mirror.1 - USE_BZIP2= yes USE_SUBMAKE= yes GNU_CONFIGURE= yes @@ -23,44 +21,27 @@ WITH_BDB_VER?= 43 CPPFLAGS+= -I${LOCALBASE}/include OPTIONS_DEFINE= GUI BDB NLS -OPTIONS_DEFAULT= BDB NLS +OPTIONS_DEFAULT= BDB +OPTIONS_SUB= yes -GUI_DESC= Build the gtk2 gui -BDB_DESC= Build with Berkeley DB support (for jigdo-file cache) +GUI_DESC= GTK2 Graphical User Interface +BDB_DESC= Berkeley DB support (for jigdo-file cache) -NO_STAGE= yes -.include +GUI_CONFIGURE_WITH= gui +GUI_LIB_DEPENDS= libgtk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20 \ + libcurl.so:${PORTSDIR}/ftp/curl +GUI_USES= pkgconfig + +BDB_CONFIGURE_ENV= LIBS=-L${BDB_LIB_DIR} +BDB_CONFIGURE_ON= --with-libdb=-l${BDB_LIB_CXX_NAME} +BDB_CONFIGURE_OFF= --without-libdb +BDB_CPPFLAGS= -I${BDB_INCLUDE_DIR} +BDB_USE= BDB=${WITH_BDB_VER} -.if ${PORT_OPTIONS:MGUI} -CONFIGURE_ARGS+= --with-gui -LIB_DEPENDS+= gtk-x11-2.0:${PORTSDIR}/x11-toolkits/gtk20 \ - curl:${PORTSDIR}/ftp/curl -MAN1+= jigdo.1 -PLIST_SUB+= GUI="" -.else -CONFIGURE_ARGS+=--without-gui -PLIST_SUB+= GUI="@comment " -.endif - -.if ${PORT_OPTIONS:MBDB} -CONFIGURE_ENV+= LIBS=-L${BDB_LIB_DIR} -CPPFLAGS+= -I${BDB_INCLUDE_DIR} -CONFIGURE_ARGS+=--with-libdb=-l${BDB_LIB_CXX_NAME} -USE_BDB= ${WITH_BDB_VER} -.else -CONFIGURE_ARGS+=--without-libdb -.endif - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -CONFIGURE_ARGS+=--enable-nls -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.endif +NLS_CONFIGURE_ENABLE= nls +NLS_USES= gettext post-install: - @${STRIP_CMD} ${PREFIX}/bin/jigdo-file + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/jigdo-file .include Modified: branches/2014Q1/net-p2p/jigdo/pkg-plist ============================================================================== --- branches/2014Q1/net-p2p/jigdo/pkg-plist Sat Dec 28 17:59:47 2013 (r337888) +++ branches/2014Q1/net-p2p/jigdo/pkg-plist Sat Dec 28 18:01:26 2013 (r337889) @@ -1,8 +1,12 @@ bin/jigdo-file bin/jigdo-lite bin/jigdo-mirror +man/man1/jigdo-file.1.gz +man/man1/jigdo-lite.1.gz +man/man1/jigdo-mirror.1.gz share/jigdo/debian-mirrors.jigdo %%GUI%%bin/jigdo +%%GUI%%man/man1/jigdo.1.gz %%GUI%%share/jigdo/COPYING %%GUI%%share/jigdo/pixmaps/close.png %%GUI%%share/jigdo/pixmaps/jigdo-logo.png From owner-svn-ports-branches@FreeBSD.ORG Sat Dec 28 18:02:41 2013 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 EA2B929A; Sat, 28 Dec 2013 18:02:41 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D4B2D1EDE; Sat, 28 Dec 2013 18:02:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBSI2fud089105; Sat, 28 Dec 2013 18:02:41 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBSI2fHC089104; Sat, 28 Dec 2013 18:02:41 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201312281802.rBSI2fHC089104@svn.freebsd.org> From: Pawel Pekala Date: Sat, 28 Dec 2013 18:02:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337890 - branches/2014Q1/audio/bmp-modplug X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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, 28 Dec 2013 18:02:42 -0000 Author: pawel Date: Sat Dec 28 18:02:41 2013 New Revision: 337890 URL: http://svnweb.freebsd.org/changeset/ports/337890 Log: MFH: r337744 Fix build on 10+, don't hardcode linking to libstdc++ Approved by: portmgr Modified: branches/2014Q1/audio/bmp-modplug/Makefile (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/audio/bmp-modplug/Makefile ============================================================================== --- branches/2014Q1/audio/bmp-modplug/Makefile Sat Dec 28 18:01:26 2013 (r337889) +++ branches/2014Q1/audio/bmp-modplug/Makefile Sat Dec 28 18:02:41 2013 (r337890) @@ -26,6 +26,10 @@ HAS_CONFIGURE= yes PLUGDIR?= lib/bmp/Input PLIST_FILES= ${PLUGDIR}/libmodplugbmp.so +post-patch: + @${REINPLACE_CMD} 's|-lstdc++||' ${WRKSRC}/modplugbmp/Makefile.in \ + ${WRKSRC}/modplugplay/Makefile.in + do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/${PLUGDIR} ${INSTALL_LIB} ${WRKSRC}/modplugbmp/.libs/libmodplugbmp.so \ From owner-svn-ports-branches@FreeBSD.ORG Sat Dec 28 18:03:57 2013 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 546B7388; Sat, 28 Dec 2013 18:03:57 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 26A111EEE; Sat, 28 Dec 2013 18:03:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBSI3v9e089385; Sat, 28 Dec 2013 18:03:57 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBSI3uL2089382; Sat, 28 Dec 2013 18:03:56 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201312281803.rBSI3uL2089382@svn.freebsd.org> From: Pawel Pekala Date: Sat, 28 Dec 2013 18:03:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337891 - branches/2014Q1/graphics/rgbpaint X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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, 28 Dec 2013 18:03:57 -0000 Author: pawel Date: Sat Dec 28 18:03:56 2013 New Revision: 337891 URL: http://svnweb.freebsd.org/changeset/ports/337891 Log: MFH: r337767 - Fix build on 10+ by respecting CC - Add desktop entry file - Support staging Approved by: portmgr Modified: branches/2014Q1/graphics/rgbpaint/Makefile branches/2014Q1/graphics/rgbpaint/pkg-plist (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/graphics/rgbpaint/Makefile ============================================================================== --- branches/2014Q1/graphics/rgbpaint/Makefile Sat Dec 28 18:02:41 2013 (r337890) +++ branches/2014Q1/graphics/rgbpaint/Makefile Sat Dec 28 18:03:56 2013 (r337891) @@ -3,7 +3,7 @@ PORTNAME= rgbpaint PORTVERSION= 0.8.7 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics MASTER_SITES= SF/mtpaint/${PORTNAME}/${PORTVERSION} @@ -16,11 +16,17 @@ USE_GNOME= gtk20 HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} --mandir=${MAN1PREFIX}/man/man1 \ --locale=${PREFIX}/share/locale cflags slow intl man -MAN1= ${PORTNAME}.1 -MANCOMPRESSED= yes -NO_STAGE= yes +DESKTOP_ENTRIES="rgbPaint" "" "" "${PORTNAME}" "" true + post-patch: - @${REINPLACE_CMD} -e '/if \[/s|==|=|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e '/if \[/s|==|=|g; s|gcc -Wall|${CC}|' \ + ${WRKSRC}/configure + @${REINPLACE_CMD} 's|$$(MT_MAN_DEST)|$$(DESTDIR)&|g' \ + ${WRKSRC}/doc/Makefile + @${REINPLACE_CMD} 's|$$(MT_LANG_DEST)|$$(DESTDIR)&|g' \ + ${WRKSRC}/po/Makefile + @${REINPLACE_CMD} 's|$$(BIN_INSTALL)|$$(DESTDIR)&|g' \ + ${WRKSRC}/src/Makefile .include Modified: branches/2014Q1/graphics/rgbpaint/pkg-plist ============================================================================== --- branches/2014Q1/graphics/rgbpaint/pkg-plist Sat Dec 28 18:02:41 2013 (r337890) +++ branches/2014Q1/graphics/rgbpaint/pkg-plist Sat Dec 28 18:03:56 2013 (r337891) @@ -1,4 +1,5 @@ bin/rgbpaint +man/man1/rgbpaint.1.gz share/locale/cs/LC_MESSAGES/rgbpaint.mo share/locale/de_DE/LC_MESSAGES/rgbpaint.mo share/locale/es/LC_MESSAGES/rgbpaint.mo From owner-svn-ports-branches@FreeBSD.ORG Sat Dec 28 18:05:21 2013 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 AB73945F; Sat, 28 Dec 2013 18:05:21 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8AE8E1EF3; Sat, 28 Dec 2013 18:05:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBSI5Lqi089784; Sat, 28 Dec 2013 18:05:21 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBSI5Kp6089778; Sat, 28 Dec 2013 18:05:20 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201312281805.rBSI5Kp6089778@svn.freebsd.org> From: Pawel Pekala Date: Sat, 28 Dec 2013 18:05:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337892 - in branches/2014Q1/games/djgame2: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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, 28 Dec 2013 18:05:21 -0000 Author: pawel Date: Sat Dec 28 18:05:20 2013 New Revision: 337892 URL: http://svnweb.freebsd.org/changeset/ports/337892 Log: MFH: r337784 - Fix build with clang - Use multiple make jobs - Strip binaries - Support staging Approved by: portmgr Added: branches/2014Q1/games/djgame2/files/patch-Base__src__DJGraphicsChessTimerItem.cpp - copied unchanged from r337784, head/games/djgame2/files/patch-Base__src__DJGraphicsChessTimerItem.cpp branches/2014Q1/games/djgame2/files/patch-Shisensho__src__DJGameRank.h - copied unchanged from r337784, head/games/djgame2/files/patch-Shisensho__src__DJGameRank.h branches/2014Q1/games/djgame2/files/patch-Shisensho__src__LLKPanelController.cpp - copied unchanged from r337784, head/games/djgame2/files/patch-Shisensho__src__LLKPanelController.cpp Modified: branches/2014Q1/games/djgame2/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/games/djgame2/Makefile ============================================================================== --- branches/2014Q1/games/djgame2/Makefile Sat Dec 28 18:03:56 2013 (r337891) +++ branches/2014Q1/games/djgame2/Makefile Sat Dec 28 18:05:20 2013 (r337892) @@ -3,7 +3,7 @@ PORTNAME= djgame2 PORTVERSION= 3.2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= http://www.bluedj.com/download/src/ DISTNAME= source-${PORTVERSION} @@ -15,13 +15,14 @@ COMMENT= bluedj contains many popular on NO_BUILD= yes USE_ZIP= yes USE_QT4= gui qt3support qmake_build uic_build rcc_build moc_build svg +USES= dos2unix +DOS2UNIX_FILES= Base/src/DJGraphicsChessTimerItem.cpp WRKSRC= ${WRKDIR}/${DISTNAME} DATADIR= ${PREFIX}/share/djgame2 SUB_FILES= djgame2.desktop startdjg -NO_STAGE= yes post-patch: ${RM} -f ${WRKSRC}/Hall/HallRes/platform/x11/install @${REINPLACE_CMD} -e 's|linux/soundcard.h|sys/soundcard.h|g' \ @@ -29,6 +30,7 @@ post-patch: @${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|g' \ ${WRKSRC}/make_linux_output @${REINPLACE_CMD} -e 's|qmake|${QMAKE} ${QMAKE_ARGS}|' \ + -e 's|make$$|make -j${MAKE_JOBS_NUMBER}|' \ ${WRKSRC}/make_linux_output @${ECHO_CMD} "INCLUDEPATH += ${LOCALBASE}/include" \ >> ${WRKSRC}/Base/Base.pro @@ -40,10 +42,13 @@ do-configure: @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./make_linux_output do-install: - ${MKDIR} ${DATADIR} + @${MKDIR} ${STAGEDIR}${DATADIR} (cd ${WRKSRC}/Hall/build; ${TAR} -cf - *) | \ - ${TAR} -xf - -C ${DATADIR} - ${INSTALL_DATA} ${WRKDIR}/djgame2.desktop ${PREFIX}/share/applications - ${INSTALL_SCRIPT} ${WRKDIR}/startdjg ${PREFIX}/bin + ${TAR} -xf - -C ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKDIR}/djgame2.desktop \ + ${STAGEDIR}${PREFIX}/share/applications + ${INSTALL_SCRIPT} ${WRKDIR}/startdjg ${STAGEDIR}${PREFIX}/bin + @(cd ${STAGEDIR}${DATADIR} && ${STRIP_CMD} modules/*.so Hall \ + UpdateHall libBase.so.1) .include Copied: branches/2014Q1/games/djgame2/files/patch-Base__src__DJGraphicsChessTimerItem.cpp (from r337784, head/games/djgame2/files/patch-Base__src__DJGraphicsChessTimerItem.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/djgame2/files/patch-Base__src__DJGraphicsChessTimerItem.cpp Sat Dec 28 18:05:20 2013 (r337892, copy of r337784, head/games/djgame2/files/patch-Base__src__DJGraphicsChessTimerItem.cpp) @@ -0,0 +1,10 @@ +--- ./Base/src/DJGraphicsChessTimerItem.cpp.orig 2013-12-27 20:08:04.531116404 +0100 ++++ ./Base/src/DJGraphicsChessTimerItem.cpp 2013-12-27 20:08:30.220122689 +0100 +@@ -19,6 +19,7 @@ + //Contact us at ggwizard@gmail.com or darkdong@gmail.com. + //****************************************************************************/ + ++#include + #include "DJGraphicsChessTimerItem.h" + #include "DJGraphicsTextItem.h" + #include "DJDesktop.h" Copied: branches/2014Q1/games/djgame2/files/patch-Shisensho__src__DJGameRank.h (from r337784, head/games/djgame2/files/patch-Shisensho__src__DJGameRank.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/djgame2/files/patch-Shisensho__src__DJGameRank.h Sat Dec 28 18:05:20 2013 (r337892, copy of r337784, head/games/djgame2/files/patch-Shisensho__src__DJGameRank.h) @@ -0,0 +1,10 @@ +--- ./Shisensho/src/DJGameRank.h.orig 2008-03-11 13:17:22.000000000 +0100 ++++ ./Shisensho/src/DJGameRank.h 2013-12-27 20:07:09.040179358 +0100 +@@ -22,6 +22,7 @@ + #ifndef DJGAMERANK_H + #define DJGAMERANK_H + ++#include + #include "DJTreeWidget.h" + #include "protocol.h" + Copied: branches/2014Q1/games/djgame2/files/patch-Shisensho__src__LLKPanelController.cpp (from r337784, head/games/djgame2/files/patch-Shisensho__src__LLKPanelController.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/djgame2/files/patch-Shisensho__src__LLKPanelController.cpp Sat Dec 28 18:05:20 2013 (r337892, copy of r337784, head/games/djgame2/files/patch-Shisensho__src__LLKPanelController.cpp) @@ -0,0 +1,17 @@ +--- ./Shisensho/src/LLKPanelController.cpp.orig 2008-03-19 12:20:04.000000000 +0100 ++++ ./Shisensho/src/LLKPanelController.cpp 2013-12-27 20:07:09.043178203 +0100 +@@ -19,6 +19,7 @@ + //Contact us at ggwizard@gmail.com or darkdong@gmail.com. + //****************************************************************************/ + ++#include + #include "LLKPanelController.h" + #include "LLKDesktopController.h" + #include "DJGameController.h" +@@ -61,4 +62,4 @@ + break; + } + DJPanelController::gameTrace(gameTrace); +-} +\ No newline at end of file ++} From owner-svn-ports-branches@FreeBSD.ORG Sat Dec 28 18:06:46 2013 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 75010546; Sat, 28 Dec 2013 18:06:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 60A831EFE; Sat, 28 Dec 2013 18:06:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBSI6kPj090102; Sat, 28 Dec 2013 18:06:46 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBSI6ktd090098; Sat, 28 Dec 2013 18:06:46 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201312281806.rBSI6ktd090098@svn.freebsd.org> From: Pawel Pekala Date: Sat, 28 Dec 2013 18:06:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337893 - in branches/2014Q1/polish/tleenx2: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 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, 28 Dec 2013 18:06:46 -0000 Author: pawel Date: Sat Dec 28 18:06:45 2013 New Revision: 337893 URL: http://svnweb.freebsd.org/changeset/ports/337893 Log: MFH: r337793 - Fix build on 10+ by respecting CC - Convert simple patch to REINPLACE_CMD - Support staging Approved by: portmgr Deleted: branches/2014Q1/polish/tleenx2/files/ Modified: branches/2014Q1/polish/tleenx2/Makefile branches/2014Q1/polish/tleenx2/pkg-plist (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/polish/tleenx2/Makefile ============================================================================== --- branches/2014Q1/polish/tleenx2/Makefile Sat Dec 28 18:05:20 2013 (r337892) +++ branches/2014Q1/polish/tleenx2/Makefile Sat Dec 28 18:06:45 2013 (r337893) @@ -21,19 +21,16 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib WRKSRC= ${WRKDIR}/TleenX2-${PORTVERSION} -MAN1= tleenx2.1 PORTDOCS= README gg.txt sms.txt -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' ${WRKSRC}/src/Makefile.in + @${REINPLACE_CMD} 's,/usr/local,${LOCALBASE},g; s,gcc,${CC},' \ + ${WRKSRC}/iksemel/Makefile + @${REINPLACE_CMD} 's,gcc,${CC},' ${WRKSRC}/jabby/Makefile post-install: -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -.for i in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR} -.endfor -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR} .include Modified: branches/2014Q1/polish/tleenx2/pkg-plist ============================================================================== --- branches/2014Q1/polish/tleenx2/pkg-plist Sat Dec 28 18:05:20 2013 (r337892) +++ branches/2014Q1/polish/tleenx2/pkg-plist Sat Dec 28 18:06:45 2013 (r337893) @@ -1,4 +1,5 @@ bin/tleenx2 +man/man1/tleenx2.1.gz %%DATADIR%%/pixmaps/archiwum.png %%DATADIR%%/pixmaps/away.png %%DATADIR%%/pixmaps/beback.png