[Midnightbsd-cvs] mports: emulators/wine: update to 1.1.1, add license

crash at midnightbsd.org crash at midnightbsd.org
Sat Jul 19 11:00:05 EDT 2008


Log Message:
-----------
update to 1.1.1,add license

Modified Files:
--------------
    mports/emulators/wine:
        Makefile (r1.4 -> r1.5)
        distinfo (r1.3 -> r1.4)
        pkg-plist (r1.3 -> r1.4)

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/emulators/wine/pkg-plist,v
retrieving revision 1.3
retrieving revision 1.4
diff -L emulators/wine/pkg-plist -L emulators/wine/pkg-plist -u -r1.3 -r1.4
--- emulators/wine/pkg-plist
+++ emulators/wine/pkg-plist
@@ -19,21 +19,25 @@
 bin/winefile
 bin/wineg++
 bin/winegcc
-bin/winelauncher
 bin/winemaker
 bin/winemine
 bin/winepath
 bin/wineprefixcreate
 bin/wineserver
 bin/wineshelllink
-bin/winhelp
 bin/wmc
 bin/wrc
+include/wine/dcetypes.h
+include/wine/dcetypes.idl
 include/wine/debug.h
+include/wine/epm.h
+include/wine/epm.idl
 include/wine/exception.h
 include/wine/itss.h
 include/wine/itss.idl
 include/wine/library.h
+include/wine/svcctl.h
+include/wine/svcctl.idl
 include/wine/unicode.h
 include/wine/msvcrt/conio.h
 include/wine/msvcrt/crtdbg.h
@@ -73,6 +77,10 @@
 include/wine/msvcrt/wctype.h
 include/wine/windows/accctrl.h
 include/wine/windows/aclapi.h
+include/wine/windows/activaut.h
+include/wine/windows/activaut.idl
+include/wine/windows/activdbg.h
+include/wine/windows/activdbg.idl
 include/wine/windows/activscp.h
 include/wine/windows/activscp.idl
 include/wine/windows/adshlp.h
@@ -91,6 +99,11 @@
 include/wine/windows/basetsd.h
 include/wine/windows/basetyps.h
 include/wine/windows/bcrypt.h
+include/wine/windows/bits.h
+include/wine/windows/bits.idl
+include/wine/windows/bits1_5.h
+include/wine/windows/bits1_5.idl
+include/wine/windows/bitsmsg.h
 include/wine/windows/cderr.h
 include/wine/windows/cfgmgr32.h
 include/wine/windows/cguid.h
@@ -104,7 +117,10 @@
 include/wine/windows/control.h
 include/wine/windows/control.idl
 include/wine/windows/cor.h
+include/wine/windows/corerror.h
 include/wine/windows/cpl.h
+include/wine/windows/cryptdlg.h
+include/wine/windows/cryptuiapi.h
 include/wine/windows/custcntl.h
 include/wine/windows/cvconst.h
 include/wine/windows/d3d.h
@@ -126,6 +142,12 @@
 include/wine/windows/d3dx8core.h
 include/wine/windows/d3dx8math.h
 include/wine/windows/d3dx8math.inl
+include/wine/windows/d3dx8mesh.h
+include/wine/windows/d3dx9.h
+include/wine/windows/d3dx9core.h
+include/wine/windows/d3dx9math.h
+include/wine/windows/d3dx9math.inl
+include/wine/windows/d3dx9tex.h
 include/wine/windows/dbghelp.h
 include/wine/windows/dbinit.idl
 include/wine/windows/dbprop.idl
@@ -178,6 +200,7 @@
 include/wine/windows/dshow.h
 include/wine/windows/dsound.h
 include/wine/windows/dsrole.h
+include/wine/windows/dvdmedia.h
 include/wine/windows/dwmapi.h
 include/wine/windows/dxdiag.h
 include/wine/windows/dxerr8.h
@@ -198,7 +221,10 @@
 include/wine/windows/exdispid.h
 include/wine/windows/fci.h
 include/wine/windows/fdi.h
+include/wine/windows/fusion.h
+include/wine/windows/fusion.idl
 include/wine/windows/gdiplus.h
+include/wine/windows/gdipluscolor.h
 include/wine/windows/gdipluscolormatrix.h
 include/wine/windows/gdiplusenums.h
 include/wine/windows/gdiplusflat.h
