diff options
| -rw-r--r-- | audio/icecast2/Makefile | 2 | ||||
| -rw-r--r-- | audio/libshout2/Makefile | 15 | ||||
| -rw-r--r-- | audio/libshout2/pkg-plist | 4 |
3 files changed, 5 insertions, 16 deletions
diff --git a/audio/icecast2/Makefile b/audio/icecast2/Makefile index f88442fa51de..35d248dff244 100644 --- a/audio/icecast2/Makefile +++ b/audio/icecast2/Makefile @@ -22,8 +22,6 @@ LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \ vorbis.2:${PORTSDIR}/audio/libvorbis \ xslt.1:${PORTSDIR}/textproc/libxslt -CONFIGURE_ENV= CFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" USE_GMAKE= yes USE_LIBTOOL= yes diff --git a/audio/libshout2/Makefile b/audio/libshout2/Makefile index 0773f8de2562..5f22db970ee4 100644 --- a/audio/libshout2/Makefile +++ b/audio/libshout2/Makefile @@ -7,6 +7,7 @@ PORTNAME= libshout2 PORTVERSION= 2.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= audio net MASTER_SITES= http://www.icecast.org/files/libshout/ @@ -22,23 +23,13 @@ CONFIGURE_ENV= CFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" INSTALLS_SHLIB= yes USE_GMAKE= yes -WANT_GNOME= yes +USE_GNOME+= pkgconfig USE_LIBTOOL_VER=13 CONFLICTS= libshout-1.0.7 USE_REINPLACE= yes -.include <bsd.port.pre.mk> - -.if ${HAVE_GNOME:Mpkgconfig}!="" -USE_GNOME+= pkgconfig -PLIST_SUB+= WITH_PKGCONFIG="" -.else -CONFIGURE_ARGS+=--disable-pkgconfig -PLIST_SUB+= WITH_PKGCONFIG="@comment " -.endif - post-configure: @ ${REINPLACE_CMD} -e "s|pkgconfigdir =.*|pkgconfigdir = ${PREFIX}/libdata/pkgconfig|g" \ ${WRKSRC}/Makefile -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/audio/libshout2/pkg-plist b/audio/libshout2/pkg-plist index 808328cf78dd..8b06a1deff1b 100644 --- a/audio/libshout2/pkg-plist +++ b/audio/libshout2/pkg-plist @@ -3,11 +3,11 @@ lib/libshout.a lib/libshout.la lib/libshout.so lib/libshout.so.3 -%%WITH_PKGCONFIG%%libdata/pkgconfig/shout.pc +libdata/pkgconfig/shout.pc share/aclocal/shout.m4 share/doc/libshout/COPYING share/doc/libshout/README share/doc/libshout/example.c @dirrm share/doc/libshout -%%WITH_PKGCONFIG%%@dirrm libdata/pkgconfig +@dirrm libdata/pkgconfig @dirrm include/shout |