svn commit: r359923 - in head/x11-toolkits/nucleo: . files

[Tijl Coosemans]

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 <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.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 <bsd.port.post.mk>
+.include <bsd.port.mk>

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
- at 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%%
- at dirrmtry lib/nucleo
+ at exec mkdir -p %D/lib/nucleo
+ at dirrm lib/nucleo
 @dirrm include/nucleo/xml
 @dirrm include/nucleo/utils
 %%QT4%%@dirrm include/nucleo/plugins/qt