@@ -226,6 +252,10 @@
 include/wine/windows/idispids.h
 include/wine/windows/imagehlp.h
 include/wine/windows/imm.h
+include/wine/windows/imnact.h
+include/wine/windows/imnact.idl
+include/wine/windows/imnxport.h
+include/wine/windows/imnxport.idl
 include/wine/windows/indexsrv.h
 include/wine/windows/indexsrv.idl
 include/wine/windows/initguid.h
@@ -235,6 +265,7 @@
 include/wine/windows/ipifcons.h
 include/wine/windows/iprtrmib.h
 include/wine/windows/iptypes.h
+include/wine/windows/isguids.h
 include/wine/windows/ks.h
 include/wine/windows/ksguid.h
 include/wine/windows/ksmedia.h
@@ -267,8 +298,11 @@
 include/wine/windows/mediaerr.h
 include/wine/windows/mediaobj.h
 include/wine/windows/mediaobj.idl
+include/wine/windows/midles.h
 include/wine/windows/mimeinfo.h
 include/wine/windows/mimeinfo.idl
+include/wine/windows/mimeole.h
+include/wine/windows/mimeole.idl
 include/wine/windows/minmax.h
 include/wine/windows/mlang.h
 include/wine/windows/mlang.idl
@@ -296,6 +330,8 @@
 include/wine/windows/msinkaut.idl
 include/wine/windows/msiquery.h
 include/wine/windows/mssip.h
+include/wine/windows/mstask.h
+include/wine/windows/mstask.idl
 include/wine/windows/mswsock.h
 include/wine/windows/msxml.h
 include/wine/windows/msxml.idl
@@ -332,6 +368,8 @@
 include/wine/windows/odbcinst.h
 include/wine/windows/ole2.h
 include/wine/windows/ole2ver.h
+include/wine/windows/oleacc.h
+include/wine/windows/oleacc.idl
 include/wine/windows/oleauto.h
 include/wine/windows/olectl.h
 include/wine/windows/oledb.h
@@ -349,6 +387,7 @@
 include/wine/windows/profinfo.h
 include/wine/windows/propidl.h
 include/wine/windows/propidl.idl
+include/wine/windows/propvarutil.h
 include/wine/windows/prsht.h
 include/wine/windows/psapi.h
 include/wine/windows/pshpack1.h
@@ -357,6 +396,10 @@
 include/wine/windows/pshpack8.h
 include/wine/windows/pstore.h
 include/wine/windows/pstore.idl
+include/wine/windows/qedit.h
+include/wine/windows/qedit.idl
+include/wine/windows/slerror.h
+include/wine/windows/slpublic.h
 include/wine/windows/ras.h
 include/wine/windows/reason.h
 include/wine/windows/regstr.h
@@ -365,6 +408,7 @@
 include/wine/windows/richole.idl
 include/wine/windows/rmxfguid.h
 include/wine/windows/rpc.h
+include/wine/windows/rpcasync.h
 include/wine/windows/rpcdce.h
 include/wine/windows/rpcdcep.h
 include/wine/windows/rpcndr.h
@@ -427,8 +471,12 @@
 include/wine/windows/uxtheme.h
 include/wine/windows/vdmdbg.h
 include/wine/windows/ver.h
+include/wine/windows/vmr9.h
+include/wine/windows/vmr9.idl
+include/wine/windows/vmrender.idl
 include/wine/windows/vfw.h
 include/wine/windows/vfwmsgs.h
+include/wine/windows/wfext.h
 include/wine/windows/winbase.h
 include/wine/windows/wincon.h
 include/wine/windows/wincred.h
@@ -485,15 +533,19 @@
 include/wine/windows/ddk/compstui.h
 include/wine/windows/ddk/hidsdi.h
 include/wine/windows/ddk/imm.h
+include/wine/windows/ddk/mountmgr.h
 include/wine/windows/ddk/ntddcdvd.h
+include/wine/windows/ddk/ntddk.h
 include/wine/windows/ddk/ntddser.h
 include/wine/windows/ddk/ntddtape.h
 include/wine/windows/ddk/wdm.h
+include/wine/windows/ddk/winddiui.h
 include/wine/windows/ddk/winsplp.h
 lib/libwine.so
 lib/libwine.so.1
 lib/wine/acledit.dll.so
 lib/wine/activeds.dll.so
