Fix building on Darwin; fix PLIST (added common_end)

9 files changed, 88 insertions, 37 deletions

diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 6d19a88eaaf..1fbde7c4032 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.150 2008/12/16 13:27:30 jmcneill Exp $
+# $NetBSD: Makefile,v 1.151 2009/04/20 18:55:42 adam Exp $
 
 DISTNAME=	wine-1.0.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	http://ibiblio.org/pub/linux/system/emulators/wine/ \
 		${MASTER_SITE_SOURCEFORGE:=wine/}
@@ -35,14 +35,14 @@ REPLACE_PERL+=		tools/winemaker tools/winedump/function_grep.pl
 #
 CONFIGURE_ENV+=		X_LIBS=${LDFLAGS:M*:Q}
 CONFIGURE_ENV+=		CFLAGS=${CFLAGS:M*:Q}\ -DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
-CONFIGURE_ENV+=		LDD=${LDD}
+CONFIGURE_ENV+=		LDD=${LDD:Q}
 LIBS+=			${LDFLAGS}
 
 # If we're doing a 32-bit build, make sure that the appropriate
 # multilib options are passed through as these values are used
 # with winegcc (which wrapper doesn't handle).
 .include "../../mk/bsd.prefs.mk"
-.if !empty(MACHINE_ARCH:Mi386)
+.if !empty(MACHINE_ARCH:Mi386) && ${OPSYS} != "Darwin"
 CONFIGURE_ENV+=		ac_cv_prog_CC=${CC}\ -m32
 CONFIGURE_ENV+=		ac_cv_prog_CXX=${CXX}\ -m32
 CONFIGURE_ENV+=		ac_cv_prog_AS=${AS}\ --32
@@ -57,7 +57,12 @@ post-install:
 		${DESTDIR}${PREFIX}/bin
 .endfor
 
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../devel/ncurses/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/lcms/buildlink3.mk"
+.include "../../graphics/libungif/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
diff --git a/emulators/wine/PLIST.Darwin b/emulators/wine/PLIST.Darwin
new file mode 100644
index 00000000000..ee0a3ebf4be
--- /dev/null
+++ b/emulators/wine/PLIST.Darwin
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.Darwin,v 1.1 2009/04/20 18:55:42 adam Exp $
+lib/wine/winequartz.drv.so
diff --git a/emulators/wine/PLIST.common b/emulators/wine/PLIST.common
index c1d068addf5..0cd97cb434c 100644
--- a/emulators/wine/PLIST.common
+++ b/emulators/wine/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.2 2008/06/28 12:34:48 sborrill Exp $
+@comment $NetBSD: PLIST.common,v 1.3 2009/04/20 18:55:42 adam Exp $
 bin/fnt2bdf
 bin/function_grep.pl
 bin/msiexec
@@ -1086,16 +1086,3 @@ ${PLIST.x11}share/wine/fonts/vgasysr.fon
 ${PLIST.x11}share/wine/fonts/vgasyst.fon
 share/wine/generic.ppd
 share/wine/wine.inf
-${PLIST.x11}@dirrm share/wine/fonts
-@dirrm share/wine
-@comment in xdg-dirs: @dirrm share/applications
-@dirrm man/fr.UTF-8/man1
-@dirrm man/fr.UTF-8
-@dirrm man/de.UTF-8/man1
-@dirrm man/de.UTF-8
-@dirrm lib/wine
-@dirrm include/wine/windows/ddk
-@dirrm include/wine/windows
-@dirrm include/wine/msvcrt/sys
-@dirrm include/wine/msvcrt
-@dirrm include/wine
diff --git a/emulators/wine/PLIST.common_end b/emulators/wine/PLIST.common_end
new file mode 100644
index 00000000000..2b9902570d0
--- /dev/null
+++ b/emulators/wine/PLIST.common_end
@@ -0,0 +1,14 @@
+@comment $NetBSD: PLIST.common_end,v 1.1 2009/04/20 18:55:42 adam Exp $
+${PLIST.x11}@dirrm share/wine/fonts
+@dirrm share/wine
+@comment in xdg-dirs: @dirrm share/applications
+@dirrm man/fr.UTF-8/man1
+@dirrm man/fr.UTF-8
+@dirrm man/de.UTF-8/man1
+@dirrm man/de.UTF-8
+@dirrm lib/wine
+@dirrm include/wine/windows/ddk
+@dirrm include/wine/windows
+@dirrm include/wine/msvcrt/sys
+@dirrm include/wine/msvcrt
+@dirrm include/wine
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index fdd0e1a640d..c39ce751809 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.84 2008/10/18 11:55:27 adam Exp $
+$NetBSD: distinfo,v 1.85 2009/04/20 18:55:42 adam Exp $
 
 SHA1 (wine-1.0.1.tar.bz2) = 0550b03bf7b314514a87b6abb2198da96ef83b22
 RMD160 (wine-1.0.1.tar.bz2) = fecd2bf970c51c80fc02ca39631034f066da145e
