- enable pthread/zlib usage

- remove rather silly no_ogg flavor (very minimal dependency)
- bump PKGNAME
This commit is contained in:
jolan 2003-06-22 02:45:31 +00:00
parent a996f1131f
commit 8a471b0bf6
2 changed files with 26 additions and 11 deletions

View File

@ -1,7 +1,8 @@
# $OpenBSD: Makefile,v 1.20 2003/05/12 08:23:45 jolan Exp $
# $OpenBSD: Makefile,v 1.21 2003/06/22 02:45:31 jolan Exp $
COMMENT= "full featured GTK Napster client"
DISTNAME= lopster-1.2.0
PKGNAME= lopster-1.2.0p0
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lopster/}
@ -17,12 +18,14 @@ PERMIT_DISTFILES_FTP= Yes
MODULES= gettext
LIB_DEPENDS= gtk.1.2,gdk.1.2::x11/gtk+
LIB_DEPENDS= gtk.1.2,gdk.1.2::x11/gtk+ \
ogg.4::audio/libogg
USE_GMAKE= Yes
USE_X11= Yes
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS+=--with-pthread --with-zlib
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
@ -31,13 +34,4 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
PATCH_LIST= gcc-* patch-*
.endif
FLAVORS= no_ogg
FLAVOR?=
.if ${FLAVOR:L:Mno_ogg}
CONFIGURE_ARGS+=--without-ogg
.else
LIB_DEPENDS+= ogg.4::audio/libogg
.endif
.include <bsd.port.mk>

View File

@ -0,0 +1,21 @@
$OpenBSD: patch-configure,v 1.1 2003/06/22 02:45:31 jolan Exp $
--- configure.orig Tue Mar 4 14:09:14 2003
+++ configure Sat Jun 14 22:29:21 2003
@@ -2162,14 +2162,14 @@ fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
- echo $ac_n "checking for main in -lpthread""... $ac_c" 1>&6
-echo "configure:2167: checking for main in -lpthread" >&5
+ echo $ac_n "checking for main in -pthread""... $ac_c" 1>&6
+echo "configure:2167: checking for main in -pthread" >&5
ac_lib_var=`echo pthread'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lpthread $LIBS"
+LIBS="-pthread $LIBS"
cat > conftest.$ac_ext <<EOF
#line 2175 "configure"
#include "confdefs.h"