From 11610ddcbd61365af06e37df103e658a25b6d6e1 Mon Sep 17 00:00:00 2001 From: Gerald Pfeifer Date: Mon, 3 Oct 2005 18:51:15 +0000 Subject: [PATCH] Update to the 20050930 version of Wine. We can now build wldap32 again. --- emulators/wine-devel/Makefile | 5 ++-- emulators/wine-devel/distinfo | 4 +-- .../wine-devel/files/patch-dlls-Makefile.in | 26 ------------------- emulators/wine-devel/pkg-plist | 9 ++++++- emulators/wine/Makefile | 5 ++-- emulators/wine/distinfo | 4 +-- emulators/wine/files/patch-dlls-Makefile.in | 26 ------------------- emulators/wine/pkg-plist | 9 ++++++- 8 files changed, 26 insertions(+), 62 deletions(-) delete mode 100644 emulators/wine-devel/files/patch-dlls-Makefile.in delete mode 100644 emulators/wine/files/patch-dlls-Makefile.in diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index 2c93c400243d..6692cf4d0e97 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -7,7 +7,7 @@ # PORTNAME= wine -PORTVERSION= 20050830 +PORTVERSION= 20050930 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= ALPHA/wine/development @@ -23,7 +23,8 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS=-I${PREFIX}/include LDFLAGS=-L${PREFIX}/lib LIBS=-Wl,-rpath,${PREFIX}/lib/wine INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/lib/wine -MAN1= widl.1 wine.1 winebuild.1 winegcc.1 winedbg.1 winedump.1 winemaker.1 wmc.1 wrc.1 +MAN1= widl.1 wine.1 winebuild.1 winedbg.1 winedump.1 winegcc.1 \ + winemaker.1 wineserver.1 wmc.1 wrc.1 ONLY_FOR_ARCHS= i386 USE_BISON= yes USE_GMAKE= yes diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo index fa91b3b03f96..f54f613b0c46 100644 --- a/emulators/wine-devel/distinfo +++ b/emulators/wine-devel/distinfo @@ -1,2 +1,2 @@ -MD5 (Wine-20050830.tar.gz) = 5d95439a74decd1f94dd8d370a24f442 -SIZE (Wine-20050830.tar.gz) = 12433457 +MD5 (Wine-20050930.tar.gz) = b8cb96e2cb2c89daeba415c734ae4218 +SIZE (Wine-20050930.tar.gz) = 12838537 diff --git a/emulators/wine-devel/files/patch-dlls-Makefile.in b/emulators/wine-devel/files/patch-dlls-Makefile.in deleted file mode 100644 index 225689d6668e..000000000000 --- a/emulators/wine-devel/files/patch-dlls-Makefile.in +++ /dev/null @@ -1,26 +0,0 @@ ---- dlls/Makefile.in.orig Fri Aug 26 14:05:12 2005 -+++ dlls/Makefile.in Tue Aug 30 23:16:02 2005 -@@ -172,7 +172,6 @@ BASEDIRS = \ - winspool \ - wintab32 \ - wintrust \ -- wldap32 \ - wow32 \ - wsock32 \ - wtsapi32 -@@ -420,7 +419,6 @@ SYMLINKS_SO = \ - winspool.drv.so \ - wintab32.dll.so \ - wintrust.dll.so \ -- wldap32.dll.so \ - wnaspi32.dll.so \ - wow32.dll.so \ - ws2_32.dll.so \ -@@ -1189,7 +1187,6 @@ IMPORT_LIBS = \ - winspool/libwinspool.$(IMPLIBEXT) \ - wintab32/libwintab32.$(IMPLIBEXT) \ - wintrust/libwintrust.$(IMPLIBEXT) \ -- wldap32/libwldap32.$(IMPLIBEXT) \ - winaspi/libwnaspi32.$(IMPLIBEXT) \ - wow32/libwow32.$(IMPLIBEXT) \ - winsock/libws2_32.$(IMPLIBEXT) \ diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist index f589ce1be0dd..b89bb3930ed2 100644 --- a/emulators/wine-devel/pkg-plist +++ b/emulators/wine-devel/pkg-plist @@ -91,7 +91,6 @@ include/wine/windows/axextend.idl include/wine/windows/basetsd.h include/wine/windows/basetyps.h include/wine/windows/cderr.h -include/wine/windows/cfgmgr32.h include/wine/windows/cguid.h include/wine/windows/comcat.h include/wine/windows/comcat.idl @@ -176,6 +175,8 @@ include/wine/windows/guiddef.h include/wine/windows/hlink.h include/wine/windows/hlink.idl include/wine/windows/htmlhelp.h +include/wine/windows/iads.h +include/wine/windows/iads.idl include/wine/windows/icm.h include/wine/windows/icmpapi.h include/wine/windows/idispids.h @@ -258,6 +259,8 @@ include/wine/windows/oaidl.idl include/wine/windows/objbase.h include/wine/windows/objidl.h include/wine/windows/objidl.idl +include/wine/windows/objsafe.h +include/wine/windows/objsafe.idl include/wine/windows/objsel.h include/wine/windows/ocidl.h include/wine/windows/ocidl.idl @@ -385,6 +388,8 @@ include/wine/windows/xmldso.h include/wine/windows/xmldso.idl include/wine/windows/xmldsodid.h include/wine/windows/zmouse.h +include/wine/windows/ddk/cfgmgr32.h +include/wine/windows/ddk/wdm.h include/wine/windows/ddk/winsplp.h lib/libwine.so lib/libwine.so.1 @@ -574,6 +579,7 @@ lib/wine/libuxtheme.def lib/wine/libvdmdbg.def lib/wine/libversion.def lib/wine/libw32skrnl.def +lib/wine/libwldap32.def lib/wine/libwinecrt0.a lib/wine/libwined3d.def lib/wine/libwinedos.def @@ -750,6 +756,7 @@ lib/wine/wintab.dll.so lib/wine/wintab32.dll.so lib/wine/wintrust.dll.so lib/wine/winver.exe.so +lib/wine/wldap32.dll.so lib/wine/wnaspi32.dll.so lib/wine/wow32.dll.so lib/wine/wprocs.dll.so diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index 2c93c400243d..6692cf4d0e97 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -7,7 +7,7 @@ # PORTNAME= wine -PORTVERSION= 20050830 +PORTVERSION= 20050930 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= ALPHA/wine/development @@ -23,7 +23,8 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS=-I${PREFIX}/include LDFLAGS=-L${PREFIX}/lib LIBS=-Wl,-rpath,${PREFIX}/lib/wine INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/lib/wine -MAN1= widl.1 wine.1 winebuild.1 winegcc.1 winedbg.1 winedump.1 winemaker.1 wmc.1 wrc.1 +MAN1= widl.1 wine.1 winebuild.1 winedbg.1 winedump.1 winegcc.1 \ + winemaker.1 wineserver.1 wmc.1 wrc.1 ONLY_FOR_ARCHS= i386 USE_BISON= yes USE_GMAKE= yes diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo index fa91b3b03f96..f54f613b0c46 100644 --- a/emulators/wine/distinfo +++ b/emulators/wine/distinfo @@ -1,2 +1,2 @@ -MD5 (Wine-20050830.tar.gz) = 5d95439a74decd1f94dd8d370a24f442 -SIZE (Wine-20050830.tar.gz) = 12433457 +MD5 (Wine-20050930.tar.gz) = b8cb96e2cb2c89daeba415c734ae4218 +SIZE (Wine-20050930.tar.gz) = 12838537 diff --git a/emulators/wine/files/patch-dlls-Makefile.in b/emulators/wine/files/patch-dlls-Makefile.in deleted file mode 100644 index 225689d6668e..000000000000 --- a/emulators/wine/files/patch-dlls-Makefile.in +++ /dev/null @@ -1,26 +0,0 @@ ---- dlls/Makefile.in.orig Fri Aug 26 14:05:12 2005 -+++ dlls/Makefile.in Tue Aug 30 23:16:02 2005 -@@ -172,7 +172,6 @@ BASEDIRS = \ - winspool \ - wintab32 \ - wintrust \ -- wldap32 \ - wow32 \ - wsock32 \ - wtsapi32 -@@ -420,7 +419,6 @@ SYMLINKS_SO = \ - winspool.drv.so \ - wintab32.dll.so \ - wintrust.dll.so \ -- wldap32.dll.so \ - wnaspi32.dll.so \ - wow32.dll.so \ - ws2_32.dll.so \ -@@ -1189,7 +1187,6 @@ IMPORT_LIBS = \ - winspool/libwinspool.$(IMPLIBEXT) \ - wintab32/libwintab32.$(IMPLIBEXT) \ - wintrust/libwintrust.$(IMPLIBEXT) \ -- wldap32/libwldap32.$(IMPLIBEXT) \ - winaspi/libwnaspi32.$(IMPLIBEXT) \ - wow32/libwow32.$(IMPLIBEXT) \ - winsock/libws2_32.$(IMPLIBEXT) \ diff --git a/emulators/wine/pkg-plist b/emulators/wine/pkg-plist index f589ce1be0dd..b89bb3930ed2 100644 --- a/emulators/wine/pkg-plist +++ b/emulators/wine/pkg-plist @@ -91,7 +91,6 @@ include/wine/windows/axextend.idl include/wine/windows/basetsd.h include/wine/windows/basetyps.h include/wine/windows/cderr.h -include/wine/windows/cfgmgr32.h include/wine/windows/cguid.h include/wine/windows/comcat.h include/wine/windows/comcat.idl @@ -176,6 +175,8 @@ include/wine/windows/guiddef.h include/wine/windows/hlink.h include/wine/windows/hlink.idl include/wine/windows/htmlhelp.h +include/wine/windows/iads.h +include/wine/windows/iads.idl include/wine/windows/icm.h include/wine/windows/icmpapi.h include/wine/windows/idispids.h @@ -258,6 +259,8 @@ include/wine/windows/oaidl.idl include/wine/windows/objbase.h include/wine/windows/objidl.h include/wine/windows/objidl.idl +include/wine/windows/objsafe.h +include/wine/windows/objsafe.idl include/wine/windows/objsel.h include/wine/windows/ocidl.h include/wine/windows/ocidl.idl @@ -385,6 +388,8 @@ include/wine/windows/xmldso.h include/wine/windows/xmldso.idl include/wine/windows/xmldsodid.h include/wine/windows/zmouse.h +include/wine/windows/ddk/cfgmgr32.h +include/wine/windows/ddk/wdm.h include/wine/windows/ddk/winsplp.h lib/libwine.so lib/libwine.so.1 @@ -574,6 +579,7 @@ lib/wine/libuxtheme.def lib/wine/libvdmdbg.def lib/wine/libversion.def lib/wine/libw32skrnl.def +lib/wine/libwldap32.def lib/wine/libwinecrt0.a lib/wine/libwined3d.def lib/wine/libwinedos.def @@ -750,6 +756,7 @@ lib/wine/wintab.dll.so lib/wine/wintab32.dll.so lib/wine/wintrust.dll.so lib/wine/winver.exe.so +lib/wine/wldap32.dll.so lib/wine/wnaspi32.dll.so lib/wine/wow32.dll.so lib/wine/wprocs.dll.so