summaryrefslogtreecommitdiffstats
path: root/graphics/xmps
diff options
context:
space:
mode:
authorsobomax <sobomax@FreeBSD.org>2001-04-02 09:12:43 +0000
committersobomax <sobomax@FreeBSD.org>2001-04-02 09:12:43 +0000
commitb625aefd221c0f19da86b771efe2e0cc8f2f2283 (patch)
tree8b7d2bf1d17eebfd68d074b076266eff45a6619c /graphics/xmps
parent461df437f1c07993667cb292df193159a741696d (diff)
downloadFreeBSD-ports-b625aefd221c0f19da86b771efe2e0cc8f2f2283.zip
FreeBSD-ports-b625aefd221c0f19da86b771efe2e0cc8f2f2283.tar.gz
Fix the build on -current (PTHREAD_LIBS conversion victim).
Prompted by: Michael McGoldrick <mtm98@doc.ic.ac.uk>
Diffstat (limited to 'graphics/xmps')
-rw-r--r--graphics/xmps/Makefile2
-rw-r--r--graphics/xmps/files/patch-libxmps::Makefile.in2
-rw-r--r--graphics/xmps/files/patch-src::Makefile.in2
3 files changed, 3 insertions, 3 deletions
diff --git a/graphics/xmps/Makefile b/graphics/xmps/Makefile
index 8c433962..b85f9d2 100644
--- a/graphics/xmps/Makefile
+++ b/graphics/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/graphics/xmps/files/patch-libxmps::Makefile.in b/graphics/xmps/files/patch-libxmps::Makefile.in
index c88117b..7fae585 100644
--- a/graphics/xmps/files/patch-libxmps::Makefile.in
+++ b/graphics/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/graphics/xmps/files/patch-src::Makefile.in b/graphics/xmps/files/patch-src::Makefile.in
index 53d4162..c450f02 100644
--- a/graphics/xmps/files/patch-src::Makefile.in
+++ b/graphics/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 =
OpenPOWER on IntegriCloud