diff options
| author | crees <crees@FreeBSD.org> | 2011-09-08 03:44:28 +0800 |
|---|---|---|
| committer | crees <crees@FreeBSD.org> | 2011-09-08 03:44:28 +0800 |
| commit | d5317d651bd960338060ed42366e082e3acc98d9 (patch) | |
| tree | ad9b5a352b148fd0bbdaf965c3800662dd0a396a | |
| parent | 22a2a8c2063c3cd4e78c7e82a6e1d22aa4e3011e (diff) | |
| download | freebsd-ports-gnome-d5317d651bd960338060ed42366e082e3acc98d9.tar.gz freebsd-ports-gnome-d5317d651bd960338060ed42366e082e3acc98d9.tar.zst freebsd-ports-gnome-d5317d651bd960338060ed42366e082e3acc98d9.zip | |
Cleanup, and stop auto-detecting OGG-- now an option.
PR: ports/160012
Submitted by: Conrad J. Sabatier <conrads@cox.net>
| -rw-r--r-- | net-p2p/lopster/Makefile | 38 | ||||
| -rw-r--r-- | net-p2p/lopster/files/patch-src-global.c (renamed from net-p2p/lopster/files/patch-src::global.c) | 5 |
2 files changed, 26 insertions, 17 deletions
diff --git a/net-p2p/lopster/Makefile b/net-p2p/lopster/Makefile index ec25fcfad5e9..9e55a19b32c9 100644 --- a/net-p2p/lopster/Makefile +++ b/net-p2p/lopster/Makefile @@ -7,7 +7,7 @@ PORTNAME= lopster PORTVERSION= 1.2.2 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= net-p2p MASTER_SITES= SF \ http://lopster.sourceforge.net/download/ @@ -19,34 +19,38 @@ GNU_CONFIGURE= yes USE_GMAKE= yes USE_GNOME= gtk12 CONFIGURE_ARGS= --with-pthread=yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= "-I${LOCALBASE}/include" + +OPTIONS= FLAC "Include FLAC support" On \ + OGG "Include OGG support" On \ + ZLIB "Enable ZLIB compression" On .include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if exists(${LOCALBASE}/lib/libogg.so.7) -WITH_OGG= yes +# --with-flac is on by default +.if defined(WITH_FLAC) +LIB_DEPENDS+= FLAC.10:${PORTSDIR}/audio/flac +.else +CONFIGURE_ARGS+= --without-flac .endif +# --with-ogg is on by default .if defined(WITH_OGG) -LIB_DEPENDS+= ogg.7:${PORTSDIR}/audio/libogg -.endif - -.if !defined(WITHOUT_ZLIB) -CONFIGURE_ARGS+= --with-zlib=yes +LIB_DEPENDS+= ogg.7:${PORTSDIR}/audio/libogg .else -CONFIGURE_ARGS+= --with-zlib=no +CONFIGURE_ARGS+= --without-ogg .endif -pre-everything:: -.ifndef WITH_OGG - @${ECHO_MSG} "You can specify WITH_OGG to include Ogg support" -.endif -.ifndef WITHOUT_ZLIB - @${ECHO_MSG} "You can specify WITHOUT_ZLIB to disable compression for old servers" +# --with-zlib is on by default +.if defined(WITHOUT_ZLIB) +CONFIGURE_ARGS+= --without-zlib .endif post-patch: - @${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|g" ${WRKSRC}/configure + @${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|g" \ + ${WRKSRC}/configure @${REINPLACE_CMD} -e "s/www.naplist.com/www.gotnap.com/" \ ${WRKSRC}/src/lopster.h diff --git a/net-p2p/lopster/files/patch-src::global.c b/net-p2p/lopster/files/patch-src-global.c index b1e92ff7e2f2..e1d031fb22ec 100644 --- a/net-p2p/lopster/files/patch-src::global.c +++ b/net-p2p/lopster/files/patch-src-global.c @@ -1,3 +1,8 @@ +$FreeBSD$ + +This used to be patch-src::global.c, but has been moved to stop using +colons in patch names. + --- src/global.c.orig Sat Jul 3 19:19:19 2004 +++ src/global.c Thu Jul 22 14:03:01 2004 @@ -3588,7 +3588,7 @@ |