From owner-svn-ports-branches@FreeBSD.ORG Mon Jan 20 08:31:21 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C91A0761; Mon, 20 Jan 2014 08:31: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 B2F3D1F26; Mon, 20 Jan 2014 08:31: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 s0K8VLoI063405; Mon, 20 Jan 2014 08:31:21 GMT (envelope-from gahr@svn.freebsd.org) Received: (from gahr@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0K8VKRW063137; Mon, 20 Jan 2014 08:31:20 GMT (envelope-from gahr@svn.freebsd.org) Message-Id: <201401200831.s0K8VKRW063137@svn.freebsd.org> From: Pietro Cerutti Date: Mon, 20 Jan 2014 08:31:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r340375 - in branches/2014Q1/net/ns: . 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: Mon, 20 Jan 2014 08:31:21 -0000 Author: gahr Date: Mon Jan 20 08:31:20 2014 New Revision: 340375 URL: http://svnweb.freebsd.org/changeset/ports/340375 QAT: https://qat.redports.org/buildarchive/r340375/ Log: MFH: r340373 - Fix build with modern compilers [MFH] - Convert to USES=tk - STAGE-clean Approved by: portmgr Added: branches/2014Q1/net/ns/files/patch-common_tclAppInit.cc - copied unchanged from r340373, head/net/ns/files/patch-common_tclAppInit.cc branches/2014Q1/net/ns/files/patch-common_tkAppInit.c - copied unchanged from r340373, head/net/ns/files/patch-common_tkAppInit.c branches/2014Q1/net/ns/files/patch-mdart_mdart_adp.cc - copied unchanged from r340373, head/net/ns/files/patch-mdart_mdart_adp.cc branches/2014Q1/net/ns/files/patch-nix_nixnode.cc - copied unchanged from r340373, head/net/ns/files/patch-nix_nixnode.cc Modified: branches/2014Q1/net/ns/Makefile (contents, props changed) branches/2014Q1/net/ns/pkg-plist (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/net/ns/Makefile ============================================================================== --- branches/2014Q1/net/ns/Makefile Mon Jan 20 08:11:51 2014 (r340374) +++ branches/2014Q1/net/ns/Makefile Mon Jan 20 08:31:20 2014 (r340375) @@ -12,8 +12,7 @@ COMMENT= Discrete event simulator for ne BUILD_DEPENDS= ${LOCALBASE}/lib/libtclcl.a:${PORTSDIR}/devel/tclcl -USES= gmake -USE_TK= 85+ +USES= gmake tk:85+ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-tcl-ver=${TCL_VER} \ --with-tk-ver=${TK_VER} \ @@ -22,11 +21,8 @@ CONFIGURE_ARGS= --with-tcl-ver=${TCL_VER WRKSRC= ${WRKDIR}/ns-${PORTVERSION} -MAN1= ns.1 - OPTIONS_DEFINE= EXAMPLES -NO_STAGE= yes .include post-patch: @@ -42,11 +38,11 @@ post-patch: ${WRKSRC}/indep-utils/webtrace-conv/ucb/Makefile.in do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/ns ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/ns.1 ${MANPREFIX}/man/man1 + ${INSTALL_PROGRAM} ${WRKSRC}/ns ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/ns.1 ${STAGEDIR}${PREFIX}/man/man1 .if ${PORT_OPTIONS:MEXAMPLES} - @${MKDIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/tcl/ex/*.tcl ${EXAMPLESDIR} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/tcl/ex/*.tcl ${STAGEDIR}${EXAMPLESDIR} .endif .include Copied: branches/2014Q1/net/ns/files/patch-common_tclAppInit.cc (from r340373, head/net/ns/files/patch-common_tclAppInit.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/net/ns/files/patch-common_tclAppInit.cc Mon Jan 20 08:31:20 2014 (r340375, copy of r340373, head/net/ns/files/patch-common_tclAppInit.cc) @@ -0,0 +1,10 @@ +--- common/tclAppInit.cc.orig 2014-01-17 10:38:38.000000000 +0100 ++++ common/tclAppInit.cc 2014-01-17 10:38:45.000000000 +0100 +@@ -237,7 +237,6 @@ + Tcl_AppInit(Tcl_Interp *interp) + { + #ifdef MEMDEBUG_SIMULATIONS +- extern MemTrace *globalMemTrace; + globalMemTrace = new MemTrace; + #endif + Copied: branches/2014Q1/net/ns/files/patch-common_tkAppInit.c (from r340373, head/net/ns/files/patch-common_tkAppInit.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/net/ns/files/patch-common_tkAppInit.c Mon Jan 20 08:31:20 2014 (r340375, copy of r340373, head/net/ns/files/patch-common_tkAppInit.c) @@ -0,0 +1,10 @@ +--- common/tkAppInit.cc.orig 2014-01-17 10:37:16.000000000 +0100 ++++ common/tkAppInit.cc 2014-01-17 10:38:11.000000000 +0100 +@@ -293,7 +293,6 @@ + Tcl_AppInit(Tcl_Interp *interp) + { + #ifdef MEMDEBUG_SIMULATIONS +- extern MemTrace *globalMemTrace; + globalMemTrace = new MemTrace; + #endif + Copied: branches/2014Q1/net/ns/files/patch-mdart_mdart_adp.cc (from r340373, head/net/ns/files/patch-mdart_mdart_adp.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/net/ns/files/patch-mdart_mdart_adp.cc Mon Jan 20 08:31:20 2014 (r340375, copy of r340373, head/net/ns/files/patch-mdart_mdart_adp.cc) @@ -0,0 +1,20 @@ +--- mdart/mdart_adp.cc.orig 2014-01-17 10:40:08.000000000 +0100 ++++ mdart/mdart_adp.cc 2014-01-17 10:40:17.000000000 +0100 +@@ -105,7 +105,7 @@ + #ifdef DEBUG_ADP + fprintf(stdout, "%.9f\tADP::sendDarq(%d)\t\t\tin node %d\twith address %s\n", CURRENT_TIME, reqId, mdart_->id_, bitString(mdart_->address_)); + #endif +- nsaddr_t dstAdd_ = hash(reqId); ++ nsaddr_t dstAdd_ = ::hash(reqId); + #ifdef DEBUG_ADP + fprintf(stdout, "\tsending darq for node %s\n", bitString(dstAdd_)); + #endif +@@ -393,7 +393,7 @@ + fprintf(stdout, "%.9f\tMDART::sendDaup()\t\t\t\tin node %d\twith address %s\n", CURRENT_TIME, mdart_->id_, bitString(mdart_->address_)); + // printDHT(); + #endif +- nsaddr_t dstAdd_ = hash(mdart_->id_); ++ nsaddr_t dstAdd_ = ::hash(mdart_->id_); + #ifdef DEBUG_ADP + fprintf(stdout, "\tsending daup for node %s\n", bitString(dstAdd_)); + mdart_->routingTable_->print(); Copied: branches/2014Q1/net/ns/files/patch-nix_nixnode.cc (from r340373, head/net/ns/files/patch-nix_nixnode.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/net/ns/files/patch-nix_nixnode.cc Mon Jan 20 08:31:20 2014 (r340375, copy of r340373, head/net/ns/files/patch-nix_nixnode.cc) @@ -0,0 +1,11 @@ +--- nix/nixnode.cc.orig 2014-01-17 10:33:55.000000000 +0100 ++++ nix/nixnode.cc 2014-01-17 10:35:51.000000000 +0100 +@@ -156,8 +156,6 @@ + if (last.first == NODE_NONE) + { + prev = m_Adj.begin(); +- if (prev == (EdgeVec_it) NULL) // ! How can this happen? +- return(NodeWeight_t(NODE_NONE, 0)); + pE = *prev; + if(0)printf("NextAdj returning first edge %ld\n", + pE->m_n); Modified: branches/2014Q1/net/ns/pkg-plist ============================================================================== --- branches/2014Q1/net/ns/pkg-plist Mon Jan 20 08:11:51 2014 (r340374) +++ branches/2014Q1/net/ns/pkg-plist Mon Jan 20 08:31:20 2014 (r340375) @@ -1,125 +1,126 @@ bin/ns -%%EXAMPLESDIR%%/agent-gen-script.tcl -%%EXAMPLESDIR%%/agent-gen.tcl -%%EXAMPLESDIR%%/aomdv.tcl -%%EXAMPLESDIR%%/callback_demo.tcl -%%EXAMPLESDIR%%/dccp.tcl -%%EXAMPLESDIR%%/diffusion-prob-run.tcl -%%EXAMPLESDIR%%/diffusion-rate-run.tcl -%%EXAMPLESDIR%%/dumbbell.tcl -%%EXAMPLESDIR%%/example.tcl -%%EXAMPLESDIR%%/flooding-run.tcl -%%EXAMPLESDIR%%/flooding.tcl -%%EXAMPLESDIR%%/fq-cbr.tcl -%%EXAMPLESDIR%%/fq.tcl -%%EXAMPLESDIR%%/grid2.tcl -%%EXAMPLESDIR%%/gridkeeper.tcl -%%EXAMPLESDIR%%/hier-rtg-10.tcl -%%EXAMPLESDIR%%/hier-rtg-100.tcl -%%EXAMPLESDIR%%/hts100-0.tcl -%%EXAMPLESDIR%%/lantest.tcl -%%EXAMPLESDIR%%/large-scale-web-traffic-old.tcl -%%EXAMPLESDIR%%/large-scale-web-traffic.tcl -%%EXAMPLESDIR%%/large-sim.tcl -%%EXAMPLESDIR%%/mac-test.tcl -%%EXAMPLESDIR%%/many_tcp.tcl -%%EXAMPLESDIR%%/manytcp_trmodel.tcl -%%EXAMPLESDIR%%/mcast.tcl -%%EXAMPLESDIR%%/miptest.tcl -%%EXAMPLESDIR%%/nam-example-em.tcl -%%EXAMPLESDIR%%/nam-example.tcl -%%EXAMPLESDIR%%/nam-large-flowid.tcl -%%EXAMPLESDIR%%/nam-separate-trace.tcl -%%EXAMPLESDIR%%/nam-simplexlink.tcl -%%EXAMPLESDIR%%/omni-run.tcl -%%EXAMPLESDIR%%/pkts.tcl -%%EXAMPLESDIR%%/puma.tcl -%%EXAMPLESDIR%%/ranvar.tcl -%%EXAMPLESDIR%%/rbp_demo.tcl -%%EXAMPLESDIR%%/rc.tcl -%%EXAMPLESDIR%%/redlight.tcl -%%EXAMPLESDIR%%/rng-test.tcl -%%EXAMPLESDIR%%/rng-test2.tcl -%%EXAMPLESDIR%%/route-gen.tcl -%%EXAMPLESDIR%%/sat-aloha.tcl -%%EXAMPLESDIR%%/sat-iridium-links.tcl -%%EXAMPLESDIR%%/sat-iridium-nodes.tcl -%%EXAMPLESDIR%%/sat-iridium.tcl -%%EXAMPLESDIR%%/sat-mixed.tcl -%%EXAMPLESDIR%%/sat-repeater.tcl -%%EXAMPLESDIR%%/sat-teledesic-links.tcl -%%EXAMPLESDIR%%/sat-teledesic-nodes.tcl -%%EXAMPLESDIR%%/sat-teledesic.tcl -%%EXAMPLESDIR%%/sat-wired.tcl -%%EXAMPLESDIR%%/shuttle-mcast.tcl -%%EXAMPLESDIR%%/shuttle.tcl -%%EXAMPLESDIR%%/simple-dyn.tcl -%%EXAMPLESDIR%%/simple-eqp.tcl -%%EXAMPLESDIR%%/simple-eqp1.tcl -%%EXAMPLESDIR%%/simple-fsm-tcp.tcl -%%EXAMPLESDIR%%/simple-heap.tcl -%%EXAMPLESDIR%%/simple-plm.tcl -%%EXAMPLESDIR%%/simple-rtg.tcl -%%EXAMPLESDIR%%/simple-rtp.tcl -%%EXAMPLESDIR%%/simple-tcp.tcl -%%EXAMPLESDIR%%/simple-webcache-comp.tcl -%%EXAMPLESDIR%%/simple-webcache-trace.tcl -%%EXAMPLESDIR%%/simple-webcache.tcl -%%EXAMPLESDIR%%/simple-wireless.tcl -%%EXAMPLESDIR%%/simple.tcl -%%EXAMPLESDIR%%/src_test.tcl -%%EXAMPLESDIR%%/srm-adapt-rep-session.tcl -%%EXAMPLESDIR%%/srm-adapt-rep.tcl -%%EXAMPLESDIR%%/srm-adapt-req-session.tcl -%%EXAMPLESDIR%%/srm-adapt-req.tcl -%%EXAMPLESDIR%%/srm-chain-session.tcl -%%EXAMPLESDIR%%/srm-chain.tcl -%%EXAMPLESDIR%%/srm-demo.tcl -%%EXAMPLESDIR%%/srm-session.tcl -%%EXAMPLESDIR%%/srm-star-session.tcl -%%EXAMPLESDIR%%/srm-star.tcl -%%EXAMPLESDIR%%/srm.tcl -%%EXAMPLESDIR%%/ss.tcl -%%EXAMPLESDIR%%/swp.tcl -%%EXAMPLESDIR%%/t1000.tcl -%%EXAMPLESDIR%%/tcp-et.tcl -%%EXAMPLESDIR%%/tcp-int.tcl -%%EXAMPLESDIR%%/tcpapp.tcl -%%EXAMPLESDIR%%/tcpecn.tcl -%%EXAMPLESDIR%%/tcpsrm.tcl -%%EXAMPLESDIR%%/test-drr.tcl -%%EXAMPLESDIR%%/test-emulator.tcl -%%EXAMPLESDIR%%/test-rcvr.tcl -%%EXAMPLESDIR%%/test-rlm.tcl -%%EXAMPLESDIR%%/test-suite-intserv.tcl -%%EXAMPLESDIR%%/test-suite.tcl -%%EXAMPLESDIR%%/test-tbf.tcl -%%EXAMPLESDIR%%/tg.tcl -%%EXAMPLESDIR%%/topo-gen-script.tcl -%%EXAMPLESDIR%%/topo-gen.tcl -%%EXAMPLESDIR%%/topo-view.tcl -%%EXAMPLESDIR%%/trace-driven.tcl -%%EXAMPLESDIR%%/udpdata.tcl -%%EXAMPLESDIR%%/varybell.tcl -%%EXAMPLESDIR%%/virtual-classifier.tcl -%%EXAMPLESDIR%%/vlantest-flat.tcl -%%EXAMPLESDIR%%/vlantest-hier.tcl -%%EXAMPLESDIR%%/vlantest-mcst.tcl -%%EXAMPLESDIR%%/web-traffic-embobj.tcl -%%EXAMPLESDIR%%/web-traffic.tcl -%%EXAMPLESDIR%%/wired-cum-wireless-sim.tcl -%%EXAMPLESDIR%%/wireless-demo-csci694.tcl -%%EXAMPLESDIR%%/wireless-dsdv-newnode.tcl -%%EXAMPLESDIR%%/wireless-flooding.tcl -%%EXAMPLESDIR%%/wireless-landmark.tcl -%%EXAMPLESDIR%%/wireless-mip-test.tcl -%%EXAMPLESDIR%%/wireless-mitf.tcl -%%EXAMPLESDIR%%/wireless-newnode-energy.tcl -%%EXAMPLESDIR%%/wireless-pkt-demo.tcl -%%EXAMPLESDIR%%/wireless-shadowing-test.tcl -%%EXAMPLESDIR%%/wireless-shadowing-vis-test.tcl -%%EXAMPLESDIR%%/wireless-simple-mac.tcl -%%EXAMPLESDIR%%/wireless-test.tcl -%%EXAMPLESDIR%%/wireless.tcl -%%EXAMPLESDIR%%/worm.tcl -@dirrm %%EXAMPLESDIR%% +man/man1/ns.1.gz +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/agent-gen-script.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/agent-gen.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/aomdv.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/callback_demo.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dccp.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/diffusion-prob-run.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/diffusion-rate-run.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dumbbell.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/flooding-run.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/flooding.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fq-cbr.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fq.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/grid2.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gridkeeper.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hier-rtg-10.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hier-rtg-100.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hts100-0.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lantest.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/large-scale-web-traffic-old.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/large-scale-web-traffic.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/large-sim.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mac-test.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/many_tcp.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manytcp_trmodel.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mcast.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/miptest.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nam-example-em.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nam-example.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nam-large-flowid.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nam-separate-trace.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nam-simplexlink.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/omni-run.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pkts.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/puma.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ranvar.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rbp_demo.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rc.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/redlight.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rng-test.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rng-test2.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/route-gen.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sat-aloha.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sat-iridium-links.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sat-iridium-nodes.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sat-iridium.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sat-mixed.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sat-repeater.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sat-teledesic-links.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sat-teledesic-nodes.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sat-teledesic.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sat-wired.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shuttle-mcast.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shuttle.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simple-dyn.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simple-eqp.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simple-eqp1.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simple-fsm-tcp.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simple-heap.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simple-plm.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simple-rtg.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simple-rtp.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simple-tcp.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simple-webcache-comp.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simple-webcache-trace.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simple-webcache.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simple-wireless.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simple.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/src_test.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/srm-adapt-rep-session.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/srm-adapt-rep.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/srm-adapt-req-session.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/srm-adapt-req.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/srm-chain-session.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/srm-chain.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/srm-demo.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/srm-session.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/srm-star-session.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/srm-star.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/srm.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ss.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/swp.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/t1000.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tcp-et.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tcp-int.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tcpapp.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tcpecn.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tcpsrm.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test-drr.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test-emulator.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test-rcvr.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test-rlm.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test-suite-intserv.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test-suite.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test-tbf.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tg.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/topo-gen-script.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/topo-gen.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/topo-view.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/trace-driven.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/udpdata.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/varybell.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/virtual-classifier.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vlantest-flat.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vlantest-hier.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vlantest-mcst.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/web-traffic-embobj.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/web-traffic.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wired-cum-wireless-sim.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wireless-demo-csci694.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wireless-dsdv-newnode.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wireless-flooding.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wireless-landmark.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wireless-mip-test.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wireless-mitf.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wireless-newnode-energy.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wireless-pkt-demo.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wireless-shadowing-test.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wireless-shadowing-vis-test.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wireless-simple-mac.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wireless-test.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wireless.tcl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/worm.tcl +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% From owner-svn-ports-branches@FreeBSD.ORG Mon Jan 20 13:21:06 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BE3406C6; Mon, 20 Jan 2014 13:21: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 AA2151F3C; Mon, 20 Jan 2014 13:21: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 s0KDL6Gk078355; Mon, 20 Jan 2014 13:21:06 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0KDL6ms078354; Mon, 20 Jan 2014 13:21:06 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201401201321.s0KDL6ms078354@svn.freebsd.org> From: Mathieu Arnold Date: Mon, 20 Jan 2014 13:21:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r340392 - branches/2014Q1/security/signing-party 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, 20 Jan 2014 13:21:06 -0000 Author: mat Date: Mon Jan 20 13:21:06 2014 New Revision: 340392 URL: http://svnweb.freebsd.org/changeset/ports/340392 QAT: https://qat.redports.org/buildarchive/r340392/ Log: MFH: r340389 * Fix build on 10 Modified: branches/2014Q1/security/signing-party/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/security/signing-party/Makefile ============================================================================== --- branches/2014Q1/security/signing-party/Makefile Mon Jan 20 13:20:08 2014 (r340391) +++ branches/2014Q1/security/signing-party/Makefile Mon Jan 20 13:21:06 2014 (r340392) @@ -55,6 +55,7 @@ post-patch: -e 's|make pgpring|make|' \ ${WRKSRC}/gpgwrap/Makefile \ ${WRKSRC}/keyanalyze/Makefile + @${REINPLACE_CMD} -e 's|gcc|${CC}|' ${WRKSRC}/gpgwrap/src/Makefile # Rename pgpring to pgppubring to avoid conflict with mail/mutt @${REINPLACE_CMD} -e 's|pgpring|pgppubring|g' \ ${WRKSRC}/keyanalyze/pgpring/Makefile.in From owner-svn-ports-branches@FreeBSD.ORG Mon Jan 20 18:30:57 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CC69367A; Mon, 20 Jan 2014 18:30: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 9EFB91D2C; Mon, 20 Jan 2014 18:30: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 s0KIUvph011356; Mon, 20 Jan 2014 18:30:57 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0KIUveS011354; Mon, 20 Jan 2014 18:30:57 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201401201830.s0KIUveS011354@svn.freebsd.org> From: Mathieu Arnold Date: Mon, 20 Jan 2014 18:30:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r340441 - branches/2014Q1/net/l2tpd 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, 20 Jan 2014 18:30:57 -0000 Author: mat Date: Mon Jan 20 18:30:56 2014 New Revision: 340441 URL: http://svnweb.freebsd.org/changeset/ports/340441 QAT: https://qat.redports.org/buildarchive/r340441/ Log: MFH: r340434 * Fix build on 10 * Stagify Sponsored by: Absolight Modified: branches/2014Q1/net/l2tpd/Makefile branches/2014Q1/net/l2tpd/pkg-plist Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/net/l2tpd/Makefile ============================================================================== --- branches/2014Q1/net/l2tpd/Makefile Mon Jan 20 18:30:40 2014 (r340440) +++ branches/2014Q1/net/l2tpd/Makefile Mon Jan 20 18:30:56 2014 (r340441) @@ -10,11 +10,10 @@ MASTER_SITES= SF/${PORTNAME}/L2TPd/${POR MAINTAINER= sobomax@FreeBSD.org COMMENT= An implementation of the layer two tunneling protocol -MAN5= l2tp-secrets.5 l2tpd.conf.5 -MAN8= l2tpd.8 +USES= compiler:nestedfct -NO_STAGE= yes -.include +PORTDOCS= README +ETCDIR= ${PREFIX}/etc/l2tp do-configure: ${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/doc/l2tpd.8 \ @@ -22,16 +21,14 @@ do-configure: ${WRKSRC}/doc/l2tpd.conf.5 do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/l2tpd ${PREFIX}/bin -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} -.endif - ${INSTALL_MAN} ${WRKSRC}/doc/l2tpd.8 ${PREFIX}/man/man8 - ${INSTALL_MAN} ${WRKSRC}/doc/l2tp-secrets.5 ${PREFIX}/man/man5 - ${INSTALL_MAN} ${WRKSRC}/doc/l2tpd.conf.5 ${PREFIX}/man/man5 - ${MKDIR} ${PREFIX}/etc/l2tp - ${INSTALL_DATA} ${WRKSRC}/doc/l2tpd.conf.sample ${PREFIX}/etc/l2tp - ${INSTALL_DATA} ${WRKSRC}/doc/l2tp-secrets.sample ${PREFIX}/etc/l2tp + ${INSTALL_PROGRAM} ${WRKSRC}/l2tpd ${STAGEDIR}${PREFIX}/bin + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR} + ${INSTALL_MAN} ${WRKSRC}/doc/l2tpd.8 ${STAGEDIR}${PREFIX}/man/man8 + ${INSTALL_MAN} ${WRKSRC}/doc/l2tp-secrets.5 ${STAGEDIR}${PREFIX}/man/man5 + ${INSTALL_MAN} ${WRKSRC}/doc/l2tpd.conf.5 ${STAGEDIR}${PREFIX}/man/man5 + @${MKDIR} ${STAGEDIR}${ETCDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/l2tpd.conf.sample ${STAGEDIR}${ETCDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/l2tp-secrets.sample ${STAGEDIR}${ETCDIR} -.include +.include Modified: branches/2014Q1/net/l2tpd/pkg-plist ============================================================================== --- branches/2014Q1/net/l2tpd/pkg-plist Mon Jan 20 18:30:40 2014 (r340440) +++ branches/2014Q1/net/l2tpd/pkg-plist Mon Jan 20 18:30:56 2014 (r340441) @@ -1,6 +1,7 @@ bin/l2tpd -etc/l2tp/l2tp-secrets.sample -etc/l2tp/l2tpd.conf.sample -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm etc/l2tp +%%ETCDIR%%/l2tp-secrets.sample +%%ETCDIR%%/l2tpd.conf.sample +man/man5/l2tp-secrets.5.gz +man/man5/l2tpd.conf.5.gz +man/man8/l2tpd.8.gz +@dirrm %%ETCDIR%% From owner-svn-ports-branches@FreeBSD.ORG Mon Jan 20 18:33:15 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 239FA8C0; Mon, 20 Jan 2014 18:33:15 +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 033DA1D57; Mon, 20 Jan 2014 18:33:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0KIXEtD011877; Mon, 20 Jan 2014 18:33:14 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0KIXE6J011873; Mon, 20 Jan 2014 18:33:14 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201401201833.s0KIXE6J011873@svn.freebsd.org> From: Mathieu Arnold Date: Mon, 20 Jan 2014 18:33:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r340443 - in branches/2014Q1/security/snortsam: . 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: Mon, 20 Jan 2014 18:33:15 -0000 Author: mat Date: Mon Jan 20 18:33:14 2014 New Revision: 340443 URL: http://svnweb.freebsd.org/changeset/ports/340443 QAT: https://qat.redports.org/buildarchive/r340443/ Log: * Fix build on 10 * Support staging * General cleanup Sponsored by: Absolight Added: branches/2014Q1/security/snortsam/files/patch-src__ssp_pf2.c - copied unchanged from r340440, head/security/snortsam/files/patch-src__ssp_pf2.c Modified: branches/2014Q1/security/snortsam/Makefile branches/2014Q1/security/snortsam/files/pkg-install.in Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/security/snortsam/Makefile ============================================================================== --- branches/2014Q1/security/snortsam/Makefile Mon Jan 20 18:32:19 2014 (r340442) +++ branches/2014Q1/security/snortsam/Makefile Mon Jan 20 18:33:14 2014 (r340443) @@ -16,24 +16,17 @@ OPTIONS_DEFAULT= IPFW SAMTOOL IPFW_DESC= checks if configured tables are available SAMTOOL_DESC= install samtool -NO_STAGE= yes .include USE_RC_SUBR= snortsam SUB_FILES= pkg-message \ pkg-install -HAS_CONFIGURE= yes -NO_BUILD= yes -CONFIGURE_SCRIPT= src/Makefile - -CONFIG_DIR?= ${PREFIX}/etc/snortsam - PLIST_DIRS= etc/snortsam PLIST_FILES= sbin/snortsam \ - etc/snortsam/snortsam.conf.sample \ - etc/snortsam/country-rootservers.conf.sample \ - etc/snortsam/rootservers.cfg.sample + %%ETCDIR%%/snortsam.conf.sample \ + %%ETCDIR%%/country-rootservers.conf.sample \ + %%ETCDIR%%/rootservers.cfg.sample .if ${PORT_OPTIONS:MSAMTOOL} PLIST_FILES+= sbin/samtool @@ -52,40 +45,34 @@ EXTRA_PATCHES+= ${FILESDIR}/ssp_ipfw2_no DEBUG=-DDEBUG .endif +# This seems silly, but the RC file gets into ${WRKDIR}/${PORTNAME} which +# without this, would exist and be a directory. post-extract: @${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC} -pre-configure: - @${REINPLACE_CMD} -e "s|/etc/snortsam.conf|${CONFIG_DIR}/snortsam.conf|g" ${WRKSRC}/conf/snortsam.conf.sample - @${REINPLACE_CMD} -e "s|/etc/snortsam.conf|${CONFIG_DIR}/snortsam.conf|g" ${WRKSRC}/docs/README.conf - @${REINPLACE_CMD} -e "s|/etc/snortsam.conf|${CONFIG_DIR}/snortsam.conf|g" ${WRKSRC}/src/snortsam.h - @${REINPLACE_CMD} -e "s|/etc/snortsam.conf|${CONFIG_DIR}/snortsam.conf|g" ${WRKSRC}/contrib/snortsam-state.c +post-patch: + @${REINPLACE_CMD} -e '/^CC/d' ${WRKSRC}/src/Makefile + @${REINPLACE_CMD} -e "s|/etc/snortsam.conf|${ETCDIR}/snortsam.conf|g" ${WRKSRC}/conf/snortsam.conf.sample + @${REINPLACE_CMD} -e "s|/etc/snortsam.conf|${ETCDIR}/snortsam.conf|g" ${WRKSRC}/docs/README.conf + @${REINPLACE_CMD} -e "s|/etc/snortsam.conf|${ETCDIR}/snortsam.conf|g" ${WRKSRC}/src/snortsam.h + @${REINPLACE_CMD} -e "s|/etc/snortsam.conf|${ETCDIR}/snortsam.conf|g" ${WRKSRC}/contrib/snortsam-state.c @${CHMOD} +x ${WRKSRC}/makesnortsam.sh -do-configure: +do-build: @cd ${WRKSRC}/src && ${MAKE} ${DEBUG} @cd ${WRKSRC}/src && ${MAKE} samtool ${DEBUG} -# no access to snortsam.conf and samtool for non root users! do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/snortsam ${PREFIX}/sbin -.if ${PORT_OPTIONS:MSAMTOOL} - @${INSTALL} -o root -g wheel -m 500 ${WRKSRC}/samtool ${PREFIX}/sbin -.endif - @${MKDIR} -m 700 ${CONFIG_DIR} - @${INSTALL_DATA} -m 600 ${WRKSRC}/conf/snortsam.conf.sample ${CONFIG_DIR}/snortsam.conf.sample - @${INSTALL_DATA} ${WRKSRC}/conf/rootservers.cfg ${CONFIG_DIR}/rootservers.cfg.sample - @${INSTALL_DATA} ${WRKSRC}/conf/country-rootservers.conf ${CONFIG_DIR}/country-rootservers.conf.sample + ${INSTALL_PROGRAM} ${WRKSRC}/snortsam ${STAGEDIR}${PREFIX}/sbin + ${INSTALL_PROGRAM} ${WRKSRC}/samtool ${STAGEDIR}${PREFIX}/sbin + @${MKDIR} ${STAGEDIR}${ETCDIR} + ${INSTALL_DATA} ${WRKSRC}/conf/snortsam.conf.sample ${STAGEDIR}${ETCDIR}/snortsam.conf.sample + ${INSTALL_DATA} ${WRKSRC}/conf/rootservers.cfg ${STAGEDIR}${ETCDIR}/rootservers.cfg.sample + ${INSTALL_DATA} ${WRKSRC}/conf/country-rootservers.conf ${STAGEDIR}${ETCDIR}/country-rootservers.conf.sample -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ${PORTDOCS} - @${INSTALL_DATA} ${WRKSRC}/docs/${f} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/docs/${f} ${STAGEDIR}${DOCSDIR} .endfor -.endif - -post-install: - @${SH} ${PKGINSTALL} ${DISTNAME} POST-INSTALL - @${CAT} ${PKGMESSAGE} .include Copied: branches/2014Q1/security/snortsam/files/patch-src__ssp_pf2.c (from r340440, head/security/snortsam/files/patch-src__ssp_pf2.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/security/snortsam/files/patch-src__ssp_pf2.c Mon Jan 20 18:33:14 2014 (r340443, copy of r340440, head/security/snortsam/files/patch-src__ssp_pf2.c) @@ -0,0 +1,11 @@ +--- ./src/ssp_pf2.c.orig 2009-11-27 02:39:40.000000000 +0100 ++++ ./src/ssp_pf2.c 2014-01-20 19:03:47.000000000 +0100 +@@ -95,7 +95,7 @@ + } + } + +- return; ++ return 0; + } + + Modified: branches/2014Q1/security/snortsam/files/pkg-install.in ============================================================================== --- branches/2014Q1/security/snortsam/files/pkg-install.in Mon Jan 20 18:32:19 2014 (r340442) +++ branches/2014Q1/security/snortsam/files/pkg-install.in Mon Jan 20 18:33:14 2014 (r340443) @@ -3,15 +3,22 @@ # $FreeBSD$ ETCDIR=${ETCDIR:=%%ETCDIR%%} +PREFIX=${PREFIX:=%%PREFIX%%} # snortsam config file contain sensitive data like # passwords needed to block IP's on the firewalls. # Set permission of the config dir to 700 so only # root:wheel can access this directory. +# Also, samtool shouldn't be run by non root. if [ "$2" = "POST-INSTALL" ]; then if [ -d ${ETCDIR} ]; then /usr/sbin/chown root:wheel ${ETCDIR} /bin/chmod 700 ${ETCDIR} + /bin/chmod 600 ${ETCDIR}/snortsam.conf.sample + fi + if [ -x ${PREFIX}/sbin/samtool ] + then + /bin/chmod 500 ${PREFIX}/sbin/samtool fi fi From owner-svn-ports-branches@FreeBSD.ORG Tue Jan 21 00:06:57 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A29A0A89; Tue, 21 Jan 2014 00:06: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 745101A53; Tue, 21 Jan 2014 00:06: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 s0L06vVX058728; Tue, 21 Jan 2014 00:06:57 GMT (envelope-from marcus@svn.freebsd.org) Received: (from marcus@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0L06vk5058725; Tue, 21 Jan 2014 00:06:57 GMT (envelope-from marcus@svn.freebsd.org) Message-Id: <201401210006.s0L06vk5058725@svn.freebsd.org> From: Joe Marcus Clarke Date: Tue, 21 Jan 2014 00:06:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r340506 - in branches/2014Q1/net/netatalk3: . 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, 21 Jan 2014 00:06:57 -0000 Author: marcus Date: Tue Jan 21 00:06:56 2014 New Revision: 340506 URL: http://svnweb.freebsd.org/changeset/ports/340506 QAT: https://qat.redports.org/buildarchive/r340506/ Log: MFH: (r340498) Revert a bad upstream patch pertaining to varargs that continued to plague Time Machine users. Submitted by: dim Approved by: portmgr (miwi) Modified: branches/2014Q1/net/netatalk3/Makefile branches/2014Q1/net/netatalk3/files/patch-etc_afpd_afp_mdns.c Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/net/netatalk3/Makefile ============================================================================== --- branches/2014Q1/net/netatalk3/Makefile Tue Jan 21 00:06:26 2014 (r340505) +++ branches/2014Q1/net/netatalk3/Makefile Tue Jan 21 00:06:56 2014 (r340506) @@ -3,7 +3,7 @@ PORTNAME= netatalk PORTVERSION= 3.1.0 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= net MASTER_SITES= SF Modified: branches/2014Q1/net/netatalk3/files/patch-etc_afpd_afp_mdns.c ============================================================================== --- branches/2014Q1/net/netatalk3/files/patch-etc_afpd_afp_mdns.c Tue Jan 21 00:06:26 2014 (r340505) +++ branches/2014Q1/net/netatalk3/files/patch-etc_afpd_afp_mdns.c Tue Jan 21 00:06:56 2014 (r340506) @@ -1,20 +1,23 @@ --- etc/afpd/afp_mdns.c.orig 2013-10-28 06:43:13.000000000 -0700 +++ etc/afpd/afp_mdns.c 2014-01-17 22:10:59.000000000 -0800 @@ -37,17 +37,15 @@ + /* * Its easier to use asprintf to set the TXT record values */ - #define TXTRecordPrintf(rec, key, args, ...) { \ +-#define TXTRecordPrintf(rec, key, args, ...) { \ - char *str; \ - asprintf(&str, args); \ ++#define TXTRecordPrintf(rec, key, args...) { \ + char str[1024]; \ + sprintf(str, args); \ TXTRecordSetValue(rec, key, strlen(str), str); \ - free(str); \ } - #define TXTRecordKeyPrintf(rec, k, var, args, ...) { \ +-#define TXTRecordKeyPrintf(rec, k, var, args, ...) { \ - char *key, *str; \ - asprintf(&key, k, var); \ - asprintf(&str, args); \ ++#define TXTRecordKeyPrintf(rec, k, var, args...) { \ + char key[1024], str[1024]; \ + sprintf(key, k, var); \ + sprintf(str, args); \ From owner-svn-ports-branches@FreeBSD.ORG Tue Jan 21 15:21:28 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 691A9BE0; Tue, 21 Jan 2014 15:21:28 +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 548131840; Tue, 21 Jan 2014 15:21:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0LFLSR3022688; Tue, 21 Jan 2014 15:21:28 GMT (envelope-from marcus@svn.freebsd.org) Received: (from marcus@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0LFLSZF022687; Tue, 21 Jan 2014 15:21:28 GMT (envelope-from marcus@svn.freebsd.org) Message-Id: <201401211521.s0LFLSZF022687@svn.freebsd.org> From: Joe Marcus Clarke Date: Tue, 21 Jan 2014 15:21:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r340613 - branches/2014Q1/net/netatalk3/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, 21 Jan 2014 15:21:28 -0000 Author: marcus Date: Tue Jan 21 15:21:27 2014 New Revision: 340613 URL: http://svnweb.freebsd.org/changeset/ports/340613 QAT: https://qat.redports.org/buildarchive/r340613/ Log: MFH: (r340612) Correct a patch mangled in transfer. Reported by: mat Approved by: portmgr (cleaning up previous commit) Modified: branches/2014Q1/net/netatalk3/files/patch-etc_afpd_afp_mdns.c Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/net/netatalk3/files/patch-etc_afpd_afp_mdns.c ============================================================================== --- branches/2014Q1/net/netatalk3/files/patch-etc_afpd_afp_mdns.c Tue Jan 21 15:18:01 2014 (r340612) +++ branches/2014Q1/net/netatalk3/files/patch-etc_afpd_afp_mdns.c Tue Jan 21 15:21:27 2014 (r340613) @@ -1,6 +1,6 @@ ---- etc/afpd/afp_mdns.c.orig 2013-10-28 06:43:13.000000000 -0700 -+++ etc/afpd/afp_mdns.c 2014-01-17 22:10:59.000000000 -0800 -@@ -37,17 +37,15 @@ +--- etc/afpd/afp_mdns.c.orig 2014-01-21 15:12:49.465373000 +0000 ++++ etc/afpd/afp_mdns.c 2014-01-21 15:15:03.618213000 +0000 +@@ -36,18 +36,16 @@ static pthread_t poller; /* * Its easier to use asprintf to set the TXT record values */ @@ -26,7 +26,7 @@ } static struct pollfd *fds; -@@ -134,7 +132,7 @@ +@@ -134,7 +132,7 @@ static void register_stuff(const AFPObj /* Register our service, prepare the TXT record */ TXTRecordCreate(&txt_adisk, 0, NULL); From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 22 07:56:33 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2283C92D; Wed, 22 Jan 2014 07:56:33 +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 0EA3C1A1D; Wed, 22 Jan 2014 07:56:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0M7uWH1022990; Wed, 22 Jan 2014 07:56:32 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0M7uWE5022989; Wed, 22 Jan 2014 07:56:32 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401220756.s0M7uWE5022989@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 22 Jan 2014 07:56:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r340684 - branches/2014Q1/Mk/Uses 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: Wed, 22 Jan 2014 07:56:33 -0000 Author: bapt Date: Wed Jan 22 07:56:32 2014 New Revision: 340684 URL: http://svnweb.freebsd.org/changeset/ports/340684 QAT: https://qat.redports.org/buildarchive/r340684/ Log: MFH: r338983 Add new uses ninja[:verbose] This allows to use the ninja build system. USES= cmake ninja Will make cmake generate ninja files and use ninja. Added: branches/2014Q1/Mk/Uses/ninja.mk - copied unchanged from r338983, head/Mk/Uses/ninja.mk Modified: Directory Properties: branches/2014Q1/ (props changed) Copied: branches/2014Q1/Mk/Uses/ninja.mk (from r338983, head/Mk/Uses/ninja.mk) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/Mk/Uses/ninja.mk Wed Jan 22 07:56:32 2014 (r340684, copy of r338983, head/Mk/Uses/ninja.mk) @@ -0,0 +1,30 @@ +# $FreeBSD$ +# +# Provide support to use ninja +# +# MAINTAINER: portmgr@FreeBSD.org +# +# Feature: ninja +# Usage: USES=ninja[:verbose] + +.if !defined(_INCLUDE_USES_NINJA_MK) +_INCLUDE_USES_NINJA_MK= yes + +.if defined(ninja_ARGS) +.if ${ninja_ARGS} == verbose +MAKE_ARGS+= -v +.else +IGNORE= Incorrect aruments for 'USES+= ninja:${ninja_ARGS}' valid argument is 'verbose' +.endif +.endif + +BUILD_DEPENDS= ninja:${PORTSDIR}/devel/ninja + +CMAKE_ARGS+= -GNinja +MAKEFILE= +MAKE_CMD= ninja +MAKE_FLAGS= +MAKE_ENV= ${DESTDIRNAME}=${STAGEDIR} +_DESTDIR_VIA_ENV= yes + +.endif From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 22 07:57:33 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A331FA1E; Wed, 22 Jan 2014 07:57:33 +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 8F5D61A28; Wed, 22 Jan 2014 07:57:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0M7vXJB023207; Wed, 22 Jan 2014 07:57:33 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0M7vX0W023206; Wed, 22 Jan 2014 07:57:33 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401220757.s0M7vX0W023206@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 22 Jan 2014 07:57:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r340685 - branches/2014Q1/Mk/Uses 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: Wed, 22 Jan 2014 07:57:33 -0000 Author: bapt Date: Wed Jan 22 07:57:33 2014 New Revision: 340685 URL: http://svnweb.freebsd.org/changeset/ports/340685 QAT: https://qat.redports.org/buildarchive/r340685/ Log: MFH: r339016 - Convert USES=ninja:verbose into NINJA_VERBOSE make.conf(5) switch. Approved by: portmgr (bapt) Modified: branches/2014Q1/Mk/Uses/ninja.mk Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/Mk/Uses/ninja.mk ============================================================================== --- branches/2014Q1/Mk/Uses/ninja.mk Wed Jan 22 07:56:32 2014 (r340684) +++ branches/2014Q1/Mk/Uses/ninja.mk Wed Jan 22 07:57:33 2014 (r340685) @@ -1,21 +1,25 @@ # $FreeBSD$ # -# Provide support to use ninja +# Provide support to use Ninja # # MAINTAINER: portmgr@FreeBSD.org # -# Feature: ninja -# Usage: USES=ninja[:verbose] +# Feature: ninja +# Usage: USES=ninja +# +# User defined variables: +# NINJA_VERBOSE - Enable verbose output. +# .if !defined(_INCLUDE_USES_NINJA_MK) _INCLUDE_USES_NINJA_MK= yes .if defined(ninja_ARGS) -.if ${ninja_ARGS} == verbose -MAKE_ARGS+= -v -.else -IGNORE= Incorrect aruments for 'USES+= ninja:${ninja_ARGS}' valid argument is 'verbose' +IGNORE= Incorrect 'USES+= ninja:${ninja_ARGS}' ninja takes no arguments .endif + +.if defined(NINJA_VERBOSE) +MAKE_ARGS+= -v .endif BUILD_DEPENDS= ninja:${PORTSDIR}/devel/ninja From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 22 07:58:31 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2A931B1E; Wed, 22 Jan 2014 07:58: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 168A61A36; Wed, 22 Jan 2014 07:58: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 s0M7wUTN023420; Wed, 22 Jan 2014 07:58:30 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0M7wUxl023419; Wed, 22 Jan 2014 07:58:30 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401220758.s0M7wUxl023419@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 22 Jan 2014 07:58:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r340686 - branches/2014Q1/Mk/Uses 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: Wed, 22 Jan 2014 07:58:31 -0000 Author: bapt Date: Wed Jan 22 07:58:30 2014 New Revision: 340686 URL: http://svnweb.freebsd.org/changeset/ports/340686 QAT: https://qat.redports.org/buildarchive/r340686/ Log: MFH: r339055 Remove bad MAKE_ENV entry (bsd.stage.mk) does the right thing already That avoid resetting MAKE_ENV Reported by: rene Modified: branches/2014Q1/Mk/Uses/ninja.mk Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/Mk/Uses/ninja.mk ============================================================================== --- branches/2014Q1/Mk/Uses/ninja.mk Wed Jan 22 07:57:33 2014 (r340685) +++ branches/2014Q1/Mk/Uses/ninja.mk Wed Jan 22 07:58:30 2014 (r340686) @@ -28,7 +28,6 @@ CMAKE_ARGS+= -GNinja MAKEFILE= MAKE_CMD= ninja MAKE_FLAGS= -MAKE_ENV= ${DESTDIRNAME}=${STAGEDIR} _DESTDIR_VIA_ENV= yes .endif From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 22 07:59:44 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 61E0CC30; Wed, 22 Jan 2014 07:59: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 4E45D1A45; Wed, 22 Jan 2014 07:59: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 s0M7xi47023645; Wed, 22 Jan 2014 07:59:44 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0M7xi1b023644; Wed, 22 Jan 2014 07:59:44 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401220759.s0M7xi1b023644@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 22 Jan 2014 07:59:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r340687 - branches/2014Q1/Mk 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: Wed, 22 Jan 2014 07:59:44 -0000 Author: bapt Date: Wed Jan 22 07:59:43 2014 New Revision: 340687 URL: http://svnweb.freebsd.org/changeset/ports/340687 QAT: https://qat.redports.org/buildarchive/r340687/ Log: MFH: r338982 Add an internal variable to decide if DESTDIR should ve define in MAKE_ENV or MAKE_ARGS Modified: branches/2014Q1/Mk/bsd.stage.mk Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/Mk/bsd.stage.mk ============================================================================== --- branches/2014Q1/Mk/bsd.stage.mk Wed Jan 22 07:58:30 2014 (r340686) +++ branches/2014Q1/Mk/bsd.stage.mk Wed Jan 22 07:59:43 2014 (r340687) @@ -5,7 +5,11 @@ STAGEDIR?= ${WRKDIR}/stage DESTDIRNAME?= DESTDIR +.if defined(_DESTDIR_VIA_ENV) +MAKE_ENV+= ${DESTDIRNAME}=${STAGEDIR} +.else MAKE_ARGS+= ${DESTDIRNAME}=${STAGEDIR} +.endif QA_ENV+= STAGEDIR=${STAGEDIR} \ PREFIX=${PREFIX} \ LOCALBASE=${LOCALBASE} \ From owner-svn-ports-branches@FreeBSD.ORG Wed Jan 22 08:00:43 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1BC84D34; Wed, 22 Jan 2014 08:00:43 +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 0827E1AB1; Wed, 22 Jan 2014 08:00:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0M80g9Z025977; Wed, 22 Jan 2014 08:00:42 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0M80gSN025976; Wed, 22 Jan 2014 08:00:42 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401220800.s0M80gSN025976@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 22 Jan 2014 08:00:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r340688 - branches/2014Q1/Mk/Uses 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: Wed, 22 Jan 2014 08:00:43 -0000 Author: bapt Date: Wed Jan 22 08:00:42 2014 New Revision: 340688 URL: http://svnweb.freebsd.org/changeset/ports/340688 QAT: https://qat.redports.org/buildarchive/r340688/ Log: MFH: r339069 Do not overwrite BUILD_DEPENDS Reported by: rene Modified: branches/2014Q1/Mk/Uses/ninja.mk Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/Mk/Uses/ninja.mk ============================================================================== --- branches/2014Q1/Mk/Uses/ninja.mk Wed Jan 22 07:59:43 2014 (r340687) +++ branches/2014Q1/Mk/Uses/ninja.mk Wed Jan 22 08:00:42 2014 (r340688) @@ -22,7 +22,7 @@ IGNORE= Incorrect 'USES+= ninja:${ninja_ MAKE_ARGS+= -v .endif -BUILD_DEPENDS= ninja:${PORTSDIR}/devel/ninja +BUILD_DEPENDS+= ninja:${PORTSDIR}/devel/ninja CMAKE_ARGS+= -GNinja MAKEFILE= From owner-svn-ports-branches@FreeBSD.ORG Thu Jan 23 20:13:10 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2149F4C5; Thu, 23 Jan 2014 20:13: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 E7D6315F4; Thu, 23 Jan 2014 20:13:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0NKD90R008881; Thu, 23 Jan 2014 20:13:09 GMT (envelope-from riggs@svn.freebsd.org) Received: (from riggs@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0NKD9tD008875; Thu, 23 Jan 2014 20:13:09 GMT (envelope-from riggs@svn.freebsd.org) Message-Id: <201401232013.s0NKD9tD008875@svn.freebsd.org> From: Thomas Zander Date: Thu, 23 Jan 2014 20:13:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r340858 - in branches/2014Q1/audio/pms: . 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, 23 Jan 2014 20:13:10 -0000 Author: riggs Date: Thu Jan 23 20:13:09 2014 New Revision: 340858 URL: http://svnweb.freebsd.org/changeset/ports/340858 QAT: https://qat.redports.org/buildarchive/r340858/ Log: MFH: r340845 (Note: Log in original commit r340845 was incomplete. Complete log is provided below.) - Fix build failure on FreeBSD 10 - Add stage support - Add license - Change whitespaces in pkg-descr due to portlint warning Approved by: portmgr (mat), maintainer (ashish), mentor (thierry) Added: branches/2014Q1/audio/pms/files/patch-src_message.h - copied unchanged from r340845, head/audio/pms/files/patch-src_message.h Modified: branches/2014Q1/audio/pms/Makefile branches/2014Q1/audio/pms/pkg-descr Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/audio/pms/Makefile ============================================================================== --- branches/2014Q1/audio/pms/Makefile Thu Jan 23 20:12:54 2014 (r340857) +++ branches/2014Q1/audio/pms/Makefile Thu Jan 23 20:13:09 2014 (r340858) @@ -10,16 +10,17 @@ MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNA MAINTAINER= ashish@FreeBSD.org COMMENT= A ncurses-based client for the Music Player Daemon +LICENSE= GPLv3 + LIB_DEPENDS= libboost_regex.so:${PORTSDIR}/devel/boost-libs USES= pkgconfig -NO_STAGE= yes USE_BZIP2= yes GNU_CONFIGURE= yes USE_GNOME= glib20 -MAN1= ${PORTNAME}.1 -PLIST_FILES= bin/${PORTNAME} +PLIST_FILES= bin/${PORTNAME} \ + man/man1/pms.1.gz CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib Copied: branches/2014Q1/audio/pms/files/patch-src_message.h (from r340845, head/audio/pms/files/patch-src_message.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/audio/pms/files/patch-src_message.h Thu Jan 23 20:13:09 2014 (r340858, copy of r340845, head/audio/pms/files/patch-src_message.h) @@ -0,0 +1,10 @@ +--- src/message.h.orig 2010-01-02 21:53:36.000000000 +0100 ++++ src/message.h 2014-01-19 16:59:54.616726275 +0100 +@@ -25,6 +25,7 @@ + #define _PMS_MESSAGE_H_ + + #include ++#include + + using namespace std; + Modified: branches/2014Q1/audio/pms/pkg-descr ============================================================================== --- branches/2014Q1/audio/pms/pkg-descr Thu Jan 23 20:12:54 2014 (r340857) +++ branches/2014Q1/audio/pms/pkg-descr Thu Jan 23 20:13:09 2014 (r340858) @@ -4,4 +4,4 @@ need an MPD client that is highly config features a simple but powerful interface similar to Vim, and runs on (at least) Linux and Mac OS X. -WWW: http://pms.sourceforge.net/ +WWW: http://pms.sourceforge.net/ From owner-svn-ports-branches@FreeBSD.ORG Thu Jan 23 21:41:47 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5B13E71D; Thu, 23 Jan 2014 21:41:47 +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 3B8241F1C; Thu, 23 Jan 2014 21:41: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 s0NLfl11043583; Thu, 23 Jan 2014 21:41:47 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0NLfkk9043581; Thu, 23 Jan 2014 21:41:46 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201401232141.s0NLfkk9043581@svn.freebsd.org> From: Raphael Kubo da Costa Date: Thu, 23 Jan 2014 21:41:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r340863 - in branches/2014Q1/devel/shiboken: . 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, 23 Jan 2014 21:41:47 -0000 Author: rakuco Date: Thu Jan 23 21:41:46 2014 New Revision: 340863 URL: http://svnweb.freebsd.org/changeset/ports/340863 QAT: https://qat.redports.org/buildarchive/r340863/ Log: MFH: r340659 Partially fix the build. Sphinx underwent an incompatible change in version 1.2 that removed the sphinx.ext.refcounting module. The module is referenced by shiboken's Sphinx configuration file, and the build fails. Fix it by removing the reference to sphinx.ext.refcounting, as it does not seem to be required and was probably added by default when the configuration file was generated. As mentioned, this is a partial fix: platforms that use libc++ by default are still broken due to other issues, but at least FreeBSD 8 and 9 should have a working package again. While here, also use the new syntax for LIB_DEPENDS. PR: ports/185179 Submitted by: rakuco@ Approved by: maintainer timeout (27 days) Approved by: portmgr (mat) Added: branches/2014Q1/devel/shiboken/files/patch-doc__conf.py.in - copied unchanged from r340659, head/devel/shiboken/files/patch-doc__conf.py.in Modified: branches/2014Q1/devel/shiboken/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/devel/shiboken/Makefile ============================================================================== --- branches/2014Q1/devel/shiboken/Makefile Thu Jan 23 21:39:40 2014 (r340862) +++ branches/2014Q1/devel/shiboken/Makefile Thu Jan 23 21:41:46 2014 (r340863) @@ -13,8 +13,8 @@ COMMENT= C++ code generator for CPython LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi -LIB_DEPENDS= xml2:${PORTSDIR}/textproc/libxml2 \ - xslt:${PORTSDIR}/textproc/libxslt +LIB_DEPENDS= libxml2.so:${PORTSDIR}/textproc/libxml2 \ + libxslt.so:${PORTSDIR}/textproc/libxslt PLIST_SUB= PORTVERSION=${PORTVERSION} \ PYTHON_VERSION=${PYTHON_VERSION} Copied: branches/2014Q1/devel/shiboken/files/patch-doc__conf.py.in (from r340659, head/devel/shiboken/files/patch-doc__conf.py.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/devel/shiboken/files/patch-doc__conf.py.in Thu Jan 23 21:41:46 2014 (r340863, copy of r340659, head/devel/shiboken/files/patch-doc__conf.py.in) @@ -0,0 +1,11 @@ +--- doc/conf.py.in.orig 2013-12-25 19:56:52.000000000 +0200 ++++ doc/conf.py.in 2013-12-25 19:57:00.000000000 +0200 +@@ -22,7 +22,7 @@ + + # Add any Sphinx extension module names here, as strings. They can be extensions + # coming with Sphinx (named 'sphinx.ext.*') or your custom ones. +-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.ifconfig', 'sphinx.ext.refcounting', 'sphinx.ext.coverage'] ++extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.ifconfig', 'sphinx.ext.coverage'] + + rst_epilog = """ + .. |project| replace:: Shiboken From owner-svn-ports-branches@FreeBSD.ORG Fri Jan 24 09:54:11 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 193A72C3; Fri, 24 Jan 2014 09:54: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 04B621967; Fri, 24 Jan 2014 09:54: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 s0O9sASq062424; Fri, 24 Jan 2014 09:54:10 GMT (envelope-from bsam@svn.freebsd.org) Received: (from bsam@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0O9sAGe062423; Fri, 24 Jan 2014 09:54:10 GMT (envelope-from bsam@svn.freebsd.org) Message-Id: <201401240954.s0O9sAGe062423@svn.freebsd.org> From: Boris Samorodov Date: Fri, 24 Jan 2014 09:54:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r340887 - branches/2014Q1/www/web2ldap 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, 24 Jan 2014 09:54:11 -0000 Author: bsam Date: Fri Jan 24 09:54:10 2014 New Revision: 340887 URL: http://svnweb.freebsd.org/changeset/ports/340887 QAT: https://qat.redports.org/buildarchive/r340887/ Log: MFH: r340884 Add MASTER_SITE_LOCAL since a previous version disappears as long as a new one is released. Requested by: marino (via e-mail) Reminded by: pkg-fallout@ Approved by: portmgr (mat) Modified: branches/2014Q1/www/web2ldap/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/www/web2ldap/Makefile ============================================================================== --- branches/2014Q1/www/web2ldap/Makefile Fri Jan 24 09:33:40 2014 (r340886) +++ branches/2014Q1/www/web2ldap/Makefile Fri Jan 24 09:54:10 2014 (r340887) @@ -5,7 +5,8 @@ PORTNAME= web2ldap PORTVERSION= 1.1.47 CATEGORIES= www MASTER_SITES= http://www.web2ldap.de/download/ \ - http://www.sfr-fresh.com/unix/www/ + http://www.sfr-fresh.com/unix/www/ \ + LOCAL/bsam MAINTAINER= bsam@FreeBSD.org COMMENT= Python-based WWW gateway to LDAP servers From owner-svn-ports-branches@FreeBSD.ORG Sat Jan 25 10:32:52 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6924DCC3; Sat, 25 Jan 2014 10:32: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 5512C147F; Sat, 25 Jan 2014 10:32: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 s0PAWqCs049625; Sat, 25 Jan 2014 10:32:52 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0PAWqsL049624; Sat, 25 Jan 2014 10:32:52 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201401251032.s0PAWqsL049624@svn.freebsd.org> From: Martin Wilke Date: Sat, 25 Jan 2014 10:32:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r341001 - in branches/2014Q1/net/yconalyzer: . 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, 25 Jan 2014 10:32:52 -0000 Author: miwi Date: Sat Jan 25 10:32:51 2014 New Revision: 341001 URL: http://svnweb.freebsd.org/changeset/ports/341001 QAT: https://qat.redports.org/buildarchive/r341001/ Log: MFH: r339915 - Fix build on FreeBSD 10. PR: 185683 Submitted by: maintainer Added: branches/2014Q1/net/yconalyzer/files/ - copied from r339915, head/net/yconalyzer/files/ Modified: branches/2014Q1/net/yconalyzer/Makefile (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/net/yconalyzer/Makefile ============================================================================== --- branches/2014Q1/net/yconalyzer/Makefile Sat Jan 25 09:28:51 2014 (r341000) +++ branches/2014Q1/net/yconalyzer/Makefile Sat Jan 25 10:32:51 2014 (r341001) @@ -3,6 +3,7 @@ PORTNAME= yconalyzer PORTVERSION= 1.0.4 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= SF MASTER_SITE_SUBDIR= ${PORTNAME} @@ -14,10 +15,10 @@ GNU_CONFIGURE= yes PLIST_FILES= bin/yconalyzer USE_BZIP2= yes USE_GMAKE= yes +NO_STAGE= yes MAN8= yconalyzer.8 -NO_STAGE= yes pre-install: ${CHMOD} a+x ${WRKSRC}/install-sh From owner-svn-ports-branches@FreeBSD.ORG Sat Jan 25 10:34:39 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F0DFCEEF; Sat, 25 Jan 2014 10:34:39 +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 DB34614B9; Sat, 25 Jan 2014 10:34:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0PAYd49049975; Sat, 25 Jan 2014 10:34:39 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0PAYd6b049974; Sat, 25 Jan 2014 10:34:39 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201401251034.s0PAYd6b049974@svn.freebsd.org> From: Martin Wilke Date: Sat, 25 Jan 2014 10:34:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r341002 - branches/2014Q1/misc/libeatmydata 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, 25 Jan 2014 10:34:40 -0000 Author: miwi Date: Sat Jan 25 10:34:39 2014 New Revision: 341002 URL: http://svnweb.freebsd.org/changeset/ports/341002 QAT: https://qat.redports.org/buildarchive/r341002/ Log: MFH: r340041 - Unbreak build PR: 185600 Submitted by: Attila Nagy (maintainer) Modified: branches/2014Q1/misc/libeatmydata/Makefile (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/misc/libeatmydata/Makefile ============================================================================== --- branches/2014Q1/misc/libeatmydata/Makefile Sat Jan 25 10:32:51 2014 (r341001) +++ branches/2014Q1/misc/libeatmydata/Makefile Sat Jan 25 10:34:39 2014 (r341002) @@ -18,6 +18,9 @@ PLIST_FILES= lib/libeatmydata.so \ lib/libeatmydata.so.1.0 NO_STAGE= yes +post-patch: + ${SED} -i '' -e 's/gcc/${CC}/' ${WRKSRC}/Makefile + do-install: ${INSTALL_DATA} ${WRKSRC}/libeatmydata.so.1.0 ${PREFIX}/lib From owner-svn-ports-branches@FreeBSD.ORG Sat Jan 25 10:35:52 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 00435FDB; Sat, 25 Jan 2014 10:35: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 E01D114C7; Sat, 25 Jan 2014 10:35: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 s0PAZpvC050228; Sat, 25 Jan 2014 10:35:51 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0PAZpVZ050227; Sat, 25 Jan 2014 10:35:51 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201401251035.s0PAZpVZ050227@svn.freebsd.org> From: Martin Wilke Date: Sat, 25 Jan 2014 10:35:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r341003 - branches/2014Q1/devel/libcwd 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, 25 Jan 2014 10:35:52 -0000 Author: miwi Date: Sat Jan 25 10:35:51 2014 New Revision: 341003 URL: http://svnweb.freebsd.org/changeset/ports/341003 QAT: https://qat.redports.org/buildarchive/r341003/ Log: MFH: r340076 - Fix build PR: 184239 Submitted by: Ports Fury Modified: branches/2014Q1/devel/libcwd/Makefile (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/devel/libcwd/Makefile ============================================================================== --- branches/2014Q1/devel/libcwd/Makefile Sat Jan 25 10:34:39 2014 (r341002) +++ branches/2014Q1/devel/libcwd/Makefile Sat Jan 25 10:35:51 2014 (r341003) @@ -7,10 +7,10 @@ CATEGORIES= devel MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org -COMMENT= The C++ Debugging Support Library +COMMENT= C++ Debugging Support Library -USES= pathfix pkgconfig -USE_GMAKE= yes +USES= gmake pathfix pkgconfig +USE_GCC= any USE_AUTOTOOLS= libtool CONFIGURE_ARGS= --disable-alloc --disable-location --disable-threading \ --disable-pch @@ -18,7 +18,6 @@ USE_LDCONFIG= yes CFLAGS+= -D__GNU_LIBRARY__ -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's|malloc\.h|stdlib.h|g ; \ s|localtime(|localtime((const time_t *)|g' ${WRKSRC}/debugmalloc.cc From owner-svn-ports-branches@FreeBSD.ORG Sat Jan 25 10:37:28 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3CC9D1DF; Sat, 25 Jan 2014 10:37:28 +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 2844814E0; Sat, 25 Jan 2014 10:37:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0PAbSu4050525; Sat, 25 Jan 2014 10:37:28 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0PAbSuB050524; Sat, 25 Jan 2014 10:37:28 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201401251037.s0PAbSuB050524@svn.freebsd.org> From: Martin Wilke Date: Sat, 25 Jan 2014 10:37:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r341004 - in branches/2014Q1/audio/xmms-modplug: . 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, 25 Jan 2014 10:37:28 -0000 Author: miwi Date: Sat Jan 25 10:37:27 2014 New Revision: 341004 URL: http://svnweb.freebsd.org/changeset/ports/341004 QAT: https://qat.redports.org/buildarchive/r341004/ Log: MFH: r340232 - Fix build with clang PR: 185313 Submitted by: Ports Fury Added: branches/2014Q1/audio/xmms-modplug/files/ - copied from r340232, head/audio/xmms-modplug/files/ Modified: branches/2014Q1/audio/xmms-modplug/Makefile (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/audio/xmms-modplug/Makefile ============================================================================== --- branches/2014Q1/audio/xmms-modplug/Makefile Sat Jan 25 10:35:51 2014 (r341003) +++ branches/2014Q1/audio/xmms-modplug/Makefile Sat Jan 25 10:37:27 2014 (r341004) @@ -12,21 +12,23 @@ DISTNAME= ${PORTNAME}${PKGNAMEPREFIX}2.0 MAINTAINER= ports@FreeBSD.org COMMENT= ModPlug-based plugin for XMMS -LIB_DEPENDS?= libxmms.so:${PORTSDIR}/multimedia/xmms -LIB_DEPENDS+= modplug:${PORTSDIR}/audio/libmodplug +BUILD_DEPENDS= xmms>0:${PORTSDIR}/multimedia/xmms +LIB_DEPENDS= libmodplug.so:${PORTSDIR}/audio/libmodplug +RUN_DEPENDS= xmms>0:${PORTSDIR}/multimedia/xmms USES= pkgconfig -NO_STAGE= yes +USE_AUTOTOOLS= libtool USE_LDCONFIG= yes -HAS_CONFIGURE= yes -PLUGDIR?= lib/xmms/Input -PLIST_FILES= ${PLUGDIR}/libmodplugxmms.so + +PLIST_FILES= lib/xmms/Input/libmodplugxmms.so post-patch: - @${REINPLACE_CMD} -e '/objformat=/s|=.*|=elf|' ${WRKSRC}/configure + @${REINPLACE_CMD} -e \ + 's|-lstdc++||' ${WRKSRC}/modplugxmms/Makefile.in do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/modplugxmms/.libs/libmodplugxmms.so \ - ${PREFIX}/${PLUGDIR} + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/xmms/Input + (cd ${WRKSRC}/modplugxmms/.libs && ${INSTALL_LIB} libmodplugxmms.so \ + ${STAGEDIR}${PREFIX}/lib/xmms/Input) .include From owner-svn-ports-branches@FreeBSD.ORG Sat Jan 25 10:39:37 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3BE2F335; Sat, 25 Jan 2014 10:39:37 +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 0DDD514FD; Sat, 25 Jan 2014 10:39:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0PAdaRx050893; Sat, 25 Jan 2014 10:39:36 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0PAdaqp050892; Sat, 25 Jan 2014 10:39:36 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201401251039.s0PAdaqp050892@svn.freebsd.org> From: Martin Wilke Date: Sat, 25 Jan 2014 10:39:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r341005 - in branches/2014Q1/graphics/xmms-fishmatic: . 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, 25 Jan 2014 10:39:37 -0000 Author: miwi Date: Sat Jan 25 10:39:36 2014 New Revision: 341005 URL: http://svnweb.freebsd.org/changeset/ports/341005 QAT: https://qat.redports.org/buildarchive/r341005/ Log: MFH: r340233 - Fix build with clang PR: 185337 Deleted: branches/2014Q1/graphics/xmms-fishmatic/files/ Modified: branches/2014Q1/graphics/xmms-fishmatic/Makefile (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/graphics/xmms-fishmatic/Makefile ============================================================================== --- branches/2014Q1/graphics/xmms-fishmatic/Makefile Sat Jan 25 10:37:27 2014 (r341004) +++ branches/2014Q1/graphics/xmms-fishmatic/Makefile Sat Jan 25 10:39:36 2014 (r341005) @@ -11,27 +11,33 @@ DISTNAME= fishmatic MAINTAINER= ports@FreeBSD.org COMMENT= XMMS non-static OpenGL stereogram visualization plugin -BUILD_DEPENDS= xmms-config:${PORTSDIR}/multimedia/xmms -RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms +BUILD_DEPENDS= xmms>0:${PORTSDIR}/multimedia/xmms +RUN_DEPENDS= xmms>0:${PORTSDIR}/multimedia/xmms -PLIST_FILES= lib/xmms/Visualization/libfishmatic.so -USE_GNOME= gtk12 USES= gmake pkgconfig -GNU_CONFIGURE= yes -USE_GL= glut USE_XORG= xext -USE_LDCONFIG= yes +USE_GNOME= gtk12 +USE_GL= glut +USE_AUTOTOOLS= libtool -CONFIGURE_ENV= LIBS="-lGL -lXext ${LIBS}" -CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib + +PLIST_FILES= lib/xmms/Visualization/libfishmatic.so -NO_STAGE= yes post-patch: + @${REINPLACE_CMD} -e \ + 's|"-lpthread|"-pthread|' ${WRKSRC}/configure + @${REINPLACE_CMD} -e \ + 's|-O2|| ; \ + s|@PNG_LIBS@||' ${WRKSRC}/Makefile.in + +pre-configure: @${RM} -f ${WRKSRC}/config.cache - @${REINPLACE_CMD} -e 's|-O2||; \ - s|-lpthreads|${PTHREAD_LIBS:S/"//g}|g' \ - ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} - @${REINPLACE_CMD} -e 's|-O2||' ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e '/objformat=/s|=.*|=elf|' ${WRKSRC}/ltconfig + +do-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/xmms/Visualization + (cd ${WRKSRC}/.libs && ${INSTALL_LIB} libfishmatic.so \ + ${STAGEDIR}${PREFIX}/lib/xmms/Visualization) .include From owner-svn-ports-branches@FreeBSD.ORG Sat Jan 25 10:41:58 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 61A02501; Sat, 25 Jan 2014 10:41:58 +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 34145158B; Sat, 25 Jan 2014 10:41:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0PAfwfh053851; Sat, 25 Jan 2014 10:41:58 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0PAfw2J053850; Sat, 25 Jan 2014 10:41:58 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201401251041.s0PAfw2J053850@svn.freebsd.org> From: Martin Wilke Date: Sat, 25 Jan 2014 10:41:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r341006 - branches/2014Q1/audio/xmms-wma 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, 25 Jan 2014 10:41:58 -0000 Author: miwi Date: Sat Jan 25 10:41:57 2014 New Revision: 341006 URL: http://svnweb.freebsd.org/changeset/ports/341006 QAT: https://qat.redports.org/buildarchive/r341006/ Log: MFH: r340234 - Fix build with clang PR: 185340 Submitted by: ports fury Modified: branches/2014Q1/audio/xmms-wma/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/audio/xmms-wma/Makefile ============================================================================== --- branches/2014Q1/audio/xmms-wma/Makefile Sat Jan 25 10:39:36 2014 (r341005) +++ branches/2014Q1/audio/xmms-wma/Makefile Sat Jan 25 10:41:57 2014 (r341006) @@ -3,7 +3,7 @@ PORTNAME= xmms-wma PORTVERSION= 1.0.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio MASTER_SITES= http://mcmcc.bat.ru/xmms-wma/ @@ -12,38 +12,54 @@ COMMENT= WMA plugin for xmms LIB_DEPENDS= libxmms.so:${PORTSDIR}/multimedia/xmms -USES= gmake -NO_STAGE= yes -USE_BZIP2= yes -CFLAGS+= -fPIC -DPIC +OPTIONS_DEFINE= ICONV +OPTIONS_DEFAULT=ICONV + ONLY_FOR_ARCHS= i386 amd64 sparc64 + +USE_BZIP2= yes +USES= compiler gmake USE_XORG= xi xext x11 +USE_CSTD= gnu89 +USE_LDCONFIG= yes + +CFLAGS+= -fPIC -DPIC PLIST_FILES= lib/xmms/Input/libwma.so -USE_LDCONFIG= yes -.if defined(WITH_ICONV) +.include + +.if ${PORT_OPTIONS:MICONV} +USES+= iconv CFLAGS+= -DUSE_ICONV -USES= iconv .endif .include -pre-everything:: -.if !defined(WITH_ICONV) - @${ECHO_MSG} "You may specify the following on the command line:" - @${ECHO_MSG} " " - @${ECHO_MSG} "WITH_ICONV=yes Enable tag recoding support using iconv" - @${ECHO_MSG} " " +.if ${CHOSEN_COMPILER_TYPE} == "clang" +CFLAGS+= -D__inline__= .endif post-extract: - @${REINPLACE_CMD} -e 's|gcc|${CC}|g' ${WRKSRC}/Makefile.inc - @${REINPLACE_CMD} -e 's|gcc|${CC}|g' ${WRKSRC}/ffmpeg-strip-wma/config.mak - @${REINPLACE_CMD} -e 's|CFLAGS :=|CFLAGS := ${CFLAGS}|g' ${WRKSRC}/Makefile.inc -.if ${ARCH}=="sparc64" - @${REINPLACE_CMD} -e 's|X86|SPARC64|' ${WRKSRC}/ffmpeg-strip-wma/config.mak - @${REINPLACE_CMD} -e 's|#define ARCH_X86 1|#define ARCH_SPARC64 1|' ${WRKSRC}/ffmpeg-strip-wma/config.h + @${REINPLACE_CMD} -e \ + 's|^CC :=|CC ?=| ; \ + s|^CFLAGS :=|CFLAGS += | ; \ + s|-O[0-9]||' ${WRKSRC}/Makefile.inc + @${REINPLACE_CMD} -e \ + 's|^MAKE=|MAKE?=| ; \ + s|^CC=|CC?=| ; \ + s|-O[0-9]||' ${WRKSRC}/ffmpeg-strip-wma/config.mak +.if ${ARCH} == "sparc64" + @${REINPLACE_CMD} -e \ + s|X86|SPARC64|' ${WRKSRC}/ffmpeg-strip-wma/config.mak + @${REINPLACE_CMD} -e \ + 's|#define ARCH_X86 1|#define ARCH_SPARC64 1|' \ + ${WRKSRC}/ffmpeg-strip-wma/config.h .endif +do-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/xmms/Input + (cd ${WRKSRC} && ${INSTALL_LIB} libwma.so \ + ${STAGEDIR}${PREFIX}/lib/xmms/Input) + .include From owner-svn-ports-branches@FreeBSD.ORG Sat Jan 25 10:46:23 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1B45B8B8; Sat, 25 Jan 2014 10:46:23 +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 F003815BA; Sat, 25 Jan 2014 10:46: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 s0PAkMkq054607; Sat, 25 Jan 2014 10:46:22 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0PAkMIG054603; Sat, 25 Jan 2014 10:46:22 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201401251046.s0PAkMIG054603@svn.freebsd.org> From: Martin Wilke Date: Sat, 25 Jan 2014 10:46:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r341007 - in branches/2014Q1/graphics/xmms-dancingparticles: . 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, 25 Jan 2014 10:46:23 -0000 Author: miwi Date: Sat Jan 25 10:46:21 2014 New Revision: 341007 URL: http://svnweb.freebsd.org/changeset/ports/341007 QAT: https://qat.redports.org/buildarchive/r341007/ Log: MFH: r340235 - Fix build with clang PR: 185340 Submitted by: ports fury Added: branches/2014Q1/graphics/xmms-dancingparticles/files/patch-plugin.cc - copied unchanged from r340235, head/graphics/xmms-dancingparticles/files/patch-plugin.cc branches/2014Q1/graphics/xmms-dancingparticles/files/patch-signal.cc - copied unchanged from r340235, head/graphics/xmms-dancingparticles/files/patch-signal.cc Deleted: branches/2014Q1/graphics/xmms-dancingparticles/pkg-plist Modified: branches/2014Q1/graphics/xmms-dancingparticles/Makefile (contents, props changed) branches/2014Q1/graphics/xmms-dancingparticles/files/patch-Makefile (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/graphics/xmms-dancingparticles/Makefile ============================================================================== --- branches/2014Q1/graphics/xmms-dancingparticles/Makefile Sat Jan 25 10:41:57 2014 (r341006) +++ branches/2014Q1/graphics/xmms-dancingparticles/Makefile Sat Jan 25 10:46:21 2014 (r341007) @@ -13,17 +13,33 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= Makes particles dance with pretty neon colors -LIB_DEPENDS= t1.5:${PORTSDIR}/devel/t1lib \ - xmms.4:${PORTSDIR}/multimedia/xmms +LIB_DEPENDS= libt1.so:${PORTSDIR}/devel/t1lib \ + libxmms.so:${PORTSDIR}/multimedia/xmms USE_GL= glut USE_GNOME= gtk12 USE_SDL= sdl -CFLAGS+= -I${PREFIX}/include -NO_STAGE= yes +PLIST_FILES= lib/xmms/Visualization/libdancingparticles2.so \ + %%DATADIR%%/dance.epic \ + %%DATADIR%%/dancingparticles.conf \ + %%DATADIR%%/font.pfb \ + %%DATADIR%%/xmms.epic +PLIST_DIRS= %%DATADIR%% + post-patch: - @${REINPLACE_CMD} -e 's|\(#include.*\)SDL/\(SDL.*\)|\1\2| ; \ - s|/usr/local|${PREFIX}|' ${WRKSRC}/*.cc ${WRKSRC}/*.h + @${FIND} ${WRKSRC} -name "*.cc" -or -name "*.h" -print0 | ${XARGS} -0 \ + ${REINPLACE_CMD} -e \ + 's|\(#include.*\)SDL/\(SDL.*\)|\1\2| ; \ + s|/usr/local|${PREFIX}|' + +do-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/xmms/Visualization + (cd ${WRKSRC} && ${INSTALL_LIB} libdancingparticles2.so \ + ${STAGEDIR}${PREFIX}/lib/xmms/Visualization) + @${MKDIR} ${STAGEDIR}${DATADIR} +.for i in dance.epic dancingparticles.conf font.pfb xmms.epic + (cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DATADIR}) +.endfor .include Modified: branches/2014Q1/graphics/xmms-dancingparticles/files/patch-Makefile ============================================================================== --- branches/2014Q1/graphics/xmms-dancingparticles/files/patch-Makefile Sat Jan 25 10:41:57 2014 (r341006) +++ branches/2014Q1/graphics/xmms-dancingparticles/files/patch-Makefile Sat Jan 25 10:46:21 2014 (r341007) @@ -1,5 +1,5 @@ ---- Makefile.orig Sat Jan 31 08:05:51 2004 -+++ Makefile Fri Oct 14 20:53:22 2005 +--- Makefile.orig 2004-01-31 20:05:51.000000000 +0900 ++++ Makefile 2013-12-12 06:44:52.000000000 +0900 @@ -1,14 +1,13 @@ -CC = gcc #OPT = -m486 -O2 @@ -8,9 +8,9 @@ -CFLAGS = $(OPT) -Wall -fPIC `gtk-config --cflags gthread` -LFLAGS = -shared -fPIC -L/usr/local/lib -lm -lstdc++ -lGL -lGLU -L/usr/X11R6/lib -lt1 -lSDL -LFLAGS2 = -L/usr/local/lib -lm -lstdc++ -lGL -lGLU -L/usr/X11R6/lib -lpthread -lgtk -lgdk -lglut -lt1 -+CFLAGS += -fPIC `gtk-config --cflags gthread` `${SDL_CONFIG} --cflags` -+LFLAGS = -shared -fPIC -L${LOCALBASE}/lib -lm -lstdc++ -lGL -lGLU -lt1 `${SDL_CONFIG} --libs` -+LFLAGS2 = -L${LOCALBASE}/lib -lm -lstdc++ -lGL -lGLU -lgtk -lgdk -lglut -lt1 ++CPPFLAGS += -fPIC `${GTK_CONFIG} --cflags gthread` `${SDL_CONFIG} --cflags` ++LFLAGS = -shared -fPIC -lm -lGL -lGLU -lt1 `${SDL_CONFIG} --libs` ++LFLAGS2 = -lm -lGL -lGLU -lglut -lt1 `${GTK_CONFIG} --libs gdk` OBJ = plugin.o gl.o etoile.o readme.o parameters.o epic.o config.o signal.o t1font.o INSTALL-DIR=`xmms-config --visualization-plugin-dir` @@ -19,24 +19,18 @@ BIN=libdancingparticles2.so all: $(BIN) -@@ -33,14 +32,12 @@ - rm -f *.o core *~ +@@ -20,11 +19,11 @@ + $(CC) -o test $(OBJ) main.o $(LFLAGS2) - install: $(BIN) -- strip $(BIN) -- install $(BIN) $(INSTALL-DIR) -- rm -Rf /usr/local/share/dancingparticles -- mkdir /usr/local/share/dancingparticles -- install dance.epic /usr/local/share/dancingparticles/ -- install dancingparticles.conf /usr/local/share/dancingparticles/ -- install xmms.epic /usr/local/share/dancingparticles/ -- install font.pfb /usr/local/share/dancingparticles/ -+ $(BSD_INSTALL_PROGRAM) $(BIN) $(INSTALL-DIR) -+ mkdir $(DATADIR) -+ $(BSD_INSTALL_DATA) dance.epic $(DATADIR) -+ $(BSD_INSTALL_DATA) dancingparticles.conf $(DATADIR) -+ $(BSD_INSTALL_DATA) xmms.epic $(DATADIR) -+ $(BSD_INSTALL_DATA) font.pfb $(DATADIR) + .cpp.o: +- $(CC) $(CFLAGS) $(XMMS_DATADIR_FLAGS) -c $< ++ $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(XMMS_DATADIR_FLAGS) -c $< + .cc.o: +- $(CC) $(CFLAGS) $(XMMS_DATADIR_FLAGS) -c $< ++ $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(XMMS_DATADIR_FLAGS) -c $< + .c.o: +- $(CC) $(CFLAGS) $(XMMS_DATADIR_FLAGS) -c $< ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(XMMS_DATADIR_FLAGS) -c $< - - plugin.o: plugin.cc etoile.h + clean: + rm -f *.o core *.so* test *~ *\# readme.c Copied: branches/2014Q1/graphics/xmms-dancingparticles/files/patch-plugin.cc (from r340235, head/graphics/xmms-dancingparticles/files/patch-plugin.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/graphics/xmms-dancingparticles/files/patch-plugin.cc Sat Jan 25 10:46:21 2014 (r341007, copy of r340235, head/graphics/xmms-dancingparticles/files/patch-plugin.cc) @@ -0,0 +1,45 @@ +--- plugin.cc.orig ++++ plugin.cc +@@ -109,7 +109,7 @@ + + static SDL_Surface *opengl_screen = NULL; + static SDL_Thread *draw_thread = NULL; +-SDL_mutex *mutex = NULL; ++SDL_mutex *sdlmutex = NULL; + + VisPlugin dp_vplugin = { + NULL, /* internal */ +@@ -158,14 +158,14 @@ + void + init_mutexes (void) + { +- mutex = SDL_CreateMutex(); ++ sdlmutex = SDL_CreateMutex(); + } + + + void + destroy_mutexes (void) + { +- SDL_DestroyMutex(mutex); ++ SDL_DestroyMutex(sdlmutex); + } + + void +@@ -456,14 +456,14 @@ + + while (!point_general->finished) { + if (!point_general->paused) { +- SDL_mutexP(mutex); ++ SDL_mutexP(sdlmutex); + + update_playlist_info(); + look_conf_file(); + etoileLoop(); + draw_gl(); + +- SDL_mutexV(mutex); ++ SDL_mutexV(sdlmutex); + calc_fps(); + calc_max_fps(); + printf("\rFPS: %3.2f", framerate); printf(" "); Copied: branches/2014Q1/graphics/xmms-dancingparticles/files/patch-signal.cc (from r340235, head/graphics/xmms-dancingparticles/files/patch-signal.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/graphics/xmms-dancingparticles/files/patch-signal.cc Sat Jan 25 10:46:21 2014 (r341007, copy of r340235, head/graphics/xmms-dancingparticles/files/patch-signal.cc) @@ -0,0 +1,29 @@ +--- signal.cc.orig ++++ signal.cc +@@ -24,7 +24,7 @@ + #include + + beatdetector detector; +-extern SDL_mutex *mutex; ++extern SDL_mutex *sdlmutex; + + beatdetector::beatdetector() + { +@@ -93,7 +93,7 @@ + { + int i; + +- SDL_mutexP(mutex); ++ SDL_mutexP(sdlmutex); + + for(i = 0; i < 32; i++) + heights[i] = (heights[i] + spectrum[0][i]) / 2; +@@ -126,7 +126,7 @@ + + curloudness = (curloudness + 1)%200; + +- SDL_mutexV(mutex); ++ SDL_mutexV(sdlmutex); + + } + From owner-svn-ports-branches@FreeBSD.ORG Sat Jan 25 10:50:48 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2F79FA34; Sat, 25 Jan 2014 10:50: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 01F3D15DD; Sat, 25 Jan 2014 10:50: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 s0PAolui055791; Sat, 25 Jan 2014 10:50:47 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0PAolTC055790; Sat, 25 Jan 2014 10:50:47 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201401251050.s0PAolTC055790@svn.freebsd.org> From: Martin Wilke Date: Sat, 25 Jan 2014 10:50:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r341008 - in branches/2014Q1/graphics/xmms-blursk: . 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, 25 Jan 2014 10:50:48 -0000 Author: miwi Date: Sat Jan 25 10:50:47 2014 New Revision: 341008 URL: http://svnweb.freebsd.org/changeset/ports/341008 QAT: https://qat.redports.org/buildarchive/r341008/ Log: MFH: r340236 - Fix build with clang PR: 185350 Submitted by: ports fury Deleted: branches/2014Q1/graphics/xmms-blursk/files/ Modified: branches/2014Q1/graphics/xmms-blursk/Makefile (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/graphics/xmms-blursk/Makefile ============================================================================== --- branches/2014Q1/graphics/xmms-blursk/Makefile Sat Jan 25 10:46:21 2014 (r341007) +++ branches/2014Q1/graphics/xmms-blursk/Makefile Sat Jan 25 10:50:47 2014 (r341008) @@ -12,22 +12,34 @@ DISTNAME= Blursk-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= XMMS plugin inspired by "Blur Scope" -BUILD_DEPENDS= xmms-config:${PORTSDIR}/multimedia/xmms -RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms +LICENSE= GPLv2 # (or later) -PLIST_FILES= lib/xmms/Visualization/libblursk.so -USE_GNOME= gtk12 +BUILD_DEPENDS= xmms>0:${PORTSDIR}/multimedia/xmms +RUN_DEPENDS= xmms>0:${PORTSDIR}/multimedia/xmms + +USES= compiler USE_XORG= x11 xv -GNU_CONFIGURE= yes +USE_GNOME= gtk12 +USE_AUTOTOOLS= libtool USE_LDCONFIG= yes -CPPFLAGS+= ${CFLAGS} ${PTHREAD_CFLAGS} +PLIST_FILES= lib/xmms/Visualization/libblursk.so + +.include + +.if ${ARCH} == "i386" && ${COMPILER_TYPE} == "clang" +USE_BINUTILS= yes +CPPFLAGS+= -no-integrated-as +.endif -NO_STAGE= yes post-patch: - @${REINPLACE_CMD} -e 's|-O2||' \ - ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} \ - ${BUILD_WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e '/objformat=/s|=.*|=elf|' ${WRKSRC}/configure + @${REINPLACE_CMD} -e \ + 's|-O2|| ; \ + s|@PTHREAD_LIBS@||' ${WRKSRC}/Makefile.in -.include +do-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/xmms/Visualization + (cd ${WRKSRC}/.libs && ${INSTALL_LIB} libblursk.so \ + ${STAGEDIR}${PREFIX}/lib/xmms/Visualization) + +.include From owner-svn-ports-branches@FreeBSD.ORG Sat Jan 25 11:25:40 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2DEC7188; Sat, 25 Jan 2014 11:25:40 +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 0E2731849; Sat, 25 Jan 2014 11:25:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0PBPdYf070218; Sat, 25 Jan 2014 11:25:39 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0PBPd4H070217; Sat, 25 Jan 2014 11:25:39 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201401251125.s0PBPd4H070217@svn.freebsd.org> From: Mathieu Arnold Date: Sat, 25 Jan 2014 11:25:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r341010 - branches/2014Q1/security/vuxml 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, 25 Jan 2014 11:25:40 -0000 Author: mat Date: Sat Jan 25 11:25:39 2014 New Revision: 341010 URL: http://svnweb.freebsd.org/changeset/ports/341010 QAT: https://qat.redports.org/buildarchive/r341010/ Log: MFH: r340750, r340819, r340877, r340998 - Document HTMLDOC < 1.8.28 vulnerability. - flash up-to 11.2r202.335 - Document Varnish HTTP Cache < 3.0.5 DoS Vulnerability Sponsored by: Absolight Modified: branches/2014Q1/security/vuxml/vuln.xml Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/security/vuxml/vuln.xml ============================================================================== --- branches/2014Q1/security/vuxml/vuln.xml Sat Jan 25 11:06:11 2014 (r341009) +++ branches/2014Q1/security/vuxml/vuln.xml Sat Jan 25 11:25:39 2014 (r341010) @@ -51,6 +51,111 @@ Note: Please add new entries to the beg --> + + varnish -- DoS vulnerability in Varnish HTTP cache + + + varnish + 3.0.5 + + + + +

Varnish Cache Project reports:

+
+

If Varnish receives a certain illegal request, and the subroutine + 'vcl_error{}' restarts the request, the varnishd worker process + will crash with an assert. +

+

The varnishd management process will restart the worker process, but + there will be a brief interruption of service and the cache will be + emptied, causing more traffic to go to the backend. +

+

We are releasing this advisory because restarting from vcl_error{} is both fairly common and documented.

+

This is purely a denial of service vulnerability, there is no risk of privilege escalation.

+

Workaround

+

Insert this at the top of your VCL file:

+ 
+		sub vcl_error {
+			if (obj.status == 400 || obj.status == 413) {
+				return(deliver);
+			}
+		}
+
+		Or add this test at the top of your existing vcl_error{}.
+
+
+ + + + CVE-2013-4484 + https://www.varnish-cache.org/lists/pipermail/varnish-announce/2013-October/000686.html + + + 2013-10-30 + 2014-01-25 + + + + + linux-flashplugin -- multiple vulnerabilities + + + linux-f10-flashplugin + 11.2r202.335 + + + + +

Adobe reports:

+
+

These updates address vulnerabilities that could cause a crash + and potentially allow an attacker to take control of the affected system.

+
+ + + + CVE-2014-0491 + CVE-2014-0492 + http://helpx.adobe.com/security/products/flash-player/apsb14-02.html + + + 2014-01-14 + 2014-01-24 + + + + + HTMLDOC -- buffer overflow issues when reading AFM files and parsing page sizes + + + htmldoc + 1.8.28 + + + + +

Michael Sweet reports:

+
+

HTMLDOC 1.8.28 fixes some known security issues and + formatting bugs. Changes include:

+
    +
  • SECURITY: Fixed three buffer overflow issues when + reading AFM files and parsing page sizes.
    • +
+
+ + + + http://www.msweet.org/projects.php?Z1 + + + 2014-01-06 + 2014-01-22 + 2014-01-23 + + + virtualbox-ose -- local vulnerability @@ -64,10 +169,10 @@ Note: Please add new entries to the beg

Oracle reports:

Unspecified vulnerability in the Oracle VM VirtualBox - component in Oracle Virtualization VirtualBox prior to - 3.2.20, 4.0.22, 4.1.30, 4.2.22, and 4.3.6 allows local - users to affect confidentiality, integrity, and availability - via unknown vectors related to Core.

+ component in Oracle Virtualization VirtualBox prior to + 3.2.20, 4.0.22, 4.1.30, 4.2.22, and 4.3.6 allows local + users to affect confidentiality, integrity, and availability + via unknown vectors related to Core.

From owner-svn-ports-branches@FreeBSD.ORG Sat Jan 25 11:44:54 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1C8FD7AB; Sat, 25 Jan 2014 11:44: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 F087619A1; Sat, 25 Jan 2014 11:44: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 s0PBir3l077698; Sat, 25 Jan 2014 11:44:53 GMT (envelope-from koobs@svn.freebsd.org) Received: (from koobs@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0PBirIJ077695; Sat, 25 Jan 2014 11:44:53 GMT (envelope-from koobs@svn.freebsd.org) Message-Id: <201401251144.s0PBirIJ077695@svn.freebsd.org> From: Kubilay Kocak Date: Sat, 25 Jan 2014 11:44:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r341011 - branches/2014Q1/www/varnish 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, 25 Jan 2014 11:44:54 -0000 Author: koobs Date: Sat Jan 25 11:44:53 2014 New Revision: 341011 URL: http://svnweb.freebsd.org/changeset/ports/341011 QAT: https://qat.redports.org/buildarchive/r341011/ Log: MFH: r340999 www/varnish: Update to 3.0.5, Enable STAGE support - Update to 3.0.5 - Enable STAGE support, update pkg-plist accordingly - Update LICENSE - Modernize LIB_DEPENDS - Pet portlint (space->tab) Changes: * A bad interaction between -b, -c and -m in the varnishlog tool has been fixed. * A malformed request could in some configurations lead to Varnish crashing has been corrected. This is CVE-2013-4484. * Duplicate Content-Length headers were in some cases sent to clients when streaming is enabled, this has been fixed * ESI parse errors are no longer printed to standard output. * Stop segfaulting if the first part of a synthetic page is NULL. PR: ports/185188 PR: ports/185543 Submitted by: feld, Hung-Yi Chen Approved by: maintainer timeout (1month) Approved by: portmgr (mat) Security: http://www.vuxml.org/freebsd/d9dbe6e8-84da-11e3-98bd-080027f2d077.html Modified: branches/2014Q1/www/varnish/Makefile branches/2014Q1/www/varnish/distinfo branches/2014Q1/www/varnish/pkg-plist Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/www/varnish/Makefile ============================================================================== --- branches/2014Q1/www/varnish/Makefile Sat Jan 25 11:25:39 2014 (r341010) +++ branches/2014Q1/www/varnish/Makefile Sat Jan 25 11:44:53 2014 (r341011) @@ -1,16 +1,16 @@ # $FreeBSD$ PORTNAME= varnish -PORTVERSION= 3.0.4 +PORTVERSION= 3.0.5 CATEGORIES= www MASTER_SITES= http://repo.varnish-cache.org/source/ MAINTAINER= anders@FreeBSD.org COMMENT= The Varnish high-performance HTTP accelerator -LICENSE= BSD +LICENSE= BSD2CLAUSE -LIB_DEPENDS= pcre:${PORTSDIR}/devel/pcre +LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre CONFLICTS= varnish-2.* @@ -20,16 +20,11 @@ USE_PYTHON_BUILD= yes CONFIGURE_ARGS= --localstatedir=${PREFIX} --enable-tests CONFIGURE_ENV= RST2MAN=true USE_LDCONFIG= yes -USE_AUTOTOOLS= aclocal libtool libtoolize automake autoconf +USE_AUTOTOOLS= aclocal libtool libtoolize automake autoconf ACLOCAL_ARGS= -I m4 LIBTOOLFLAGS= --copy --force --disable-static AUTOMAKE_ARGS= --add-missing --copy --foreign -MAN1= varnishadm.1 varnishd.1 varnishhist.1 varnishlog.1 \ - varnishncsa.1 varnishreplay.1 varnishsizes.1 \ - varnishstat.1 varnishtest.1 varnishtop.1 -MAN3= vmod_std.3 -MAN7= vcl.7 varnish-cli.7 varnish-counters.7 USE_RC_SUBR= varnishd varnishlog varnishncsa SUB_FILES= pkg-message .if defined(NO_INET6) || defined(WITHOUT_INET6) @@ -37,7 +32,6 @@ BAD_TESTS+= r00832 EXTRA_PATCHES+= ${FILESDIR}/no-inet6.patch .endif -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's|\$$(libdir)/pkgconfig|\$$(prefix)/libdata/pkgconfig|' \ ${WRKSRC}/Makefile.am @@ -59,16 +53,16 @@ post-build: # post-install: - @${MKDIR} ${PREFIX}/share/varnish - @${INSTALL_SCRIPT} ${WRKSRC}/lib/libvmod_std/vmod.py ${PREFIX}/share/varnish + ${MKDIR} ${STAGEDIR}${PREFIX}/share/varnish + ${INSTALL_SCRIPT} ${WRKSRC}/lib/libvmod_std/vmod.py ${STAGEDIR}${PREFIX}/share/varnish .for f in cache.h heritage.h steps.h common.h acct_fields.h locks.h body_status.h - @${INSTALL_DATA} ${WRKSRC}/bin/varnishd/${f} ${PREFIX}/include/varnish + ${INSTALL_DATA} ${WRKSRC}/bin/varnishd/${f} ${STAGEDIR}${PREFIX}/include/varnish .endfor .for f in vct.h vmod_abi.h vre.h vrt.h vqueue.h vsb.h libvarnish.h miniobj.h vas.h vav.h http_headers.h vcl_returns.h - @${INSTALL_DATA} ${WRKSRC}/include/${f} ${PREFIX}/include/varnish + ${INSTALL_DATA} ${WRKSRC}/include/${f} ${STAGEDIR}${PREFIX}/include/varnish .endfor @${CAT} ${PKGMESSAGE} - @${RM} -f ${PREFIX}/lib/libvarnishapi.*a ${PREFIX}/lib/varnish/lib*a ${PREFIX}/lib/varnish/vmods/lib*a + @${RM} -f ${STAGEDIR}${PREFIX}/lib/libvarnishapi.*a ${STAGEDIR}${PREFIX}/lib/varnish/lib*a ${STAGEDIR}${PREFIX}/lib/varnish/vmods/lib*a .include Modified: branches/2014Q1/www/varnish/distinfo ============================================================================== --- branches/2014Q1/www/varnish/distinfo Sat Jan 25 11:25:39 2014 (r341010) +++ branches/2014Q1/www/varnish/distinfo Sat Jan 25 11:44:53 2014 (r341011) @@ -1,2 +1,2 @@ -SHA256 (varnish-3.0.4.tar.gz) = 4e044ccb5c76222bddf89c808f13ea8f66977972675aecb48a920f6800ad0f79 -SIZE (varnish-3.0.4.tar.gz) = 2081361 +SHA256 (varnish-3.0.5.tar.gz) = 302fd6afc771524ca3912f5d945ab197a55762385c012b2054df7d86bf7ae2b7 +SIZE (varnish-3.0.5.tar.gz) = 2116664 Modified: branches/2014Q1/www/varnish/pkg-plist ============================================================================== --- branches/2014Q1/www/varnish/pkg-plist Sat Jan 25 11:25:39 2014 (r341010) +++ branches/2014Q1/www/varnish/pkg-plist Sat Jan 25 11:44:53 2014 (r341011) @@ -43,6 +43,20 @@ lib/varnish/vmods/libvmod_std.so lib/libvarnishapi.so.1 lib/libvarnishapi.so libdata/pkgconfig/varnishapi.pc +man/man1/varnishadm.1.gz +man/man1/varnishd.1.gz +man/man1/varnishhist.1.gz +man/man1/varnishlog.1.gz +man/man1/varnishncsa.1.gz +man/man1/varnishreplay.1.gz +man/man1/varnishsizes.1.gz +man/man1/varnishstat.1.gz +man/man1/varnishtest.1.gz +man/man1/varnishtop.1.gz +man/man3/vmod_std.3.gz +man/man7/varnish-cli.7.gz +man/man7/varnish-counters.7.gz +man/man7/vcl.7.gz sbin/varnishd share/varnish/vmod.py @exec [ -d %D/varnish ] || mkdir %D/varnish From owner-svn-ports-branches@FreeBSD.ORG Sat Jan 25 12:55:50 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A829AA12; Sat, 25 Jan 2014 12:55: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 936CA1F1F; Sat, 25 Jan 2014 12:55: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 s0PCtof0005196; Sat, 25 Jan 2014 12:55:50 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0PCtoZt005195; Sat, 25 Jan 2014 12:55:50 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201401251255.s0PCtoZt005195@svn.freebsd.org> From: Martin Wilke Date: Sat, 25 Jan 2014 12:55:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r341016 - in branches/2014Q1/emulators/xbraitenberg: . 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, 25 Jan 2014 12:55:50 -0000 Author: miwi Date: Sat Jan 25 12:55:49 2014 New Revision: 341016 URL: http://svnweb.freebsd.org/changeset/ports/341016 QAT: https://qat.redports.org/buildarchive/r341016/ Log: MFH: r340240 - Fix build with clang PR: 185500 Submitted by: Ports Fury Added: branches/2014Q1/emulators/xbraitenberg/files/ - copied from r340240, head/emulators/xbraitenberg/files/ Modified: branches/2014Q1/emulators/xbraitenberg/Makefile (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/emulators/xbraitenberg/Makefile ============================================================================== --- branches/2014Q1/emulators/xbraitenberg/Makefile Sat Jan 25 12:40:42 2014 (r341015) +++ branches/2014Q1/emulators/xbraitenberg/Makefile Sat Jan 25 12:55:49 2014 (r341016) @@ -8,12 +8,16 @@ CATEGORIES= emulators MASTER_SITES= http://www.lcdf.org/~eddietwo/xbraitenberg/ MAINTAINER= ports@FreeBSD.org -COMMENT= A Braitenberg vehicle simulator with pseudo-physics +COMMENT= Braitenberg vehicle simulator with pseudo-physics USE_XORG= x11 ice sm xext GNU_CONFIGURE= yes +CONFIGURE_ENV= ac_cv_fpermissive=no PLIST_FILES= bin/xbraitenberg -NO_STAGE= yes +post-patch: + @${REINPLACE_CMD} -e \ + '/operator bool() const/d' ${WRKSRC}/operator.hh + .include From owner-svn-ports-branches@FreeBSD.ORG Sat Jan 25 12:56:57 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4CA7BB7E; Sat, 25 Jan 2014 12:56: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 383BF1F33; Sat, 25 Jan 2014 12:56: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 s0PCuvaO005430; Sat, 25 Jan 2014 12:56:57 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0PCuu7t005428; Sat, 25 Jan 2014 12:56:56 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201401251256.s0PCuu7t005428@svn.freebsd.org> From: Martin Wilke Date: Sat, 25 Jan 2014 12:56:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r341017 - branches/2014Q1/audio/calf 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, 25 Jan 2014 12:56:57 -0000 Author: miwi Date: Sat Jan 25 12:56:56 2014 New Revision: 341017 URL: http://svnweb.freebsd.org/changeset/ports/341017 QAT: https://qat.redports.org/buildarchive/r341017/ Log: MFH: r340242 - Fix build with clang PR: 185500 Submitted by: Ports Fury Modified: branches/2014Q1/audio/calf/Makefile branches/2014Q1/audio/calf/pkg-plist Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/audio/calf/Makefile ============================================================================== --- branches/2014Q1/audio/calf/Makefile Sat Jan 25 12:55:49 2014 (r341016) +++ branches/2014Q1/audio/calf/Makefile Sat Jan 25 12:56:56 2014 (r341017) @@ -20,33 +20,51 @@ LIB_DEPENDS= libfluidsynth.so:${PORTSDIR OPTIONS_DEFINE= LASH LV2 OPTIONS_DEFAULT=LASH LV2 +OPTIONS_SUB= yes LV2_DESC= LV2 audio plugin USES= gmake pkgconfig USE_GNOME= gtk20 -USE_CSTD= gnu89 GNU_CONFIGURE= yes INSTALLS_ICONS= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -OPTIONS_SUB= yes LASH_LIB_DEPENDS= liblash.so:${PORTSDIR}/audio/lash LASH_CONFIGURE_WITH= lash -LV2_BUILD_DEPENDS+= lv2core>0:${PORTSDIR}/audio/lv2core -LV2_RUN_DEPENDS+= lv2core>0:${PORTSDIR}/audio/lv2core +LV2_BUILD_DEPENDS= lv2core>0:${PORTSDIR}/audio/lv2core +LV2_RUN_DEPENDS= lv2core>0:${PORTSDIR}/audio/lv2core LV2_CONFIGURE_WITH= lv2 +.include + post-patch: @${FIND} ${BUILD_WRKSRC} -name '*.cpp' | ${XARGS} ${REINPLACE_CMD} -e \ 's|||' @${REINPLACE_CMD} -e '/CXXFLAGS/s|-O3||' ${WRKSRC}/configure - @${REINPLACE_CMD} -e '/^install-data-am:/s|install-data-local||' \ - ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e '/calf.so/s|$$(pkglibdir)|../../calf|' \ + ${WRKSRC}/src/Makefile.in + @${REINPLACE_CMD} -e 's|src\.size();|src->size();|' \ + ${WRKSRC}/src/calf/buffer.h + @${REINPLACE_CMD} -e 's|data\[(1< Modified: branches/2014Q1/audio/calf/pkg-plist ============================================================================== --- branches/2014Q1/audio/calf/pkg-plist Sat Jan 25 12:55:49 2014 (r341016) +++ branches/2014Q1/audio/calf/pkg-plist Sat Jan 25 12:56:56 2014 (r341017) @@ -34,6 +34,11 @@ lib/calf/calf.so %%LV2%%lib/lv2/calf.lv2/calf.so %%LV2%%lib/lv2/calf.lv2/calflv2gui.so %%LV2%%lib/lv2/calf.lv2/manifest.ttl +%%LV2%%lib/lv2/calf.lv2/presets-Filter.ttl +%%LV2%%lib/lv2/calf.lv2/presets-Flanger.ttl +%%LV2%%lib/lv2/calf.lv2/presets-Monosynth.ttl +%%LV2%%lib/lv2/calf.lv2/presets-Organ.ttl +%%LV2%%lib/lv2/calf.lv2/presets-Reverb.ttl man/man1/calfjackhost.1.gz man/man7/calf.7.gz share/applications/calf.desktop From owner-svn-ports-branches@FreeBSD.ORG Sat Jan 25 12:58:08 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9B487D39; Sat, 25 Jan 2014 12:58: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 870661F3D; Sat, 25 Jan 2014 12:58: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 s0PCw8K3005774; Sat, 25 Jan 2014 12:58:08 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0PCw8uu005773; Sat, 25 Jan 2014 12:58:08 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201401251258.s0PCw8uu005773@svn.freebsd.org> From: Martin Wilke Date: Sat, 25 Jan 2014 12:58:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r341019 - in branches/2014Q1/mail/bbmail: . 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, 25 Jan 2014 12:58:08 -0000 Author: miwi Date: Sat Jan 25 12:58:08 2014 New Revision: 341019 URL: http://svnweb.freebsd.org/changeset/ports/341019 QAT: https://qat.redports.org/buildarchive/r341019/ Log: MFH: r340256 - Fix build - Add License PR: 185335 Submitted by: ports fury Added: branches/2014Q1/mail/bbmail/files/ - copied from r340256, head/mail/bbmail/files/ Modified: branches/2014Q1/mail/bbmail/Makefile (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/mail/bbmail/Makefile ============================================================================== --- branches/2014Q1/mail/bbmail/Makefile Sat Jan 25 12:57:41 2014 (r341018) +++ branches/2014Q1/mail/bbmail/Makefile Sat Jan 25 12:58:08 2014 (r341019) @@ -7,7 +7,9 @@ CATEGORIES= mail MASTER_SITES= SF/bbtools/${PORTNAME}/${PORTNAME}-${PORTVERSION} MAINTAINER= ports@FreeBSD.org -COMMENT= A tool intended for Blackbox that checks for new mail +COMMENT= Tool intended for Blackbox that checks for new mail + +LICENSE= GPLv2 # (or later) BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/libbt.pc:${PORTSDIR}/x11-wm/blackbox @@ -15,12 +17,7 @@ USES= pkgconfig USE_XORG= xext GNU_CONFIGURE= yes -MAN1= bbmail.1 -PLIST_FILES= bin/bbmail share/bbtools/bbmail.rc - -NO_STAGE= yes -post-install: - @${ECHO_CMD} "@unexec rmdir %D/share/bbtools 2>/dev/null || true" \ - >> ${TMPPLIST} +PLIST_FILES= bin/bbmail man/man1/bbmail.1.gz share/bbtools/bbmail.rc +PLIST_DIRSTRY= share/bbtools .include From owner-svn-ports-branches@FreeBSD.ORG Sat Jan 25 12:59:38 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6308AEEF; Sat, 25 Jan 2014 12:59: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 4CE091F48; Sat, 25 Jan 2014 12:59: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 s0PCxc1R006249; Sat, 25 Jan 2014 12:59:38 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0PCxZJ7006233; Sat, 25 Jan 2014 12:59:35 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201401251259.s0PCxZJ7006233@svn.freebsd.org> From: Martin Wilke Date: Sat, 25 Jan 2014 12:59:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r341021 - in branches/2014Q1/net/netmap: . 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, 25 Jan 2014 12:59:38 -0000 Author: miwi Date: Sat Jan 25 12:59:35 2014 New Revision: 341021 URL: http://svnweb.freebsd.org/changeset/ports/341021 QAT: https://qat.redports.org/buildarchive/r341021/ Log: MFH: r340257 - Fix build with clang PR: 185506 Submitted by: ports fury Added: branches/2014Q1/net/netmap/files/patch-makelist__args.c - copied unchanged from r340257, head/net/netmap/files/patch-makelist__args.c branches/2014Q1/net/netmap/files/patch-netmap__args.c - copied unchanged from r340257, head/net/netmap/files/patch-netmap__args.c branches/2014Q1/net/netmap/files/patch-netmap__drawmap.c - copied unchanged from r340257, head/net/netmap/files/patch-netmap__drawmap.c branches/2014Q1/net/netmap/files/patch-netmap__hostclass.c - copied unchanged from r340257, head/net/netmap/files/patch-netmap__hostclass.c branches/2014Q1/net/netmap/files/patch-netmap__hostclass.h - copied unchanged from r340257, head/net/netmap/files/patch-netmap__hostclass.h branches/2014Q1/net/netmap/files/patch-netmap__lookup.h - copied unchanged from r340257, head/net/netmap/files/patch-netmap__lookup.h branches/2014Q1/net/netmap/files/patch-netmap__misc.h - copied unchanged from r340257, head/net/netmap/files/patch-netmap__misc.h branches/2014Q1/net/netmap/files/patch-netmap__netmap.c - copied unchanged from r340257, head/net/netmap/files/patch-netmap__netmap.c Modified: branches/2014Q1/net/netmap/Makefile (contents, props changed) branches/2014Q1/net/netmap/files/patch-belgolib::files.c (contents, props changed) branches/2014Q1/net/netmap/files/patch-netmap::Makefile (contents, props changed) branches/2014Q1/net/netmap/files/patch-netmap::lookup.c (contents, props changed) branches/2014Q1/net/netmap/files/patch-netmap::misc.c (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/net/netmap/Makefile ============================================================================== --- branches/2014Q1/net/netmap/Makefile Sat Jan 25 12:58:29 2014 (r341020) +++ branches/2014Q1/net/netmap/Makefile Sat Jan 25 12:59:35 2014 (r341021) @@ -10,15 +10,18 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= Make a graphical representation of the surrounding network +LICENSE= GPLv2 + RUN_DEPENDS= dotty:${PORTSDIR}/graphics/graphviz -USE_GMAKE= yes +USES= gmake PLIST_FILES= bin/makelist bin/netmap -NO_STAGE= yes do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/makelist/makelist ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/netmap/netmap ${PREFIX}/bin +.for i in makelist netmap + (cd ${WRKSRC}/${i} && ${INSTALL_PROGRAM} ${i} \ + ${STAGEDIR}${PREFIX}/bin) +.endfor .include Modified: branches/2014Q1/net/netmap/files/patch-belgolib::files.c ============================================================================== --- branches/2014Q1/net/netmap/files/patch-belgolib::files.c Sat Jan 25 12:58:29 2014 (r341020) +++ branches/2014Q1/net/netmap/files/patch-belgolib::files.c Sat Jan 25 12:59:35 2014 (r341021) @@ -1,14 +1,16 @@ --- belgolib/files.c.orig 2010-01-06 08:00:52.000000000 +0900 +++ belgolib/files.c 2011-11-23 22:22:36.000000000 +0900 -@@ -17,7 +17,7 @@ +@@ -17,8 +17,8 @@ Infile::Infile() : ifstream() { } -Infile::Infile(const string& file_name, int mode, bool fatal) +- : ifstream(file_name.c_str(), (std::_Ios_Openmode)mode) +Infile::Infile(const string& file_name, ios::openmode mode, bool fatal) - : ifstream(file_name.c_str(), (std::_Ios_Openmode)mode) ++ : ifstream(file_name.c_str(), (std::ios_base::openmode)mode) { + if(cdb>d_list) @@ -39,7 +39,7 @@ } @@ -18,3 +20,12 @@ { if(cdb>d_list) +@@ -49,7 +49,7 @@ + //file is open, close it first + close(); + +- open(file_name.c_str(), (std::_Ios_Openmode)mode); ++ open(file_name.c_str(), (std::ios_base::openmode)mode); + + if(int error_nr = check_open()) { + if(cdb>d_list) Copied: branches/2014Q1/net/netmap/files/patch-makelist__args.c (from r340257, head/net/netmap/files/patch-makelist__args.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/net/netmap/files/patch-makelist__args.c Sat Jan 25 12:59:35 2014 (r341021, copy of r340257, head/net/netmap/files/patch-makelist__args.c) @@ -0,0 +1,29 @@ +--- makelist/args.c.orig ++++ makelist/args.c +@@ -1,6 +1,6 @@ +-#include ++#include + #include +-#include ++#include + + using namespace std; + +@@ -35,7 +35,7 @@ + exit(-1); + } + +-static void set_string_arg(strstream& ss, string& val) ++static void set_string_arg(stringstream& ss, string& val) + { + string argvalue; + ss >> argvalue; +@@ -62,7 +62,7 @@ + + static void process(const string& argline) + { +- strstream ss; ++ stringstream ss; + ss << argline; + + string arg; Modified: branches/2014Q1/net/netmap/files/patch-netmap::Makefile ============================================================================== --- branches/2014Q1/net/netmap/files/patch-netmap::Makefile Sat Jan 25 12:58:29 2014 (r341020) +++ branches/2014Q1/net/netmap/files/patch-netmap::Makefile Sat Jan 25 12:59:35 2014 (r341021) @@ -10,7 +10,14 @@ CPPFLAGS = -I../belgolib -@@ -34,7 +33,7 @@ +@@ -28,13 +27,13 @@ + + test: $(OFILES) + $(CC) -o $(OEXE) $(OFILES) $(LDFLAGS) +- strip $(OEXE) ++# strip $(OEXE) + + clean: -/bin/rm -f $(OFILES) $(OEXE) depend: Modified: branches/2014Q1/net/netmap/files/patch-netmap::lookup.c ============================================================================== --- branches/2014Q1/net/netmap/files/patch-netmap::lookup.c Sat Jan 25 12:58:29 2014 (r341020) +++ branches/2014Q1/net/netmap/files/patch-netmap::lookup.c Sat Jan 25 12:59:35 2014 (r341021) @@ -1,7 +1,7 @@ --- netmap/lookup.c.orig 2010-01-06 07:59:38.000000000 +0900 +++ netmap/lookup.c 2011-11-23 22:32:15.000000000 +0900 -@@ -1,6 +1,8 @@ - #include +@@ -1,6 +1,7 @@ +-#include #include +#include Modified: branches/2014Q1/net/netmap/files/patch-netmap::misc.c ============================================================================== --- branches/2014Q1/net/netmap/files/patch-netmap::misc.c Sat Jan 25 12:58:29 2014 (r341020) +++ branches/2014Q1/net/netmap/files/patch-netmap::misc.c Sat Jan 25 12:59:35 2014 (r341021) @@ -1,6 +1,21 @@ --- netmap/misc.c.orig Sun Dec 15 14:54:26 2002 +++ netmap/misc.c Sun Dec 15 14:54:26 2002 -@@ -54,7 +54,7 @@ +@@ -1,4 +1,4 @@ +-#include ++#include + #include + + #include "misc.h" +@@ -17,7 +17,7 @@ + + string int_to_str(int i) + { +- strstream ost; ++ stringstream ost; + + ost << i << char(0); + +@@ -55,7 +55,7 @@ return false; bool had_point = false; Copied: branches/2014Q1/net/netmap/files/patch-netmap__args.c (from r340257, head/net/netmap/files/patch-netmap__args.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/net/netmap/files/patch-netmap__args.c Sat Jan 25 12:59:35 2014 (r341021, copy of r340257, head/net/netmap/files/patch-netmap__args.c) @@ -0,0 +1,26 @@ +--- netmap/args.c.orig ++++ netmap/args.c +@@ -1,4 +1,4 @@ +-#include ++#include + #include + #include + +@@ -47,7 +47,7 @@ + exit(0); + } + +-static void set_string_arg(strstream& ss, string& val) ++static void set_string_arg(stringstream& ss, string& val) + { + string argvalue; + ss >> argvalue; +@@ -60,7 +60,7 @@ + + static void process(const string& argline) + { +- strstream ss; ++ stringstream ss; + ss << argline; + + string arg; Copied: branches/2014Q1/net/netmap/files/patch-netmap__drawmap.c (from r340257, head/net/netmap/files/patch-netmap__drawmap.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/net/netmap/files/patch-netmap__drawmap.c Sat Jan 25 12:59:35 2014 (r341021, copy of r340257, head/net/netmap/files/patch-netmap__drawmap.c) @@ -0,0 +1,7 @@ +--- netmap/drawmap.c.orig ++++ netmap/drawmap.c +@@ -1,4 +1,3 @@ +-#include + #include + + #include Copied: branches/2014Q1/net/netmap/files/patch-netmap__hostclass.c (from r340257, head/net/netmap/files/patch-netmap__hostclass.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/net/netmap/files/patch-netmap__hostclass.c Sat Jan 25 12:59:35 2014 (r341021, copy of r340257, head/net/netmap/files/patch-netmap__hostclass.c) @@ -0,0 +1,7 @@ +--- netmap/hostclass.c.orig ++++ netmap/hostclass.c +@@ -1,4 +1,3 @@ +-#include + #include + + //from belgolib Copied: branches/2014Q1/net/netmap/files/patch-netmap__hostclass.h (from r340257, head/net/netmap/files/patch-netmap__hostclass.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/net/netmap/files/patch-netmap__hostclass.h Sat Jan 25 12:59:35 2014 (r341021, copy of r340257, head/net/netmap/files/patch-netmap__hostclass.h) @@ -0,0 +1,15 @@ +--- netmap/hostclass.h.orig ++++ netmap/hostclass.h +@@ -48,10 +48,10 @@ + HostClass* a; + HostClass* b; + +- bool operator==(HostLink& hl) ++ bool operator==(const HostLink& hl) const + { return a == hl.a && b == hl.b; } + +- bool operator <(HostLink& hl) ++ bool operator <(const HostLink& hl) const + { return a==hl.a ? b < hl.b : a < hl.a; } + }; + Copied: branches/2014Q1/net/netmap/files/patch-netmap__lookup.h (from r340257, head/net/netmap/files/patch-netmap__lookup.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/net/netmap/files/patch-netmap__lookup.h Sat Jan 25 12:59:35 2014 (r341021, copy of r340257, head/net/netmap/files/patch-netmap__lookup.h) @@ -0,0 +1,15 @@ +--- netmap/lookup.h.orig ++++ netmap/lookup.h +@@ -14,10 +14,10 @@ + string ip; + string hostname; + +- bool operator==(const HostRec& hr) ++ bool operator==(const HostRec& hr) const + { return ip == hr.ip && hostname == hr.hostname; } + +- bool operator<(const HostRec& hr) ++ bool operator<(const HostRec& hr) const + { return ip==hr.ip ? hostname +-#include + #include + + #include Copied: branches/2014Q1/net/netmap/files/patch-netmap__netmap.c (from r340257, head/net/netmap/files/patch-netmap__netmap.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/net/netmap/files/patch-netmap__netmap.c Sat Jan 25 12:59:35 2014 (r341021, copy of r340257, head/net/netmap/files/patch-netmap__netmap.c) @@ -0,0 +1,26 @@ +--- netmap/netmap.c.orig ++++ netmap/netmap.c +@@ -1,4 +1,4 @@ +-#include ++#include + #include + #include + +@@ -18,7 +18,7 @@ + Dbgfile dbgs; + int cdb = 1; + +-static void copy_line(strstream& os, istream& inf) ++static void copy_line(stringstream& os, istream& inf) + { + string result; + +@@ -67,7 +67,7 @@ + int nr_hops = 0; + int invalid_hosts_found = 0; + while(inf && !inf.eof()) { +- strstream line; ++ stringstream line; + copy_line(line, inf); + + if(max_hops && ++nr_hops > max_hops) { From owner-svn-ports-branches@FreeBSD.ORG Sat Jan 25 13:00:57 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6D898158; Sat, 25 Jan 2014 13:00: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 4E7DF1F65; Sat, 25 Jan 2014 13:00: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 s0PD0vFI007651; Sat, 25 Jan 2014 13:00:57 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0PD0uBa007648; Sat, 25 Jan 2014 13:00:56 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201401251300.s0PD0uBa007648@svn.freebsd.org> From: Martin Wilke Date: Sat, 25 Jan 2014 13:00:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r341022 - in branches/2014Q1/devel/libmpcbdm: . 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, 25 Jan 2014 13:00:57 -0000 Author: miwi Date: Sat Jan 25 13:00:56 2014 New Revision: 341022 URL: http://svnweb.freebsd.org/changeset/ports/341022 QAT: https://qat.redports.org/buildarchive/r341022/ Log: MFH: r340258 - Fix build with clang PR: 184851 Submitted by: ports fury Modified: branches/2014Q1/devel/libmpcbdm/Makefile (contents, props changed) branches/2014Q1/devel/libmpcbdm/files/patch-libmpc8xx_lptbdm.c (contents, props changed) branches/2014Q1/devel/libmpcbdm/pkg-plist (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/devel/libmpcbdm/Makefile ============================================================================== --- branches/2014Q1/devel/libmpcbdm/Makefile Sat Jan 25 12:59:35 2014 (r341021) +++ branches/2014Q1/devel/libmpcbdm/Makefile Sat Jan 25 13:00:56 2014 (r341022) @@ -13,19 +13,20 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Standalone library to control various mpc8xx boards WRKSRC= ${WRKDIR}/libmpc8xx -USE_GMAKE= yes -GNU_CONFIGURE= yes + +USES= gmake +USE_AUTOTOOLS= libtool USE_LDCONFIG= yes -ONLY_FOR_ARCHS= i386 +ONLY_FOR_ARCHS= amd64 i386 -NO_STAGE= yes post-patch: - @${REINPLACE_CMD} -E -e 's,(objformat=).*,\1elf,' \ - ${WRKSRC}/configure + @${REINPLACE_CMD} -e \ + 's| $$(includedir)| $$(DESTDIR)$$(includedir)|' \ + ${WRKSRC}/libmpc8xx/Makefile.in post-install: - @${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/Flash.dev ${DATADIR} + @${MKDIR} ${STAGEDIR}${DATADIR} + (cd ${WRKSRC} && ${INSTALL_DATA} Flash.dev ${STAGEDIR}${DATADIR}) .include Modified: branches/2014Q1/devel/libmpcbdm/files/patch-libmpc8xx_lptbdm.c ============================================================================== --- branches/2014Q1/devel/libmpcbdm/files/patch-libmpc8xx_lptbdm.c Sat Jan 25 12:59:35 2014 (r341021) +++ branches/2014Q1/devel/libmpcbdm/files/patch-libmpc8xx_lptbdm.c Sat Jan 25 13:00:56 2014 (r341022) @@ -9,12 +9,24 @@ #include static int lptbdm_read( void ); -@@ -252,7 +252,7 @@ +@@ -52,8 +52,9 @@ + + static uid_t lptbdm_euid = -1; + +-#define INB(x,port) asm volatile("inb %1, %0" : "=a" (x) : "d" (port)) +-#define OUTB(x,port) asm volatile("outb %0, %1" : : "a" (x), "d" (port)) ++#include ++#define INB(x,port) x = inb(port) ++#define OUTB(x,port) outb(port,x) + + /* in case of asm trouble (red hat 7.0?) try the code below and compile with -O option */ + /*#include +@@ -252,7 +253,7 @@ } } - nResult = ioperm( lptbdm_port.DATAAddr, 3, 1 ); -+ nResult = i386_set_ioperm( lptbdm_port.DATAAddr, 3, 1 ); ++ nResult = sysarch( I386_SET_IOPERM, (void *) ( lptbdm_port.DATAAddr, 3, 1 ) ); seteuid( getuid() ); Modified: branches/2014Q1/devel/libmpcbdm/pkg-plist ============================================================================== --- branches/2014Q1/devel/libmpcbdm/pkg-plist Sat Jan 25 12:59:35 2014 (r341021) +++ branches/2014Q1/devel/libmpcbdm/pkg-plist Sat Jan 25 13:00:56 2014 (r341022) @@ -7,6 +7,7 @@ include/mpc8xx/mpc8xxmem.h include/mpc8xx/mpc8xxmisc.h include/mpc8xx/mpc8xxspr.h include/mpc8xx/mpc8xxtarget.h +lib/libmpc8xx.a lib/libmpc8xx.la lib/libmpc8xx.so lib/libmpc8xx.so.0 From owner-svn-ports-branches@FreeBSD.ORG Sat Jan 25 13:02:05 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BF72F233; Sat, 25 Jan 2014 13:02: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 AB01E1FC2; Sat, 25 Jan 2014 13:02: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 s0PD255P009577; Sat, 25 Jan 2014 13:02:05 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0PD25eE009576; Sat, 25 Jan 2014 13:02:05 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201401251302.s0PD25eE009576@svn.freebsd.org> From: Martin Wilke Date: Sat, 25 Jan 2014 13:02:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r341023 - in branches/2014Q1/multimedia/xmms-status-plugin: . 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, 25 Jan 2014 13:02:05 -0000 Author: miwi Date: Sat Jan 25 13:02:05 2014 New Revision: 341023 URL: http://svnweb.freebsd.org/changeset/ports/341023 QAT: https://qat.redports.org/buildarchive/r341023/ Log: MFH: r340289 - Fix build with clang PR: 185330 Submitted by: ports fury Deleted: branches/2014Q1/multimedia/xmms-status-plugin/files/patch-configure Modified: branches/2014Q1/multimedia/xmms-status-plugin/Makefile (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/multimedia/xmms-status-plugin/Makefile ============================================================================== --- branches/2014Q1/multimedia/xmms-status-plugin/Makefile Sat Jan 25 13:00:56 2014 (r341022) +++ branches/2014Q1/multimedia/xmms-status-plugin/Makefile Sat Jan 25 13:02:05 2014 (r341023) @@ -10,17 +10,19 @@ MASTER_SITES= http://www.hellion.org.uk/ MAINTAINER= ports@FreeBSD.org COMMENT= XMMS control applet for GNOME 2 panel / KDE tray -LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms +LICENSE= GPLv2 # (or later) +LIB_DEPENDS= libxmms.so:${PORTSDIR}/multimedia/xmms + +USES= gettext gmake USE_XORG= x11 xpm -USE_GMAKE= yes -USE_LDCONFIG= yes +USE_CSTD= gnu89 USE_AUTOTOOLS= libtool + CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -NO_STAGE= yes post-patch: - ${REINPLACE_CMD} -e 's,-Werror,,' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's,-Werror,,' ${WRKSRC}/configure .include From owner-svn-ports-branches@FreeBSD.ORG Sat Jan 25 13:03:15 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5A6F6324; Sat, 25 Jan 2014 13:03:15 +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 2AF521FCE; Sat, 25 Jan 2014 13:03:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0PD3Fkr009870; Sat, 25 Jan 2014 13:03:15 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0PD3EjK009867; Sat, 25 Jan 2014 13:03:14 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201401251303.s0PD3EjK009867@svn.freebsd.org> From: Martin Wilke Date: Sat, 25 Jan 2014 13:03:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r341024 - in branches/2014Q1/emulators/cpmemu: . 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, 25 Jan 2014 13:03:15 -0000 Author: miwi Date: Sat Jan 25 13:03:14 2014 New Revision: 341024 URL: http://svnweb.freebsd.org/changeset/ports/341024 QAT: https://qat.redports.org/buildarchive/r341024/ Log: MFH: r340290 - Fix build with clang PR: 185322 Submitted by: ports fury Modified: branches/2014Q1/emulators/cpmemu/Makefile (contents, props changed) branches/2014Q1/emulators/cpmemu/files/patch-ab (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/emulators/cpmemu/Makefile ============================================================================== --- branches/2014Q1/emulators/cpmemu/Makefile Sat Jan 25 13:02:05 2014 (r341023) +++ branches/2014Q1/emulators/cpmemu/Makefile Sat Jan 25 13:03:14 2014 (r341024) @@ -18,5 +18,13 @@ COMMENT= Cpm emulator ONLY_FOR_ARCHS= i386 -NO_STAGE= yes -.include +USES= compiler + +.include + +.if ${COMPILER_TYPE} == "clang" +USE_BINUTILS= yes +CPPFLAGS+= -no-integrated-as +.endif + +.include Modified: branches/2014Q1/emulators/cpmemu/files/patch-ab ============================================================================== --- branches/2014Q1/emulators/cpmemu/files/patch-ab Sat Jan 25 13:02:05 2014 (r341023) +++ branches/2014Q1/emulators/cpmemu/files/patch-ab Sat Jan 25 13:03:14 2014 (r341024) @@ -21,14 +21,14 @@ +CC ?= gcc -CFLAGS = -O2 -pipe -ansi -Wall \ -+CFLAGS += -ansi -Wall \ ++CFLAGS += $(CPPFLAGS) -ansi -Wall \ -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align \ -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes \ -Wnested-externs -Wwrite-strings \ -DCPMLIBDIR=\"$(CPMLIBDIR)\" -LDFLAGS = -s -+LDFLAGS += -s ++#LDFLAGS = -s OBJS = single.o z80emu.o em.o io.o bios.o \ commands.o running.o main.o disneu.o disz80.o low.o @@ -44,9 +44,10 @@ install: all - install -m 511 cpm $(BINDIR) -+ ${BSD_INSTALL_PROGRAM} cpm $(BINDIR)/cpmemu -+ ${BSD_INSTALL_PROGRAM} format $(BINDIR)/cpmformat - -mkdir $(CPMLIBDIR) +- -mkdir $(CPMLIBDIR) - chmod 755 $(CPMLIBDIR) - install -m 444 z80-binaries/* $(CPMLIBDIR) -+ ${BSD_INSTALL_DATA} z80-binaries/* $(CPMLIBDIR) ++ ${BSD_INSTALL_PROGRAM} cpm $(DESTDIR)$(BINDIR)/cpmemu ++ ${BSD_INSTALL_PROGRAM} format $(DESTDIR)$(BINDIR)/cpmformat ++ -mkdir $(DESTDIR)$(CPMLIBDIR) ++ ${BSD_INSTALL_DATA} z80-binaries/* $(DESTDIR)$(CPMLIBDIR) From owner-svn-ports-branches@FreeBSD.ORG Sat Jan 25 13:04:49 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C4595412; Sat, 25 Jan 2014 13:04: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 A3C551FD8; Sat, 25 Jan 2014 13:04: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 s0PD4noL010354; Sat, 25 Jan 2014 13:04:49 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0PD4kpt010334; Sat, 25 Jan 2014 13:04:46 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201401251304.s0PD4kpt010334@svn.freebsd.org> From: Martin Wilke Date: Sat, 25 Jan 2014 13:04:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r341025 - in branches/2014Q1/graphics/ipe: . 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, 25 Jan 2014 13:04:49 -0000 Author: miwi Date: Sat Jan 25 13:04:46 2014 New Revision: 341025 URL: http://svnweb.freebsd.org/changeset/ports/341025 QAT: https://qat.redports.org/buildarchive/r341025/ Log: MFH: r340291 - Fix build with clang PR: 185318 Submitted by: ports fury Added: branches/2014Q1/graphics/ipe/files/patch-include__ipedoc.h - copied unchanged from r340291, head/graphics/ipe/files/patch-include__ipedoc.h branches/2014Q1/graphics/ipe/files/patch-include__ipereference.h - copied unchanged from r340291, head/graphics/ipe/files/patch-include__ipereference.h branches/2014Q1/graphics/ipe/files/patch-ipe6upgrade__ipe6upgrade.cpp - copied unchanged from r340291, head/graphics/ipe/files/patch-ipe6upgrade__ipe6upgrade.cpp branches/2014Q1/graphics/ipe/files/patch-ipecairo__ipecairopainter.cpp - copied unchanged from r340291, head/graphics/ipe/files/patch-ipecairo__ipecairopainter.cpp branches/2014Q1/graphics/ipe/files/patch-ipecairo__ipestdfonts.cpp - copied unchanged from r340291, head/graphics/ipe/files/patch-ipecairo__ipestdfonts.cpp branches/2014Q1/graphics/ipe/files/patch-ipeextract__ipeextract.cpp - copied unchanged from r340291, head/graphics/ipe/files/patch-ipeextract__ipeextract.cpp branches/2014Q1/graphics/ipe/files/patch-ipelib__ipebase.cpp - copied unchanged from r340291, head/graphics/ipe/files/patch-ipelib__ipebase.cpp branches/2014Q1/graphics/ipe/files/patch-ipelib__ipedct.cpp - copied unchanged from r340291, head/graphics/ipe/files/patch-ipelib__ipedct.cpp branches/2014Q1/graphics/ipe/files/patch-ipelib__ipegeo.cpp - copied unchanged from r340291, head/graphics/ipe/files/patch-ipelib__ipegeo.cpp branches/2014Q1/graphics/ipe/files/patch-ipelib__ipelatex.cpp - copied unchanged from r340291, head/graphics/ipe/files/patch-ipelib__ipelatex.cpp branches/2014Q1/graphics/ipe/files/patch-ipelib__ipepdfparser.cpp - copied unchanged from r340291, head/graphics/ipe/files/patch-ipelib__ipepdfparser.cpp branches/2014Q1/graphics/ipe/files/patch-ipelib__ipeshape.cpp - copied unchanged from r340291, head/graphics/ipe/files/patch-ipelib__ipeshape.cpp branches/2014Q1/graphics/ipe/files/patch-ipetoipe__ipetoipe.cpp - copied unchanged from r340291, head/graphics/ipe/files/patch-ipetoipe__ipetoipe.cpp Modified: branches/2014Q1/graphics/ipe/Makefile branches/2014Q1/graphics/ipe/pkg-plist Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/graphics/ipe/Makefile ============================================================================== --- branches/2014Q1/graphics/ipe/Makefile Sat Jan 25 13:03:14 2014 (r341024) +++ branches/2014Q1/graphics/ipe/Makefile Sat Jan 25 13:04:46 2014 (r341025) @@ -24,12 +24,13 @@ USES= gmake iconv pkgconfig USE_QT4= gui moc_build qmake_build rcc_build uic_build USE_TEX= latex MAKE_ENV= DLL_CFLAGS="-fPIC" \ - ICONV_CFLAGS="-I${LOCALBASE}/include" \ - ICONV_LIBS="-L${LOCALBASE}/lib ${ICONV_LIB}" \ + ICONV_CFLAGS="-I${ICONV_PREFIX}/include" \ + ICONV_LIBS="-L${ICONV_PREFIX}/lib ${ICONV_LIB}" \ INSTALL_DIR="${MKDIR}" \ INSTALL_FILES="${INSTALL_DATA}" \ INSTALL_SCRIPTS="${INSTALL_SCRIPT}" \ INSTALL_PROGRAMS="${INSTALL_PROGRAM}" \ + INSTALL_ROOT="${STAGEDIR}" \ IPE_USE_ICONV="-DIPE_USE_ICONV" \ IPEDOCDIR="${DOCSDIR}" \ IPEMANDIR="${MANPREFIX}/man/man1" \ @@ -41,14 +42,11 @@ USE_LDCONFIG= yes PLIST_SUB= VERSION="${PORTVERSION}" -MAN1= ipe.1 ipe6upgrade.1 ipeextract.1 iperender.1 ipetoipe.1 \ - ipescript.1 PORTDOCS= * DESKTOP_ENTRIES="Ipe" "" "${DATADIR}/${PORTVERSION}/ipe.png" \ "${PORTNAME}" "" true -NO_STAGE= yes .include post-patch: @@ -68,10 +66,9 @@ post-patch: post-install: (cd ${WRKSRC}/../fontmaps && ${INSTALL_DATA} fontmap.xml \ - ${DATADIR}/${PORTVERSION}) -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - @(cd ${WRKSRC}/../build/doc && ${COPYTREE_SHARE} . ${DOCSDIR}) -.endif + ${STAGEDIR}${DATADIR}/${PORTVERSION}) + @${MKDIR} ${STAGEDIR}${DOCSDIR} + @(cd ${WRKSRC}/../build/doc && ${COPYTREE_SHARE} . \ + ${STAGEDIR}${DOCSDIR}) .include Copied: branches/2014Q1/graphics/ipe/files/patch-include__ipedoc.h (from r340291, head/graphics/ipe/files/patch-include__ipedoc.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/graphics/ipe/files/patch-include__ipedoc.h Sat Jan 25 13:04:46 2014 (r341025, copy of r340291, head/graphics/ipe/files/patch-include__ipedoc.h) @@ -0,0 +1,10 @@ +--- include/ipedoc.h.orig ++++ include/ipedoc.h +@@ -37,6 +37,7 @@ + #include "ipeimage.h" + #include "ipestyle.h" + #include "ipefontpool.h" ++#include + + // -------------------------------------------------------------------- + Copied: branches/2014Q1/graphics/ipe/files/patch-include__ipereference.h (from r340291, head/graphics/ipe/files/patch-include__ipereference.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/graphics/ipe/files/patch-include__ipereference.h Sat Jan 25 13:04:46 2014 (r341025, copy of r340291, head/graphics/ipe/files/patch-include__ipereference.h) @@ -0,0 +1,10 @@ +--- include/ipereference.h.orig ++++ include/ipereference.h +@@ -33,6 +33,7 @@ + #define IPEREF_H + + #include "ipeobject.h" ++#include + + // -------------------------------------------------------------------- + Copied: branches/2014Q1/graphics/ipe/files/patch-ipe6upgrade__ipe6upgrade.cpp (from r340291, head/graphics/ipe/files/patch-ipe6upgrade__ipe6upgrade.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/graphics/ipe/files/patch-ipe6upgrade__ipe6upgrade.cpp Sat Jan 25 13:04:46 2014 (r341025, copy of r340291, head/graphics/ipe/files/patch-ipe6upgrade__ipe6upgrade.cpp) @@ -0,0 +1,11 @@ +--- ipe6upgrade/ipe6upgrade.cpp.orig ++++ ipe6upgrade/ipe6upgrade.cpp +@@ -30,6 +30,8 @@ + + #include "ipexml.h" + #include "ipeattributes.h" ++#include ++#include + + using namespace ipe; + Copied: branches/2014Q1/graphics/ipe/files/patch-ipecairo__ipecairopainter.cpp (from r340291, head/graphics/ipe/files/patch-ipecairo__ipecairopainter.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/graphics/ipe/files/patch-ipecairo__ipecairopainter.cpp Sat Jan 25 13:04:46 2014 (r341025, copy of r340291, head/graphics/ipe/files/patch-ipecairo__ipecairopainter.cpp) @@ -0,0 +1,10 @@ +--- ipecairo/ipecairopainter.cpp.orig ++++ ipecairo/ipecairopainter.cpp +@@ -32,6 +32,7 @@ + #include "ipepdfparser.h" + #include "ipecairopainter.h" + #include "ipefonts.h" ++#include + + using namespace ipe; + Copied: branches/2014Q1/graphics/ipe/files/patch-ipecairo__ipestdfonts.cpp (from r340291, head/graphics/ipe/files/patch-ipecairo__ipestdfonts.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/graphics/ipe/files/patch-ipecairo__ipestdfonts.cpp Sat Jan 25 13:04:46 2014 (r341025, copy of r340291, head/graphics/ipe/files/patch-ipecairo__ipestdfonts.cpp) @@ -0,0 +1,10 @@ +--- ipecairo/ipestdfonts.cpp.orig ++++ ipecairo/ipestdfonts.cpp +@@ -30,6 +30,7 @@ + */ + + #include "ipebase.h" ++#include + + using namespace ipe; + Copied: branches/2014Q1/graphics/ipe/files/patch-ipeextract__ipeextract.cpp (from r340291, head/graphics/ipe/files/patch-ipeextract__ipeextract.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/graphics/ipe/files/patch-ipeextract__ipeextract.cpp Sat Jan 25 13:04:46 2014 (r341025, copy of r340291, head/graphics/ipe/files/patch-ipeextract__ipeextract.cpp) @@ -0,0 +1,10 @@ +--- ipeextract/ipeextract.cpp.orig ++++ ipeextract/ipeextract.cpp +@@ -31,6 +31,7 @@ + #include "ipexml.h" + #include "ipeutils.h" + #include "ipepdfparser.h" ++#include + + using namespace ipe; + Copied: branches/2014Q1/graphics/ipe/files/patch-ipelib__ipebase.cpp (from r340291, head/graphics/ipe/files/patch-ipelib__ipebase.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/graphics/ipe/files/patch-ipelib__ipebase.cpp Sat Jan 25 13:04:46 2014 (r341025, copy of r340291, head/graphics/ipe/files/patch-ipelib__ipebase.cpp) @@ -0,0 +1,12 @@ +--- ipelib/ipebase.cpp.orig ++++ ipelib/ipebase.cpp +@@ -29,7 +29,9 @@ + */ + + #include "ipebase.h" ++#include + #include ++#include + + using namespace ipe; + Copied: branches/2014Q1/graphics/ipe/files/patch-ipelib__ipedct.cpp (from r340291, head/graphics/ipe/files/patch-ipelib__ipedct.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/graphics/ipe/files/patch-ipelib__ipedct.cpp Sat Jan 25 13:04:46 2014 (r341025, copy of r340291, head/graphics/ipe/files/patch-ipelib__ipedct.cpp) @@ -0,0 +1,10 @@ +--- ipelib/ipedct.cpp.orig ++++ ipelib/ipedct.cpp +@@ -31,6 +31,7 @@ + */ + + #include "ipebase.h" ++#include + + using namespace ipe; + Copied: branches/2014Q1/graphics/ipe/files/patch-ipelib__ipegeo.cpp (from r340291, head/graphics/ipe/files/patch-ipelib__ipegeo.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/graphics/ipe/files/patch-ipelib__ipegeo.cpp Sat Jan 25 13:04:46 2014 (r341025, copy of r340291, head/graphics/ipe/files/patch-ipelib__ipegeo.cpp) @@ -0,0 +1,11 @@ +--- ipelib/ipegeo.cpp.orig ++++ ipelib/ipegeo.cpp +@@ -38,6 +38,8 @@ + */ + + #include "ipegeo.h" ++#include ++#include + + using namespace ipe; + Copied: branches/2014Q1/graphics/ipe/files/patch-ipelib__ipelatex.cpp (from r340291, head/graphics/ipe/files/patch-ipelib__ipelatex.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/graphics/ipe/files/patch-ipelib__ipelatex.cpp Sat Jan 25 13:04:46 2014 (r341025, copy of r340291, head/graphics/ipe/files/patch-ipelib__ipelatex.cpp) @@ -0,0 +1,11 @@ +--- ipelib/ipelatex.cpp.orig ++++ ipelib/ipelatex.cpp +@@ -35,6 +35,8 @@ + #include "ipefontpool.h" + #include "ipelatex.h" + ++#include ++ + using namespace ipe; + + /*! \class ipe::Latex Copied: branches/2014Q1/graphics/ipe/files/patch-ipelib__ipepdfparser.cpp (from r340291, head/graphics/ipe/files/patch-ipelib__ipepdfparser.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/graphics/ipe/files/patch-ipelib__ipepdfparser.cpp Sat Jan 25 13:04:46 2014 (r341025, copy of r340291, head/graphics/ipe/files/patch-ipelib__ipepdfparser.cpp) @@ -0,0 +1,10 @@ +--- ipelib/ipepdfparser.cpp.orig ++++ ipelib/ipepdfparser.cpp +@@ -30,6 +30,7 @@ + + #include "ipepdfparser.h" + #include "ipeutils.h" ++#include + + using namespace ipe; + Copied: branches/2014Q1/graphics/ipe/files/patch-ipelib__ipeshape.cpp (from r340291, head/graphics/ipe/files/patch-ipelib__ipeshape.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/graphics/ipe/files/patch-ipelib__ipeshape.cpp Sat Jan 25 13:04:46 2014 (r341025, copy of r340291, head/graphics/ipe/files/patch-ipelib__ipeshape.cpp) @@ -0,0 +1,10 @@ +--- ipelib/ipeshape.cpp.orig ++++ ipelib/ipeshape.cpp +@@ -30,6 +30,7 @@ + + #include "ipeshape.h" + #include "ipepainter.h" ++#include + + using namespace ipe; + Copied: branches/2014Q1/graphics/ipe/files/patch-ipetoipe__ipetoipe.cpp (from r340291, head/graphics/ipe/files/patch-ipetoipe__ipetoipe.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/graphics/ipe/files/patch-ipetoipe__ipetoipe.cpp Sat Jan 25 13:04:46 2014 (r341025, copy of r340291, head/graphics/ipe/files/patch-ipetoipe__ipetoipe.cpp) @@ -0,0 +1,10 @@ +--- ipetoipe/ipetoipe.cpp.orig ++++ ipetoipe/ipetoipe.cpp +@@ -29,6 +29,7 @@ + */ + + #include "ipedoc.h" ++#include + + using ipe::Document; + using ipe::String; Modified: branches/2014Q1/graphics/ipe/pkg-plist ============================================================================== --- branches/2014Q1/graphics/ipe/pkg-plist Sat Jan 25 13:03:14 2014 (r341024) +++ branches/2014Q1/graphics/ipe/pkg-plist Sat Jan 25 13:04:46 2014 (r341025) @@ -56,6 +56,12 @@ lib/libipelua.so lib/libipelua.so.%%VERSION%% lib/libipeui.so lib/libipeui.so.%%VERSION%% +man/man1/ipe.1.gz +man/man1/ipe6upgrade.1.gz +man/man1/ipeextract.1.gz +man/man1/iperender.1.gz +man/man1/ipescript.1.gz +man/man1/ipetoipe.1.gz %%DATADIR%%/%%VERSION%%/fontmap.xml %%DATADIR%%/%%VERSION%%/icons/copy.png %%DATADIR%%/%%VERSION%%/icons/cut.png From owner-svn-ports-branches@FreeBSD.ORG Sat Jan 25 13:06:07 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 18FF44F9; Sat, 25 Jan 2014 13:06: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 EC50C1FE3; Sat, 25 Jan 2014 13:06: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 s0PD66rc010736; Sat, 25 Jan 2014 13:06:06 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0PD65Cc010731; Sat, 25 Jan 2014 13:06:05 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201401251306.s0PD65Cc010731@svn.freebsd.org> From: Martin Wilke Date: Sat, 25 Jan 2014 13:06:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r341026 - in branches/2014Q1/games/gillo: . 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, 25 Jan 2014 13:06:07 -0000 Author: miwi Date: Sat Jan 25 13:06:05 2014 New Revision: 341026 URL: http://svnweb.freebsd.org/changeset/ports/341026 QAT: https://qat.redports.org/buildarchive/r341026/ Log: MFH: r340292 - Fix build with clang PR: 184836 Submitted by: Ports Fury Added: branches/2014Q1/games/gillo/files/patch-src__goal.cpp - copied unchanged from r340292, head/games/gillo/files/patch-src__goal.cpp branches/2014Q1/games/gillo/files/patch-src__goal.h - copied unchanged from r340292, head/games/gillo/files/patch-src__goal.h branches/2014Q1/games/gillo/files/patch-src__simpleball.cpp - copied unchanged from r340292, head/games/gillo/files/patch-src__simpleball.cpp branches/2014Q1/games/gillo/files/patch-src__simpleball.h - copied unchanged from r340292, head/games/gillo/files/patch-src__simpleball.h Modified: branches/2014Q1/games/gillo/Makefile (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/games/gillo/Makefile ============================================================================== --- branches/2014Q1/games/gillo/Makefile Sat Jan 25 13:04:46 2014 (r341025) +++ branches/2014Q1/games/gillo/Makefile Sat Jan 25 13:06:05 2014 (r341026) @@ -11,18 +11,20 @@ DISTNAME= ${PORTNAME}-${DISTVERSION}-src MAINTAINER= ports@FreeBSD.org COMMENT= Players are cars throwing a magnetic fuzzy ball into a goal +LICENSE= GPLv2 + BUILD_DEPENDS= ${JAM}:${PORTSDIR}/devel/jam \ ${LOCALBASE}/lib/libode.a:${PORTSDIR}/devel/ode \ ${LOCALBASE}/lib/libplibsg.a:${PORTSDIR}/x11-toolkits/plib +WRKSRC= ${WRKDIR}/${PORTNAME} + USE_BZIP2= yes USE_GL= gl USE_SDL= yes -WRKSRC= ${WRKDIR}/${PORTNAME} JAM?= ${LOCALBASE}/bin/jam -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -i '' -e 's|SDL/||g' ${WRKSRC}/src/* @${REINPLACE_CMD} -e 's|%%SDL_CFLAGS%%|`${SDL_CONFIG} --cflags`|' \ @@ -33,11 +35,11 @@ post-patch: do-build: cd ${WRKSRC} && ${SETENV} "C++=${CC}" "LOCALBASE=${LOCALBASE}" \ "CFLAGS=${CFLAGS} -DDATADIR=\\\"${PREFIX}/share\\\"" \ - ${JAM} -dx -sPREFIX=${PREFIX} + ${JAM} -dx -sPREFIX=${PREFIX} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/gillo3 ${PREFIX}/bin - @${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/data/*.* ${DATADIR} + (cd ${WRKSRC}/src && ${INSTALL_PROGRAM} gillo3 ${STAGEDIR}${PREFIX}/bin) + @${MKDIR} ${STAGEDIR}${DATADIR} + (cd ${WRKSRC}/data && ${INSTALL_DATA} *.* ${STAGEDIR}${DATADIR}) .include Copied: branches/2014Q1/games/gillo/files/patch-src__goal.cpp (from r340292, head/games/gillo/files/patch-src__goal.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/gillo/files/patch-src__goal.cpp Sat Jan 25 13:06:05 2014 (r341026, copy of r340292, head/games/gillo/files/patch-src__goal.cpp) @@ -0,0 +1,11 @@ +--- src/goal.cpp.orig ++++ src/goal.cpp +@@ -22,6 +22,8 @@ + + namespace gillo { + ++const float Goal::areaRadius = ODE_GOAL_DISTANCE; ++ + Goal::Goal(Context& c) + : Entity(c) + { Copied: branches/2014Q1/games/gillo/files/patch-src__goal.h (from r340292, head/games/gillo/files/patch-src__goal.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/gillo/files/patch-src__goal.h Sat Jan 25 13:06:05 2014 (r341026, copy of r340292, head/games/gillo/files/patch-src__goal.h) @@ -0,0 +1,11 @@ +--- src/goal.h.orig ++++ src/goal.h +@@ -32,7 +32,7 @@ + */ + class Goal : public Entity + { +- static const float areaRadius = ODE_GOAL_DISTANCE; ++ static const float areaRadius; + dGeomID gids[6]; + public: + Goal(Context& c); Copied: branches/2014Q1/games/gillo/files/patch-src__simpleball.cpp (from r340292, head/games/gillo/files/patch-src__simpleball.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/gillo/files/patch-src__simpleball.cpp Sat Jan 25 13:06:05 2014 (r341026, copy of r340292, head/games/gillo/files/patch-src__simpleball.cpp) @@ -0,0 +1,11 @@ +--- src/simpleball.cpp.orig ++++ src/simpleball.cpp +@@ -26,6 +26,8 @@ + const sgVec4 SimpleBall::p1[3] = { {0.3, 0.0, 0.0, 1.0}, {1.0, 0.0, 0.0, 1.0}, {1.0, 0.4, 0.4, 1.0} }; + const sgVec4 SimpleBall::ne[3] = { {0.0, 0.0, 0.0, 1}, {0.6, 0.6, 0.6, 1}, {1.0, 1.0, 1.0, 1} }; + const sgVec4 SimpleBall::p2[3] = { {0.0, 0.0, 0.3, 1}, {0.0, 0.0, 1.0, 1}, {0.4, 0.4, 1.0, 1} }; ++const double SimpleBall::weight = ODE_BALL_MASS; ++const double SimpleBall::radius = ODE_BALL_RADIUS; + + SimpleBall::SimpleBall(Context& c) + : Entity(c), ballEffectPtr(NULL), possessionIncrement(0), targetSize(2*radius), currentSize(2*radius) Copied: branches/2014Q1/games/gillo/files/patch-src__simpleball.h (from r340292, head/games/gillo/files/patch-src__simpleball.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/gillo/files/patch-src__simpleball.h Sat Jan 25 13:06:05 2014 (r341026, copy of r340292, head/games/gillo/files/patch-src__simpleball.h) @@ -0,0 +1,13 @@ +--- src/simpleball.h.orig ++++ src/simpleball.h +@@ -37,8 +37,8 @@ + static const sgVec4 p1[3]; + static const sgVec4 ne[3]; + static const sgVec4 p2[3]; +- static const double weight = ODE_BALL_MASS; +- static const double radius = ODE_BALL_RADIUS; ++ static const double weight; ++ static const double radius; + + SimpleBall(Context& c); + SimpleBall(Context& c, float size, ssgSimpleState* state); From owner-svn-ports-branches@FreeBSD.ORG Sat Jan 25 13:07:32 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1174B60A; Sat, 25 Jan 2014 13:07:32 +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 E61801FEF; Sat, 25 Jan 2014 13:07: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 s0PD7Qjd011045; Sat, 25 Jan 2014 13:07:31 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0PD7QPN011043; Sat, 25 Jan 2014 13:07:26 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201401251307.s0PD7QPN011043@svn.freebsd.org> From: Martin Wilke Date: Sat, 25 Jan 2014 13:07:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r341027 - in branches/2014Q1/audio/bmp-mac: . 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, 25 Jan 2014 13:07:32 -0000 Author: miwi Date: Sat Jan 25 13:07:26 2014 New Revision: 341027 URL: http://svnweb.freebsd.org/changeset/ports/341027 QAT: https://qat.redports.org/buildarchive/r341027/ Log: MFH: r340293 - Fix build with clang PR: 185515 Submitted by: ports fury Modified: branches/2014Q1/audio/bmp-mac/Makefile (contents, props changed) branches/2014Q1/audio/bmp-mac/files/patch-configure.in (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/audio/bmp-mac/Makefile ============================================================================== --- branches/2014Q1/audio/bmp-mac/Makefile Sat Jan 25 13:06:05 2014 (r341026) +++ branches/2014Q1/audio/bmp-mac/Makefile Sat Jan 25 13:07:26 2014 (r341027) @@ -12,23 +12,27 @@ DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${ MAINTAINER= ports@FreeBSD.org COMMENT= Monkey's Audio Codec non-win32 port -LIB_DEPENDS= libbeep.so:${PORTSDIR}/multimedia/beep-media-player \ - libmac.so:${PORTSDIR}/audio/mac +LIB_DEPENDS= libmac.so:${PORTSDIR}/audio/mac \ + libbeep.so:${PORTSDIR}/multimedia/beep-media-player USES= gmake pkgconfig -GNU_CONFIGURE= yes -USE_AUTOTOOLS= autoconf libtool -CPPFLAGS+= "-I${LOCALBASE}/include" -PLUGDIR= lib/bmp/Input -PLUGFILE= lib${PKGNAMEPREFIX}${PORTNAME}.so -PLIST_FILES= ${PLUGDIR}/${PLUGFILE} +USE_AUTOTOOLS= libtoolize aclocal automake autoconf +LIBTOOLIZE_ARGS=--force --copy +AUTOMAKE_ARGS= --add-missing --copy + +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib + +PLIST_FILES= lib/bmp/Input/libbmp-mac.so post-patch: - @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \ - 's|-D.*_DISABLE_DEPRECATED||g' + @${REINPLACE_CMD} -e \ + 's|-D.*_DISABLE_DEPRECATED|| ; \ + s|@BMP_LIBS@|@GTK_LIBS@|' ${WRKSRC}/src/Makefile.am do-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/${PLUGDIR} - ${INSTALL_LIB} ${WRKSRC}/src/.libs/${PLUGFILE} ${STAGEDIR}${PREFIX}/${PLUGDIR}/ + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/bmp/Input + (cd ${WRKSRC}/src/.libs && ${INSTALL_LIB} libbmp-mac.so \ + ${STAGEDIR}${PREFIX}/lib/bmp/Input) .include Modified: branches/2014Q1/audio/bmp-mac/files/patch-configure.in ============================================================================== --- branches/2014Q1/audio/bmp-mac/files/patch-configure.in Sat Jan 25 13:06:05 2014 (r341026) +++ branches/2014Q1/audio/bmp-mac/files/patch-configure.in Sat Jan 25 13:07:26 2014 (r341027) @@ -1,11 +1,14 @@ --- configure.in.orig Tue Jan 17 23:49:11 2006 +++ configure.in Tue Jan 17 23:49:55 2006 -@@ -62,7 +62,7 @@ +@@ -62,9 +62,9 @@ AC_CHECK_LIB(mac, DecompressFile, []) -#MAC_LIBS="-lmac" -+MAC_LIBS="-lmac -lpthread" ++MAC_LIBS="-lmac -pthread" #MAC_INCLUDES="-I/usr/include/mac" - MAC_CXXFLAGS="-s -O3 -Wall -pedantic -DBUILD_CROSS_PLATFORM" +-MAC_CXXFLAGS="-s -O3 -Wall -pedantic -DBUILD_CROSS_PLATFORM" ++MAC_CXXFLAGS="-DBUILD_CROSS_PLATFORM" + AC_SUBST(MAC_LIBS) + AC_SUBST(MAC_CXXFLAGS) From owner-svn-ports-branches@FreeBSD.ORG Sat Jan 25 13:08:42 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E7F166E8; Sat, 25 Jan 2014 13:08: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 BA6B21FF6; Sat, 25 Jan 2014 13:08: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 s0PD8gsU011331; Sat, 25 Jan 2014 13:08:42 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0PD8gsc011330; Sat, 25 Jan 2014 13:08:42 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201401251308.s0PD8gsc011330@svn.freebsd.org> From: Martin Wilke Date: Sat, 25 Jan 2014 13:08:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r341028 - branches/2014Q1/audio/bmp-flac 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, 25 Jan 2014 13:08:43 -0000 Author: miwi Date: Sat Jan 25 13:08:42 2014 New Revision: 341028 URL: http://svnweb.freebsd.org/changeset/ports/341028 QAT: https://qat.redports.org/buildarchive/r341028/ Log: MFH: r340295 - Fix build with clang PR: 185512 Submitted by: ports fury Modified: branches/2014Q1/audio/bmp-flac/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/audio/bmp-flac/Makefile ============================================================================== --- branches/2014Q1/audio/bmp-flac/Makefile Sat Jan 25 13:07:26 2014 (r341027) +++ branches/2014Q1/audio/bmp-flac/Makefile Sat Jan 25 13:08:42 2014 (r341028) @@ -12,22 +12,33 @@ DISTNAME= ${PORTNAME}-CVS-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= FLAC input plugin for beep-media-player -LIB_DEPENDS= libbeep.so:${PORTSDIR}/multimedia/beep-media-player \ - libFLAC.so:${PORTSDIR}/audio/flac +LICENSE= GPLv2 -PLIST_FILES= lib/bmp/Input/libbmp-flac.so +LIB_DEPENDS= libFLAC.so:${PORTSDIR}/audio/flac \ + libbeep.so:${PORTSDIR}/multimedia/beep-media-player -USES= iconv pkgconfig USE_BZIP2= yes +USES= iconv pkgconfig GNU_CONFIGURE= yes CONFIGURE_ARGS= ${ICONV_CONFIGURE_ARG} \ --with-ogg="${LOCALBASE}" \ --with-xmms-prefix="${LOCALBASE}" - MAKEFILE= ${FILESDIR}/Makefile +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib + +PLIST_FILES= lib/bmp/Input/libbmp-flac.so + +.include + +.if ${ARCH} == "sparc64" +BROKEN= Does not compile with GCC 4.2 +.endif + post-patch: - @${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure + @${REINPLACE_CMD} -e \ + '/xtra_stdcpp/s|-lstdc++||' ${WRKSRC}/configure # "obj" is magic to our make(1) # make sure we get the new includes from ${LOCALBASE}/include/FLAC @@ -38,12 +49,7 @@ post-configure: # This is to avoid libtool running ldconfig -m ${LOCALBASE}/lib/bmp/Input do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/bmp/Input - ${INSTALL_LIB} ${WRKSRC}/src/plugin_bmp/.libs/libbmp-flac.so ${STAGEDIR}${PREFIX}/lib/bmp/Input - -.include - -.if ${ARCH} == "sparc64" -BROKEN= Does not compile with GCC 4.2 -.endif + (cd ${WRKSRC}/src/plugin_bmp/.libs && ${INSTALL_LIB} libbmp-flac.so \ + ${STAGEDIR}${PREFIX}/lib/bmp/Input) .include From owner-svn-ports-branches@FreeBSD.ORG Sat Jan 25 13:10:30 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 472288A5; Sat, 25 Jan 2014 13:10: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 3325C1026; Sat, 25 Jan 2014 13:10: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 s0PDAUoo013652; Sat, 25 Jan 2014 13:10:30 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0PDAUlU013650; Sat, 25 Jan 2014 13:10:30 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201401251310.s0PDAUlU013650@svn.freebsd.org> From: Martin Wilke Date: Sat, 25 Jan 2014 13:10:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r341029 - branches/2014Q1/emulators/tuxnes 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, 25 Jan 2014 13:10:30 -0000 Author: miwi Date: Sat Jan 25 13:10:29 2014 New Revision: 341029 URL: http://svnweb.freebsd.org/changeset/ports/341029 QAT: https://qat.redports.org/buildarchive/r341029/ Log: MFH: r340296 - Fix build with clang - Add LICENSE - Add DESKTOP_ENTRIES PR: 185310 Submitted by: Ports Fury Modified: branches/2014Q1/emulators/tuxnes/Makefile (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/emulators/tuxnes/Makefile ============================================================================== --- branches/2014Q1/emulators/tuxnes/Makefile Sat Jan 25 13:08:42 2014 (r341028) +++ branches/2014Q1/emulators/tuxnes/Makefile Sat Jan 25 13:10:29 2014 (r341029) @@ -3,21 +3,40 @@ PORTNAME= tuxnes PORTVERSION= 0.75 -PORTREVISION= 4 +PORTREVISION= 6 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/TuxNES/TuxNES%20v${PORTVERSION} MAINTAINER= ports@FreeBSD.org -COMMENT= A Nintendo Entertainment System 8-bit emulator +COMMENT= Nintendo Entertainment System 8-bit emulator + +LICENSE= GPLv2 ONLY_FOR_ARCHS= i386 ONLY_FOR_ARCHS_REASON= uses i386 assembly code +USES= compiler gmake USE_XORG= x11 ice sm xext xpm -USE_GMAKE= yes +USE_BINUTILS= yes GNU_CONFIGURE= yes -PLIST_FILES= bin/romfixer bin/tuxnes +PLIST_FILES= bin/romfixer bin/tuxnes share/pixmaps/tuxnes.xpm + +DESKTOP_ENTRIES="TuxNES" "" "${PREFIX}/share/pixmaps/tuxnes.xpm" \ + "${PORTNAME}" "" "" + +.include + +.if ${COMPILER_TYPE} == "clang" +CPPFLAGS+= -no-integrated-as +.endif + +post-patch: + @${REINPLACE_CMD} -e \ + 's|^CFLAGS=|#CFLAGS=|' ${WRKSRC}/configure + +post-install: + (cd ${WRKSRC} && ${INSTALL_DATA} tuxnes.xpm \ + ${STAGEDIR}${PREFIX}/share/pixmaps) -NO_STAGE= yes -.include +.include From owner-svn-ports-branches@FreeBSD.ORG Sat Jan 25 13:12:07 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DEDA2A17; Sat, 25 Jan 2014 13:12: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 CA5DE10BC; Sat, 25 Jan 2014 13:12: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 s0PDC6Ra014737; Sat, 25 Jan 2014 13:12:06 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0PDC642014730; Sat, 25 Jan 2014 13:12:06 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201401251312.s0PDC642014730@svn.freebsd.org> From: Martin Wilke Date: Sat, 25 Jan 2014 13:12:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r341030 - in branches/2014Q1/games/species: . 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, 25 Jan 2014 13:12:07 -0000 Author: miwi Date: Sat Jan 25 13:12:05 2014 New Revision: 341030 URL: http://svnweb.freebsd.org/changeset/ports/341030 QAT: https://qat.redports.org/buildarchive/r341030/ Log: MFH: r340297 - FIx build with clang - Support CXXFLAGS properly - Support COPYTREE_SHARE - Add LICENSE PR: 185332 Submitted by: ports fury Modified: branches/2014Q1/games/species/Makefile branches/2014Q1/games/species/files/patch-Makefile (contents, props changed) branches/2014Q1/games/species/files/patch-main.cpp Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/games/species/Makefile ============================================================================== --- branches/2014Q1/games/species/Makefile Sat Jan 25 13:10:29 2014 (r341029) +++ branches/2014Q1/games/species/Makefile Sat Jan 25 13:12:05 2014 (r341030) @@ -3,14 +3,16 @@ PORTNAME= species PORTVERSION= 1.2d +PORTREVISION= 1 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= alepulver +MASTER_SITES= LOCAL/alepulver DISTNAME= redcoder MAINTAINER= ports@FreeBSD.org COMMENT= Corewars evolver - generates warriors using genetic algorithms +LICENSE= GPLv1 # (or later) + USE_BZIP2= yes USES= gmake dos2unix WRKSRC= ${WRKDIR}/${PORTNAME} @@ -25,11 +27,17 @@ VISITOOL_ALL_TARGET= all visitool .include +.if empty(PORT_OPTIONS:MVISITOOL) +MAKE_ENV+= WX_CONFIG="${TRUE}" +.endif + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${DATADIR} cd ${WRKSRC} && ${INSTALL_DATA} koen.* species.ini *.rc ${STAGEDIR}${DATADIR} - cd ${WRKSRC} && ${CP} -r bench evolver_hill wilfiz ${STAGEDIR}${DATADIR} +.for i in bench evolver_hill wilfiz + @(cd ${WRKSRC} && ${COPYTREE_SHARE} ${i} ${STAGEDIR}${DATADIR}) +.endfor .if ${PORT_OPTIONS:MVISITOOL} ${INSTALL_PROGRAM} ${WRKSRC}/visitool ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-visitool .endif Modified: branches/2014Q1/games/species/files/patch-Makefile ============================================================================== --- branches/2014Q1/games/species/files/patch-Makefile Sat Jan 25 13:10:29 2014 (r341029) +++ branches/2014Q1/games/species/files/patch-Makefile Sat Jan 25 13:12:05 2014 (r341030) @@ -1,6 +1,6 @@ --- ./Makefile.orig Sun Feb 22 03:54:24 2004 +++ ./Makefile Wed Jan 16 18:29:09 2008 -@@ -1,8 +1,8 @@ +@@ -1,22 +1,22 @@ # makefile for species -CC = gcc @@ -10,9 +10,11 @@ +CPP = $(CXX) +LD = $(CXX) - OPT = -O4 +-OPT = -O4 ++#OPT = -O4 DBG = -@@ -11,12 +11,12 @@ + # Recommended extra options for gcc: + #OPT += -fomit-frame-pointer -fforce-addr -finline-functions -funroll-loops #OPT += -mcpu=i686 -march=i686 #DBG += -W -Wall -pedantic -ansi Modified: branches/2014Q1/games/species/files/patch-main.cpp ============================================================================== --- branches/2014Q1/games/species/files/patch-main.cpp Sat Jan 25 13:10:29 2014 (r341029) +++ branches/2014Q1/games/species/files/patch-main.cpp Sat Jan 25 13:12:05 2014 (r341030) @@ -1,11 +1,11 @@ ---- ./main.cpp.orig 2013-11-10 23:14:27.000000000 -0200 -+++ ./main.cpp 2013-11-10 23:14:37.000000000 -0200 +--- main.cpp.orig ++++ main.cpp @@ -29,7 +29,7 @@ /***** main program entry point ********************/ -int main(int /*argc*/,char /***args*/) { -+int main(int /*argc*/,char ** /*args*/) { ++int main(int /*argc*/,char **/*args*/) { CKingdom kingdom; #ifndef _WIN32 From owner-svn-ports-branches@FreeBSD.ORG Sat Jan 25 13:13:21 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 945BCAFE; Sat, 25 Jan 2014 13:13: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 802E210C5; Sat, 25 Jan 2014 13:13: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 s0PDDL8M015030; Sat, 25 Jan 2014 13:13:21 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0PDDL5v015029; Sat, 25 Jan 2014 13:13:21 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201401251313.s0PDDL5v015029@svn.freebsd.org> From: Martin Wilke Date: Sat, 25 Jan 2014 13:13:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r341031 - in branches/2014Q1/sysutils/kdirstat: . 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, 25 Jan 2014 13:13:21 -0000 Author: miwi Date: Sat Jan 25 13:13:21 2014 New Revision: 341031 URL: http://svnweb.freebsd.org/changeset/ports/341031 QAT: https://qat.redports.org/buildarchive/r341031/ Log: MFH: r340298 - Stage support - Fix build with clang PR: 185333 Submitted by: ports fury Added: branches/2014Q1/sysutils/kdirstat/files/ - copied from r340298, head/sysutils/kdirstat/files/ Modified: branches/2014Q1/sysutils/kdirstat/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/sysutils/kdirstat/Makefile ============================================================================== --- branches/2014Q1/sysutils/kdirstat/Makefile Sat Jan 25 13:12:05 2014 (r341030) +++ branches/2014Q1/sysutils/kdirstat/Makefile Sat Jan 25 13:13:21 2014 (r341031) @@ -20,7 +20,6 @@ USE_KDE4= automoc4 kdelibs kdeprefix lib USE_QT4= moc_build qmake_build rcc_build uic_build INSTALLS_ICONS= yes -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e \ '/^Categories/s|=.*|=Qt;KDE;Utility;|' \ @@ -30,6 +29,6 @@ post-patch: ${WRKSRC}/src/kdirreadjob.cpp post-install: - @${LN} -sf k4dirstat ${PREFIX}/bin/kdirstat + @${LN} -sf k4dirstat ${STAGEDIR}${PREFIX}/bin/kdirstat .include From owner-svn-ports-branches@FreeBSD.ORG Sat Jan 25 13:14:51 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 747ECC00; Sat, 25 Jan 2014 13:14: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 5EED310D2; Sat, 25 Jan 2014 13:14: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 s0PDEpIQ015405; Sat, 25 Jan 2014 13:14:51 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0PDEoHm015400; Sat, 25 Jan 2014 13:14:50 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201401251314.s0PDEoHm015400@svn.freebsd.org> From: Martin Wilke Date: Sat, 25 Jan 2014 13:14:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r341032 - in branches/2014Q1/x11-toolkits/nucleo: . 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, 25 Jan 2014 13:14:51 -0000 Author: miwi Date: Sat Jan 25 13:14:50 2014 New Revision: 341032 URL: http://svnweb.freebsd.org/changeset/ports/341032 QAT: https://qat.redports.org/buildarchive/r341032/ Log: MFH: r340302 - Fix build with clang PR: 185706 Submitted by: ports fury Added: branches/2014Q1/x11-toolkits/nucleo/files/patch-nucleo__gl__scenegraph__sgNode.cxx - copied unchanged from r340302, head/x11-toolkits/nucleo/files/patch-nucleo__gl__scenegraph__sgNode.cxx branches/2014Q1/x11-toolkits/nucleo/files/patch-nucleo__plugins__ffmpeg__ffmpegImageSink.cxx - copied unchanged from r340302, head/x11-toolkits/nucleo/files/patch-nucleo__plugins__ffmpeg__ffmpegImageSink.cxx branches/2014Q1/x11-toolkits/nucleo/files/patch-nucleo__plugins__ffmpeg__ffmpegImageSource.cxx - copied unchanged from r340302, head/x11-toolkits/nucleo/files/patch-nucleo__plugins__ffmpeg__ffmpegImageSource.cxx Modified: branches/2014Q1/x11-toolkits/nucleo/Makefile branches/2014Q1/x11-toolkits/nucleo/pkg-plist (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/x11-toolkits/nucleo/Makefile ============================================================================== --- branches/2014Q1/x11-toolkits/nucleo/Makefile Sat Jan 25 13:13:21 2014 (r341031) +++ branches/2014Q1/x11-toolkits/nucleo/Makefile Sat Jan 25 13:14:50 2014 (r341032) @@ -12,72 +12,68 @@ COMMENT= Toolkit to explore video and hu LICENSE= LGPL21 -LIB_DEPENDS= freetype:${PORTSDIR}/print/freetype2 \ - jpeg:${PORTSDIR}/graphics/jpeg \ - png15:${PORTSDIR}/graphics/png \ - exif:${PORTSDIR}/graphics/libexif +LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ + libexif.so:${PORTSDIR}/graphics/libexif \ + libpng15.so:${PORTSDIR}/graphics/png \ + libfreetype.so:${PORTSDIR}/print/freetype2 USE_BZIP2= yes USES= gmake pkgconfig USE_GL= glu GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +CONFIGURE_ARGS= --without-opencv USE_LDCONFIG= yes -OPTIONS_DEFINE= GNUTLS DNSSD FFMPEG QT4 GD +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -DNSSD_DESC= DNS-SD support -FFMPEG_DESC= FFmpeg plugin -QT4_DESC= Qt4 plugin -GD_DESC= GD plugin +OPTIONS_DEFINE= FFMPEG GD GNUTLS QT4 +OPTIONS_RADIO= DNSSD +OPTIONS_RADIO_DNSSD= AVAHI MDNSRESPONDER +OPTIONS_SUB= yes + +AVAHI_BUILD_DEPENDS= avahi-libdns>0:${PORTSDIR}/net/avahi-libdns +AVAHI_LIB_DEPENDS= libdns_sd.so:${PORTSDIR}/net/avahi-libdns +AVAHI_CPPFLAGS= -I${LOCALBASE}/include/avahi-compat-libdns_sd +DNSSD_DESC= DNS-SD support +FFMPEG_DESC= FFmpeg plugin +FFMPEG_LIB_DEPENDS= libavformat.so:${PORTSDIR}/multimedia/ffmpeg +FFMPEG_CONFIGURE_WITH= ffmpeg +GD_DESC= GD plugin +GD_LIB_DEPENDS= libgd.so:${PORTSDIR}/graphics/gd +QT4_DESC= Qt4 plugin +GD_CONFIGURE_WITH= gd +GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls +GNUTLS_CONFIGURE_WITH= gnutls +MDNSRESPONDER_BUILD_DEPENDS=\ + mDNSResponder>0:${PORTSDIR}/net/mDNSResponder +MDNSRESPONDER_LIB_DEPENDS=\ + libdns_sd.so:${PORTSDIR}/net/mDNSResponder +QT4_USE= QT4=moc_build,corelib +QT4_CONFIGURE_WITH= qt +QT4_MAKE_ARGS= QT4MOC="${MOC}" -NO_STAGE= yes -.include +.include -.if ${ARCH} == "powerpc" && ${OSVERSION} > 900000 -BROKEN= Does not compile on powerpc-9 +.if ! ${PORT_OPTIONS:MAVAHI} && ! ${PORT_OPTIONS:MMDNSRESPONDER} +CONFIGURE_ARGS+= --without-dns-sd .endif -.if ${PORT_OPTIONS:MGNUTLS} -LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls -.else -CONFIGURE_ARGS+= --without-gnutls +.if ${PORT_OPTIONS:MQT4} +QT_NONSTANDARD= yes .endif -.if ${PORT_OPTIONS:MDNSSD} -. if exists(${LOCALBASE}/include/avahi-compat-libdns_sd/dns_sd.h) -LIB_DEPENDS+= dns_sd:${PORTSDIR}/net/avahi-libdns -. else -LIB_DEPENDS+= dns_sd:${PORTSDIR}/net/mDNSResponder -. endif -.else -CONFIGURE_ARGS+= --without-dns-sd -.endif +.include -.if ${PORT_OPTIONS:MFFMPEG} -LIB_DEPENDS+= avformat:${PORTSDIR}/multimedia/ffmpeg -PLIST_SUB+= FFMPEG="" -.else -CONFIGURE_ARGS+= --without-ffmpeg -PLIST_SUB+= FFMPEG="@comment " +.if ${ARCH} == "powerpc" && ${OSVERSION} > 900000 +BROKEN= Does not compile on powerpc-9 .endif -.if ${PORT_OPTIONS:MQT4} -USE_QT4= moc_build corelib -MAKE_ARGS+= QT4MOC=${LOCALBASE}/bin/moc-qt4 -PLIST_SUB+= QT4="" -.else -CONFIGURE_ARGS+= --without-qt -PLIST_SUB+= QT4="@comment " -.endif +post-patch: + @${REINPLACE_CMD} -e \ + 's|-lpthread|-pthread|' ${WRKSRC}/configure -.if ${PORT_OPTIONS:MGD} -LIB_DEPENDS+= gd:${PORTSDIR}/graphics/gd -PLIST_SUB+= GD="" -.else -CONFIGURE_ARGS+= --without-gd -PLIST_SUB+= GD="@comment " -.endif +post-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/nucleo .include Copied: branches/2014Q1/x11-toolkits/nucleo/files/patch-nucleo__gl__scenegraph__sgNode.cxx (from r340302, head/x11-toolkits/nucleo/files/patch-nucleo__gl__scenegraph__sgNode.cxx) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/x11-toolkits/nucleo/files/patch-nucleo__gl__scenegraph__sgNode.cxx Sat Jan 25 13:14:50 2014 (r341032, copy of r340302, head/x11-toolkits/nucleo/files/patch-nucleo__gl__scenegraph__sgNode.cxx) @@ -0,0 +1,14 @@ +--- nucleo/gl/scenegraph/sgNode.cxx.orig ++++ nucleo/gl/scenegraph/sgNode.cxx +@@ -16,7 +16,10 @@ + #include + #include + +-#if defined (HAVE_TR1_UNORDERED_MAP) ++#if defined (_LIBCPP_VERSION) ++#include ++typedef std::unordered_map sgNodeMap; ++#elif defined (HAVE_TR1_UNORDERED_MAP) + #include + typedef std::tr1::unordered_map sgNodeMap; + #elif defined (HAVE_EXT_HASH_MAP) Copied: branches/2014Q1/x11-toolkits/nucleo/files/patch-nucleo__plugins__ffmpeg__ffmpegImageSink.cxx (from r340302, head/x11-toolkits/nucleo/files/patch-nucleo__plugins__ffmpeg__ffmpegImageSink.cxx) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/x11-toolkits/nucleo/files/patch-nucleo__plugins__ffmpeg__ffmpegImageSink.cxx Sat Jan 25 13:14:50 2014 (r341032, copy of r340302, head/x11-toolkits/nucleo/files/patch-nucleo__plugins__ffmpeg__ffmpegImageSink.cxx) @@ -0,0 +1,97 @@ +--- nucleo/plugins/ffmpeg/ffmpegImageSink.cxx.orig ++++ nucleo/plugins/ffmpeg/ffmpegImageSink.cxx +@@ -118,11 +118,11 @@ + + output_format = 0 ; + if (uri.scheme=="mpegts-udp") { +- output_format = guess_format("mpegts", NULL, NULL) ; ++ output_format = av_guess_format("mpegts", NULL, NULL) ; + } else { + filename = uri.opaque!="" ? uri.opaque : uri.path ; +- if (guessFormat) output_format = guess_format(NULL, filename.c_str(), NULL) ; +- if (!output_format) output_format = guess_format(format.c_str(), NULL, NULL) ; ++ if (guessFormat) output_format = av_guess_format(NULL, filename.c_str(), NULL) ; ++ if (!output_format) output_format = av_guess_format(format.c_str(), NULL, NULL) ; + } + + std::string message ; +@@ -190,7 +190,7 @@ + + AVCodecContext *codec_context = vstream->codec ; + codec_context->codec_id = output_format->video_codec ; +- codec_context->codec_type = CODEC_TYPE_VIDEO ; ++ codec_context->codec_type = AVMEDIA_TYPE_VIDEO ; + codec_context->pix_fmt = PIX_FMT_YUV420P ; + codec_context->width = img->getWidth() ; // must be a multiple of two + codec_context->height = img->getHeight() ; // must be a multiple of two +@@ -210,12 +210,7 @@ + || !strcmp(format_context->oformat->name, "3gp")) + codec_context->flags |= CODEC_FLAG_GLOBAL_HEADER ; + +- if (av_set_parameters(format_context, NULL) < 0) { +- std::cerr << "ffmpegImageSink: invalid output format parameters" << std::endl ; +- return false ; +- } +- +- dump_format(format_context, 0, filename.c_str(), 1) ; // FIXME: for debug only ++ av_dump_format(format_context, 0, filename.c_str(), 1) ; // FIXME: for debug only + + // ------------------ + +@@ -225,7 +220,7 @@ + return false ; + } + +- if (avcodec_open(codec_context, codec) < 0) { ++ if (avcodec_open2(codec_context, codec, NULL) < 0) { + std::cerr << "ffmpegImageSink: could not open codec" << std::endl ; + vstream->codec = 0 ; + return false ; +@@ -235,7 +230,7 @@ + + if (filename!="") { + sender = 0 ; +- if (url_fopen(&format_context->pb, filename.c_str(), URL_WRONLY) < 0) { ++ if (avio_open(&format_context->pb, filename.c_str(), AVIO_FLAG_WRITE) < 0) { + std::cerr << "ffmpegImageSink: could not open " << filename << std::endl ; + return false ; + } +@@ -245,17 +240,17 @@ + int port = uri.port ; + if (!port) port = 1234 ; + sender = new UdpSender(uri.host.c_str(), port) ; +- if (init_put_byte(format_context->pb, buffer, buffer_size, ++ if (avio_alloc_context(buffer, buffer_size, + 1, (void *)this, + 0, udp_callback, 0) < 0) { + std::cerr << "ffmpegImageSink: init_put_byte failed" << std::endl ; + return false ; + } +- format_context->pb->is_streamed = 1 ; // no seek ++ format_context->pb->seekable = 0 ; // no seek + format_context->pb->max_packet_size = buffer_size ; + } + +- av_write_header(format_context) ; ++ avformat_write_header(format_context, NULL) ; + + video_outbuf_size = 256*1024 ; // FIXME ? + video_outbuf = new uint8_t [video_outbuf_size] ; +@@ -346,7 +341,7 @@ + pkt.size = out_size ; + if (cctx->coded_frame) { + pkt.pts = pkt.dts = pts ; +- if (cctx->coded_frame->key_frame) pkt.flags |= PKT_FLAG_KEY ; ++ if (cctx->coded_frame->key_frame) pkt.flags |= AV_PKT_FLAG_KEY ; + } + if (av_write_frame(format_context, &pkt) != 0) { + // std::cerr << "ffmpegImageSink: error while writing video frame" << std::endl ; +@@ -372,7 +367,7 @@ + if (vstream->codec) { + avcodec_close(vstream->codec) ; + av_write_trailer(format_context) ; +- if (!sender) url_fclose(format_context->pb) ; ++ if (!sender) avio_close(format_context->pb) ; + } + av_freep(&vstream) ; + } Copied: branches/2014Q1/x11-toolkits/nucleo/files/patch-nucleo__plugins__ffmpeg__ffmpegImageSource.cxx (from r340302, head/x11-toolkits/nucleo/files/patch-nucleo__plugins__ffmpeg__ffmpegImageSource.cxx) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/x11-toolkits/nucleo/files/patch-nucleo__plugins__ffmpeg__ffmpegImageSource.cxx Sat Jan 25 13:14:50 2014 (r341032, copy of r340302, head/x11-toolkits/nucleo/files/patch-nucleo__plugins__ffmpeg__ffmpegImageSource.cxx) @@ -0,0 +1,48 @@ +--- nucleo/plugins/ffmpeg/ffmpegImageSource.cxx.orig ++++ nucleo/plugins/ffmpeg/ffmpegImageSource.cxx +@@ -47,23 +47,23 @@ + + bool + ffmpegImageSource::start(void) { +- int ret = av_open_input_file(&fctx, filename.c_str(), 0, 0, 0); ++ int ret = avformat_open_input(&fctx, filename.c_str(), 0, 0); + if (ret<0) { + std::cerr << "ffmpegImageSource: failed to open " << filename << " (" << ret << ")" << std::endl ; + return false ; + } + +- ret = av_find_stream_info(fctx) ; ++ ret = avformat_find_stream_info(fctx, NULL) ; + if (ret<0) { + std::cerr << "ffmpegImageSource: failed to find codec parameters for " << filename << " (" << ret << ")" << std::endl ; + return false ; + } + +- dump_format(fctx, 1, filename.c_str(), 0) ; ++ av_dump_format(fctx, 1, filename.c_str(), 0) ; + + bool found_video_stream = false ; + for (unsigned int i=0; inb_streams; ++i) { +- if (fctx->streams[i]->codec->codec_type==CODEC_TYPE_VIDEO) { ++ if (fctx->streams[i]->codec->codec_type==AVMEDIA_TYPE_VIDEO) { + video_stream = i ; + found_video_stream = true ; + } else +@@ -86,7 +86,7 @@ + return false ; + } + +- ret = avcodec_open(cctx, codec); ++ ret = avcodec_open2(cctx, codec, NULL); + if (ret<0) { + std::cerr << "ffmpegImageSource: unable to open codec" << std::endl ; + return false ; +@@ -123,7 +123,7 @@ + #endif + + int got_picture = 0 ; +- avcodec_decode_video(cctx, &frame, &got_picture, packet.data, packet.size) ; ++ avcodec_decode_video2(cctx, &frame, &got_picture, &packet) ; + av_free_packet(&packet) ; + if (!got_picture) continue ; + Modified: branches/2014Q1/x11-toolkits/nucleo/pkg-plist ============================================================================== --- branches/2014Q1/x11-toolkits/nucleo/pkg-plist Sat Jan 25 13:13:21 2014 (r341031) +++ branches/2014Q1/x11-toolkits/nucleo/pkg-plist Sat Jan 25 13:14:50 2014 (r341032) @@ -11,7 +11,6 @@ include/nucleo/core/TimeKeeper.H include/nucleo/core/TimeStamp.H include/nucleo/core/URI.H include/nucleo/core/UUID.H -@dirrm include/nucleo/core include/nucleo/gl/glIncludes.H include/nucleo/gl/glUtils.H include/nucleo/gl/scenegraph/sgClipper.H @@ -29,15 +28,8 @@ include/nucleo/gl/window/_macos2keysym.H include/nucleo/gl/window/glWindow.H include/nucleo/gl/window/glWindow_GLX.H include/nucleo/gl/window/keysym.H -@dirrm include/nucleo/gl/window -@dirrm include/nucleo/gl/texture -@dirrm include/nucleo/gl/text -@dirrm include/nucleo/gl/shading -@dirrm include/nucleo/gl/scenegraph -@dirrm include/nucleo/gl include/nucleo/helpers/OpenCV.H include/nucleo/helpers/Phone.H -@dirrm include/nucleo/helpers include/nucleo/image/Image.H include/nucleo/image/ImageBridge.H include/nucleo/image/RegionOfInterest.H @@ -79,17 +71,6 @@ include/nucleo/image/source/nudpcImageSo include/nucleo/image/source/nudppImageSource.H include/nucleo/image/source/serverpushImageSource.H include/nucleo/image/source/vssImageSource.H -@dirrm include/nucleo/image/source -@dirrm include/nucleo/image/sink -@dirrm include/nucleo/image/processing/noise -@dirrm include/nucleo/image/processing/gamma -@dirrm include/nucleo/image/processing/difference -@dirrm include/nucleo/image/processing/convolution -@dirrm include/nucleo/image/processing/chromakeying -@dirrm include/nucleo/image/processing/basic -@dirrm include/nucleo/image/processing -@dirrm include/nucleo/image/encoding -@dirrm include/nucleo/image include/nucleo/network/NetworkUtils.H include/nucleo/network/dnssd/DNSService.H include/nucleo/network/dnssd/DNSServiceAnnouncer.H @@ -109,18 +90,10 @@ include/nucleo/network/udp/UdpReceiver.H include/nucleo/network/udp/UdpSender.H include/nucleo/network/udp/UdpSocket.H include/nucleo/network/xmpp/XmppConnection.H -@dirrm include/nucleo/network/xmpp -@dirrm include/nucleo/network/udp -@dirrm include/nucleo/network/tcp -@dirrm include/nucleo/network/http -@dirrm include/nucleo/network/dnssd -@dirrm include/nucleo/network include/nucleo/nucleo.H -%%QT4%%include/nucleo/plugins/qt/qtReactiveEngine.H %%QT4%%include/nucleo/plugins/qt/qtFileKeeper.H +%%QT4%%include/nucleo/plugins/qt/qtReactiveEngine.H %%QT4%%include/nucleo/plugins/qt/qtTimeKeeper.H -%%QT4%%@dirrm include/nucleo/plugins/qt -%%QT4%%@dirrm include/nucleo/plugins include/nucleo/utils/AppUtils.H include/nucleo/utils/Base64.H include/nucleo/utils/ByteOrder.H @@ -130,22 +103,19 @@ include/nucleo/utils/MD5.H include/nucleo/utils/SignalUtils.H include/nucleo/utils/StringUtils.H include/nucleo/utils/TimeUtils.H -@dirrm include/nucleo/utils -include/nucleo/xml/XmlText.H -include/nucleo/xml/XmlStructure.H include/nucleo/xml/XmlParser.H -@dirrm include/nucleo/xml -@dirrm include/nucleo +include/nucleo/xml/XmlStructure.H +include/nucleo/xml/XmlText.H lib/libNucleo.la lib/libNucleo.so lib/libNucleo.so.0 +@exec mkdir -p %D/lib/nucleo %%FFMPEG%%lib/nucleo/nPffmpeg.la %%FFMPEG%%lib/nucleo/nPffmpeg.so %%GD%%lib/nucleo/nPgd.la %%GD%%lib/nucleo/nPgd.so %%QT4%%lib/nucleo/nPqt.la %%QT4%%lib/nucleo/nPqt.so -@dirrmtry lib/nucleo libdata/pkgconfig/nucleo.pc %%DATADIR%%/Info.plist.tmpl %%DATADIR%%/fonts/Vera.ttf @@ -161,5 +131,36 @@ libdata/pkgconfig/nucleo.pc %%DATADIR%%/nucleo.icns %%DATADIR%%/nucleo.pdf %%DATADIR%%/plugin-list -@dirrm share/nucleo/fonts -@dirrm share/nucleo +@dirrm %%DATADIR%%/fonts +@dirrm %%DATADIR%% +@dirrmtry lib/nucleo +@dirrm include/nucleo/xml +@dirrm include/nucleo/utils +%%QT4%%@dirrm include/nucleo/plugins/qt +%%QT4%%@dirrm include/nucleo/plugins +@dirrm include/nucleo/network/xmpp +@dirrm include/nucleo/network/udp +@dirrm include/nucleo/network/tcp +@dirrm include/nucleo/network/http +@dirrm include/nucleo/network/dnssd +@dirrm include/nucleo/network +@dirrm include/nucleo/image/source +@dirrm include/nucleo/image/sink +@dirrm include/nucleo/image/processing/noise +@dirrm include/nucleo/image/processing/gamma +@dirrm include/nucleo/image/processing/difference +@dirrm include/nucleo/image/processing/convolution +@dirrm include/nucleo/image/processing/chromakeying +@dirrm include/nucleo/image/processing/basic +@dirrm include/nucleo/image/processing +@dirrm include/nucleo/image/encoding +@dirrm include/nucleo/image +@dirrm include/nucleo/helpers +@dirrm include/nucleo/gl/window +@dirrm include/nucleo/gl/texture +@dirrm include/nucleo/gl/text +@dirrm include/nucleo/gl/shading +@dirrm include/nucleo/gl/scenegraph +@dirrm include/nucleo/gl +@dirrm include/nucleo/core +@dirrm include/nucleo From owner-svn-ports-branches@FreeBSD.ORG Sat Jan 25 13:16:33 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1AFDFCEC; Sat, 25 Jan 2014 13:16:33 +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 059E010E1; Sat, 25 Jan 2014 13:16:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0PDGWj7015797; Sat, 25 Jan 2014 13:16:32 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0PDGW42015793; Sat, 25 Jan 2014 13:16:32 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201401251316.s0PDGW42015793@svn.freebsd.org> From: Martin Wilke Date: Sat, 25 Jan 2014 13:16:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r341033 - in branches/2014Q1/japanese/ebview: . 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, 25 Jan 2014 13:16:33 -0000 Author: miwi Date: Sat Jan 25 13:16:31 2014 New Revision: 341033 URL: http://svnweb.freebsd.org/changeset/ports/341033 QAT: https://qat.redports.org/buildarchive/r341033/ Log: MFH: r340304 - Fix build with clang - Add License PR: 185708 Submitted by: ports fury Added: branches/2014Q1/japanese/ebview/files/patch-data__Makefile.in - copied unchanged from r340304, head/japanese/ebview/files/patch-data__Makefile.in branches/2014Q1/japanese/ebview/files/patch-help__Makefile.in - copied unchanged from r340304, head/japanese/ebview/files/patch-help__Makefile.in branches/2014Q1/japanese/ebview/files/patch-po__Makefile.in.in - copied unchanged from r340304, head/japanese/ebview/files/patch-po__Makefile.in.in Modified: branches/2014Q1/japanese/ebview/Makefile (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/japanese/ebview/Makefile ============================================================================== --- branches/2014Q1/japanese/ebview/Makefile Sat Jan 25 13:14:50 2014 (r341032) +++ branches/2014Q1/japanese/ebview/Makefile Sat Jan 25 13:16:31 2014 (r341033) @@ -9,12 +9,16 @@ MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Electronic Book Viewer -LIB_DEPENDS= eb:${PORTSDIR}/japanese/eb +LICENSE= GPLv2 # (or later) -CONFLICTS= ja-ebview-gtk2-* +LIB_DEPENDS= libeb.so:${PORTSDIR}/japanese/eb +OPTIONS_DEFINE= DOCS + +CONFLICTS= ja-ebview-gtk2-[0-9]* + +USES= gettext gmake USE_GNOME= imlib -USE_GMAKE= yes USE_AUTOTOOLS= autoconf MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ AUTOHEADER="${TRUE}" @@ -22,21 +26,16 @@ MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="$ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -NO_STAGE= yes -.include +.include -pre-build: -.for file in src/dictheading.c - cd ${WRKSRC} && ${MV} ${file} ${file}.pre_iconv \ - && iconv -c -t ascii ${file}.pre_iconv > ${file} || ${TRUE} -.endfor +post-patch: + @${REINPLACE_CMD} -e \ + 's|// .*||' ${WRKSRC}/src/dictheading.c post-install: -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ChangeLog README - ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR}) .endfor -.endif -.include +.include Copied: branches/2014Q1/japanese/ebview/files/patch-data__Makefile.in (from r340304, head/japanese/ebview/files/patch-data__Makefile.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/japanese/ebview/files/patch-data__Makefile.in Sat Jan 25 13:16:31 2014 (r341033, copy of r340304, head/japanese/ebview/files/patch-data__Makefile.in) @@ -0,0 +1,19 @@ +--- data/Makefile.in.orig ++++ data/Makefile.in +@@ -46,13 +46,13 @@ + + install: + if test -r $(MKINSTALLDIRS); then \ +- $(MKINSTALLDIRS) $(packagedatadir); \ ++ $(MKINSTALLDIRS) $(DESTDIR)$(packagedatadir); \ + else \ +- $(top_srcdir)/mkinstalldirs $(packagedatadir); \ ++ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(packagedatadir); \ + fi; \ + data="$(data)"; \ + for file in $$data; do \ +- $(INSTALL_DATA) $(srcdir)/$$file $(packagedatadir)/$$file; \ ++ $(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(packagedatadir)/$$file; \ + done; \ + + # Define this as empty until I found a useful application. Copied: branches/2014Q1/japanese/ebview/files/patch-help__Makefile.in (from r340304, head/japanese/ebview/files/patch-help__Makefile.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/japanese/ebview/files/patch-help__Makefile.in Sat Jan 25 13:16:31 2014 (r341033, copy of r340304, head/japanese/ebview/files/patch-help__Makefile.in) @@ -0,0 +1,21 @@ +--- help/Makefile.in.orig ++++ help/Makefile.in +@@ -49,15 +49,15 @@ + dir="$(dir)"; \ + for lang in $$dir; do \ + if test -r $(MKINSTALLDIRS); then \ +- $(MKINSTALLDIRS) $(packagedatadir)/help/$$lang; \ ++ $(MKINSTALLDIRS) $(DESTDIR)$(packagedatadir)/help/$$lang; \ + else \ +- $(top_srcdir)/mkinstalldirs $(packagedatadir)/help/$$lang; \ ++ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(packagedatadir)/help/$$lang; \ + fi; \ + done; \ + data="$(data)"; \ + for lang in $$dir; do \ + for file in $$data; do \ +- $(INSTALL_DATA) $(srcdir)/$$lang/$$file $(packagedatadir)/help/$$lang/$$file; \ ++ $(INSTALL_DATA) $(srcdir)/$$lang/$$file $(DESTDIR)$(packagedatadir)/help/$$lang/$$file; \ + done; \ + done; \ + Copied: branches/2014Q1/japanese/ebview/files/patch-po__Makefile.in.in (from r340304, head/japanese/ebview/files/patch-po__Makefile.in.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/japanese/ebview/files/patch-po__Makefile.in.in Sat Jan 25 13:16:31 2014 (r341033, copy of r340304, head/japanese/ebview/files/patch-po__Makefile.in.in) @@ -0,0 +1,52 @@ +--- po/Makefile.in.in.orig ++++ po/Makefile.in.in +@@ -111,9 +111,9 @@ + install-data-no: all + install-data-yes: all + if test -r "$(MKINSTALLDIRS)"; then \ +- $(MKINSTALLDIRS) $(datadir); \ ++ $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \ + else \ +- $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \ ++ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \ + fi + @catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ +@@ -125,27 +125,27 @@ + lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ + dir=$$destdir/$$lang/LC_MESSAGES; \ + if test -r "$(MKINSTALLDIRS)"; then \ +- $(MKINSTALLDIRS) $$dir; \ ++ $(MKINSTALLDIRS) $(DESTDIR)$$dir; \ + else \ +- $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \ ++ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$$dir; \ + fi; \ + if test -r $$cat; then \ +- $(INSTALL_DATA) $$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \ +- echo "installing $$cat as $$dir/$(PACKAGE)$(INSTOBJEXT)"; \ ++ $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT); \ ++ echo "installing $$cat as $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT)"; \ + else \ +- $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \ ++ $(INSTALL_DATA) $(srcdir)/$$cat $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT); \ + echo "installing $(srcdir)/$$cat as" \ +- "$$dir/$(PACKAGE)$(INSTOBJEXT)"; \ ++ "$(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT)"; \ + fi; \ + if test -r $$cat.m; then \ +- $(INSTALL_DATA) $$cat.m $$dir/$(PACKAGE)$(INSTOBJEXT).m; \ +- echo "installing $$cat.m as $$dir/$(PACKAGE)$(INSTOBJEXT).m"; \ ++ $(INSTALL_DATA) $$cat.m $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT).m; \ ++ echo "installing $$cat.m as $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \ + else \ + if test -r $(srcdir)/$$cat.m ; then \ + $(INSTALL_DATA) $(srcdir)/$$cat.m \ +- $$dir/$(PACKAGE)$(INSTOBJEXT).m; \ ++ $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT).m; \ + echo "installing $(srcdir)/$$cat as" \ +- "$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \ ++ "$(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \ + else \ + true; \ + fi; \ From owner-svn-ports-branches@FreeBSD.ORG Sat Jan 25 13:18:21 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A9977DFA; Sat, 25 Jan 2014 13:18: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 954EB10ED; Sat, 25 Jan 2014 13:18: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 s0PDILtE016115; Sat, 25 Jan 2014 13:18:21 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0PDIL55016114; Sat, 25 Jan 2014 13:18:21 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201401251318.s0PDIL55016114@svn.freebsd.org> From: Martin Wilke Date: Sat, 25 Jan 2014 13:18:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r341034 - in branches/2014Q1/x11-toolkits/viewklass: . 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, 25 Jan 2014 13:18:21 -0000 Author: miwi Date: Sat Jan 25 13:18:21 2014 New Revision: 341034 URL: http://svnweb.freebsd.org/changeset/ports/341034 QAT: https://qat.redports.org/buildarchive/r341034/ Log: MFH: r340305 - Fix build with clang PR: 185708 Submitted by: ports fury Added: branches/2014Q1/x11-toolkits/viewklass/files/ - copied from r340305, head/x11-toolkits/viewklass/files/ Modified: branches/2014Q1/x11-toolkits/viewklass/Makefile (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/x11-toolkits/viewklass/Makefile ============================================================================== --- branches/2014Q1/x11-toolkits/viewklass/Makefile Sat Jan 25 13:16:31 2014 (r341033) +++ branches/2014Q1/x11-toolkits/viewklass/Makefile Sat Jan 25 13:18:21 2014 (r341034) @@ -11,15 +11,16 @@ DISTNAME= ViewKlass-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= C++ Framework for Motif -BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake +LICENSE= LGPL20 # (or later) -USES= motif -GNU_CONFIGURE= yes +USES= imake:env motif +USE_AUTOTOOLS= autoconf213 -NO_STAGE= yes post-patch: - @${REINPLACE_CMD} -e 's/^CFLAGS=/CFLAGS+=/g ; \ - s/^CXXFLAGS=/CXXFLAGS+=/g ; \ - s/-g -Wall//g' ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e \ + '/^CFLAGS=/s|-g|@CFLAGS@| ; \ + /^CXXFLAGS=/s|-g|@CXXFLAGS@| ; \ + s| $$(exec_prefix)| $$(DESTDIR)$$(exec_prefix)| ; \ + s| $$(prefix)| $$(DESTDIR)$$(prefix)|' ${WRKSRC}/Makefile.in .include From owner-svn-ports-branches@FreeBSD.ORG Sat Jan 25 13:21:20 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4BFA118C; Sat, 25 Jan 2014 13:21: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 36977116D; Sat, 25 Jan 2014 13:21: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 s0PDLK9H018986; Sat, 25 Jan 2014 13:21:20 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0PDLJ04018980; Sat, 25 Jan 2014 13:21:19 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201401251321.s0PDLJ04018980@svn.freebsd.org> From: Martin Wilke Date: Sat, 25 Jan 2014 13:21:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r341036 - in branches/2014Q1/graphics/dynamechs: . 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, 25 Jan 2014 13:21:20 -0000 Author: miwi Date: Sat Jan 25 13:21:18 2014 New Revision: 341036 URL: http://svnweb.freebsd.org/changeset/ports/341036 QAT: https://qat.redports.org/buildarchive/r341036/ Log: MFH: r340307 - Fix build with clang PR: 185716 Submitted by: ports fury Added: branches/2014Q1/graphics/dynamechs/files/patch-aquarobot__MatrixMy.cpp - copied unchanged from r340307, head/graphics/dynamechs/files/patch-aquarobot__MatrixMy.cpp branches/2014Q1/graphics/dynamechs/files/patch-dm__svd_linpack.cpp - copied unchanged from r340307, head/graphics/dynamechs/files/patch-dm__svd_linpack.cpp Modified: branches/2014Q1/graphics/dynamechs/Makefile branches/2014Q1/graphics/dynamechs/files/make.platform.freebsd (contents, props changed) branches/2014Q1/graphics/dynamechs/files/patch-aquarobot::Gait.hpp (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/graphics/dynamechs/Makefile ============================================================================== --- branches/2014Q1/graphics/dynamechs/Makefile Sat Jan 25 13:20:40 2014 (r341035) +++ branches/2014Q1/graphics/dynamechs/Makefile Sat Jan 25 13:21:18 2014 (r341036) @@ -10,32 +10,32 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME} DISTNAME= ${PORTNAME}_${PORTVERSION:S/.p/pre/} MAINTAINER= ports@FreeBSD.org -COMMENT= A Multibody Dynamic Simulation Library +COMMENT= Multibody Dynamic Simulation Library -USES= perl5 USE_BZIP2= yes +USES= gmake perl5 USE_GL= glut -USE_GMAKE= yes USE_PERL5= build -CXXFLAGS+= ${PTHREAD_CFLAGS} MAKE_ENV= OPENGLINCDIR="${LOCALBASE}/include" \ OPENGLLIBDIR="${LOCALBASE}/lib" -LDFLAGS+= ${PTHREAD_LIBS} ALL_TARGET= freebsd USE_LDCONFIG= yes -NO_STAGE= yes -.include +post-patch: + @${REINPLACE_CMD} -e \ + 's|.SILENT:||' ${WRKSRC}/Makefile do-configure: @${CP} -f ${FILESDIR}/make.platform.freebsd ${WRKSRC}/make/ do-install: .for dir in dm dmu dmGL - ${RM} -f ${WRKSRC}/${dir}/*.orig - @${MKDIR} ${PREFIX}/include/${PORTNAME}/${dir} - ${INSTALL_DATA} ${WRKSRC}/${dir}/*.h* ${PREFIX}/include/${PORTNAME}/${dir} - ${INSTALL_DATA} ${WRKSRC}/lib/platform.freebsd/lib${dir}.so ${PREFIX}/lib + @${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME}/${dir} + (cd ${WRKSRC}/${dir} && ${FIND} . -name "*.h" -or -name "*.hpp" | \ + ${XARGS} -J % ${INSTALL_DATA} % \ + ${STAGEDIR}${PREFIX}/include/${PORTNAME}/${dir}) + (cd ${WRKSRC}/lib/platform.freebsd && ${INSTALL_LIB} lib${dir}.so \ + ${STAGEDIR}${PREFIX}/lib) .endfor -.include +.include Modified: branches/2014Q1/graphics/dynamechs/files/make.platform.freebsd ============================================================================== --- branches/2014Q1/graphics/dynamechs/files/make.platform.freebsd Sat Jan 25 13:20:40 2014 (r341035) +++ branches/2014Q1/graphics/dynamechs/files/make.platform.freebsd Sat Jan 25 13:21:18 2014 (r341036) @@ -2,7 +2,7 @@ CXXFLAGS += -D_BOOL -c -fPIC -I/$(OPENGL # -pthreads DEPENDFLAGS := $(CXXFLAGS) -LDFLAGS += -fPIC -L/$(OPENGLLIBDIR) -L${LOCALBASE}/lib -lX11 -lm -l$(MESA)GLU -l$(MESA)GL +LDFLAGS += -pthread -fPIC -L/$(OPENGLLIBDIR) -L${LOCALBASE}/lib -lX11 -lm -l$(MESA)GLU -l$(MESA)GL LDGLUT := -lglut # CXX := c++ Modified: branches/2014Q1/graphics/dynamechs/files/patch-aquarobot::Gait.hpp ============================================================================== --- branches/2014Q1/graphics/dynamechs/files/patch-aquarobot::Gait.hpp Sat Jan 25 13:20:40 2014 (r341035) +++ branches/2014Q1/graphics/dynamechs/files/patch-aquarobot::Gait.hpp Sat Jan 25 13:21:18 2014 (r341036) @@ -1,15 +1,28 @@ ---- aquarobot/Gait.hpp.orig Thu Jul 19 08:40:44 2001 -+++ aquarobot/Gait.hpp Sat Dec 21 08:57:01 2002 -@@ -26,10 +26,11 @@ +--- aquarobot/Gait.hpp.orig 2001-07-19 08:40:44.000000000 +0900 ++++ aquarobot/Gait.hpp 2014-01-08 21:46:35.000000000 +0900 +@@ -26,24 +26,17 @@ #include #endif -#if defined(WIN32) || (defined(sgi) && defined(_STANDARD_C_PLUS_PLUS)) || (defined(__GNUC__) && (__GNUC__>=2) && (__GNUC_MINOR__>=91)) -+#if defined(WIN32) || (defined(sgi) && defined(_STANDARD_C_PLUS_PLUS)) || (defined(__GNUC__) && (__GNUC__>=2) && (__GNUC_MINOR__>=91)) || (defined(__GNUC__) && (__GNUC__>=3)) #include #include #include +-#else +-#include +-#include +-#include +-#endif +using namespace std; - #else - #include - #include + + #include + #include + #include + + // Use the std namespace. To do this we must first guarantee that it exists. +-#if defined(__sgi) || defined(__WIN32_) || defined(WIN32) + namespace std {} + using namespace std; +-#endif + + #endif Copied: branches/2014Q1/graphics/dynamechs/files/patch-aquarobot__MatrixMy.cpp (from r340307, head/graphics/dynamechs/files/patch-aquarobot__MatrixMy.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/graphics/dynamechs/files/patch-aquarobot__MatrixMy.cpp Sat Jan 25 13:21:18 2014 (r341036, copy of r340307, head/graphics/dynamechs/files/patch-aquarobot__MatrixMy.cpp) @@ -0,0 +1,11 @@ +--- aquarobot/MatrixMy.cpp.orig ++++ aquarobot/MatrixMy.cpp +@@ -38,7 +38,7 @@ + // Constructor + // ************************************************************************** + //MatrixMy::MatrixMy(int r = 4, int c = 4) +-MatrixMy::MatrixMy(int r = 3, int c = 3) ++MatrixMy::MatrixMy(int r, int c) + { + row = r; + column = c; Copied: branches/2014Q1/graphics/dynamechs/files/patch-dm__svd_linpack.cpp (from r340307, head/graphics/dynamechs/files/patch-dm__svd_linpack.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/graphics/dynamechs/files/patch-dm__svd_linpack.cpp Sat Jan 25 13:21:18 2014 (r341036, copy of r340307, head/graphics/dynamechs/files/patch-dm__svd_linpack.cpp) @@ -0,0 +1,13 @@ +--- dm/svd_linpack.cpp.orig ++++ dm/svd_linpack.cpp +@@ -10,7 +10,9 @@ + #endif + + #include +-#include ++#include ++#include ++using namespace std; + + #ifdef __cplusplus + extern "C" { From owner-svn-ports-branches@FreeBSD.ORG Sat Jan 25 13:22:39 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AE77F27C; Sat, 25 Jan 2014 13:22:39 +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 8F04F1178; Sat, 25 Jan 2014 13:22:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0PDMdFl019693; Sat, 25 Jan 2014 13:22:39 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0PDMc6c019688; Sat, 25 Jan 2014 13:22:38 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201401251322.s0PDMc6c019688@svn.freebsd.org> From: Martin Wilke Date: Sat, 25 Jan 2014 13:22:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r341037 - in branches/2014Q1/japanese/ebview-gtk2: . 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, 25 Jan 2014 13:22:39 -0000 Author: miwi Date: Sat Jan 25 13:22:38 2014 New Revision: 341037 URL: http://svnweb.freebsd.org/changeset/ports/341037 QAT: https://qat.redports.org/buildarchive/r341037/ Log: MFH: r340308 - Fix build with clang PR: 185717 Submitted by: ports fury Added: branches/2014Q1/japanese/ebview-gtk2/files/patch-data__Makefile.in - copied unchanged from r340308, head/japanese/ebview-gtk2/files/patch-data__Makefile.in branches/2014Q1/japanese/ebview-gtk2/files/patch-doc__Makefile.in - copied unchanged from r340308, head/japanese/ebview-gtk2/files/patch-doc__Makefile.in branches/2014Q1/japanese/ebview-gtk2/files/patch-po__Makefile.in.in - copied unchanged from r340308, head/japanese/ebview-gtk2/files/patch-po__Makefile.in.in Modified: branches/2014Q1/japanese/ebview-gtk2/Makefile (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/japanese/ebview-gtk2/Makefile ============================================================================== --- branches/2014Q1/japanese/ebview-gtk2/Makefile Sat Jan 25 13:21:18 2014 (r341036) +++ branches/2014Q1/japanese/ebview-gtk2/Makefile Sat Jan 25 13:22:38 2014 (r341037) @@ -10,36 +10,35 @@ PKGNAMESUFFIX= -gtk2 MAINTAINER= ports@FreeBSD.org COMMENT= Electronic Book Viewer -LIB_DEPENDS= eb:${PORTSDIR}/japanese/eb +LICENSE= GPLv2 # (or later) -CONFLICTS= ja-ebview-0* +LIB_DEPENDS= libeb.so:${PORTSDIR}/japanese/eb -USES= pkgconfig -USE_GNOME= gtk20 -USE_GMAKE= yes -GNU_CONFIGURE= yes +CONFLICTS= ja-ebview-[0-9]* + +USES= gettext gmake pkgconfig +USE_GNOME= gtk20 pangox-compat USE_CSTD= gnu89 -CONFIGURE_ARGS+=--with-eb-conf=${LOCALBASE}/etc/eb.conf -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --with-eb-conf=${LOCALBASE}/etc/eb.conf SUB_FILES= ebview.desktop -NO_STAGE= yes +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib + post-patch: - @${REINPLACE_CMD} -e \ - 's|-pthread|${PTHREAD_LIBS:S/"//g}|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|#define GTK_DISABLE_DEPRECATED 1||g' \ ${WRKSRC}/src/ebview.c post-install: - ${INSTALL_DATA} ${WRKSRC}/pixmaps/ebview.xpm ${PREFIX}/share/pixmaps/ - ${INSTALL_DATA} ${WRKDIR}/${SUB_FILES} ${PREFIX}/share/applications/ -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -.for file in ChangeLog README - ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} + (cd ${WRKDIR} && ${INSTALL_DATA} ${SUB_FILES} \ + ${STAGEDIR}${DESKTOPDIR}) + (cd ${WRKSRC}/pixmaps && ${INSTALL_DATA} ebview.xpm \ + ${STAGEDIR}${PREFIX}/share/pixmaps) + @${MKDIR} ${STAGEDIR}${DOCSDIR} +.for i in ChangeLog README + (cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR}) .endfor -.endif .include Copied: branches/2014Q1/japanese/ebview-gtk2/files/patch-data__Makefile.in (from r340308, head/japanese/ebview-gtk2/files/patch-data__Makefile.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/japanese/ebview-gtk2/files/patch-data__Makefile.in Sat Jan 25 13:22:38 2014 (r341037, copy of r340308, head/japanese/ebview-gtk2/files/patch-data__Makefile.in) @@ -0,0 +1,19 @@ +--- data/Makefile.in.orig ++++ data/Makefile.in +@@ -304,13 +304,13 @@ + + install: + if test -r $(MKINSTALLDIRS); then \ +- $(MKINSTALLDIRS) $(pkgdatadir); \ ++ $(MKINSTALLDIRS) $(DESTDIR)$(pkgdatadir); \ + else \ +- $(top_srcdir)/mkinstalldirs $(pkgdatadir); \ ++ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(pkgdatadir); \ + fi; \ + data="$(data)"; \ + for file in $$data; do \ +- $(INSTALL_DATA) $(srcdir)/$$file $(pkgdatadir)/$$file; \ ++ $(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(pkgdatadir)/$$file; \ + done; + + # Define this as empty until I found a useful application. Copied: branches/2014Q1/japanese/ebview-gtk2/files/patch-doc__Makefile.in (from r340308, head/japanese/ebview-gtk2/files/patch-doc__Makefile.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/japanese/ebview-gtk2/files/patch-doc__Makefile.in Sat Jan 25 13:22:38 2014 (r341037, copy of r340308, head/japanese/ebview-gtk2/files/patch-doc__Makefile.in) @@ -0,0 +1,21 @@ +--- doc/Makefile.in.orig ++++ doc/Makefile.in +@@ -308,15 +308,15 @@ + dir="$(dir)"; \ + for lang in $$dir; do \ + if test -r $(MKINSTALLDIRS); then \ +- $(MKINSTALLDIRS) $(pkgdatadir)/help/$$lang; \ ++ $(MKINSTALLDIRS) $(DESTDIR)$(pkgdatadir)/help/$$lang; \ + else \ +- $(top_srcdir)/mkinstalldirs $(pkgdatadir)/help/$$lang; \ ++ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(pkgdatadir)/help/$$lang; \ + fi; \ + done; \ + data="$(data)"; \ + for lang in $$dir; do \ + for file in $$data; do \ +- $(INSTALL_DATA) $(srcdir)/$$lang/$$file $(pkgdatadir)/help/$$lang/$$file; \ ++ $(INSTALL_DATA) $(srcdir)/$$lang/$$file $(DESTDIR)$(pkgdatadir)/help/$$lang/$$file; \ + done; \ + done; + Copied: branches/2014Q1/japanese/ebview-gtk2/files/patch-po__Makefile.in.in (from r340308, head/japanese/ebview-gtk2/files/patch-po__Makefile.in.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/japanese/ebview-gtk2/files/patch-po__Makefile.in.in Sat Jan 25 13:22:38 2014 (r341037, copy of r340308, head/japanese/ebview-gtk2/files/patch-po__Makefile.in.in) @@ -0,0 +1,52 @@ +--- po/Makefile.in.in.orig ++++ po/Makefile.in.in +@@ -115,9 +115,9 @@ + install-data-no: all + install-data-yes: all + if test -r "$(MKINSTALLDIRS)"; then \ +- $(MKINSTALLDIRS) $(datadir); \ ++ $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \ + else \ +- $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \ ++ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \ + fi + @catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ +@@ -129,27 +129,27 @@ + lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ + dir=$$destdir/$$lang/LC_MESSAGES; \ + if test -r "$(MKINSTALLDIRS)"; then \ +- $(MKINSTALLDIRS) $$dir; \ ++ $(MKINSTALLDIRS) $(DESTDIR)$$dir; \ + else \ +- $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \ ++ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$$dir; \ + fi; \ + if test -r $$cat; then \ +- $(INSTALL_DATA) $$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \ +- echo "installing $$cat as $$dir/$(PACKAGE)$(INSTOBJEXT)"; \ ++ $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT); \ ++ echo "installing $$cat as $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT)"; \ + else \ +- $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \ ++ $(INSTALL_DATA) $(srcdir)/$$cat $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT); \ + echo "installing $(srcdir)/$$cat as" \ +- "$$dir/$(PACKAGE)$(INSTOBJEXT)"; \ ++ "$(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT)"; \ + fi; \ + if test -r $$cat.m; then \ +- $(INSTALL_DATA) $$cat.m $$dir/$(PACKAGE)$(INSTOBJEXT).m; \ +- echo "installing $$cat.m as $$dir/$(PACKAGE)$(INSTOBJEXT).m"; \ ++ $(INSTALL_DATA) $$cat.m $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT).m; \ ++ echo "installing $$cat.m as $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \ + else \ + if test -r $(srcdir)/$$cat.m ; then \ + $(INSTALL_DATA) $(srcdir)/$$cat.m \ +- $$dir/$(PACKAGE)$(INSTOBJEXT).m; \ ++ $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT).m; \ + echo "installing $(srcdir)/$$cat as" \ +- "$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \ ++ "$(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \ + else \ + true; \ + fi; \ From owner-svn-ports-branches@FreeBSD.ORG Sat Jan 25 13:27:30 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3EBCD39B; Sat, 25 Jan 2014 13:27: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 105681192; Sat, 25 Jan 2014 13:27: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 s0PDRTwF020294; Sat, 25 Jan 2014 13:27:29 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0PDRTJd020293; Sat, 25 Jan 2014 13:27:29 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201401251327.s0PDRTJd020293@svn.freebsd.org> From: Martin Wilke Date: Sat, 25 Jan 2014 13:27:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r341038 - branches/2014Q1/security/poly1305aes 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, 25 Jan 2014 13:27:30 -0000 Author: miwi Date: Sat Jan 25 13:27:29 2014 New Revision: 341038 URL: http://svnweb.freebsd.org/changeset/ports/341038 QAT: https://qat.redports.org/buildarchive/r341038/ Log: MFH: r340310 - Fix build with clang PR: 185334 Submitted by: ports fury Modified: branches/2014Q1/security/poly1305aes/Makefile (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/security/poly1305aes/Makefile ============================================================================== --- branches/2014Q1/security/poly1305aes/Makefile Sat Jan 25 13:22:38 2014 (r341037) +++ branches/2014Q1/security/poly1305aes/Makefile Sat Jan 25 13:27:29 2014 (r341038) @@ -7,23 +7,36 @@ CATEGORIES= security MASTER_SITES= http://cr.yp.to/mac/ MAINTAINER= ports@FreeBSD.org -COMMENT= The poly1305 message authentication reference implementation using AES +COMMENT= Poly1305 message authentication reference implementation using AES -CC+= ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} ${STRIP} ALL_TARGET= default -REPLACE_HDRS= aes.h cpucycles.h poly1305aes.h -PROGRAM_FILES= poly1305aes-speed test-aes test-poly1305aes +CC+= ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} + +NOT_FOR_ARCHS= amd64 + +.include + +pre-build: +.if ${ARCH} == "i386" + @${ECHO_CMD} "ppro" > ${WRKSRC}/poly1305aes.impl +.endif + +post-build: +.for i in aes.h cpucycles.h poly1305aes.h + @${REINPLACE_CMD} -e \ + 's|#include "|#include "poly1305/|' ${WRKSRC}/${i} +.endfor -NO_STAGE= yes do-install: - ${MKDIR} ${PREFIX}/include/poly1305 - ${INSTALL_DATA} ${WRKSRC}/*_*.h ${PREFIX}/include/poly1305/ -.for i in ${REPLACE_HDRS} - ${REINPLACE_CMD} -e "s,#include \",#include \"poly1305/," ${WRKSRC}/$i > ${WRKSRC}/$i.fixed - ${INSTALL_DATA} ${WRKSRC}/$i.fixed ${PREFIX}/include/poly1305/$i - ${INSTALL_DATA} ${WRKSRC}/*.a ${PREFIX}/lib/ - ${INSTALL_DATA} ${PROGRAM_FILES:S,^,${WRKSRC}/,} ${PREFIX}/bin/ +.for i in poly1305aes-speed test-aes test-poly1305aes + (cd ${WRKSRC} && ${INSTALL_PROGRAM} ${i} \ + ${STAGEDIR}${PREFIX}/bin) .endfor + @${MKDIR} ${STAGEDIR}${PREFIX}/include/poly1305 + (cd ${WRKSRC} && ${INSTALL_DATA} *.h \ + ${STAGEDIR}${PREFIX}/include/poly1305) + (cd ${WRKSRC} && ${INSTALL_DATA} *.a \ + ${STAGEDIR}${PREFIX}/lib) -.include +.include From owner-svn-ports-branches@FreeBSD.ORG Sat Jan 25 17:23:26 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F293DB1C; Sat, 25 Jan 2014 17:23:25 +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 C477C1210; Sat, 25 Jan 2014 17:23:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0PHNPhr012936; Sat, 25 Jan 2014 17:23:25 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0PHNPAo012934; Sat, 25 Jan 2014 17:23:25 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201401251723.s0PHNPAo012934@svn.freebsd.org> From: Mathieu Arnold Date: Sat, 25 Jan 2014 17:23:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r341062 - branches/2014Q1/www/linux-f10-flashplugin11 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, 25 Jan 2014 17:23:26 -0000 Author: mat Date: Sat Jan 25 17:23:25 2014 New Revision: 341062 URL: http://svnweb.freebsd.org/changeset/ports/341062 QAT: https://qat.redports.org/buildarchive/r341062/ Log: MFH: r340877 Update flash to 11.2r202.335 Report security issues PR: ports/185790 Reported by: Tsurutani Naoki Modified: branches/2014Q1/www/linux-f10-flashplugin11/Makefile branches/2014Q1/www/linux-f10-flashplugin11/distinfo Modified: branches/2014Q1/www/linux-f10-flashplugin11/Makefile ============================================================================== --- branches/2014Q1/www/linux-f10-flashplugin11/Makefile Sat Jan 25 17:00:15 2014 (r341061) +++ branches/2014Q1/www/linux-f10-flashplugin11/Makefile Sat Jan 25 17:23:25 2014 (r341062) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= flashplugin -PORTVERSION= 11.2r202.327 -PORTREVISION= 1 +PORTVERSION= 11.2r202.335 CATEGORIES= www multimedia linux MASTER_SITES= http://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION:C/r/\./}/:plugin \ LOCAL/nox:suplib Modified: branches/2014Q1/www/linux-f10-flashplugin11/distinfo ============================================================================== --- branches/2014Q1/www/linux-f10-flashplugin11/distinfo Sat Jan 25 17:00:15 2014 (r341061) +++ branches/2014Q1/www/linux-f10-flashplugin11/distinfo Sat Jan 25 17:23:25 2014 (r341062) @@ -1,4 +1,4 @@ -SHA256 (flashplugin/11.2r202.327/install_flash_player_11_linux.i386.tar.gz) = 1fbbadf17c86b3fd52bbf1df299f52c0b2eb7a0b9aca1d55756bc884c9270f62 -SIZE (flashplugin/11.2r202.327/install_flash_player_11_linux.i386.tar.gz) = 6923587 -SHA256 (flashplugin/11.2r202.327/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 4a309b1a326bd2212cc72480628659e5a7fd61d9e0572cb7350c206f030955bf -SIZE (flashplugin/11.2r202.327/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 3455 +SHA256 (flashplugin/11.2r202.335/install_flash_player_11_linux.i386.tar.gz) = 71d403cdca7a0a13a37c024da28d8e07d765290e1df0e1b1e05482a7d4a27d46 +SIZE (flashplugin/11.2r202.335/install_flash_player_11_linux.i386.tar.gz) = 6923385 +SHA256 (flashplugin/11.2r202.335/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 4a309b1a326bd2212cc72480628659e5a7fd61d9e0572cb7350c206f030955bf +SIZE (flashplugin/11.2r202.335/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 3455 From owner-svn-ports-branches@FreeBSD.ORG Sat Jan 25 18:20:02 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C33F359A; Sat, 25 Jan 2014 18:20: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 AF1BD166C; Sat, 25 Jan 2014 18:20: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 s0PIK29V032934; Sat, 25 Jan 2014 18:20:02 GMT (envelope-from madpilot@svn.freebsd.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0PIK2rS032928; Sat, 25 Jan 2014 18:20:02 GMT (envelope-from madpilot@svn.freebsd.org) Message-Id: <201401251820.s0PIK2rS032928@svn.freebsd.org> From: Guido Falsi Date: Sat, 25 Jan 2014 18:20:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r341072 - in branches/2014Q1/devel/monotone: . 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, 25 Jan 2014 18:20:02 -0000 Author: madpilot Date: Sat Jan 25 18:20:01 2014 New Revision: 341072 URL: http://svnweb.freebsd.org/changeset/ports/341072 QAT: https://qat.redports.org/buildarchive/r341072/ Log: MFH: r341070 - Fix build on 10 and head with clang - Convert to staging - Improve library detection patch with a cleaner one - Mark jobs safe PR: ports/186060 Submitted by: Lapo Luchini (maintainer) Approved by: portmgr Added: branches/2014Q1/devel/monotone/files/patch-configure - copied unchanged from r341070, head/devel/monotone/files/patch-configure branches/2014Q1/devel/monotone/files/patch-src_automate_reader.hh - copied unchanged from r341070, head/devel/monotone/files/patch-src_automate_reader.hh Modified: branches/2014Q1/devel/monotone/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/devel/monotone/Makefile ============================================================================== --- branches/2014Q1/devel/monotone/Makefile Sat Jan 25 18:11:42 2014 (r341071) +++ branches/2014Q1/devel/monotone/Makefile Sat Jan 25 18:20:01 2014 (r341072) @@ -24,6 +24,7 @@ USE_BZIP2= yes USES= iconv pkgconfig gmake perl5 USE_PERL5= build USE_LUA= 5.1+ +MAKE_JOBS_SAFE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= MAKEINFO="makeinfo --no-split" @@ -50,13 +51,12 @@ PLIST_FILES= bin/mtn bin/mtn-cleanup bin "@dirrm share/monotone" .if !defined(NO_INSTALL_MANPAGES) INFO= monotone -MAN1= mtn.1 \ - mtn-cleanup.1 \ - mtnopt.1 +PLIST_FILES+= man/man1/mtn.1.gz \ + man/man1/mtn-cleanup.1.gz \ + man/man1/mtnopt.1.gz .endif PORTDOCS= * -NO_STAGE= yes .include .if ${PORT_OPTIONS:MNLS} @@ -82,19 +82,20 @@ post-patch: ${REINPLACE_CMD} -Ee '/^install-info: /s/ install-info-am$$//' \ -e '/^install-data-am:/s/ install-info-am$$//' ${WRKSRC}/doc/Makefile.in .endif - ${REINPLACE_CMD} -e "s/\"lua/\"lua-${LUA_VER}/g" \ - -e "s/\"idn/\"libidn/g" \ - -e "s/\"pcre/\"libpcre/g" \ - -e "s/\"botan/\"botan-1.10/g" \ + ${REINPLACE_CMD} \ -e "s/REBUILD_NLS=true/REBUILD_NLS=false/g" \ + -e "s/std::tr1::/std::/g" \ ${WRKSRC}/configure + ${REINPLACE_CMD} \ + -e "s/std::tr1::/std::/g" \ + ${WRKSRC}/src/hash_map.hh post-install: - ${MKDIR} ${PREFIX}/share/zsh/site-functions - ${INSTALL_DATA} ${WRKSRC}/contrib/monotone.zsh_completion ${PREFIX}/share/zsh/site-functions/_mtn + ${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions + ${INSTALL_DATA} ${WRKSRC}/contrib/monotone.zsh_completion ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_mtn .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} NEWS UPGRADE ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} NEWS UPGRADE ${STAGEDIR}${DOCSDIR} .endif @${CAT} ${PKGMESSAGE} Copied: branches/2014Q1/devel/monotone/files/patch-configure (from r341070, head/devel/monotone/files/patch-configure) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/devel/monotone/files/patch-configure Sat Jan 25 18:20:01 2014 (r341072, copy of r341070, head/devel/monotone/files/patch-configure) @@ -0,0 +1,13 @@ +--- configure.orig 2014-01-22 00:48:12.855108408 +0100 ++++ configure 2014-01-22 00:48:54.244105202 +0100 +@@ -4594,9 +4594,7 @@ fi + + # The dummy "pkg-config" package is guaranteed to exist. + if test -n "$PKG_CONFIG"; then +- mtn__full_pkg_config_path=`$PKG_CONFIG --debug pkg-config 2>&1 | +- sed -ne "/^Scanning directory '/{; s///; s/'$//; p;}" | +- tr "$as_nl" ':' | sed 's/:$//'` ++ mtn__full_pkg_config_path=`$PKG_CONFIG --variable=pc_path pkg-config 2>&1 | sed 's/:.*$//'` + #AC_MSG_NOTICE([detected pkg-config path: $mtn__full_pkg_config_path]) + fi + Copied: branches/2014Q1/devel/monotone/files/patch-src_automate_reader.hh (from r341070, head/devel/monotone/files/patch-src_automate_reader.hh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/devel/monotone/files/patch-src_automate_reader.hh Sat Jan 25 18:20:01 2014 (r341072, copy of r341070, head/devel/monotone/files/patch-src_automate_reader.hh) @@ -0,0 +1,10 @@ +--- src/automate_reader.hh.orig 2014-01-22 01:04:27.675051506 +0100 ++++ src/automate_reader.hh 2014-01-22 01:04:41.682040341 +0100 +@@ -13,6 +13,7 @@ + #define __AUTOMATE_READER_HH__ + + #include ++#include + + class automate_reader + { From owner-svn-ports-branches@FreeBSD.ORG Sat Jan 25 21:56:29 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A9EA765B; Sat, 25 Jan 2014 21:56:29 +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 8A6B21A9A; Sat, 25 Jan 2014 21:56:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0PLuT2m019183; Sat, 25 Jan 2014 21:56:29 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0PLuS33019162; Sat, 25 Jan 2014 21:56:28 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201401252156.s0PLuS33019162@svn.freebsd.org> From: Raphael Kubo da Costa Date: Sat, 25 Jan 2014 21:56:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r341117 - in branches/2014Q1/x11-toolkits/sdl_pango: . 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, 25 Jan 2014 21:56:29 -0000 Author: rakuco Date: Sat Jan 25 21:56:28 2014 New Revision: 341117 URL: http://svnweb.freebsd.org/changeset/ports/341117 QAT: https://qat.redports.org/buildarchive/r341117/ Log: MFH: r341112 - Add a patch to fix the build with clang (a function is used before being declared). [1] - Support staging. - Set LICENSE. - Remove tab from the WWW line in pkg-descr. PR: ports/185558 [1] Submitted by: Jan Henrik Sylvester Approved by: maintainer timeout (18 days) Approved by: portmgr (antoine) Added: branches/2014Q1/x11-toolkits/sdl_pango/files/patch-src_SDL_Pango.c - copied unchanged from r341112, head/x11-toolkits/sdl_pango/files/patch-src_SDL_Pango.c Modified: branches/2014Q1/x11-toolkits/sdl_pango/Makefile branches/2014Q1/x11-toolkits/sdl_pango/pkg-descr Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/x11-toolkits/sdl_pango/Makefile ============================================================================== --- branches/2014Q1/x11-toolkits/sdl_pango/Makefile Sat Jan 25 21:47:47 2014 (r341116) +++ branches/2014Q1/x11-toolkits/sdl_pango/Makefile Sat Jan 25 21:56:28 2014 (r341117) @@ -14,6 +14,8 @@ PATCHFILES= SDL_Pango-0.1.2-API-adds.pat MAINTAINER= edwin@mavetju.org COMMENT= SDL_Pango is the SDL API to the Pango text rendering engine of GNOME 2.x +LICENSE= LGPL21 + USES= pkgconfig USE_AUTOTOOLS= libtool USE_SDL= sdl @@ -21,5 +23,4 @@ USE_GNOME= pango GNU_CONFIGURE= yes USE_LDCONFIG= yes -NO_STAGE= yes .include Copied: branches/2014Q1/x11-toolkits/sdl_pango/files/patch-src_SDL_Pango.c (from r341112, head/x11-toolkits/sdl_pango/files/patch-src_SDL_Pango.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/x11-toolkits/sdl_pango/files/patch-src_SDL_Pango.c Sat Jan 25 21:56:28 2014 (r341117, copy of r341112, head/x11-toolkits/sdl_pango/files/patch-src_SDL_Pango.c) @@ -0,0 +1,14 @@ +--- src/SDL_Pango.c~ 2013-12-31 14:26:31.000000000 +0000 ++++ src/SDL_Pango.c 2013-12-31 14:22:36.000000000 +0000 +@@ -330,6 +330,11 @@ + @param *rect [in] Draw on this area + @param baseline [in] Horizontal location of glyphs + */ ++void SDLPango_CopyFTBitmapToSurface( ++ const FT_Bitmap *bitmap, ++ SDL_Surface *surface, ++ const SDLPango_Matrix *matrix, ++ SDL_Rect *rect); + static void + drawGlyphString( + SDLPango_Context *context, Modified: branches/2014Q1/x11-toolkits/sdl_pango/pkg-descr ============================================================================== --- branches/2014Q1/x11-toolkits/sdl_pango/pkg-descr Sat Jan 25 21:47:47 2014 (r341116) +++ branches/2014Q1/x11-toolkits/sdl_pango/pkg-descr Sat Jan 25 21:56:28 2014 (r341117) @@ -14,4 +14,4 @@ your support desk. You should carefully process. Author: NAKAMURA Ken'ichi -WWW: http://sdlpango.sourceforge.net/ +WWW: http://sdlpango.sourceforge.net/ From owner-svn-ports-branches@FreeBSD.ORG Sat Jan 25 22:04:31 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2A53AB92; Sat, 25 Jan 2014 22:04: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 1519C1B2A; Sat, 25 Jan 2014 22:04: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 s0PM4UXX032257; Sat, 25 Jan 2014 22:04:30 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0PM4UYH032256; Sat, 25 Jan 2014 22:04:30 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201401252204.s0PM4UYH032256@svn.freebsd.org> From: Raphael Kubo da Costa Date: Sat, 25 Jan 2014 22:04:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r341121 - branches/2014Q1/x11-toolkits/sdl_pango/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, 25 Jan 2014 22:04:31 -0000 Author: rakuco Date: Sat Jan 25 22:04:30 2014 New Revision: 341121 URL: http://svnweb.freebsd.org/changeset/ports/341121 QAT: https://qat.redports.org/buildarchive/r341121/ Log: MFH: r341114 Hopefully fix `make patch' after r341112. src/SDL_Pango.c is CRLF-encoded; while we could use dos2unix here, the port's Makefile also fetches a patch from elsewhere that expects a CRLF-encoded file. PR: ports/185558 Approved by: portmgr (antoine) Modified: branches/2014Q1/x11-toolkits/sdl_pango/files/patch-src_SDL_Pango.c (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/x11-toolkits/sdl_pango/files/patch-src_SDL_Pango.c ============================================================================== --- branches/2014Q1/x11-toolkits/sdl_pango/files/patch-src_SDL_Pango.c Sat Jan 25 22:03:15 2014 (r341120) +++ branches/2014Q1/x11-toolkits/sdl_pango/files/patch-src_SDL_Pango.c Sat Jan 25 22:04:30 2014 (r341121) @@ -1,14 +1,14 @@ ---- src/SDL_Pango.c~ 2013-12-31 14:26:31.000000000 +0000 -+++ src/SDL_Pango.c 2013-12-31 14:22:36.000000000 +0000 -@@ -330,6 +330,11 @@ - @param *rect [in] Draw on this area - @param baseline [in] Horizontal location of glyphs - */ -+void SDLPango_CopyFTBitmapToSurface( -+ const FT_Bitmap *bitmap, -+ SDL_Surface *surface, -+ const SDLPango_Matrix *matrix, -+ SDL_Rect *rect); - static void - drawGlyphString( - SDLPango_Context *context, +--- src/SDL_Pango.c~ 2013-12-31 14:26:31.000000000 +0000 ++++ src/SDL_Pango.c 2013-12-31 14:22:36.000000000 +0000 +@@ -330,6 +330,11 @@ + @param *rect [in] Draw on this area + @param baseline [in] Horizontal location of glyphs + */ ++void SDLPango_CopyFTBitmapToSurface( ++ const FT_Bitmap *bitmap, ++ SDL_Surface *surface, ++ const SDLPango_Matrix *matrix, ++ SDL_Rect *rect); + static void + drawGlyphString( + SDLPango_Context *context, From owner-svn-ports-branches@FreeBSD.ORG Sat Jan 25 22:31:46 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E60EE7FD; Sat, 25 Jan 2014 22:31: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 B73BE1E1F; Sat, 25 Jan 2014 22:31: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 s0PMVkkp056915; Sat, 25 Jan 2014 22:31:46 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0PMVkGL056913; Sat, 25 Jan 2014 22:31:46 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201401252231.s0PMVkGL056913@svn.freebsd.org> From: Raphael Kubo da Costa Date: Sat, 25 Jan 2014 22:31:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r341130 - in branches/2014Q1/games/sauerbraten: . 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, 25 Jan 2014 22:31:47 -0000 Author: rakuco Date: Sat Jan 25 22:31:45 2014 New Revision: 341130 URL: http://svnweb.freebsd.org/changeset/ports/341130 QAT: https://qat.redports.org/buildarchive/r341130/ Log: MFH: r341119 - Fix the build on 10 and beyond. Since r253839 ld(1) behaves more strictly and does not pull in indirect shared library dependencies (in this case, libX11.so). Upstream correctly has -lX11 in the linker line, but r315151 removed this section in patch-src_Makefile. Based on a patch by Jan Henrik Sylvester in [1]. - While here, convert USE_GMAKE=yes to USES=gmake. PR: ports/185033 [1] Submitted by: Jan Henrik Sylvester [1] Approved by: maintainer timeout (37 days) Approved by: portmgr (antoine) Modified: branches/2014Q1/games/sauerbraten/Makefile branches/2014Q1/games/sauerbraten/files/patch-src_Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/games/sauerbraten/Makefile ============================================================================== --- branches/2014Q1/games/sauerbraten/Makefile Sat Jan 25 22:30:09 2014 (r341129) +++ branches/2014Q1/games/sauerbraten/Makefile Sat Jan 25 22:31:45 2014 (r341130) @@ -14,7 +14,7 @@ COMMENT= First person shooter based on C LICENSE_COMB= multi LICENSE= MIT ZLIB -USE_GMAKE= yes +USES= gmake GNU_CONFIGURE= yes USE_BZIP2= yes CONFIGURE_ENV= ACLOCAL=true AUTOCONF=true AUTOMAKE=true Modified: branches/2014Q1/games/sauerbraten/files/patch-src_Makefile ============================================================================== --- branches/2014Q1/games/sauerbraten/files/patch-src_Makefile Sat Jan 25 22:30:09 2014 (r341129) +++ branches/2014Q1/games/sauerbraten/files/patch-src_Makefile Sat Jan 25 22:31:45 2014 (r341130) @@ -17,7 +17,7 @@ -CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags` -CLIENT_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib -lX11 `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL +CLIENT_INCLUDES= $(INCLUDES) `${SDL_CONFIG} --cflags` -I${LOCALBASE}/include -+CLIENT_LIBS= -Lenet/.libs -lenet `${SDL_CONFIG} --libs` -L${LOCALBASE}/lib -lSDL_image -lSDL_mixer -lz -lGL ++CLIENT_LIBS= -Lenet/.libs -lenet `${SDL_CONFIG} --libs` -L${LOCALBASE}/lib -lX11 -lSDL_image -lSDL_mixer -lz -lGL endif ifeq ($(PLATFORM),Linux) CLIENT_LIBS+= -lrt From owner-svn-ports-branches@FreeBSD.ORG Sat Jan 25 23:45:19 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 14358ABB; Sat, 25 Jan 2014 23:45: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 F207812C5; Sat, 25 Jan 2014 23:45:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0PNjIWu085357; Sat, 25 Jan 2014 23:45:18 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0PNjIYq085352; Sat, 25 Jan 2014 23:45:18 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201401252345.s0PNjIYq085352@svn.freebsd.org> From: Raphael Kubo da Costa Date: Sat, 25 Jan 2014 23:45:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r341140 - in branches/2014Q1/multimedia/k9copy-kde4: . 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, 25 Jan 2014 23:45:19 -0000 Author: rakuco Date: Sat Jan 25 23:45:17 2014 New Revision: 341140 URL: http://svnweb.freebsd.org/changeset/ports/341140 QAT: https://qat.redports.org/buildarchive/r341140/ Log: MFH: r341132 - Fix the build with clang and 10+'s ld(1). On the clang side, there's a non-void function missing a return statement and some wrong QString-to-char* casts that had to be fixed. On the linker side, r253839 made our ld stricter, so we had to add some shared libraries that we use since they are not being pulled in indirectly anymore. Based on a patch by Jan Henrik Sylvester [1]. - Set LICENSE - Support staging. - Remove LATEST_LINK, it is deprecated. - Use the new OPTIONS helpers for conditional RUN_DEPENDS. PR: ports/185032 [1] Submitted by: Jan Henrik Sylvester [1] Approved by: maintainer timeout (37 days) Approved by: portmgr (antoine) Added: branches/2014Q1/multimedia/k9copy-kde4/files/patch-src_mpeg2_kdecmpeg2.cpp - copied unchanged from r341132, head/multimedia/k9copy-kde4/files/patch-src_mpeg2_kdecmpeg2.cpp Modified: branches/2014Q1/multimedia/k9copy-kde4/Makefile branches/2014Q1/multimedia/k9copy-kde4/files/patch-CMakeLists.txt branches/2014Q1/multimedia/k9copy-kde4/files/patch-src-xine-k9xineplayer.cpp Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/multimedia/k9copy-kde4/Makefile ============================================================================== --- branches/2014Q1/multimedia/k9copy-kde4/Makefile Sat Jan 25 23:44:40 2014 (r341139) +++ branches/2014Q1/multimedia/k9copy-kde4/Makefile Sat Jan 25 23:45:17 2014 (r341140) @@ -11,6 +11,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-Sou MAINTAINER= egoliveira@gmail.com COMMENT= DVD-9 to DVD-5 shrinking application for KDE +LICENSE= GPLv2 + LIB_DEPENDS= libxine.so:${PORTSDIR}/multimedia/libxine \ libmpeg2.so:${PORTSDIR}/multimedia/libmpeg2 \ libavcodec0.so:${PORTSDIR}/multimedia/ffmpeg0 @@ -19,8 +21,6 @@ USES= cmake gettext USE_KDE4= kdeprefix kdelibs automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build -LATEST_LINK= ${PORTNAME}-kde4 - CFLAGS= -I${LOCALBASE}/include/ffmpeg0 CPPFLAGS= -I${LOCALBASE}/include/ffmpeg0 CXXFLAGS= -I${LOCALBASE}/include/ffmpeg0 @@ -30,20 +30,9 @@ MENCODER_DESC= MEncoder support MPLAYER_DESC= MPlayer support DVDAUTHOR_DESC= DVD Author support -NO_STAGE= yes -.include - -.if ${PORT_OPTIONS:MMENCODER} -RUN_DEPENDS+= mencoder:${PORTSDIR}/multimedia/mencoder -.endif - -.if ${PORT_OPTIONS:MMPLAYER} -RUN_DEPENDS+= mplayer:${PORTSDIR}/multimedia/mplayer -.endif - -.if ${PORT_OPTIONS:MDVDAUTHOR} -RUN_DEPENDS+= dvdauthor:${PORTSDIR}/multimedia/dvdauthor -.endif +MENCODER_RUN_DEPENDS= mencoder:${PORTSDIR}/multimedia/mencoder +MPLAYER_RUN_DEPENDS= mplayer:${PORTSDIR}/multimedia/mplayer +DVDAUTHOR_RUN_DEPENDS= dvdauthor:${PORTSDIR}/multimedia/dvdauthor post-patch: @${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},g' ${WRKSRC}/cmake/*.cmake Modified: branches/2014Q1/multimedia/k9copy-kde4/files/patch-CMakeLists.txt ============================================================================== --- branches/2014Q1/multimedia/k9copy-kde4/files/patch-CMakeLists.txt Sat Jan 25 23:44:40 2014 (r341139) +++ branches/2014Q1/multimedia/k9copy-kde4/files/patch-CMakeLists.txt Sat Jan 25 23:45:17 2014 (r341140) @@ -29,10 +29,10 @@ kde4_add_executable(k9xineplayer ${k9xineplayer_SRCS}) -target_link_libraries(k9copy k9copylib ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBS} -lphonon ) -+target_link_libraries(k9copy k9copylib ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${PHONON_LIBRARY} ) ++target_link_libraries(k9copy k9copylib ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_SOLID_LIBS} ${PHONON_LIBRARY} ) target_link_libraries(k9play k9copylib ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ) -target_link_libraries(k9xineplayer ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBS} -lxine ) -+target_link_libraries(k9xineplayer ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${XINE_LIBRARY} ) ++target_link_libraries(k9xineplayer ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${XINE_LIBRARY} ${X11_LIBRARIES} ) install(TARGETS k9copy DESTINATION ${BIN_INSTALL_DIR} ) Modified: branches/2014Q1/multimedia/k9copy-kde4/files/patch-src-xine-k9xineplayer.cpp ============================================================================== --- branches/2014Q1/multimedia/k9copy-kde4/files/patch-src-xine-k9xineplayer.cpp Sat Jan 25 23:44:40 2014 (r341139) +++ branches/2014Q1/multimedia/k9copy-kde4/files/patch-src-xine-k9xineplayer.cpp Sat Jan 25 23:45:17 2014 (r341140) @@ -1,6 +1,15 @@ ---- src/xine/k9xineplayer.cpp.orig -+++ src/xine/k9xineplayer.cpp -@@ -260,8 +260,10 @@ void k9xinePlayer::init(WId _wid) { +--- src/xine/k9xineplayer.cpp.orig 2009-12-06 10:13:37.000000000 +0000 ++++ src/xine/k9xineplayer.cpp 2013-12-06 15:34:35.000000000 +0000 +@@ -251,7 +251,7 @@ + + if ((vo_port = xine_open_video_driver(xine, + m_vo.toAscii(), XINE_VISUAL_TYPE_X11, (void *) &vis)) == NULL) { +- printf("I'm unable to initialize '%s' video driver. Giving up.\n", m_vo.toAscii()); ++ printf("I'm unable to initialize '%s' video driver. Giving up.\n", m_vo.toAscii().constData()); + return ; + } + +@@ -260,8 +260,10 @@ event_queue = xine_event_new_queue(stream); xine_event_create_listener_thread(event_queue, event_listener, this); @@ -13,7 +22,16 @@ m_execute=true; } -@@ -284,7 +286,8 @@ void k9xinePlayer::quit() { +@@ -270,7 +272,7 @@ + running=false; + m_title=""; + if ((!xine_open(stream, m_mrl.toUtf8())) || (!xine_play(stream, 0, 0))) { +- printf("Unable to open mrl '%s'\n", m_mrl.toUtf8()); ++ printf("Unable to open mrl '%s'\n", m_mrl.toUtf8().constData()); + return ; + } + QTimer::singleShot (500, this, SLOT (updatePosition ())); +@@ -284,7 +286,8 @@ void k9xinePlayer::update() { if (stream && !running ) { if (m_mutex.tryLock()) { Copied: branches/2014Q1/multimedia/k9copy-kde4/files/patch-src_mpeg2_kdecmpeg2.cpp (from r341132, head/multimedia/k9copy-kde4/files/patch-src_mpeg2_kdecmpeg2.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/multimedia/k9copy-kde4/files/patch-src_mpeg2_kdecmpeg2.cpp Sat Jan 25 23:45:17 2014 (r341140, copy of r341132, head/multimedia/k9copy-kde4/files/patch-src_mpeg2_kdecmpeg2.cpp) @@ -0,0 +1,10 @@ +--- src/mpeg2/kdecmpeg2.cpp.orig 2009-12-06 10:13:36.000000000 +0000 ++++ src/mpeg2/kdecmpeg2.cpp 2013-12-06 15:00:15.000000000 +0000 +@@ -286,6 +286,7 @@ + } + } + } ++ return 0; + } + + void kDecMPEG2::sync() {