aboutsummaryrefslogtreecommitdiffstats
path: root/audio/xmms-kj
diff options
context:
space:
mode:
authorkrion <krion@FreeBSD.org>2004-03-01 03:14:56 +0800
committerkrion <krion@FreeBSD.org>2004-03-01 03:14:56 +0800
commit1e78b7b6339e462ffdce4b52ab49e39235aaba71 (patch)
tree81cb379d451b71edb69bf6dcf764a892d429aa46 /audio/xmms-kj
parent092ca31a706593fae66b017df925ef165ed5e2a9 (diff)
downloadfreebsd-ports-gnome-1e78b7b6339e462ffdce4b52ab49e39235aaba71.tar.gz
freebsd-ports-gnome-1e78b7b6339e462ffdce4b52ab49e39235aaba71.tar.zst
freebsd-ports-gnome-1e78b7b6339e462ffdce4b52ab49e39235aaba71.zip
- Respect PTHREAD_{CFLAGS,LIBS} and CFLAGS
- Do not mark FORBIDDEN PR: ports/63538 Submitted by: Craig Rodrigues <rodrigc@crodrigues.org> Approved by: maintainer informed
Diffstat (limited to 'audio/xmms-kj')
-rw-r--r--audio/xmms-kj/Makefile12
-rw-r--r--audio/xmms-kj/files/patch-aa4
2 files changed, 9 insertions, 7 deletions
diff --git a/audio/xmms-kj/Makefile b/audio/xmms-kj/Makefile
index 14ea7dc27a28..6a58cacdecfd 100644
--- a/audio/xmms-kj/Makefile
+++ b/audio/xmms-kj/Makefile
@@ -23,17 +23,19 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
USE_X_PREFIX= yes
USE_GNOME= gtk12
+USE_REINPLACE= yes
.include <bsd.port.pre.mk>
-.if ${OSVERSION} >= 502102
-FORBIDDEN= "Does not respect PTHREAD_{CFLAGS,LIBS}"
-.endif
+pre-patch:
+ ${REINPLACE_CMD} -e 's/PTHREAD_LIBS/ ${PTHREAD_LIBS}/g' \
+ ${PATCHDIR}/patch-aa
+ ${RM} -f ${PATCHDIR}/*.bak
do-build:
- cd ${WRKSRC} && make
+ cd ${WRKSRC} && $(MAKE)
do-install:
- cd ${WRKSRC} && make install
+ cd ${WRKSRC} && $(MAKE) install
.include <bsd.port.post.mk>
diff --git a/audio/xmms-kj/files/patch-aa b/audio/xmms-kj/files/patch-aa
index 6bbead0365b3..b3d625dadda9 100644
--- a/audio/xmms-kj/files/patch-aa
+++ b/audio/xmms-kj/files/patch-aa
@@ -5,12 +5,12 @@
xmmsvislib=`xmms-config --visualization-plugin-dir`
-CFLAGS=-O2 -Wall -DHAVE_LIBPNG -DXMMS_DIR=\"$(xmmsdir)\" -DKJSKIN=\"$(xmmsdir)/kjofol/default.zip\" -I. `xmms-config --cflags`
-+CFLAGS=-O2 -Wall -DHAVE_LIBPNG -DXMMS_DIR=\"$(xmmsdir)\" -DKJSKIN=\"$(xmmsdir)/kjofol/default.zip\" -I. `xmms-config --cflags` -fPIC
++CFLAGS+=-O2 -Wall -DHAVE_LIBPNG -DXMMS_DIR=\"$(xmmsdir)\" -DKJSKIN=\"$(xmmsdir)/kjofol/default.zip\" -I. `xmms-config --cflags` -fPIC
LPNG = -lpng -lz
LDFLAGS=-O2
# LIBS=-L/usr/lib `gtk-config --libs` $(LPNG) -lgthread -lpthread -lxmms -Wl,--rpath -Wl,/usr/local/lib
-LIBS=`xmms-config --libs` $(LPNG)
-+LIBS=`xmms-config --libs` $(LPNG) -lc_r
++LIBS=`xmms-config --libs` $(LPNG) -pthread
OBJS=kj.o resource.o config.o image.o playlist.o
CC=gcc