[Midnightbsd-cvs] mports [18416] trunk/math/libqalculate: fix build

[laffer1 at midnightbsd.org]

Revision: 18416
          http://svnweb.midnightbsd.org/mports/?rev=18416
Author:   laffer1
Date:     2015-03-28 16:45:21 -0400 (Sat, 28 Mar 2015)
Log Message:
-----------
fix build

Modified Paths:
--------------
    trunk/math/libqalculate/Makefile
    trunk/math/libqalculate/distinfo
    trunk/math/libqalculate/pkg-plist

Modified: trunk/math/libqalculate/Makefile
===================================================================
--- trunk/math/libqalculate/Makefile	2015-03-28 20:43:47 UTC (rev 18415)
+++ trunk/math/libqalculate/Makefile	2015-03-28 20:45:21 UTC (rev 18416)
@@ -2,35 +2,36 @@
 
 PORTNAME=	libqalculate
 PORTVERSION=	0.9.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	SF/qalculate/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports at MidnightBSD.org
-COMMENT=	A a multi-purpose desktop calculator (backend library)
+COMMENT=	Multi-purpose desktop calculator (backend library)
+
 LICENSE=	gpl2
 
-LIB_DEPENDS=	cln:${PORTSDIR}/math/cln
+LIB_DEPENDS=	libcln.so:${PORTSDIR}/math/cln
 
-USE_PKGCONFIG=	build
-USE_GNOME=	glib20 gnomehack intlhack libxml2
-USE_GETTEXT=	yes
-USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool
+USES=		pkgconfig pathfix gmake libtool gettext-tools
+USE_GNOME=	glib20 intltool libxml2
 USE_LDCONFIG=	yes
+GNU_CONFIGURE=	yes
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
+INSTALL_TARGET=	install-strip
 
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT=		yes
-PLIST_SUB+=		NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=		NLS="@comment "
-.endif
+OPTIONS_DEFINE=	NLS
+OPTIONS_SUB=	yes
 
+NLS_USES=	gettext-runtime
+
+.include <bsd.mport.options.mk>
+
 post-patch:
+.if !${PORT_OPTIONS:MNLS}
+	@${REINPLACE_CMD} -e '/^SUBDIRS =/s|po ||g' ${WRKSRC}/Makefile.in
+.endif
 	@${REINPLACE_CMD} -e '/^SUBDIRS =/s|docs||g' ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's/^GMSGFMT = @GMSGFMT@/GMSGFMT = msgfmt/' ${WRKSRC}/po/Makefile.in.in
-	@${REINPLACE_CMD} -e 's/-pthread/${PTHREAD_LIBS}/g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's/-lpthread/${PTHREAD_LIBS}/g' ${WRKSRC}/libqalculate.pc.in
 
 .include <bsd.port.mk>

Modified: trunk/math/libqalculate/distinfo
===================================================================
--- trunk/math/libqalculate/distinfo	2015-03-28 20:43:47 UTC (rev 18415)
+++ trunk/math/libqalculate/distinfo	2015-03-28 20:45:21 UTC (rev 18416)
@@ -1,3 +1,2 @@
 SHA256 (libqalculate-0.9.7.tar.gz) = 9a6d97ce3339d104358294242c3ecd5e312446721e93499ff70acc1604607955
-RMD160 (libqalculate-0.9.7.tar.gz) = cc9e198769bea9731f92d2f3836875c83f715674
 SIZE (libqalculate-0.9.7.tar.gz) = 1256271

Modified: trunk/math/libqalculate/pkg-plist
===================================================================
--- trunk/math/libqalculate/pkg-plist	2015-03-28 20:43:47 UTC (rev 18415)
+++ trunk/math/libqalculate/pkg-plist	2015-03-28 20:45:21 UTC (rev 18416)
@@ -13,13 +13,14 @@
 include/libqalculate/qalculate.h
 include/libqalculate/util.h
 lib/libqalculate.a
-lib/libqalculate.la
 lib/libqalculate.so
 lib/libqalculate.so.5
+lib/libqalculate.so.5.0.0
 libdata/pkgconfig/libqalculate.pc
-share/locale/fr/LC_MESSAGES/libqalculate.mo
-share/locale/nl/LC_MESSAGES/libqalculate.mo
-share/locale/sv/LC_MESSAGES/libqalculate.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/libqalculate.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/libqalculate.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/libqalculate.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/libqalculate.mo
 share/qalculate/currencies.xml
 share/qalculate/datasets.xml
 share/qalculate/elements.xml
@@ -28,5 +29,3 @@
 share/qalculate/prefixes.xml
 share/qalculate/units.xml
 share/qalculate/variables.xml
- at dirrm share/qalculate
- at dirrm include/libqalculate