+lib/wine/actxprxy.dll.so
 lib/wine/advapi32.dll.so
 lib/wine/advpack.dll.so
 lib/wine/amstream.dll.so
@@ -502,7 +554,6 @@
 lib/wine/avifil32.dll.so
 lib/wine/avifile.dll16
 lib/wine/browseui.dll.so
-lib/wine/bug_report.pl
 lib/wine/cabinet.dll.so
 lib/wine/capi2032.dll.so
 lib/wine/cards.dll.so
@@ -521,8 +572,11 @@
 lib/wine/credui.dll.so
 lib/wine/crtdll.dll.so
 lib/wine/crypt32.dll.so
+lib/wine/cryptdlg.dll.so
 lib/wine/cryptdll.dll.so
 lib/wine/cryptnet.dll.so
+lib/wine/cryptui.dll.so
+lib/wine/ctapi32.dll.so
 lib/wine/ctl3d.dll16
 lib/wine/ctl3d32.dll.so
 lib/wine/ctl3dv2.dll16
@@ -532,6 +586,20 @@
 lib/wine/d3dim.dll.so
 lib/wine/d3drm.dll.so
 lib/wine/d3dx8.dll.so
+lib/wine/d3dx9_24.dll.so
+lib/wine/d3dx9_25.dll.so
+lib/wine/d3dx9_26.dll.so
+lib/wine/d3dx9_27.dll.so
+lib/wine/d3dx9_28.dll.so
+lib/wine/d3dx9_29.dll.so
+lib/wine/d3dx9_30.dll.so
+lib/wine/d3dx9_31.dll.so
+lib/wine/d3dx9_32.dll.so
+lib/wine/d3dx9_33.dll.so
+lib/wine/d3dx9_34.dll.so
+lib/wine/d3dx9_35.dll.so
+lib/wine/d3dx9_36.dll.so
+lib/wine/d3dx9_37.dll.so
 lib/wine/d3dxof.dll.so
 lib/wine/dbghelp.dll.so
 lib/wine/dciman32.dll.so
@@ -560,6 +628,7 @@
 lib/wine/dpnhpast.dll.so
 lib/wine/dpnlobby.dll.so
 lib/wine/dsound.dll.so
+lib/wine/dssenh.dll.so
 lib/wine/dswave.dll.so
 lib/wine/dwmapi.dll.so
 lib/wine/dxdiagn.dll.so
@@ -567,11 +636,13 @@
 lib/wine/expand.exe.so
 lib/wine/explorer.exe.so
 lib/wine/faultrep.dll.so
+lib/wine/fusion.dll.so
 lib/wine/gdi.exe16
 lib/wine/gdi32.dll.so
 lib/wine/gdiplus.dll.so
 lib/wine/glu32.dll.so
 lib/wine/gphoto2.ds.so
+lib/wine/gpkcsp.dll.so
 lib/wine/hal.dll.so
 lib/wine/hh.exe.so
 lib/wine/hhctrl.ocx.so
@@ -587,15 +658,21 @@
 lib/wine/imagehlp.dll.so
 lib/wine/imm.dll16
 lib/wine/imm32.dll.so
+lib/wine/inetcomm.dll.so
+lib/wine/inetmib1.dll.so
 lib/wine/infosoft.dll.so
+lib/wine/initpki.dll.so
 lib/wine/inkobj.dll.so
 lib/wine/inseng.dll.so
 lib/wine/iphlpapi.dll.so
+lib/wine/itircl.dll.so
 lib/wine/itss.dll.so
+lib/wine/jscript.dll.so
 lib/wine/kernel32.dll.so
 lib/wine/keyboard.drv16
 lib/wine/krnl386.exe16
 lib/wine/libactiveds.def
+lib/wine/libadsiid.a
 lib/wine/libadvapi32.def
 lib/wine/libadvpack.def
 lib/wine/libatl.def
@@ -620,6 +697,7 @@
 lib/wine/libd3dim.def
 lib/wine/libd3drm.def
 lib/wine/libd3dx8.def
+lib/wine/libd3dx9.def
 lib/wine/libd3dxof.def
 lib/wine/libdbghelp.def
 lib/wine/libdciman32.def
@@ -645,6 +723,7 @@
 lib/wine/libicmp.def
 lib/wine/libimagehlp.def
 lib/wine/libimm32.def
+lib/wine/libinetcomm.def
 lib/wine/libiphlpapi.def
 lib/wine/libkernel32.def
 lib/wine/liblz32.def
