Attachment 9165 Details for Bug 18877 – file.diff

[patch] file.diff

file.diff (text/plain), 8.44 KB, created by pfeifer on 2000-05-29 17:30:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: pfeifer

Created: 2000-05-29 17:30:00 UTC

Size: 8.44 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/emulators/wine/Makefile,v
>retrieving revision 1.79
>diff -c -3 -p -r1.79 Makefile
>*** Makefile	2000/05/29 02:11:41	1.79
>--- Makefile	2000/05/29 16:15:04
>*************** post-build:
>*** 49,65 ****
>  	${SED} 's-$look at the file $<dirs to wine>/wine.ini-\1'${PREFIX}/etc/wine.conf.sample- <${WRKSRC}/documentation/config >${WRKDIR}/config
>  
>  do-install:
>! .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}/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 \
>--- 49,61 ----
>  	${SED} 's-$look at the file $<dirs to wine>/wine.ini-\1'${PREFIX}/etc/wine.conf.sample- <${WRKSRC}/documentation/config >${WRKDIR}/config
>  
>  do-install:
>! 	cd ${WRKSRC} && ${MAKE} install
>  	${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}/documentation/wine.man ${PREFIX}/man/man1/wine.1
>  	${INSTALL_DATA} ${WRKSRC}/documentation/wine.conf.man ${PREFIX}/man/man5/wine.conf.5
>  	-@${MKDIR} ${PREFIX}/lib/wine/documentation ${PREFIX}/lib/wine/reg 2>/dev/null
>  	${INSTALL_DATA} ${WRKDIR}/bugreports ${WRKDIR}/config \
>  		${WRKSRC}/README \
>Index: patches/patch-ba
>===================================================================
>RCS file: /home/ncvs/ports/emulators/wine/patches/patch-ba,v
>retrieving revision 1.2
>diff -c -3 -p -r1.2 patch-ba
>*** patch-ba	2000/05/29 02:11:52	1.2
>--- patch-ba	2000/05/29 16:15:04
>*************** diff -u -u -r1.17 Make.rules.in
>*** 14,16 ****
>--- 14,25 ----
>   X_CFLAGS  = @X_CFLAGS@
>   X_LIBS    = @X_LIBS@
>   XLIB      = @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@
>+ @@ -69,7 +69,7 @@
>+  prefix          = @prefix@
>+  exec_prefix     = @exec_prefix@
>+  bindir          = @bindir@
>+ -libdir          = @libdir@
>+ +libdir          = @libdir@/wine
>+  infodir         = @infodir@
>+  mandir          = @mandir@
>+  prog_manext     = 1
>Index: pkg/PLIST
>===================================================================
>RCS file: /home/ncvs/ports/emulators/wine/pkg/PLIST,v
>retrieving revision 1.6
>diff -c -3 -p -r1.6 PLIST
>*** PLIST	2000/05/18 18:10:27	1.6
>--- PLIST	2000/05/29 16:15:05
>***************
>*** 1,11 ****
>  bin/wine
>  bin/wineserver
>- bin/fnt2bdf
>  bin/wineclipsrv
>! bin/regapi
>  bin/regSet.sh
>  etc/wine.conf.sample
>! lib/libwine.so
>  lib/wine/README.patch
>  lib/wine/patch-3.3-sys-ldtshare
>  lib/wine/patch-3.3-sys-sigtrap
>--- 1,13 ----
>  bin/wine
>  bin/wineserver
>  bin/wineclipsrv
>! bin/winedbg
>  bin/regSet.sh
>  etc/wine.conf.sample
>! include/wine/windef.h
>! include/wine/windows.h
>! include/wine/wingdi.h
>! include/wine/winuser.h
>  lib/wine/README.patch
>  lib/wine/patch-3.3-sys-ldtshare
>  lib/wine/patch-3.3-sys-sigtrap
>*************** lib/wine/documentation/psdrv.reg
>*** 33,40 ****
>  lib/wine/documentation/ttfserver
>  lib/wine/documentation/README.debugger
>  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
>--- 35,186 ----
>  lib/wine/documentation/ttfserver
>  lib/wine/documentation/README.debugger
>  lib/wine/documentation/README.regapi
>+ lib/wine/libavifil32.so
>+ lib/wine/libavifil32.so.1.0
>+ lib/wine/libavifile.so
>+ lib/wine/libcomctl32.so
>+ lib/wine/libcomctl32.so.1.0
>+ lib/wine/libcomdlg32.so
>+ lib/wine/libcomdlg32.so.1.0
>+ lib/wine/libcommdlg.so
>+ lib/wine/libcompobj.so
>+ lib/wine/libdciman32.so
>+ lib/wine/libdciman32.so.1.0
>+ lib/wine/libddeml.so
>+ lib/wine/libddraw.so
>+ lib/wine/libddraw.so.1.0
>+ lib/wine/libdinput.so
>+ lib/wine/libdinput.so.1.0
>+ lib/wine/libdplay.so
>+ lib/wine/libdplayx.so
>+ lib/wine/libdplayx.so.1.0
>+ lib/wine/libdsound.so
>+ lib/wine/libdsound.so.1.0
>+ lib/wine/libgdi.so
>+ lib/wine/libgdi32.so
>+ lib/wine/libgdi32.so.1.0
>+ lib/wine/libicmp.so
>+ lib/wine/libicmp.so.1.0
>+ lib/wine/libimagehlp.so
>+ lib/wine/libimagehlp.so.1.0
>+ lib/wine/libimm32.so
>+ lib/wine/libimm32.so.1.0
>+ lib/wine/libjoystick.drv.so
>+ lib/wine/libjoystick.drv.so.1.0
>+ lib/wine/libkeyboard.so
>+ lib/wine/liblz32.so
>+ lib/wine/liblz32.so.1.0
>+ lib/wine/liblzexpand.so
>+ lib/wine/libmcianim.drv.so
>+ lib/wine/libmcianim.drv.so.1.0
>+ lib/wine/libmciavi.drv.so
>+ lib/wine/libmciavi.drv.so.1.0
>+ lib/wine/libmcicda.drv.so
>+ lib/wine/libmcicda.drv.so.1.0
>+ lib/wine/libmciseq.drv.so
>+ lib/wine/libmciseq.drv.so.1.0
>+ lib/wine/libmciwave.drv.so
>+ lib/wine/libmciwave.drv.so.1.0
>+ lib/wine/libmidimap.drv.so
>+ lib/wine/libmidimap.drv.so.1.0
>+ lib/wine/libmmsystem.so
>+ lib/wine/libmpr.so
>+ lib/wine/libmpr.so.1.0
>+ lib/wine/libmsacm.drv.so
>+ lib/wine/libmsacm.drv.so.1.0
>+ lib/wine/libmsacm.so
>+ lib/wine/libmsacm.so.1.0
>+ lib/wine/libmsacm32.so
>+ lib/wine/libmsacm32.so.1.0
>+ lib/wine/libmsnet32.so
>+ lib/wine/libmsnet32.so.1.0
>+ lib/wine/libmsvfw32.so
>+ lib/wine/libmsvfw32.so.1.0
>+ lib/wine/libmsvideo.so
>+ lib/wine/libodbc32.so
>+ lib/wine/libodbc32.so.1.0
>+ lib/wine/libole2.so
>+ lib/wine/libole2conv.so
>+ lib/wine/libole2disp.so
>+ lib/wine/libole2nls.so
>+ lib/wine/libole2prox.so
>+ lib/wine/libole2thk.so
>+ lib/wine/libole32.so
>+ lib/wine/libole32.so.1.0
>+ lib/wine/liboleaut32.so
>+ lib/wine/liboleaut32.so.1.0
>+ lib/wine/libolecli.so
>+ lib/wine/libolecli32.so
>+ lib/wine/libolecli32.so.1.0
>+ lib/wine/liboledlg.so
>+ lib/wine/liboledlg.so.1.0
>+ lib/wine/libolepro32.so
>+ lib/wine/libolepro32.so.1.0
>+ lib/wine/libolesvr.so
>+ lib/wine/libolesvr32.so
>+ lib/wine/libolesvr32.so.1.0
>+ lib/wine/libpsapi.so
>+ lib/wine/libpsapi.so.1.0
>+ lib/wine/librasapi16.so
>+ lib/wine/librasapi32.so
>+ lib/wine/librasapi32.so.1.0
>+ lib/wine/libriched32.so
>+ lib/wine/libriched32.so.1.0
>+ lib/wine/libsetupx.so
>+ lib/wine/libsetupx.so.1.0
>+ lib/wine/libshell.so
>+ lib/wine/libshell32.so
>+ lib/wine/libshell32.so.1.0
>+ lib/wine/libshlwapi.so
>+ lib/wine/libsound.so
>+ lib/wine/libsound.so.1.0
>+ lib/wine/libstorage.so
>+ lib/wine/libstress.so
>+ lib/wine/libstress.so.1.0
>+ lib/wine/libtapi32.so
>+ lib/wine/libtapi32.so.1.0
>+ lib/wine/libttydrv.so
>+ lib/wine/libttydrv.so.1.0
>+ lib/wine/libtypelib/wine/lib.so
>+ lib/wine/liburlmon.so
>+ lib/wine/liburlmon.so.1.0
>+ lib/wine/libuser.so
>+ lib/wine/libuser32.so
>+ lib/wine/libuser32.so.1.0
>+ lib/wine/libver.so
>+ lib/wine/libversion.so
>+ lib/wine/libversion.so.1.0
>+ lib/wine/libw32skrnl.so
>+ lib/wine/libw32skrnl.so.1.0
>+ lib/wine/libw32sys.so
>+ lib/wine/libwin32s16.so
>+ lib/wine/libwin87em.so
>+ lib/wine/libwin87em.so.1.0
>+ lib/wine/libwinaspi.so
>+ lib/wine/libwindebug.so
>+ lib/wine/libwindebug.so.1.0
>+ lib/wine/libwine.so.1.0
>+ lib/wine/libwineoss.drv.so
>+ lib/wine/libwineoss.drv.so.1.0
>+ lib/wine/libwing.so
>+ lib/wine/libwing.so.1.0
>+ lib/wine/libwininet.so
>+ lib/wine/libwininet.so.1.0
>+ lib/wine/libwinmm.so
>+ lib/wine/libwinmm.so.1.0
>+ lib/wine/libwinsock.so
>+ lib/wine/libwinspool.drv.so
>+ lib/wine/libwinspool.drv.so.1.0
>+ lib/wine/libwnaspi32.so
>+ lib/wine/libwnaspi32.so.1.0
>+ lib/wine/libwsock32.so
>+ lib/wine/libwsock32.so.1.0
>+ lib/wine/libx11drv.so
>+ lib/wine/libx11drv.so.1.0
>+ lib/wine/libwine.so
>+ @exec /sbin/ldconfig -m %B
>+ @dirrm include/wine
>  @dirrm lib/wine/reg
>  @dirrm lib/wine/documentation
>  @dirrm lib/wine
>  @unexec /sbin/ldconfig -R
>*** /dev/null	Mon May 29 18:05:01 2000
>--- patches/patch-gb	Mon May 29 16:30:26 2000
>***************
>*** 0 ****
>--- 1,17 ----
>+ Index: Makefile.in
>+ ===================================================================
>+ RCS file: /home/wine/wine/Makefile.in,v
>+ retrieving revision 1.79
>+ diff -c -3 -p -r1.79 Makefile.in
>+ *** Makefile.in	2000/04/24 17:17:49	1.79
>+ --- Makefile.in	2000/05/29 14:30:26
>+ *************** uninstall_programs: dummy
>+ *** 209,215 ****
>+   
>+   install::
>+   	for i in $(INSTALLSUBDIRS); do (cd $$i && $(MAKE) install) || exit 1; done
>+ - 	-$(LDCONFIG)
>+   
>+   uninstall::
>+   	for i in $(INSTALLSUBDIRS); do (cd $$i && $(MAKE) uninstall) || exit 1; done
>+ --- 209,214 ----

Actions: View | Diff

Attachments on bug 18877: 9165