From owner-svn-ports-all@FreeBSD.ORG Mon Jun 30 21:21:12 2014 Return-Path: Delivered-To: svn-ports-all@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 DF725CB; Mon, 30 Jun 2014 21:21:12 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B2FAF2703; Mon, 30 Jun 2014 21:21:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5ULLCWQ027668; Mon, 30 Jun 2014 21:21:12 GMT (envelope-from tijl@svn.freebsd.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5ULLCQ4027666; Mon, 30 Jun 2014 21:21:12 GMT (envelope-from tijl@svn.freebsd.org) Message-Id: <201406302121.s5ULLCQ4027666@svn.freebsd.org> From: Tijl Coosemans Date: Mon, 30 Jun 2014 21:21:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r359923 - in head/x11-toolkits/nucleo: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jun 2014 21:21:13 -0000 Author: tijl Date: Mon Jun 30 21:21:12 2014 New Revision: 359923 URL: http://svnweb.freebsd.org/changeset/ports/359923 QAT: https://qat.redports.org/buildarchive/r359923/ Log: - USES=libtool pathfix tar:bzip2 - Test OPSYS before OSVERSION - Remove pthread patch Deleted: head/x11-toolkits/nucleo/files/patch-Makefile.in Modified: head/x11-toolkits/nucleo/Makefile head/x11-toolkits/nucleo/pkg-plist Modified: head/x11-toolkits/nucleo/Makefile ============================================================================== --- head/x11-toolkits/nucleo/Makefile Mon Jun 30 21:10:01 2014 (r359922) +++ head/x11-toolkits/nucleo/Makefile Mon Jun 30 21:21:12 2014 (r359923) @@ -3,7 +3,7 @@ PORTNAME= nucleo PORTVERSION= 0.7.6 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= x11-toolkits MASTER_SITES= http://insitu.lri.fr/metisse/download/nucleo/ @@ -17,8 +17,7 @@ LIB_DEPENDS= libjpeg.so:${PORTSDIR}/grap libpng15.so:${PORTSDIR}/graphics/png \ libfreetype.so:${PORTSDIR}/print/freetype2 -USE_BZIP2= yes -USES= gmake pkgconfig +USES= gmake libtool pathfix pkgconfig tar:bzip2 USE_GL= glu GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-opencv @@ -63,17 +62,13 @@ CONFIGURE_ARGS+= --without-dns-sd QT_NONSTANDARD= yes .endif -.include +.include -.if ${ARCH} == "powerpc" && ${OSVERSION} > 900000 +.if ${ARCH} == "powerpc" && ${OPSYS} == FreeBSD && ${OSVERSION} > 900000 BROKEN= Does not compile on powerpc-9 .endif -post-patch: - @${REINPLACE_CMD} -e \ - 's|-lpthread|-pthread|' ${WRKSRC}/configure - post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/nucleo -.include +.include Modified: head/x11-toolkits/nucleo/pkg-plist ============================================================================== --- head/x11-toolkits/nucleo/pkg-plist Mon Jun 30 21:10:01 2014 (r359922) +++ head/x11-toolkits/nucleo/pkg-plist Mon Jun 30 21:21:12 2014 (r359923) @@ -106,15 +106,11 @@ include/nucleo/utils/TimeUtils.H include/nucleo/xml/XmlParser.H 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 +lib/libNucleo.so.0.0.0 %%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 libdata/pkgconfig/nucleo.pc %%DATADIR%%/Info.plist.tmpl @@ -133,7 +129,8 @@ libdata/pkgconfig/nucleo.pc %%DATADIR%%/plugin-list @dirrm %%DATADIR%%/fonts @dirrm %%DATADIR%% -@dirrmtry lib/nucleo +@exec mkdir -p %D/lib/nucleo +@dirrm lib/nucleo @dirrm include/nucleo/xml @dirrm include/nucleo/utils %%QT4%%@dirrm include/nucleo/plugins/qt