@@ -658,6 +737,7 @@
 lib/wine/libmshtml.def
 lib/wine/libmsi.def
 lib/wine/libmsimg32.def
+lib/wine/libmsvcr71.def
 lib/wine/libmsvcrt.def
 lib/wine/libmsvcrt20.def
 lib/wine/libmsvcrt40.def
@@ -699,6 +779,7 @@
 lib/wine/libshell32.def
 lib/wine/libshfolder.def
 lib/wine/libshlwapi.def
+lib/wine/libslc.def
 lib/wine/libsnmpapi.def
 lib/wine/libspoolss.def
 lib/wine/libsti.def
@@ -708,6 +789,7 @@
 lib/wine/liburl.def
 lib/wine/liburlmon.def
 lib/wine/libuser32.def
+lib/wine/libuserenv.def
 lib/wine/libusp10.def
 lib/wine/libuuid.a
 lib/wine/libuxtheme.def
@@ -716,6 +798,7 @@
 lib/wine/libwinecrt0.a
 lib/wine/libwined3d.def
 lib/wine/libwinedos.def
+lib/wine/libwinhttp.def
 lib/wine/libwininet.def
 lib/wine/libwinmm.def
 lib/wine/libwinnls32.def
@@ -743,6 +826,7 @@
 lib/wine/mmdevldr.vxd.so
 lib/wine/mmsystem.dll16
 lib/wine/monodebg.vxd.so
+lib/wine/mountmgr.sys.so
 lib/wine/mouse.drv16
 lib/wine/mpr.dll.so
 lib/wine/mprapi.dll.so
@@ -750,6 +834,7 @@
 lib/wine/msacm32.dll.so
 lib/wine/msacm32.drv.so
 lib/wine/msadp32.acm.so
+lib/wine/mscat32.dll.so
 lib/wine/mscms.dll.so
 lib/wine/mscoree.dll.so
 lib/wine/msdmo.dll.so
@@ -764,8 +849,10 @@
 lib/wine/msisys.ocx.so
 lib/wine/msnet32.dll.so
 lib/wine/msrle32.dll.so
+lib/wine/mssip32.dll.so
 lib/wine/msvcirt.dll.so
 lib/wine/msvcrt.dll.so
+lib/wine/msvcr71.dll.so
 lib/wine/msvcrt20.dll.so
 lib/wine/msvcrt40.dll.so
 lib/wine/msvcrtd.dll.so
@@ -808,14 +895,18 @@
 lib/wine/powrprof.dll.so
 lib/wine/printui.dll.so
 lib/wine/progman.exe.so
+lib/wine/propsys.dll.so
 lib/wine/psapi.dll.so
 lib/wine/pstorec.dll.so
 lib/wine/qcap.dll.so
+lib/wine/qedit.dll.so
 lib/wine/qmgr.dll.so
+lib/wine/qmgrprxy.dll.so
 lib/wine/quartz.dll.so
 lib/wine/query.dll.so
 lib/wine/rasapi16.dll16
 lib/wine/rasapi32.dll.so
+lib/wine/reg.exe.so
 lib/wine/regedit.exe.so
 lib/wine/regsvr32.exe.so
 lib/wine/resutils.dll.so
@@ -827,11 +918,14 @@
 lib/wine/rsaenh.dll.so
 lib/wine/rundll32.exe.so
 lib/wine/sane.ds.so
+lib/wine/sccbase.dll.so
 lib/wine/schannel.dll.so
+lib/wine/secedit.exe.so
 lib/wine/secur32.dll.so
 lib/wine/security.dll.so
 lib/wine/sensapi.dll.so
 lib/wine/serialui.dll.so
+lib/wine/services.exe.so
 lib/wine/setupapi.dll.so
 lib/wine/setupx.dll16
 lib/wine/sfc.dll.so
@@ -842,7 +936,10 @@
 lib/wine/shell32.dll.so
 lib/wine/shfolder.dll.so
 lib/wine/shlwapi.dll.so
+lib/wine/slbcsp.dll.so
+lib/wine/slc.dll.so
 lib/wine/snmpapi.dll.so
+lib/wine/softpub.dll.so
 lib/wine/sound.drv16
 lib/wine/spoolss.dll.so
 lib/wine/spoolsv.exe.so
