From owner-ports-jp@jp.FreeBSD.org Fri Jan 25 12:10:46 2002
Received: (from daemon@localhost)
	by castle.jp.FreeBSD.org (8.11.6+3.4W/8.11.3) id g0P3AkW21217;
	Fri, 25 Jan 2002 12:10:46 +0900 (JST)
	(envelope-from owner-ports-jp@jp.FreeBSD.org)
Received: from pelsia.netmove.co.jp (pelsia.netmove.co.jp [202.241.207.159])
	by castle.jp.FreeBSD.org (8.11.6+3.4W/8.11.3) with ESMTP/inet id g0P3Ak621212
	for <ports-jp@jp.FreeBSD.org>; Fri, 25 Jan 2002 12:10:46 +0900 (JST)
	(envelope-from shige@netmove.co.jp)
Received: (from nork@localhost)
	by pelsia.netmove.co.jp (8.11.6/8.11.6) id g0P3Aed88151;
	Fri, 25 Jan 2002 12:10:40 +0900 (JST)
	(envelope-from nork)
From: nork@cityfujisawa.ne.jp (Norikatsu Shigemura)
To: ports-jp@jp.FreeBSD.org
In-Reply-To: Your message of "Fri, 25 Jan 2002 03:04:27 +0900".
	<864rlb39sk.wl@gray.plala.or.jp>
X-Mailer: mnews [version 1.22PL5] 2001-02/07(Wed)
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-2022-JP
Date: Fri, 25 Jan 2002 12:10:40 +0900
Message-ID: <020125121040.M0187363@pelsia.netmove.co.jp>
Reply-To: ports-jp@jp.FreeBSD.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+011218
X-Sequence: ports-jp 12306
Subject: [ports-jp 12306] Re: XINE with LinuxThreads
Errors-To: owner-ports-jp@jp.FreeBSD.org
Sender: owner-ports-jp@jp.FreeBSD.org
X-Originator: nork@cityfujisawa.ne.jp

$B=EB<K!9n$G$9!#(B