@@ -15,4 +15,7 @@ SHA1 (patch-aj) = fa9d3baad8d3b895edc6275c2b6da23daa941a09
 SHA1 (patch-ba) = 342564062296d316a20f1c0b3ad7aaa17e7e79be
 SHA1 (patch-bb) = 77cad41a7e8e34f12243e53f6c1cec998bedefda
 SHA1 (patch-bc) = 1542a59718229a41e23aff93e4571bf7127a276b
+SHA1 (patch-bd) = 46a7b8cc8e0793facf78876d26f24cd40ee1d097
+SHA1 (patch-be) = ce9d21a9716c79525239499c89fcf0bb3ef807a3
+SHA1 (patch-bf) = d31bcc193ffe6abc57700bcb43fea6ff5886c038
 SHA1 (patch-ca) = 1383c03cc83cefe6099b58340db2bc468c7524bb
diff --git a/emulators/wine/options.mk b/emulators/wine/options.mk
index 9841452b1dc..803d4f213eb 100644
--- a/emulators/wine/options.mk
+++ b/emulators/wine/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.11 2008/12/07 15:31:57 jmcneill Exp $
+# $NetBSD: options.mk,v 1.12 2009/04/20 18:55:42 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.wine
-PKG_SUPPORTED_OPTIONS=	cups opengl sane esound ldap dbus hal ssl x11
-PKG_SUGGESTED_OPTIONS=	opengl esound ldap dbus hal ssl x11
+PKG_SUPPORTED_OPTIONS=	cups opengl sane esound ldap hal ssl x11
+PKG_SUGGESTED_OPTIONS=	opengl esound ldap hal ssl x11
 
 .include "../../mk/bsd.options.mk"
 
@@ -15,41 +15,31 @@ PLIST_VARS+=		opengl x11
 .if !empty(PKG_OPTIONS:Mldap)
 .include "../../databases/openldap-client/buildlink3.mk"
 .else
-CONFIGURE_ARGS+= --without-ldap
-.endif
-
-.if !empty(PKG_OPTIONS:Mdbus)
-.include "../../sysutils/dbus/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --without-dbus
+CONFIGURE_ARGS+=	--without-ldap
 .endif
 
 .if !empty(PKG_OPTIONS:Mhal)
 .include "../../sysutils/hal/buildlink3.mk"
 .else
-CONFIGURE_ARGS+= --without-hal
+CONFIGURE_ARGS+=	--without-hal
 .endif
 
 .if !empty(PKG_OPTIONS:Mssl)
 .include "../../security/openssl/buildlink3.mk"
 .else
-CONFIGURE_ARGS+= --without-openssl
+CONFIGURE_ARGS+=	--without-openssl
 .endif
 
 .if !empty(PKG_OPTIONS:Mcups)
 .include "../../print/cups/buildlink3.mk"
 .else
-CONFIGURE_ARGS+= --without-cups
+CONFIGURE_ARGS+=	--without-cups
 .endif
 
 .if !empty(PKG_OPTIONS:Mx11)
 PLIST.x11=		yes
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/lcms/buildlink3.mk"
-.include "../../graphics/libungif/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
 .include "../../x11/libICE/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
@@ -61,13 +51,16 @@ PLIST.x11=		yes
 .include "../../x11/libXrender/buildlink3.mk"
 .include "../../x11/libXxf86vm/buildlink3.mk"
 .else
-CONFIGURE_ARGS+= --without-x --without-freetype
+CONFIGURE_ARGS+=	--without-freetype
+CONFIGURE_ARGS+=	--without-x
 .endif
 
 .if !empty(PKG_OPTIONS:Mopengl) && !empty(PKG_OPTIONS:Mx11)
 PLIST.opengl=		yes
+.  if ${OPSYS} != "Darwin"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/glut/buildlink3.mk"
+.  endif
 .else
 CONFIGURE_ARGS+=	--without-opengl
 .endif