@@ -852,6 +949,7 @@
 lib/wine/sti.dll.so
 lib/wine/storage.dll16
 lib/wine/stress.dll16
+lib/wine/svchost.exe.so
 lib/wine/svrapi.dll.so
 lib/wine/sxs.dll.so
 lib/wine/system.drv16
@@ -912,12 +1010,14 @@
 lib/wine/winex11.drv.so
 lib/wine/wing.dll16
 lib/wine/wing32.dll.so
-lib/wine/winhelp.exe.so
+lib/wine/winhelp.exe16
+lib/wine/winhlp32.exe.so
 lib/wine/winhttp.dll.so
 lib/wine/wininet.dll.so
 lib/wine/winmm.dll.so
 lib/wine/winnls.dll16
 lib/wine/winnls32.dll.so
+lib/wine/winoldap.mod16
 lib/wine/winscard.dll.so
 lib/wine/winsock.dll16
 lib/wine/winspool.drv.so
@@ -926,6 +1026,7 @@
 lib/wine/wintrust.dll.so
 lib/wine/winver.exe.so
 lib/wine/wldap32.dll.so
+lib/wine/wmi.dll.so
 lib/wine/wnaspi32.dll.so
 lib/wine/wordpad.exe.so
 lib/wine/wow32.dll.so
@@ -935,52 +1036,52 @@
 lib/wine/wsock32.dll.so
 lib/wine/wtsapi32.dll.so
 lib/wine/xcopy.exe.so
-share/aclocal/wine.m4
 share/applications/wine.desktop
-share/wine/wine.inf
-share/wine/generic.ppd
-share/wine/fonts/coue1255.fon
-share/wine/fonts/coue1256.fon
-share/wine/fonts/coue1257.fon
-share/wine/fonts/coure.fon
-share/wine/fonts/couree.fon
-share/wine/fonts/coureg.fon
-share/wine/fonts/courer.fon
-share/wine/fonts/couret.fon
-share/wine/fonts/cvgasys.fon
-share/wine/fonts/hvgasys.fon
-share/wine/fonts/jsmalle.fon
-share/wine/fonts/jvgasys.fon
-share/wine/fonts/marlett.ttf
-share/wine/fonts/smae1255.fon
-share/wine/fonts/smae1256.fon
-share/wine/fonts/smae1257.fon
-share/wine/fonts/smalle.fon
-share/wine/fonts/smallee.fon
-share/wine/fonts/smalleg.fon
-share/wine/fonts/smaller.fon
-share/wine/fonts/smallet.fon
-share/wine/fonts/ssee1255.fon
-share/wine/fonts/ssee1256.fon
-share/wine/fonts/ssee1257.fon
-share/wine/fonts/ssee874.fon
-share/wine/fonts/sserife.fon
-share/wine/fonts/sserifee.fon
-share/wine/fonts/sserifeg.fon
-share/wine/fonts/sserifer.fon
-share/wine/fonts/sserifet.fon
-share/wine/fonts/svgasys.fon
-share/wine/fonts/tahoma.ttf
-share/wine/fonts/tahomabd.ttf
-share/wine/fonts/vgas1255.fon
-share/wine/fonts/vgas1256.fon
-share/wine/fonts/vgas1257.fon
-share/wine/fonts/vgas874.fon
-share/wine/fonts/vgasys.fon
-share/wine/fonts/vgasyse.fon
-share/wine/fonts/vgasysg.fon
-share/wine/fonts/vgasysr.fon
-share/wine/fonts/vgasyst.fon
+%%DATADIR%%/aclocal/wine.m4
+%%DATADIR%%/wine/generic.ppd
+%%DATADIR%%/wine/wine.inf
+%%DATADIR%%/wine/fonts/coue1255.fon
+%%DATADIR%%/wine/fonts/coue1256.fon
+%%DATADIR%%/wine/fonts/coue1257.fon
+%%DATADIR%%/wine/fonts/coure.fon
+%%DATADIR%%/wine/fonts/couree.fon
+%%DATADIR%%/wine/fonts/coureg.fon
+%%DATADIR%%/wine/fonts/courer.fon
+%%DATADIR%%/wine/fonts/couret.fon
+%%DATADIR%%/wine/fonts/cvgasys.fon
+%%DATADIR%%/wine/fonts/hvgasys.fon
+%%DATADIR%%/wine/fonts/jsmalle.fon
+%%DATADIR%%/wine/fonts/jvgasys.fon
+%%DATADIR%%/wine/fonts/marlett.ttf
+%%DATADIR%%/wine/fonts/smae1255.fon
+%%DATADIR%%/wine/fonts/smae1256.fon
+%%DATADIR%%/wine/fonts/smae1257.fon
+%%DATADIR%%/wine/fonts/smalle.fon
+%%DATADIR%%/wine/fonts/smallee.fon
+%%DATADIR%%/wine/fonts/smalleg.fon
+%%DATADIR%%/wine/fonts/smaller.fon
+%%DATADIR%%/wine/fonts/smallet.fon
+%%DATADIR%%/wine/fonts/ssee1255.fon
+%%DATADIR%%/wine/fonts/ssee1256.fon
+%%DATADIR%%/wine/fonts/ssee1257.fon
+%%DATADIR%%/wine/fonts/ssee874.fon
+%%DATADIR%%/wine/fonts/sserife.fon
+%%DATADIR%%/wine/fonts/sserifee.fon
+%%DATADIR%%/wine/fonts/sserifeg.fon
+%%DATADIR%%/wine/fonts/sserifer.fon
+%%DATADIR%%/wine/fonts/sserifet.fon
+%%DATADIR%%/wine/fonts/svgasys.fon
+%%DATADIR%%/wine/fonts/tahoma.ttf
+%%DATADIR%%/wine/fonts/tahomabd.ttf
+%%DATADIR%%/wine/fonts/vgas1255.fon
+%%DATADIR%%/wine/fonts/vgas1256.fon
+%%DATADIR%%/wine/fonts/vgas1257.fon
+%%DATADIR%%/wine/fonts/vgas874.fon
+%%DATADIR%%/wine/fonts/vgasys.fon
+%%DATADIR%%/wine/fonts/vgasyse.fon
+%%DATADIR%%/wine/fonts/vgasysg.fon
+%%DATADIR%%/wine/fonts/vgasysr.fon
+%%DATADIR%%/wine/fonts/vgasyst.fon
 %%PORTDOCS%%%%DOCSDIR%%/ANNOUNCE
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
@@ -997,7 +1098,8 @@
 @dirrm include/wine/msvcrt/sys
 @dirrm include/wine/msvcrt
 @dirrm include/wine
