summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorHidetoshi Shimokawa <simokawa@FreeBSD.org>2003-09-26 12:55:59 +0000
committerHidetoshi Shimokawa <simokawa@FreeBSD.org>2003-09-26 12:55:59 +0000
commite530b8fce1e71d41d6322108054f9aef42a16119 (patch)
tree4725d745ff916955c85c9fb18b7d62f0e97afbc3 /multimedia
parentUpdate to 2.4.4.3 (diff)
- Remove -pthread from CFLAGS for -current.
- Distfile has been updated(PAL support).
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/xdvshow/Makefile14
-rw-r--r--multimedia/xdvshow/distinfo2
-rw-r--r--multimedia/xdvshow/files/patch-configure.in28
-rw-r--r--multimedia/xdvshow/files/patch-src::Makefile.in10
4 files changed, 47 insertions, 7 deletions
diff --git a/multimedia/xdvshow/Makefile b/multimedia/xdvshow/Makefile
index a9688a4aaee5..e6aba612e506 100644
--- a/multimedia/xdvshow/Makefile
+++ b/multimedia/xdvshow/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME= xdvshow
-PORTVERSION= 00.2002.03.16
-PORTREVISION= 1
+PORTVERSION= 00.2003.09.03
+#PORTREVISION= 0
CATEGORIES= multimedia
MASTER_SITES= http://www.sfc.wide.ad.jp/DVTS/software/xdvshow/
DISTNAME= ${PORTNAME}
@@ -17,7 +17,15 @@ COMMENT= DV/RTP viewer
LIB_DEPENDS= dv.3:${PORTSDIR}/multimedia/libdv
-GNU_CONFIGURE= YES
+GNU_CONFIGURE= YES
USE_AUTOCONF_VER= 253
+USE_REINPLACE= YES
+
+post-patch:
+ @${REINPLACE_CMD} \
+ -e "s|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|g" \
+ -e "s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g" \
+ ${WRKSRC}/configure.in
+
.include <bsd.port.mk>
diff --git a/multimedia/xdvshow/distinfo b/multimedia/xdvshow/distinfo
index 13ea695368d2..02ed09b96654 100644
--- a/multimedia/xdvshow/distinfo
+++ b/multimedia/xdvshow/distinfo
@@ -1 +1 @@
-MD5 (xdvshow.tar.gz) = 095cd1577012390efd0a2bbef0702a79
+MD5 (xdvshow.tar.gz) = e870b61ab59624d695850bee03f7cb80
diff --git a/multimedia/xdvshow/files/patch-configure.in b/multimedia/xdvshow/files/patch-configure.in
index f42519fc7d53..a146cba1df57 100644
--- a/multimedia/xdvshow/files/patch-configure.in
+++ b/multimedia/xdvshow/files/patch-configure.in
@@ -1,6 +1,29 @@
--- configure.in.orig Thu May 16 20:07:47 2002
-+++ configure.in Mon May 12 22:47:00 2003
-@@ -80,14 +80,9 @@
++++ configure.in Sun Sep 21 11:54:41 2003
+@@ -18,8 +18,8 @@
+
+ AC_PROG_CC_WARNINGS()
+
+-LDFLAGS="$LDFLAGS -L/usr/local/lib"
+-CFLAGS="-I/usr/local/include $CFLAGS"
++LDFLAGS="$LDFLAGS -L/usr/local/lib %%PTHREAD_LIBS%%"
++CFLAGS="-I/usr/local/include $CFLAGS %%PTHREAD_CFLAGS%%"
+
+ AC_PATH_X
+ if test $have_x
+@@ -38,11 +38,6 @@
+ echo "*****************************"
+ exit
+ ])
+-AC_CHECK_LIB(pthread, main, [],
+- [
+- CFLAGS="$CFLAGS -pthread"
+- ])
+-
+
+ dnl AC_WITH_SDL
+ AC_CHECK_LIB(SDL, main,
+@@ -80,14 +75,8 @@
AC_CANONICAL_HOST
case "$host_os" in
@@ -14,7 +37,6 @@
- CFLAGS="-DFREEBSD_5 $CFLAGS"
+ freebsd*)
+ echo " + OS Type is FreeBSD"
-+ CFLAGS="-DFREEBSD $CFLAGS"
;;
darwin1.3.*)
diff --git a/multimedia/xdvshow/files/patch-src::Makefile.in b/multimedia/xdvshow/files/patch-src::Makefile.in
new file mode 100644
index 000000000000..3fcfcd9d007e
--- /dev/null
+++ b/multimedia/xdvshow/files/patch-src::Makefile.in
@@ -0,0 +1,10 @@
+--- src/Makefile.in.orig Sat Sep 20 09:10:49 2003
++++ src/Makefile.in Sat Sep 20 09:16:21 2003
+@@ -108,7 +108,6 @@
+
+ AM_CFLAGS = \
+ @XDVSHOW_CFLAGS@ \
+- -pthread \
+ -Wall -Werror -O3
+
+ subdir = src