diff options
| author | Kirill Ponomarev <krion@FreeBSD.org> | 2004-02-29 19:14:56 +0000 |
|---|---|---|
| committer | Kirill Ponomarev <krion@FreeBSD.org> | 2004-02-29 19:14:56 +0000 |
| commit | 4a21408ef26670043f34570d55ff02f234db942e (patch) | |
| tree | 8347736157c2b67e743a2b76b282f6222a63f0dd /audio | |
| parent | Update to 1.3.21. (diff) | |
- Respect PTHREAD_{CFLAGS,LIBS} and CFLAGS
- Do not mark FORBIDDEN
PR: ports/63538
Submitted by: Craig Rodrigues <rodrigc@crodrigues.org>
Approved by: maintainer informed
Notes
Notes:
svn path=/head/; revision=102566
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/xmms-kj/Makefile | 12 | ||||
| -rw-r--r-- | audio/xmms-kj/files/patch-aa | 4 |
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 |