- at dirrmtry man/man3w
- at dirrm share/wine/fonts
- at dirrm share/wine
- at dirrmtry share/applications
+ at dirrm %%DATADIR%%/wine/fonts
+ at dirrm %%DATADIR%%/wine
+ at dirrmtry %%DATADIR%%/aclocal
+ at dirrmtry %%DATADIR%%/applications
+ at dirrmtry %%DATADIR%%
\ No newline at end of file
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/emulators/wine/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -L emulators/wine/Makefile -L emulators/wine/Makefile -u -r1.4 -r1.5
--- emulators/wine/Makefile
+++ emulators/wine/Makefile
@@ -8,7 +8,7 @@
 #
 
 PORTNAME=	wine
-PORTVERSION=	0.9.48
+PORTVERSION=  1.1.1	
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED} \
@@ -17,53 +17,78 @@
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Microsoft Windows compatibility layer for Unix-like systems
-
-BUILD_DEPENDS=	fontforge:${PORTSDIR}/print/fontforge
+LICENSE=        lgpl3
 LIB_DEPENDS=	fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
+		freetype.9:${PORTSDIR}/print/freetype2 \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		lcms.1:${PORTSDIR}/graphics/lcms \
+		png.5:${PORTSDIR}/graphics/png \
 		xml2:${PORTSDIR}/textproc/libxml2
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man
-CONFIGURE_ENV=	CPPFLAGS=-I${PREFIX}/include \
-		LDFLAGS="-L${PREFIX}/lib -L${LOCALBASE}/lib" \
-		LIBS=-Wl,-rpath,${PREFIX}/lib/wine \
-		EXTRA_BINARIES="wine-kthread"
+CONFIGURE_ARGS=	--datadir=${DATADIR} --verbose
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 USE_LDCONFIG=	${PREFIX}/lib ${PREFIX}/lib/wine
 MAN1=		widl.1 wine.1 winebuild.1 winedbg.1 winedump.1 winegcc.1 \
 		winemaker.1 wineprefixcreate.1 wineserver.1 wmc.1 wrc.1
