Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 16 Oct 2012 07:52:53 +0000 (UTC)
From:      "Jason E. Hale" <jhale@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r305953 - head/math/libqalculate
Message-ID:  <201210160752.q9G7qrXX084191@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jhale
Date: Tue Oct 16 07:52:52 2012
New Revision: 305953
URL: http://svn.freebsd.org/changeset/ports/305953

Log:
  - Replace reference to -lpthread in .pc file
  - Bump PORTREVISION since installed file will change
  
  While here:
  - Trim Makefile header
  - Convert to new options framework
  - Add explict USE_PKGCONFIG (was implied by USE_GNOME)
  - Drop specific ABI version numbers from LIB_DEPENDS to satisfy portlint(1)
  
  PR:		ports/170507
  Submitted by:	myself
  Approved by:	maintainer timeout (5 weeks)
  		makc, avilla (mentors, implicit)
  Feature safe:	yes

Modified:
  head/math/libqalculate/Makefile   (contents, props changed)

Modified: head/math/libqalculate/Makefile
==============================================================================
--- head/math/libqalculate/Makefile	Tue Oct 16 06:41:41 2012	(r305952)
+++ head/math/libqalculate/Makefile	Tue Oct 16 07:52:52 2012	(r305953)
@@ -1,27 +1,26 @@
-# New ports collection makefile for:   libqalculate
-# Date created:        03 June 2004
-# Whom:                Sergey Akifyev <asa@agava.com>
-#
+# Created by: Sergey Akifyev <asa@agava.com>
 # $FreeBSD$
-#
 
 PORTNAME=	libqalculate
 PORTVERSION=	0.9.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	SF/qalculate/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	sylvio@FreeBSD.org
 COMMENT=	Multi-purpose desktop calculator (backend library)
 
-LIB_DEPENDS=	cln.6:${PORTSDIR}/math/cln
+LIB_DEPENDS=	cln:${PORTSDIR}/math/cln
 
+USE_PKGCONFIG=	build
 USE_GNOME=	glib20 gnomehack intlhack libxml2
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 
-.if !defined(WITHOUT_NLS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=		yes
 PLIST_SUB+=		NLS=""
 .else
@@ -32,6 +31,7 @@ PLIST_SUB+=		NLS="@comment "
 post-patch:
 	@${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}/' ${WRKSRC}/configure
+	@${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>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210160752.q9G7qrXX084191>