diff options
| author | Will Andrews <will@FreeBSD.org> | 2000-05-18 18:10:27 +0000 |
|---|---|---|
| committer | Will Andrews <will@FreeBSD.org> | 2000-05-18 18:10:27 +0000 |
| commit | 692ce9c1f0a32267ff951844b511749ba6bb4a60 (patch) | |
| tree | e579d277a043f83c41c439a05d857d44235da9ee /emulators | |
| parent | Forgot to add this patch and remove that one... (diff) | |
Make WINE build again!
1) Update to 20000430 release snapshot.
2) Remove irrelevant (integrated into wine tree) patches.
3) Add new patch.
4) New MAINTAINER (pfeifer@dbai.tuwien.ac.at).
Gerald apparently overlooked installation, so I added a few files to the
install so people can actually run WINE; I also accounted for these files
in pkg/PLIST updating. Unfortunately, I could not test WINE because I
don't have USER_LDT in my kernel and I'm not adding it just now. :-)
Special thanks to Gerald for his help!
PR: 18648
Submitted by: Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at>
Approved by: se (previous MAINTAINER)
Notes
Notes:
svn path=/head/; revision=28564
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/wine-devel/Makefile | 15 | ||||
| -rw-r--r-- | emulators/wine-devel/distinfo | 2 | ||||
| -rw-r--r-- | emulators/wine-devel/files/patch-ad | 13 | ||||
| -rw-r--r-- | emulators/wine-devel/pkg-plist | 6 | ||||
| -rw-r--r-- | emulators/wine/Makefile | 15 | ||||
| -rw-r--r-- | emulators/wine/distinfo | 2 | ||||
| -rw-r--r-- | emulators/wine/files/patch-ad | 13 | ||||
| -rw-r--r-- | emulators/wine/pkg-plist | 6 |
8 files changed, 24 insertions, 48 deletions
diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index 12aeab4eb86f..4154caa907fd 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -6,13 +6,13 @@ # PORTNAME= wine -PORTVERSION= 99.11.14 +PORTVERSION= 2000.04.30 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= ALPHA/wine/development DISTNAME= Wine-${PORTVERSION:S/.//g} -MAINTAINER= se@FreeBSD.org +MAINTAINER= pfeifer@dbai.tuwien.ac.at LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ GL.14:${PORTSDIR}/graphics/Mesa3 @@ -49,17 +49,17 @@ post-build: ${SED} 's-\(look at the file \)<dirs to wine>/wine.ini-\1'${PREFIX}/etc/wine.conf.sample- <${WRKSRC}/documentation/config >${WRKDIR}/config do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/wine ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/tools/fnt2bdf ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/windows/x11drv/wineclipsrv ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/programs/regapi/regapi ${PREFIX}/bin +.for EXEC in wine server/wineserver tools/fnt2bdf windows/x11drv/wineclipsrv \ + programs/regapi/regapi + ${INSTALL_PROGRAM} ${WRKSRC}/${EXEC} ${PREFIX}/bin +.endfor ${INSTALL_SCRIPT} ${WRKDIR}/regSet.sh ${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/wine.ini ${PREFIX}/etc/wine.conf.sample [ -f ${PREFIX}/etc/wine.conf ] \ || ${INSTALL_DATA} ${WRKSRC}/wine.ini ${PREFIX}/etc/wine.conf - ${INSTALL_DATA} ${WRKSRC}/wine.sym ${PREFIX}/etc ${INSTALL_DATA} ${WRKSRC}/documentation/wine.man ${PREFIX}/man/man1/wine.1 ${INSTALL_DATA} ${WRKSRC}/documentation/wine.conf.man ${PREFIX}/man/man5/wine.conf.5 + ${INSTALL_DATA} ${WRKSRC}/libwine.so ${PREFIX}/lib -@${MKDIR} ${PREFIX}/lib/wine/documentation ${PREFIX}/lib/wine/reg 2>/dev/null ${INSTALL_DATA} ${WRKDIR}/bugreports ${WRKDIR}/config \ ${WRKSRC}/README \ @@ -72,7 +72,6 @@ do-install: ${WRKSRC}/documentation/dlls \ ${WRKSRC}/documentation/fonts \ ${WRKSRC}/documentation/ioport-trace-hints \ - ${WRKSRC}/documentation/lables-and-serial-nubers \ ${WRKSRC}/documentation/no-windows \ ${WRKSRC}/documentation/printing \ ${WRKSRC}/documentation/psdriver \ diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo index 47f3da24d87d..7f225717f6f7 100644 --- a/emulators/wine-devel/distinfo +++ b/emulators/wine-devel/distinfo @@ -1 +1 @@ -MD5 (Wine-991114.tar.gz) = 51df1d91f266b3e72c4e17093670da35 +MD5 (Wine-20000430.tar.gz) = 7dd29f68e26c624115e6654d619e9ab5 diff --git a/emulators/wine-devel/files/patch-ad b/emulators/wine-devel/files/patch-ad index a66a526cfef1..d309001ef307 100644 --- a/emulators/wine-devel/files/patch-ad +++ b/emulators/wine-devel/files/patch-ad @@ -1,19 +1,6 @@ *** wine.ini.orig Sun Oct 31 03:23:49 1999 --- wine.ini Sat Nov 13 13:36:18 1999 *************** -*** 53,57 **** - Temp=e:\ - Path=c:\windows;c:\windows\system;e:\;e:\test;f:\ -! SymbolTableFile=./wine.sym - - # <wineconf> ---- 53,57 ---- - Temp=e:\ - Path=c:\windows;c:\windows\system;e:\;e:\test;f:\ -! SymbolTableFile=/usr/local/etc/wine.sym - - # <wineconf> -*************** *** 107,117 **** [serialports] diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist index b26954599840..7e62af34d27a 100644 --- a/emulators/wine-devel/pkg-plist +++ b/emulators/wine-devel/pkg-plist @@ -1,10 +1,11 @@ bin/wine +bin/wineserver bin/fnt2bdf bin/wineclipsrv bin/regapi bin/regSet.sh etc/wine.conf.sample -etc/wine.sym +lib/libwine.so lib/wine/README.patch lib/wine/patch-3.3-sys-ldtshare lib/wine/patch-3.3-sys-sigtrap @@ -25,7 +26,6 @@ lib/wine/documentation/debugging lib/wine/documentation/dlls lib/wine/documentation/fonts lib/wine/documentation/ioport-trace-hints -lib/wine/documentation/lables-and-serial-nubers lib/wine/documentation/no-windows lib/wine/documentation/printing lib/wine/documentation/psdriver @@ -36,3 +36,5 @@ lib/wine/documentation/README.regapi @dirrm lib/wine/reg @dirrm lib/wine/documentation @dirrm lib/wine +@exec /sbin/ldconfig -m %B +@unexec /sbin/ldconfig -R diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index 12aeab4eb86f..4154caa907fd 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -6,13 +6,13 @@ # PORTNAME= wine -PORTVERSION= 99.11.14 +PORTVERSION= 2000.04.30 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= ALPHA/wine/development DISTNAME= Wine-${PORTVERSION:S/.//g} -MAINTAINER= se@FreeBSD.org +MAINTAINER= pfeifer@dbai.tuwien.ac.at LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ GL.14:${PORTSDIR}/graphics/Mesa3 @@ -49,17 +49,17 @@ post-build: ${SED} 's-\(look at the file \)<dirs to wine>/wine.ini-\1'${PREFIX}/etc/wine.conf.sample- <${WRKSRC}/documentation/config >${WRKDIR}/config do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/wine ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/tools/fnt2bdf ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/windows/x11drv/wineclipsrv ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/programs/regapi/regapi ${PREFIX}/bin +.for EXEC in wine server/wineserver tools/fnt2bdf windows/x11drv/wineclipsrv \ + programs/regapi/regapi + ${INSTALL_PROGRAM} ${WRKSRC}/${EXEC} ${PREFIX}/bin +.endfor ${INSTALL_SCRIPT} ${WRKDIR}/regSet.sh ${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/wine.ini ${PREFIX}/etc/wine.conf.sample [ -f ${PREFIX}/etc/wine.conf ] \ || ${INSTALL_DATA} ${WRKSRC}/wine.ini ${PREFIX}/etc/wine.conf - ${INSTALL_DATA} ${WRKSRC}/wine.sym ${PREFIX}/etc ${INSTALL_DATA} ${WRKSRC}/documentation/wine.man ${PREFIX}/man/man1/wine.1 ${INSTALL_DATA} ${WRKSRC}/documentation/wine.conf.man ${PREFIX}/man/man5/wine.conf.5 + ${INSTALL_DATA} ${WRKSRC}/libwine.so ${PREFIX}/lib -@${MKDIR} ${PREFIX}/lib/wine/documentation ${PREFIX}/lib/wine/reg 2>/dev/null ${INSTALL_DATA} ${WRKDIR}/bugreports ${WRKDIR}/config \ ${WRKSRC}/README \ @@ -72,7 +72,6 @@ do-install: ${WRKSRC}/documentation/dlls \ ${WRKSRC}/documentation/fonts \ ${WRKSRC}/documentation/ioport-trace-hints \ - ${WRKSRC}/documentation/lables-and-serial-nubers \ ${WRKSRC}/documentation/no-windows \ ${WRKSRC}/documentation/printing \ ${WRKSRC}/documentation/psdriver \ diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo index 47f3da24d87d..7f225717f6f7 100644 --- a/emulators/wine/distinfo +++ b/emulators/wine/distinfo @@ -1 +1 @@ -MD5 (Wine-991114.tar.gz) = 51df1d91f266b3e72c4e17093670da35 +MD5 (Wine-20000430.tar.gz) = 7dd29f68e26c624115e6654d619e9ab5 diff --git a/emulators/wine/files/patch-ad b/emulators/wine/files/patch-ad index a66a526cfef1..d309001ef307 100644 --- a/emulators/wine/files/patch-ad +++ b/emulators/wine/files/patch-ad @@ -1,19 +1,6 @@ *** wine.ini.orig Sun Oct 31 03:23:49 1999 --- wine.ini Sat Nov 13 13:36:18 1999 *************** -*** 53,57 **** - Temp=e:\ - Path=c:\windows;c:\windows\system;e:\;e:\test;f:\ -! SymbolTableFile=./wine.sym - - # <wineconf> ---- 53,57 ---- - Temp=e:\ - Path=c:\windows;c:\windows\system;e:\;e:\test;f:\ -! SymbolTableFile=/usr/local/etc/wine.sym - - # <wineconf> -*************** *** 107,117 **** [serialports] diff --git a/emulators/wine/pkg-plist b/emulators/wine/pkg-plist index b26954599840..7e62af34d27a 100644 --- a/emulators/wine/pkg-plist +++ b/emulators/wine/pkg-plist @@ -1,10 +1,11 @@ bin/wine +bin/wineserver bin/fnt2bdf bin/wineclipsrv bin/regapi bin/regSet.sh etc/wine.conf.sample -etc/wine.sym +lib/libwine.so lib/wine/README.patch lib/wine/patch-3.3-sys-ldtshare lib/wine/patch-3.3-sys-sigtrap @@ -25,7 +26,6 @@ lib/wine/documentation/debugging lib/wine/documentation/dlls lib/wine/documentation/fonts lib/wine/documentation/ioport-trace-hints -lib/wine/documentation/lables-and-serial-nubers lib/wine/documentation/no-windows lib/wine/documentation/printing lib/wine/documentation/psdriver @@ -36,3 +36,5 @@ lib/wine/documentation/README.regapi @dirrm lib/wine/reg @dirrm lib/wine/documentation @dirrm lib/wine +@exec /sbin/ldconfig -m %B +@unexec /sbin/ldconfig -R |