From owner-ports-jp@jp.FreeBSD.org Fri Jan 25 06:56:05 2002
Received: (from daemon@localhost)
	by castle.jp.FreeBSD.org (8.11.6+3.4W/8.11.3) id g0OLu5O10860;
	Fri, 25 Jan 2002 06:56:05 +0900 (JST)
	(envelope-from owner-ports-jp@jp.FreeBSD.org)
Received: from sv01.geocities.co.jp (sv01.geocities.co.jp [210.153.89.155])
	by castle.jp.FreeBSD.org (8.11.6+3.4W/8.11.3) with ESMTP/inet id g0OLu5L10855
	for <ports-jp@jp.FreeBSD.org>; Fri, 25 Jan 2002 06:56:05 +0900 (JST)
	(envelope-from dai_fugo@geocities.co.jp)
Received: from mail.geocities.co.jp (mail.geocities.co.jp [210.153.89.137]) by sv01.geocities.co.jp (8.9.3+3.2W/3.7W) with ESMTP id GAA28562 for <ports-jp@jp.FreeBSD.org>; Fri, 25 Jan 2002 06:56:04 +0900 (JST)
Received: from localhost.localdomain (socigeog.hmt.toyama-u.ac.jp [160.26.63.48]) by mail.geocities.co.jp (1.3G-GeocitiesJ-3.3) with SMTP id GAA05010 for <ports-jp@jp.FreeBSD.org>; Fri, 25 Jan 2002 06:55:13 +0900 (JST)
Date: Fri, 25 Jan 2002 06:55:14 +0900
From: KATO Tsuguru <dai_fugo@geocities.co.jp>
To: ports-jp@jp.FreeBSD.org
Message-Id: <20020125065514.543fd83f.dai_fugo@geocities.co.jp>
X-Mailer: Sylpheed version 0.7.0 (GTK+ 1.2.10; i386--freebsd4.4)
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-2022-JP
Content-Transfer-Encoding: 7bit
Reply-To: ports-jp@jp.FreeBSD.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+011218
X-Sequence: ports-jp 12303
Subject: [ports-jp 12303] Re: XINE with LinuxThreads
Errors-To: owner-ports-jp@jp.FreeBSD.org
Sender: owner-ports-jp@jp.FreeBSD.org
X-Originator: dai_fugo@geocities.co.jp

$B$H$j$"$($:(Blibc_r$B$H(Bliblthread$B$N@ZBX$($K4X$7$F$O!"$3$s$J46$8$G(B
$B$&$^$/$$$-$^$9!#(Bperl$B$G=q$-49$($F$k2U=j$O%Q%C%A$G$b$$$$$s$G$9$,!"(B
$B$H$j$"$($:(BMakefile$B$@$1$$$8$l$P:Q$`$h$&$K$7$F$k$s$G!"$3$s$J7A$K(B
$B$J$C$F$^$9!#(B

$B$^$@(Bwine$B$H$V$D$+$kLdBj$,2r7h$G$-$F$^$;$s$,!"$H$j$"$($:(Blibxine$B$N(B
$BESCf7P2a$G$9!#(Bwine$B$,F~$C$F$J$1$l$P$9$s$J$jDL$k$O$:$G$9!#(B

--- /usr/ports/graphics/libxine/Makefile	Thu Jan 24 20:03:24 2002
+++ Makefile	Fri Jan 25 06:42:27 2002
@@ -7,6 +7,7 @@
 
 PORTNAME=	xine
 PORTVERSION=	0.9.8
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://xine.sourceforge.net/files/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -22,16 +23,28 @@
 		intl.1:${PORTSDIR}/devel/gettext
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-lib-${PORTVERSION}
-CONFIGURE_ARGS=	--with-w32-path=${LOCALBASE}/lib/win32
-CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include LIBS=-L${LOCALBASE}/lib
 
-USE_AUTOMAKE=	yes
-USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-USE_IMLIB=	yes
 USE_ESOUND=	yes
+USE_IMLIB=	yes
+USE_GMAKE=	yes
+USE_AUTOMAKE=	yes
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ARGS=	--with-w32-path=${LOCALBASE}/lib/win32
 INSTALLS_SHLIB=	yes
 
+CPPFLAGS=	-I./.. -I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
+
+.if defined(WITH_LINUXTHREADS)
+LIB_DEPENDS+=	lthread.2:${PORTSDIR}/devel/linuxthreads
+CPPFLAGS+=	-I${LOCALBASE}/include/pthread/linuxthreads
+LDFLAGS+=	-llthread -llgcc_r
+.else
+CPPFLAGS+=	${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS}
+.endif
+
 MAN1=		xine-config.1
 MAN3=		ao_driver_t.3 ao_functions_t.3 autoplay_group.3 \
 		audio_cap.3 audio_group.3 audio_prop.3 \
@@ -74,9 +87,18 @@
 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
+post-patch:
+	@${PERL} -pi.dist -e \
+		's|THREAD_LIBS=.*$$|THREAD_LIBS=|g ; \
+		 s|THREAD_CFLAGS=.*$$|THREAD_CFLAGS=|g ; \
+		 s|-L/usr/local/lib||g ; \
+		 s|-I/usr/local/include||g ; \
+		 sl-funroll-loops||g ; \
+		 s|-D_REENTRANT||g' ${WRKSRC}/configure.in
+	@${PERL} -pi.dist -e \
+		's|aclocal,|${ACLOCAL},|g ; \
+		 s|autoconf,|${AUTOCONF},|g ; \
+		 s|automake,|${AUTOMAKE},|g ; \
+		 s|autoheader,|${AUTOHEADER},|g' ${WRKSRC}/aclocal.m4
 
 .include <bsd.port.post.mk>