diff --git a/emulators/wine/patches/patch-bd b/emulators/wine/patches/patch-bd
new file mode 100644
index 00000000000..deca3620a74
--- /dev/null
+++ b/emulators/wine/patches/patch-bd
@@ -0,0 +1,13 @@
+$NetBSD: patch-bd,v 1.1 2009/04/20 18:55:42 adam Exp $
+
+--- dlls/Makedll.rules.in.orig	2008-10-17 17:45:25.000000000 +0200
++++ dlls/Makedll.rules.in
+@@ -96,7 +96,7 @@ install_static_implib_a:
+ $(IMPLIB_SRCS:%=_install_static_implib_/%): install_static_implib_$(IMPLIBEXT)
+ 
+ install install-lib:: $(MODULE)$(DLLEXT) $(DESTDIR)$(dlldir) dummy
+-	$(INSTALL_PROGRAM) $(MODULE)$(DLLEXT) $(DESTDIR)$(dlldir)/$(MODULE)$(DLLEXT)
++	${BSD_INSTALL_LIB} $(MODULE)$(DLLEXT) $(DESTDIR)$(dlldir)/$(MODULE)$(DLLEXT)
+ 
+ install install-dev:: $(IMPORTLIB:%=_install_/%) $(IMPLIB_SRCS:%=_install_static_implib_/%)
+ 
diff --git a/emulators/wine/patches/patch-be b/emulators/wine/patches/patch-be
new file mode 100644
index 00000000000..05468d3ba35
--- /dev/null
+++ b/emulators/wine/patches/patch-be
@@ -0,0 +1,13 @@
+$NetBSD: patch-be,v 1.1 2009/04/20 18:55:42 adam Exp $
+
+--- programs/Makeprog.rules.in.orig	2008-10-17 17:45:25.000000000 +0200
++++ programs/Makeprog.rules.in
+@@ -44,7 +44,7 @@ $(TESTRESULTS): $(MODULE)$(DLLEXT)
+ .PHONY: install_prog install_prog.so uninstall_prog uninstall_prog.so
+ 
+ install_prog.so: $(MODULE).so $(DESTDIR)$(dlldir) dummy
+-	$(INSTALL_PROGRAM) $(MODULE).so $(DESTDIR)$(dlldir)/$(MODULE).so
++	${BSD_INSTALL_LIB} $(MODULE).so $(DESTDIR)$(dlldir)/$(MODULE).so
+ 
+ install_prog: $(MODULE) $(DESTDIR)$(bindir) dummy
+ 	$(INSTALL_PROGRAM) $(MODULE) $(DESTDIR)$(bindir)/$(MODULE)
diff --git a/emulators/wine/patches/patch-bf b/emulators/wine/patches/patch-bf
new file mode 100644
index 00000000000..6afe13d2c05
--- /dev/null
+++ b/emulators/wine/patches/patch-bf
@@ -0,0 +1,21 @@
+$NetBSD: patch-bf,v 1.1 2009/04/20 18:55:42 adam Exp $
+
+--- libs/wine/Makefile.in.orig	2008-10-17 17:45:25.000000000 +0200
++++ libs/wine/Makefile.in
+@@ -150,14 +150,14 @@ libwine.dylib: libwine.$(SOVERSION).dyli
+ .PHONY: install-lib-so install-lib-dll install-lib-dylib install-dev-so install-dev-dll install-dev-dylib
+ 
+ install-lib-so: libwine.so.$(VERSION) $(DESTDIR)$(libdir) dummy
+-	$(INSTALL_PROGRAM) libwine.so.$(VERSION) $(DESTDIR)$(libdir)/libwine.so.$(VERSION)
++	${BSD_INSTALL_LIB} libwine.so.$(VERSION) $(DESTDIR)$(libdir)/libwine.so.$(VERSION)
+ 	cd $(DESTDIR)$(libdir) && $(RM) libwine.so.$(SOVERSION) && $(LN_S) libwine.so.$(VERSION) libwine.so.$(SOVERSION)
+ 
+ install-lib-dll: libwine.dll $(DESTDIR)$(libdir) dummy
+ 	$(INSTALL_DATA) libwine.dll $(DESTDIR)$(libdir)/libwine.dll
+ 
+ install-lib-dylib: libwine.$(VERSION).dylib $(DESTDIR)$(libdir) dummy
+-	$(INSTALL_PROGRAM) libwine.$(VERSION).dylib $(DESTDIR)$(libdir)/libwine.$(VERSION).dylib
++	${BSD_INSTALL_LIB} libwine.$(VERSION).dylib $(DESTDIR)$(libdir)/libwine.$(VERSION).dylib
+ 	cd $(DESTDIR)$(libdir) && $(RM) libwine.$(SOVERSION).dylib && $(LN_S) libwine.$(VERSION).dylib libwine.$(SOVERSION).dylib
+ 
+ install-dev-so: $(DESTDIR)$(libdir) dummy