2002/01/25 03:04 $B$K(BFUJISHIMA Satsuki$B$5$s$O=q$-$^$7$?(B.
>> $BCx$7$/$d$k5$$N$J$$%"%W%m!<%A$G$9!%!V$b$&$3$l0J>e<j$r=P$7$^$;$s!$4*J[$7(B
>> $B$F$/$@$5$$!W$H8l$C$F$$$k$h$&$G$9!%(B

	($B>P(B)$B!#(B

>> $BDI?-(B: 0.9.8$B$N(Blibc_r$BHG$G(Bencrypted DVD$B$r(B1$BKg:F@8$7=*$o$j$^$7$?!%(B
>> linuxthreads$BHG$G$O4V0c$$$J$/ESCf$G;I$5$k$N$G!$$=$C$A$K$b<j$rF~$l$J$$$H(B
>> $B;H$($k$h$&$K$O$J$i$J$$$G$7$g$&!%(B

	$BHyL/$KIT0BDj$G$9$M!#2hLL$NBg$-$5$r$$$8$k$HMn$A$?$j$7$^$9!#(B
	$B%*%Z%l!<%7%g%s$GMn$A$J$$$N$OJQ$o$j$^$;$s$,!#$3$l$O(B
	xine_d4d_plugin $B$,(B 0.3.0 $B$K$J$C$F$+$i$NIT0BDj$5$J$N$G(B, xine
	$B<+BN$O0-$/$J$$$H;W$o$l!#$H$$$&$N$b;d$,=i$a$F;n$7$?;~(B(0.2.8)
	$B$K$O%U%k%9%/%j!<%sEy$K$7$F$bMn$A$^$;$s$G$7$?!#(B

>> > 	$B$H$$$&$o$1$G(B, missing $B$r(B
>> > #!/bin/sh
>> > exit 0
>> > 	$B$KCV$-49$($F$7$^$($PBg>!Mx(B
>> ${LN} -sf ${TRUE} missing
>> $B$H$$$&$N$r9M$($^$7$?!%(B

	$B$N$C$/$"$&$H!#(B


	$B$3$N7k2L$H(B KATO Tsuguru $B;a$N%"%$%G%"$H;d$NLnK>$r$3$a$F0J2<%Q%C(B
	$B%A$G$9!#$H$j$"$($:$N%W%m%H%?%$%W$J$N$G(B bsd.port.mk $B$r$3$N$^$^(B
	$B$K$7$F$*$/$H$d$P$$$N$G(B, GNOME $BEy$N%U%l!<%`%o!<%/$r;29M$K(B WANT_
	$B1>!9Ey$rF3F~$7$F2sHr$7$F$d$i$J$$$H!D!#(B

	$B$"$H$3$3$^$G$-$?$i(B, bsd.thread.mk $B$rMQ0U$7$F(B, thread $B$^$o$j$N(B
	$B%U%l!<%`%o!<%/$rMQ0U$9$k$H8@$&$N$O$$$+$,$G$7$g$&(B?
	$B8=:_(B, FreeBSD thread, LinuxThreads, GNU Portable Threads,
	Portable Thread Library, (MIT $B$O$I$3(B?)$B$H$"$k$N$G?'!9;n$;$?$i(B
	$B4r$7$$$+$bCN$l$^$;$s!#(B

# bsd.port.mk $B$$$8$C$F$$$?$i(B PTL $BEy;n$7$F$_$?$/$J$C$?!D(B...
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--- Mk/bsd.port.mk.orig	Thu Jan 24 19:11:43 2002
+++ Mk/bsd.port.mk	Fri Jan 25 11:33:46 2002
@@ -1067,6 +1067,11 @@
 MAKEFILE?=		Makefile
 MAKE_ENV+=		PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} MOTIFLIB="${MOTIFLIB}" LIBDIR="${LIBDIR}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
 
+.if defiend(WITH_LINUXTHREADS)
+PTHREAD_LIBS=	"-L${LOCALBASE}/lib -llthread -llgcc_r"
+PTHREAD_CFLAGS=	"-D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads"
+LIB_DEPENDS+=	lthread.2:${PORTSDIR}/devel/linuxthreads
+.else
 .if ${OSVERSION} < 500016
 PTHREAD_CFLAGS=	-D_THREAD_SAFE
 PTHREAD_LIBS=		"-pthread"
@@ -1074,6 +1079,7 @@
 PTHREAD_CFLAGS=	""
 PTHREAD_LIBS=		"-lc_r"
 .endif
+.endif
 
 .if exists(/usr/bin/fetch)
 # avoid -A for 2.2 -- it's not ported to that branch
@@ -2190,6 +2196,9 @@
 .if defined(USE_AUTOCONF)
 	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOCONF_ENV} ${AUTOCONF} \
 		${AUTOCONF_ARGS})
+.endif
+.if defined(USE_AUTOMAKE) || defined(USE_AUTOCONF)
+	@${LN} -sf ${TRUE} ${WRKSRC}/missing
 .endif
 	@if [ -f ${SCRIPTDIR}/configure ]; then \
 		cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} \
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--- libxine/Makefile.orig	Thu Jan 24 19:19:34 2002
+++ libxine/Makefile	Fri Jan 25 11:28:37 2002
@@ -23,7 +23,8 @@
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-lib-${PORTVERSION}
 CONFIGURE_ARGS=	--with-w32-path=${LOCALBASE}/lib/win32
-CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include LIBS=-L${LOCALBASE}/lib
+CONFIGURE_ENV=	CPPFLAGS="-I.. -I${LOCALBASE}/include" LIBS=-L${LOCALBASE}/lib
+CONFIGURE_ENV+=	PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS}
 
 USE_AUTOMAKE=	yes
 USE_GMAKE=	yes
@@ -74,9 +75,13 @@
 PLIST_SUB+=	HAVE_OGG="@comment "
 .endif
 
-# XXX: To avoid internal error in gcc.
 post-configure:
-	@${SED} -e "s/-funroll-loops//" < ${WRKSRC}/src/libw32dll/wine/Makefile > ${WRKSRC}/src/libw32dll/wine/Makefile.tmp
-	@${MV} ${WRKSRC}/src/libw32dll/wine/Makefile.tmp ${WRKSRC}/src/libw32dll/wine/Makefile
+	@${PERL} -pi.old -e \
+		's|(THREAD_LIBS=)"-L.*$$|$$1"$$PTHREAD_LIBS"|g ; \
+		 s|(THREAD_CFLAGS=)".*$$|$$1"$$PTHREAD_CFLAGS"|g ; \
+		 s|(COMMON_CFLAGS=".*)"$$|$$1 $$PTHREAD_CFLAGS"|g ; \
+		' ${WRKSRC}/configure.in
+	@${PERL} -pi.old -e \
+		's|-funroll-loops||g' ${WRKSRC}/src/libw32dll/wine/Makefile
 
 .include <bsd.port.post.mk>
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--- xine/Makefile.orig	Thu Jan 24 19:19:42 2002
+++ xine/Makefile	Fri Jan 25 11:37:53 2002
@@ -29,6 +29,7 @@
 CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include" \
 			CPPFLAGS="-I${LOCALBASE}/include" \
 			LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV+=	PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS}
 
 MANLANG=	"" es fr pl
 MAN1=		aaxine.1 xine.1
@@ -43,6 +44,12 @@
 CODEC_DETECTION_FILE!=	${MAKE} -f ${CODEC_PORT}/Makefile -V CODEC_DETECTION_FILE
 .endif
 .endif
+
+post-patch:
+	@${PERL} -pi.old -e \
+		's|(THREAD_LIBS=)"-L.*$$|$$1"$$PTHREAD_LIBS"|g ; \
+		 s|(THREAD_CFLAGS=)".*$$|$$1"$$PTHREAD_CFLAGS"|g ; \
+		' ${WRKSRC}/configure.in
 
 post-configure:
 	@${LN} -sf ${LOCALBASE}/bin/libtool ${WRKSRC}
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
