>Number:         18212
>Category:       pkg
>Synopsis:       build wine with optional arts/sane support
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sat Sep 07 00:47:00 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     Benedikt Meurer
>Release:        NetBSD 1.6_RC1
>Organization:
	University Siegen
>Environment:
	
	
System: NetBSD darkstar.kosmos.all 1.6_RC1 NetBSD 1.6_RC1 (DARKSTAR) #0: Thu Aug 22 19:56:05 CEST 2002 benny@darkstar.kosmos.all:/usr/src/sys/arch/i386/compile/DARKSTAR i386
Architecture: i386
Machine: i386
>Description:
	wine lacks (optional!) support for arts and sane.
>How-To-Repeat:
>Fix:
	Apply the following patch to the current wine pkg. This will
	allow you to build wine with arts support be setting
	WINE_USE_ARTS=YES, and sane by setting WINE_USE_SANE=YES, and
	the wine pkg will depend on arts/sane-backends.

Common subdirectories: ../wine.orig/CVS and ./CVS
diff -uN ../wine.orig/Makefile ./Makefile
--- ../wine.orig/Makefile	Sat Sep  7 08:48:03 2002
+++ ./Makefile	Sat Sep  7 09:32:54 2002
@@ -14,7 +14,7 @@
 
 ONLY_FOR_PLATFORM=	NetBSD-1.5Z*-i386 NetBSD-1.[6-9]*-i386
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 USE_GMAKE=		YES
 USE_PERL5=		run
 GNU_CONFIGURE=		YES
@@ -31,13 +31,27 @@
 CONFIGURE_ENV+=		X_LIBS="${LDFLAGS}"
 LIBS+=			${LDFLAGS}
 
+.include "../../mk/bsd.prefs.mk"
+
+.if defined(WINE_USE_ARTS) && (${WINE_USE_ARTS} == YES)
+PLIST_SRC+=             ${PKGDIR}/PLIST.arts
+.include "../../audio/arts/buildlink2.mk"
+CONFIGURE_ENV+=		ARTSCCONFIG="${X11BASE}/bin/artsc-config"
+.else
 CONFIGURE_ENV+=		ac_cv_path_ARTSCCONFIG=no
+.endif
+
+.if defined(WINE_USE_SANE) && (${WINE_USE_SANE} == YES)
+.include "../../graphics/sane-backends/buildlink2.mk"
+CONFIGURE_ENV+=		ac_cv_prog_sane_devel="${LOCALBASE}/bin/sane-config"
+.else
 CONFIGURE_ENV+=		ac_cv_prog_sane_devel=no
+.endif
 
-.include "../../mk/bsd.prefs.mk"
+PLIST_SRC+=             ${PKGDIR}/PLIST
 
 .if defined(USE_CUPS) && (${USE_CUPS} == YES)
-.include "../../print/cups/buildlink.mk"
+.include "../../print/cups/buildlink2.mk"
 BUILD_DEFS+=		USE_CUPS
 .endif
 
@@ -50,8 +64,7 @@
 	${INSTALL_DATA} generic.ppd ${EGDIR}/generic.ppd;		\
 	${INSTALL_DATA} system.ini ${EGDIR}/system.ini
 
-.include "../../graphics/Mesa/buildlink.mk"
-.include "../../graphics/freetype2/buildlink.mk"
-.include "../../graphics/jpeg/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../graphics/Mesa/buildlink2.mk"
+.include "../../graphics/freetype2/buildlink2.mk"
+.include "../../graphics/jpeg/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff -uN ../wine.orig/PLIST ./PLIST
--- ../wine.orig/PLIST	Sat Sep  7 08:48:21 2002
+++ ./PLIST	Sat Sep  7 09:35:35 2002
@@ -366,7 +366,6 @@
 lib/wine/winaspi.dll.so
 lib/wine/windebug.dll.so
 lib/wine/winealsa.drv.so
-lib/wine/winearts.drv.so
 lib/wine/wineaudioio.drv.so
 lib/wine/wineconsole.exe.so
 lib/wine/winedbg.exe.so
diff -uN ../wine.orig/PLIST.arts ./PLIST.arts
--- ../wine.orig/PLIST.arts	Thu Jan  1 01:00:00 1970
+++ ./PLIST.arts	Sat Sep  7 09:35:47 2002
@@ -0,0 +1,2 @@
+@comment $NetBSD$
+lib/wine/winearts.drv.so
Common subdirectories: ../wine.orig/patches and ./patches
>Release-Note:
>Audit-Trail:
>Unformatted: