From e0533dac80fb68a91076912cabd2e864a18857ba Mon Sep 17 00:00:00 2001 From: Kurt Jaeger Date: Sun, 3 Aug 2014 12:25:11 +0000 Subject: [PATCH] devel/libconfuse: USES=libtool, bump dependencies --- audio/scmpc/Makefile | 1 + devel/libconfuse/Makefile | 12 +++++++----- devel/libconfuse/files/patch-configure | 10 ++++++++++ devel/libconfuse/pkg-plist | 2 +- net/bmon/Makefile | 1 + sysutils/ganglia-monitor-core/Makefile | 2 +- sysutils/unieject/Makefile | 2 +- x11-wm/awesome2/Makefile | 2 +- x11/i3status/Makefile | 2 +- x11/tilda/Makefile | 2 +- 10 files changed, 25 insertions(+), 11 deletions(-) create mode 100644 devel/libconfuse/files/patch-configure diff --git a/audio/scmpc/Makefile b/audio/scmpc/Makefile index 2e702545300c..eb5ae931623d 100644 --- a/audio/scmpc/Makefile +++ b/audio/scmpc/Makefile @@ -3,6 +3,7 @@ PORTNAME= scmpc PORTVERSION= 0.4.1 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= http://cdn.bitbucket.org/cmende/${PORTNAME}/downloads/ diff --git a/devel/libconfuse/Makefile b/devel/libconfuse/Makefile index e51418936ced..d19cf4251996 100644 --- a/devel/libconfuse/Makefile +++ b/devel/libconfuse/Makefile @@ -3,6 +3,7 @@ PORTNAME= libconfuse PORTVERSION= 2.7 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= SAVANNAH MASTER_SITE_SUBDIR= confuse @@ -17,14 +18,15 @@ LICENSE= ISCL LIB_DEPENDS+= ${LOCALBASE}/lib/libcheck.a:${PORTSDIR}/devel/libcheck .endif -USES= iconv pathfix pkgconfig -USE_AUTOTOOLS= libtool -USE_LDCONFIG= yes +USES= iconv pathfix pkgconfig libtool +GNU_CONFIGURE= yes +USE_LDCONFIG= yes CONFIGURE_ARGS+= --disable-nls -CFLAGS+= -I${WRKSRC}/src +CFLAGS+= -I${WRKSRC}/src .if defined(WITH_CHECK) CONFIGURE_ARGS+= --with-check=${LOCALBASE} -CFLAGS+= -I${LOCALBASE}/include +CFLAGS+= -I${LOCALBASE}/include .endif +INSTALL_TARGET= install-strip .include diff --git a/devel/libconfuse/files/patch-configure b/devel/libconfuse/files/patch-configure new file mode 100644 index 000000000000..ebc435ae89a3 --- /dev/null +++ b/devel/libconfuse/files/patch-configure @@ -0,0 +1,10 @@ +--- ./configure.orig 2014-08-03 14:00:38.000000000 +0200 ++++ ./configure 2014-08-03 14:00:45.000000000 +0200 +@@ -10584,6 +10584,7 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 + $as_echo_n "checking whether to build shared libraries... " >&6; } + test "$can_build_shared" = "no" && enable_shared=no ++ enable_shared=yes + + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. diff --git a/devel/libconfuse/pkg-plist b/devel/libconfuse/pkg-plist index d05108212f81..811622fe96fc 100644 --- a/devel/libconfuse/pkg-plist +++ b/devel/libconfuse/pkg-plist @@ -1,6 +1,6 @@ include/confuse.h lib/libconfuse.a -lib/libconfuse.la lib/libconfuse.so lib/libconfuse.so.0 +lib/libconfuse.so.0.0.0 libdata/pkgconfig/libconfuse.pc diff --git a/net/bmon/Makefile b/net/bmon/Makefile index cfaba67e1335..9ce9fff230a8 100644 --- a/net/bmon/Makefile +++ b/net/bmon/Makefile @@ -3,6 +3,7 @@ PORTNAME= bmon PORTVERSION= 3.3 +PORTREVISION= 1 CATEGORIES= net MAINTAINER= michelle@sorbs.net diff --git a/sysutils/ganglia-monitor-core/Makefile b/sysutils/ganglia-monitor-core/Makefile index 14397e6c4940..ee4cc1183127 100644 --- a/sysutils/ganglia-monitor-core/Makefile +++ b/sysutils/ganglia-monitor-core/Makefile @@ -2,7 +2,7 @@ PORTNAME= monitor-core PORTVERSION= 3.4.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils net parallel MASTER_SITES= SF/ganglia/ganglia%20monitoring%20core/${PORTVERSION} PKGNAMEPREFIX= ganglia- diff --git a/sysutils/unieject/Makefile b/sysutils/unieject/Makefile index f37db6637a97..9bc79c928219 100644 --- a/sysutils/unieject/Makefile +++ b/sysutils/unieject/Makefile @@ -3,7 +3,7 @@ PORTNAME= unieject PORTVERSION= 6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MASTER_SITES= SF diff --git a/x11-wm/awesome2/Makefile b/x11-wm/awesome2/Makefile index 8b2685f4054c..254eb5bc9802 100644 --- a/x11-wm/awesome2/Makefile +++ b/x11-wm/awesome2/Makefile @@ -3,7 +3,7 @@ PORTNAME= awesome2 PORTVERSION= 2.3.6 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-wm MASTER_SITES= http://awesome.naquadah.org/download/ DISTNAME= awesome-${PORTVERSION} diff --git a/x11/i3status/Makefile b/x11/i3status/Makefile index 2ada0124a38a..75e1ab37e7a9 100644 --- a/x11/i3status/Makefile +++ b/x11/i3status/Makefile @@ -2,7 +2,7 @@ PORTNAME= i3status PORTVERSION= 2.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= http://i3wm.org/i3status/ diff --git a/x11/tilda/Makefile b/x11/tilda/Makefile index 66d0fe94ed16..96802a19342b 100644 --- a/x11/tilda/Makefile +++ b/x11/tilda/Makefile @@ -2,7 +2,7 @@ PORTNAME= tilda PORTVERSION= 0.9.6 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11 MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}