summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorMaxim Sobolev <sobomax@FreeBSD.org>2001-04-02 09:12:43 +0000
committerMaxim Sobolev <sobomax@FreeBSD.org>2001-04-02 09:12:43 +0000
commit9d77d03a9ccd3fbb85f1d81bdb700888dd599800 (patch)
tree21c7f9403ce6e9b6b675c556812040f3d395c2f1 /multimedia
parentUpdate to 1.6.1. (diff)
Fix the build on -current (PTHREAD_LIBS conversion victim).
Prompted by: Michael McGoldrick <mtm98@doc.ic.ac.uk>
Notes
Notes: svn path=/head/; revision=40730
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/xmps/Makefile2
-rw-r--r--multimedia/xmps/files/patch-libxmps::Makefile.in2
-rw-r--r--multimedia/xmps/files/patch-src::Makefile.in2
3 files changed, 3 insertions, 3 deletions
diff --git a/multimedia/xmps/Makefile b/multimedia/xmps/Makefile
index 8c4339620bb7..b85f9d2430c5 100644
--- a/multimedia/xmps/Makefile
+++ b/multimedia/xmps/Makefile
@@ -24,7 +24,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
SDL_CONFIG="${SDL_CONFIG}" \
LDFLAGS="-L${LOCALBASE}/lib"
-pre-patch:
+post-patch:
@${PERL} -pi -e "s|-lpthread|${PTHREAD_LIBS}|g" ${WRKSRC}/configure
@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \
diff --git a/multimedia/xmps/files/patch-libxmps::Makefile.in b/multimedia/xmps/files/patch-libxmps::Makefile.in
index c88117b1482b..7fae58513ea5 100644
--- a/multimedia/xmps/files/patch-libxmps::Makefile.in
+++ b/multimedia/xmps/files/patch-libxmps::Makefile.in
@@ -9,6 +9,6 @@ $FreeBSD$
-libxmps_la_LDFLAGS = -module -avoid-version
+libxmps_la_LDFLAGS = -module
- libxmps_la_LIBADD = -pthread
+ libxmps_la_LIBADD = -lpthread
libxmps_la_SOURCES = libxmps_config.h libxmps_config.c libxmps_graph.c libxmps_events.c libxmps_video_conversion.c libxmps_xml.c libxmps.h libxmps.c
diff --git a/multimedia/xmps/files/patch-src::Makefile.in b/multimedia/xmps/files/patch-src::Makefile.in
index 53d416227753..c450f02f74f1 100644
--- a/multimedia/xmps/files/patch-src::Makefile.in
+++ b/multimedia/xmps/files/patch-src::Makefile.in
@@ -8,7 +8,7 @@ $FreeBSD$
-xmps_LDADD = -L@LIBXMPS_DIR@ -lxmps -L@LIBXMPSUTILS_DIR@ -lxmpsutils
-+xmps_LDADD = -L@LIBXMPS_DIR@ -lxmps -L@LIBXMPSUTILS_DIR@ -lxmpsutils -pthread
++xmps_LDADD = -L@LIBXMPS_DIR@ -lxmps -L@LIBXMPSUTILS_DIR@ -lxmpsutils -lpthread
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h
CONFIG_CLEAN_FILES =