+MLINKS=		winegcc.1 wineg++.1
 ONLY_FOR_ARCHS=	i386
-USE_BISON=	yes
+USE_BISON=	build
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GL=		glut
-USE_XPM=	yes
+USE_GL=	glut
+USE_XORG=	xpm
 
 SUB_FILES=	pkg-message
 
+
+OPTIONS=	CUPS	"Use CUPS (Common UNIX Printing System)"	On \
+		HAL	"Use HAL (Hardware Abstraction Layer)"		Off
+
 .include <bsd.port.pre.mk>
 
+.ifdef WITHOUT_CUPS
+CONFIGURE_ARGS+=	--without-cups
+.else
+CONFIGURE_ARGS+=	--with-cups
+LIB_DEPENDS+=	cups.2:${PORTSDIR}/print/cups-base
+.endif
+
+.ifdef WITH_HAL
+CONFIGURE_ARGS+=	--with-hal
+LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
+.else
+CONFIGURE_ARGS+=	--without-hal
+.endif
+
 post-patch:
 	${REINPLACE_CMD} 's/-lpthread/-lthr/g' ${WRKSRC}/configure
+	${REINPLACE_CMD} '/ac_hal_libs=/s/"$$/ -lthr"/' ${WRKSRC}/configure
 
 pre-build:
 	cd ${WRKSRC} && make depend
 
 post-install:
-	${RM} ${PREFIX}/man/man1/wineg++.1
+	@${RM} -f ${MAN1PREFIX}/man/de.UTF-8/man1/wine.1 \
+	          ${MAN1PREFIX}/man/fr.UTF-8/man1/wine.1 \
+	          ${MAN1PREFIX}/man/fr.UTF-8/man1/wineserver.1
+	@-${RMDIR} -p ${MAN1PREFIX}/man/de.UTF-8/man1 \
+	              ${MAN1PREFIX}/man/fr.UTF-8/man1
 	${MV} -f ${PREFIX}/lib/libwine.so.1.0 ${PREFIX}/lib/libwine.so.1
-	${LN} -sf ${PREFIX}/lib/libwine.so.1 ${PREFIX}/lib/libwine.so
+	${LN} -sf libwine.so.1 ${PREFIX}/lib/libwine.so
 .if !defined(NOPORTDOCS)
 	-@${MKDIR} ${DOCSDIR}
 .for i in README ANNOUNCE AUTHORS LICENSE
 	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 .for i in progman uninstaller winedbg winemine
-	${INSTALL_DATA} ${WRKSRC}/programs/${i}/README ${DOCSDIR}/README.${i}
+	@${INSTALL_DATA} ${WRKSRC}/programs/${i}/README ${DOCSDIR}/README.${i}
 .endfor
-	${INSTALL_DATA} ${WRKSRC}/tools/winedump/README ${DOCSDIR}/README.winedump
+	@${INSTALL_DATA} ${WRKSRC}/tools/winedump/README ${DOCSDIR}/README.winedump
 .endif
-	@${INSTALL_SCRIPT} ${WRKSRC}/tools/bug_report.pl ${PREFIX}/lib/wine
+	@${MKDIR} ${DESKTOPDIR}
+	@${MV} ${DATADIR}/applications/wine.desktop ${DESKTOPDIR}/
+
 
 .include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/emulators/wine/distinfo,v
retrieving revision 1.3
retrieving revision 1.4
diff -L emulators/wine/distinfo -L emulators/wine/distinfo -u -r1.3 -r1.4
--- emulators/wine/distinfo
+++ emulators/wine/distinfo
@@ -1,3 +1,3 @@
-MD5 (wine-0.9.48.tar.bz2) = e2cc11fe7ec7769bcf8fe4f59b1dd75a
-SHA256 (wine-0.9.48.tar.bz2) = 63eb98acd20fd7b592e3a7961f47b812ed33edad053486889ca65da702c2905e
-SIZE (wine-0.9.48.tar.bz2) = 12756450
+MD5 (wine-1.1.1.tar.bz2) = 7c68c241a52e88b69d290ffe569ee723
+SHA256 (wine-1.1.1.tar.bz2) = 9f6e66ef5139d9b6850ec6dccb1200441a82b17e73dc9c62e53cc417e4670cd7
+SIZE (wine-1.1.1.tar.bz2) = 14114338


More information about the Midnightbsd-cvs mailing list