From pfeifer@dbai.tuwien.ac.at  Mon May 29 09:26:15 2000
Return-Path: <pfeifer@dbai.tuwien.ac.at>
Received: from vexpert.dbai.tuwien.ac.at (vexpert.dbai.tuwien.ac.at [128.130.111.12])
	by hub.freebsd.org (Postfix) with ESMTP id E205537BC1A
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 29 May 2000 09:26:12 -0700 (PDT)
	(envelope-from pfeifer@dbai.tuwien.ac.at)
Received: from [128.130.111.10] (nunki [128.130.111.10])
	by vexpert.dbai.tuwien.ac.at (8.9.3/8.9.3) with ESMTP id SAA07166
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 29 May 2000 18:25:57 +0200 (MET DST)
Message-Id: <Pine.GSO.4.21.0005291817490.16935-100000@nunki.dbai.tuwien.ac.at>
Date: Mon, 29 May 2000 18:25:57 +0200 (MET DST)
From: Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at>
To: FreeBSD-gnats-submit@freebsd.org
Subject: Also install libraries for the Wine port!

>Number:         18877
>Category:       ports
>Synopsis:       Also install libraries for the Wine port!
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    will
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon May 29 09:30:00 PDT 2000
>Closed-Date:    Sat Jun 10 14:37:07 PDT 2000
>Last-Modified:  Sat Jun 10 14:37:16 PDT 2000
>Originator:     Gerald Pfeifer
>Release:        FreeBSD 3.4-RELEASE i386
>Organization:
Vienna University of Technology
>Environment:

	Vanilla FreeBSD 3.4-RELEASE i386 with only those kernel configs
	required by Wine.

>Description:

	We (actually, I) forgot to install the libraries that are part
	of the Wine port, as well as the include files for winelib.
	
	Both happened because we did not use Wine's install target but
	implemented our own, so I also reverted that.


	These changes require a bit of ldconfig hackery and significant
	updates to pkg/PLIST, and uninstalling does not completely work
	yet, but at least the installation should be complete now.

>How-To-Repeat:

>Fix:

	Install the patches below. Note, patches/patch-gb is a new file.
	
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 ----


>Release-Note:
>Audit-Trail:

From: Maxim Sobolev <sobomax@freebsd.org>
To: Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at>
Cc: FreeBSD-gnats-submit@freebsd.org
Subject: Re: ports/18877: Also install libraries for the Wine port!
Date: Mon, 29 May 2000 19:48:54 +0300

 Gerald Pfeifer wrote:
 
 > + 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
 
 Please get rid of those old aout-style 1.0 versions, before we could committ this stuff. It could be easily accomplished by replacing SOVERSION=1.0
 with SOVERSION=1 in dll's Makefile's - "find ${WRKSRC} -name Makefile.in | xargs perl -pi -e '....'" is your friend.
 
 -Maxim
 
 

From: Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at>
To: Maxim Sobolev <sobomax@freebsd.org>
Cc: FreeBSD-gnats-submit@freebsd.org
Subject: Re: ports/18877: Also install libraries for the Wine port!
Date: Mon, 29 May 2000 19:22:04 +0200 (MET DST)

 On Mon, 29 May 2000, Maxim Sobolev wrote:
 >> + 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
 > Please get rid of those old aout-style 1.0 versions, before we could
 > committ this stuff. It could be easily accomplished by replacing
 > SOVERSION=1.0 with SOVERSION=1 in dll's Makefile's - "find ${WRKSRC}
 > -name Makefile.in | xargs perl -pi -e '....'" is your friend.
 
 I consider this an *extremely* bad idea.  You may be right, in principle,
 but for the ports we should strive to keep the differences between the
 official sources and the ports minimal.
 
 As a matter of fact, I lost many hours in updating the Wine port and
 bringing it back into fashion just due to extraneous modifications and
 additions, and I definitely want to avoid such a situation happening
 again.
 
 Gerald
 -- 
 Gerald "Jerry" pfeifer@dbai.tuwien.ac.at http://www.dbai.tuwien.ac.at/~pfeifer/
 
 

From: Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at>
To: Will Andrews <andrews@technologist.com>
Cc: freebsd-ports@freebsd.org
Subject: Re: ports/18877: Also install libraries for the Wine port!
Date: Tue, 30 May 2000 23:20:47 +0200 (CEST)

 On Tue, 30 May 2000, Gerald Pfeifer wrote:
 >> Please consider putting the perl line in the port until Wine
 >> developers resync the sources on this issue.
 > Can you install the patch nevertheless? [...]
 > I'll then take care of the SOVERSION issue, one way or the other...
 
 Okay, please install my original patch and on top of that, add
 patches/patch-gc as follows, and do a  s/1.0/1/g  in pkg/PLIST.
 
 Thanks,
 Gerald
 
 --- /dev/null	Tue May 30 13:03:39 2000
 +++ patch-gc	Tue May 30 23:18:16 2000
 @@ -0,0 +1,441 @@
 +Index: Makefile.in
 +===================================================================
 +RCS file: /home/wine/wine/Makefile.in,v
 +retrieving revision 1.80
 +diff -r1.80 Makefile.in
 +23c23
 +< SOVERSION = 1.0
 +---
 +> SOVERSION = 1
 +Index: dlls/avifil32/Makefile.in
 +===================================================================
 +RCS file: /home/wine/wine/dlls/avifil32/Makefile.in,v
 +retrieving revision 1.8
 +diff -r1.8 Makefile.in
 +6c6
 +< SOVERSION = 1.0
 +---
 +> SOVERSION = 1
 +Index: dlls/comctl32/Makefile.in
 +===================================================================
 +RCS file: /home/wine/wine/dlls/comctl32/Makefile.in,v
 +retrieving revision 1.12
 +diff -r1.12 Makefile.in
 +6c6
 +< SOVERSION = 1.0
 +---
 +> SOVERSION = 1
 +Index: dlls/commdlg/Makefile.in
 +===================================================================
 +RCS file: /home/wine/wine/dlls/commdlg/Makefile.in,v
 +retrieving revision 1.12
 +diff -r1.12 Makefile.in
 +6c6
 +< SOVERSION = 1.0
 +---
 +> SOVERSION = 1
 +Index: dlls/dciman32/Makefile.in
 +===================================================================
 +RCS file: /home/wine/wine/dlls/dciman32/Makefile.in,v
 +retrieving revision 1.3
 +diff -r1.3 Makefile.in
 +6c6
 +< SOVERSION = 1.0
 +---
 +> SOVERSION = 1
 +Index: dlls/ddraw/Makefile.in
 +===================================================================
 +RCS file: /home/wine/wine/dlls/ddraw/Makefile.in,v
 +retrieving revision 1.6
 +diff -r1.6 Makefile.in
 +6c6
 +< SOVERSION = 1.0
 +---
 +> SOVERSION = 1
 +Index: dlls/dinput/Makefile.in
 +===================================================================
 +RCS file: /home/wine/wine/dlls/dinput/Makefile.in,v
 +retrieving revision 1.1
 +diff -r1.1 Makefile.in
 +6c6
 +< SOVERSION = 1.0
 +---
 +> SOVERSION = 1
 +Index: dlls/dplayx/Makefile.in
 +===================================================================
 +RCS file: /home/wine/wine/dlls/dplayx/Makefile.in,v
 +retrieving revision 1.6
 +diff -r1.6 Makefile.in
 +6c6
 +< SOVERSION = 1.0
 +---
 +> SOVERSION = 1
 +Index: dlls/dsound/Makefile.in
 +===================================================================
 +RCS file: /home/wine/wine/dlls/dsound/Makefile.in,v
 +retrieving revision 1.3
 +diff -r1.3 Makefile.in
 +6c6
 +< SOVERSION = 1.0
 +---
 +> SOVERSION = 1
 +Index: dlls/gdi/Makefile.in
 +===================================================================
 +RCS file: /home/wine/wine/dlls/gdi/Makefile.in,v
 +retrieving revision 1.2
 +diff -r1.2 Makefile.in
 +6c6
 +< SOVERSION = 1.0
 +---
 +> SOVERSION = 1
 +Index: dlls/icmp/Makefile.in
 +===================================================================
 +RCS file: /home/wine/wine/dlls/icmp/Makefile.in,v
 +retrieving revision 1.3
 +diff -r1.3 Makefile.in
 +6c6
 +< SOVERSION = 1.0
 +---
 +> SOVERSION = 1
 +Index: dlls/imagehlp/Makefile.in
 +===================================================================
 +RCS file: /home/wine/wine/dlls/imagehlp/Makefile.in,v
 +retrieving revision 1.4
 +diff -r1.4 Makefile.in
 +6c6
 +< SOVERSION = 1.0
 +---
 +> SOVERSION = 1
 +Index: dlls/imm32/Makefile.in
 +===================================================================
 +RCS file: /home/wine/wine/dlls/imm32/Makefile.in,v
 +retrieving revision 1.3
 +diff -r1.3 Makefile.in
 +6c6
 +< SOVERSION = 1.0
 +---
 +> SOVERSION = 1
 +Index: dlls/lzexpand/Makefile.in
 +===================================================================
 +RCS file: /home/wine/wine/dlls/lzexpand/Makefile.in,v
 +retrieving revision 1.5
 +diff -r1.5 Makefile.in
 +6c6
 +< SOVERSION = 1.0
 +---
 +> SOVERSION = 1
 +Index: dlls/mpr/Makefile.in
 +===================================================================
 +RCS file: /home/wine/wine/dlls/mpr/Makefile.in,v
 +retrieving revision 1.2
 +diff -r1.2 Makefile.in
 +6c6
 +< SOVERSION = 1.0
 +---
 +> SOVERSION = 1
 +Index: dlls/msacm/Makefile.in
 +===================================================================
 +RCS file: /home/wine/wine/dlls/msacm/Makefile.in,v
 +retrieving revision 1.5
 +diff -r1.5 Makefile.in
 +6c6
 +< SOVERSION = 1.0
 +---
 +> SOVERSION = 1
 +Index: dlls/msacm32/Makefile.in
 +===================================================================
 +RCS file: /home/wine/wine/dlls/msacm32/Makefile.in,v
 +retrieving revision 1.5
 +diff -r1.5 Makefile.in
 +6c6
 +< SOVERSION = 1.0
 +---
 +> SOVERSION = 1
 +Index: dlls/msnet32/Makefile.in
 +===================================================================
 +RCS file: /home/wine/wine/dlls/msnet32/Makefile.in,v
 +retrieving revision 1.3
 +diff -r1.3 Makefile.in
 +6c6
 +< SOVERSION = 1.0
 +---
 +> SOVERSION = 1
 +Index: dlls/msvideo/Makefile.in
 +===================================================================
 +RCS file: /home/wine/wine/dlls/msvideo/Makefile.in,v
 +retrieving revision 1.6
 +diff -r1.6 Makefile.in
 +6c6
 +< SOVERSION = 1.0
 +---
 +> SOVERSION = 1
 +Index: dlls/odbc32/Makefile.in
 +===================================================================
 +RCS file: /home/wine/wine/dlls/odbc32/Makefile.in,v
 +retrieving revision 1.3
 +diff -r1.3 Makefile.in
 +6c6
 +< SOVERSION = 1.0
 +---
 +> SOVERSION = 1
 +Index: dlls/ole32/Makefile.in
 +===================================================================
 +RCS file: /home/wine/wine/dlls/ole32/Makefile.in,v
 +retrieving revision 1.8
 +diff -r1.8 Makefile.in
 +6c6
 +< SOVERSION = 1.0
 +---
 +> SOVERSION = 1
 +Index: dlls/oleaut32/Makefile.in
 +===================================================================
 +RCS file: /home/wine/wine/dlls/oleaut32/Makefile.in,v
 +retrieving revision 1.11
 +diff -r1.11 Makefile.in
 +6c6
 +< SOVERSION = 1.0
 +---
 +> SOVERSION = 1
 +Index: dlls/olecli/Makefile.in
 +===================================================================
 +RCS file: /home/wine/wine/dlls/olecli/Makefile.in,v
 +retrieving revision 1.4
 +diff -r1.4 Makefile.in
 +6c6
 +< SOVERSION = 1.0
 +---
 +> SOVERSION = 1
 +Index: dlls/oledlg/Makefile.in
 +===================================================================
 +RCS file: /home/wine/wine/dlls/oledlg/Makefile.in,v
 +retrieving revision 1.3
 +diff -r1.3 Makefile.in
 +6c6
 +< SOVERSION = 1.0
 +---
 +> SOVERSION = 1
 +Index: dlls/olepro32/Makefile.in
 +===================================================================
 +RCS file: /home/wine/wine/dlls/olepro32/Makefile.in,v
 +retrieving revision 1.2
 +diff -r1.2 Makefile.in
 +6c6
 +< SOVERSION = 1.0
 +---
 +> SOVERSION = 1
 +Index: dlls/olesvr/Makefile.in
 +===================================================================
 +RCS file: /home/wine/wine/dlls/olesvr/Makefile.in,v
 +retrieving revision 1.4
 +diff -r1.4 Makefile.in
 +6c6
 +< SOVERSION = 1.0
 +---
 +> SOVERSION = 1
 +Index: dlls/opengl32/Makefile.in
 +===================================================================
 +RCS file: /home/wine/wine/dlls/opengl32/Makefile.in,v
 +retrieving revision 1.1
 +diff -r1.1 Makefile.in
 +6c6
 +< SOVERSION = 1.0
 +---
 +> SOVERSION = 1
 +Index: dlls/psapi/Makefile.in
 +===================================================================
 +RCS file: /home/wine/wine/dlls/psapi/Makefile.in,v
 +retrieving revision 1.4
 +diff -r1.4 Makefile.in
 +6c6
 +< SOVERSION = 1.0
 +---
 +> SOVERSION = 1
 +Index: dlls/rasapi32/Makefile.in
 +===================================================================
 +RCS file: /home/wine/wine/dlls/rasapi32/Makefile.in,v
 +retrieving revision 1.7
 +diff -r1.7 Makefile.in
 +6c6
 +< SOVERSION = 1.0
 +---
 +> SOVERSION = 1
 +Index: dlls/richedit/Makefile.in
 +===================================================================
 +RCS file: /home/wine/wine/dlls/richedit/Makefile.in,v
 +retrieving revision 1.2
 +diff -r1.2 Makefile.in
 +6c6
 +< SOVERSION = 1.0
 +---
 +> SOVERSION = 1
 +Index: dlls/setupx/Makefile.in
 +===================================================================
 +RCS file: /home/wine/wine/dlls/setupx/Makefile.in,v
 +retrieving revision 1.3
 +diff -r1.3 Makefile.in
 +6c6
 +< SOVERSION = 1.0
 +---
 +> SOVERSION = 1
 +Index: dlls/shell32/Makefile.in
 +===================================================================
 +RCS file: /home/wine/wine/dlls/shell32/Makefile.in,v
 +retrieving revision 1.26
 +diff -r1.26 Makefile.in
 +6c6
 +< SOVERSION = 1.0
 +---
 +> SOVERSION = 1
 +Index: dlls/sound/Makefile.in
 +===================================================================
 +RCS file: /home/wine/wine/dlls/sound/Makefile.in,v
 +retrieving revision 1.4
 +diff -r1.4 Makefile.in
 +6c6
 +< SOVERSION = 1.0
 +---
 +> SOVERSION = 1
 +Index: dlls/stress/Makefile.in
 +===================================================================
 +RCS file: /home/wine/wine/dlls/stress/Makefile.in,v
 +retrieving revision 1.4
 +diff -r1.4 Makefile.in
 +6c6
 +< SOVERSION = 1.0
 +---
 +> SOVERSION = 1
 +Index: dlls/tapi32/Makefile.in
 +===================================================================
 +RCS file: /home/wine/wine/dlls/tapi32/Makefile.in,v
 +retrieving revision 1.4
 +diff -r1.4 Makefile.in
 +6c6
 +< SOVERSION = 1.0
 +---
 +> SOVERSION = 1
 +Index: dlls/ttydrv/Makefile.in
 +===================================================================
 +RCS file: /home/wine/wine/dlls/ttydrv/Makefile.in,v
 +retrieving revision 1.4
 +diff -r1.4 Makefile.in
 +6c6
 +< SOVERSION = 1.0
 +---
 +> SOVERSION = 1
 +Index: dlls/urlmon/Makefile.in
 +===================================================================
 +RCS file: /home/wine/wine/dlls/urlmon/Makefile.in,v
 +retrieving revision 1.2
 +diff -r1.2 Makefile.in
 +6c6
 +< SOVERSION = 1.0
 +---
 +> SOVERSION = 1
 +Index: dlls/user/Makefile.in
 +===================================================================
 +RCS file: /home/wine/wine/dlls/user/Makefile.in,v
 +retrieving revision 1.5
 +diff -r1.5 Makefile.in
 +6c6
 +< SOVERSION = 1.0
 +---
 +> SOVERSION = 1
 +Index: dlls/version/Makefile.in
 +===================================================================
 +RCS file: /home/wine/wine/dlls/version/Makefile.in,v
 +retrieving revision 1.6
 +diff -r1.6 Makefile.in
 +6c6
 +< SOVERSION = 1.0
 +---
 +> SOVERSION = 1
 +Index: dlls/win32s/Makefile.in
 +===================================================================
 +RCS file: /home/wine/wine/dlls/win32s/Makefile.in,v
 +retrieving revision 1.6
 +diff -r1.6 Makefile.in
 +6c6
 +< SOVERSION = 1.0
 +---
 +> SOVERSION = 1
 +Index: dlls/win87em/Makefile.in
 +===================================================================
 +RCS file: /home/wine/wine/dlls/win87em/Makefile.in,v
 +retrieving revision 1.5
 +diff -r1.5 Makefile.in
 +6c6
 +< SOVERSION = 1.0
 +---
 +> SOVERSION = 1
 +Index: dlls/winaspi/Makefile.in
 +===================================================================
 +RCS file: /home/wine/wine/dlls/winaspi/Makefile.in,v
 +retrieving revision 1.4
 +diff -r1.4 Makefile.in
 +6c6
 +< SOVERSION = 1.0
 +---
 +> SOVERSION = 1
 +Index: dlls/windebug/Makefile.in
 +===================================================================
 +RCS file: /home/wine/wine/dlls/windebug/Makefile.in,v
 +retrieving revision 1.4
 +diff -r1.4 Makefile.in
 +6c6
 +< SOVERSION = 1.0
 +---
 +> SOVERSION = 1
 +Index: dlls/wing/Makefile.in
 +===================================================================
 +RCS file: /home/wine/wine/dlls/wing/Makefile.in,v
 +retrieving revision 1.4
 +diff -r1.4 Makefile.in
 +6c6
 +< SOVERSION = 1.0
 +---
 +> SOVERSION = 1
 +Index: dlls/wininet/Makefile.in
 +===================================================================
 +RCS file: /home/wine/wine/dlls/wininet/Makefile.in,v
 +retrieving revision 1.2
 +diff -r1.2 Makefile.in
 +6c6
 +< SOVERSION = 1.0
 +---
 +> SOVERSION = 1
 +Index: dlls/winmm/Makefile.in
 +===================================================================
 +RCS file: /home/wine/wine/dlls/winmm/Makefile.in,v
 +retrieving revision 1.8
 +diff -r1.8 Makefile.in
 +6c6
 +< SOVERSION = 1.0
 +---
 +> SOVERSION = 1
 +Index: dlls/winsock/Makefile.in
 +===================================================================
 +RCS file: /home/wine/wine/dlls/winsock/Makefile.in,v
 +retrieving revision 1.4
 +diff -r1.4 Makefile.in
 +6c6
 +< SOVERSION = 1.0
 +---
 +> SOVERSION = 1
 +Index: dlls/winspool/Makefile.in
 +===================================================================
 +RCS file: /home/wine/wine/dlls/winspool/Makefile.in,v
 +retrieving revision 1.6
 +diff -r1.6 Makefile.in
 +6c6
 +< SOVERSION = 1.0
 +---
 +> SOVERSION = 1
 +Index: dlls/x11drv/Makefile.in
 +===================================================================
 +RCS file: /home/wine/wine/dlls/x11drv/Makefile.in,v
 +retrieving revision 1.5
 +diff -r1.5 Makefile.in
 +6c6
 +< SOVERSION = 1.0
 +---
 +> SOVERSION = 1
 
 
 

From: Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at>
To: Maxim Sobolev <sobomax@freebsd.org>
Cc: ports@freebsd.org, gnats-admin@freebsd.org
Subject: Re: ports/18877
Date: Tue, 6 Jun 2000 21:11:00 +0200 (MET DST)

 On Tue, 6 Jun 2000, Maxim Sobolev wrote:
 > There is newest snapshot availabe, so probably the best way would be
 > to do it all in one batch.
 
 Now I'm a bit confused: I already updated our (= FreeBSD) port to
 our (= Wine) latest version! =:-)
 
 > Please think about it and if you agree submit all diffs against
 > ORIGINAL wine port (one that is in the tree).
 
 Okay. Please find below the merger of my recent two patches, with a few
 additional fixes in pkg/PLIST. With this patch, the Wine port installs,
 runs and deinstall without problems on one of my FreeBSD 3.4 boxes.
 
 Gerald
 
 
 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/06/06 19:03:31
 *************** 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
 *** patches/patch-ba	2000/05/29 02:11:52	1.2
 --- patches/patch-ba	2000/06/06 19:03:31
 *************** 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
 *** pkg/PLIST	2000/05/18 18:10:27	1.6
 --- pkg/PLIST	2000/06/06 19:03:31
 ***************
 *** 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
 + lib/wine/libavifile.so
 + lib/wine/libcomctl32.so
 + lib/wine/libcomctl32.so.1
 + lib/wine/libcomdlg32.so
 + lib/wine/libcomdlg32.so.1
 + lib/wine/libcommdlg.so
 + lib/wine/libcompobj.so
 + lib/wine/libdciman32.so
 + lib/wine/libdciman32.so.1
 + lib/wine/libddeml.so
 + lib/wine/libddraw.so
 + lib/wine/libddraw.so.1
 + lib/wine/libdinput.so
 + lib/wine/libdinput.so.1
 + lib/wine/libdplay.so
 + lib/wine/libdplayx.so
 + lib/wine/libdplayx.so.1
 + lib/wine/libdsound.so
 + lib/wine/libdsound.so.1
 + lib/wine/libgdi.so
 + lib/wine/libgdi32.so
 + lib/wine/libgdi32.so.1
 + lib/wine/libicmp.so
 + lib/wine/libicmp.so.1
 + lib/wine/libimagehlp.so
 + lib/wine/libimagehlp.so.1
 + lib/wine/libimm32.so
 + lib/wine/libimm32.so.1
 + lib/wine/libjoystick.drv.so
 + lib/wine/libjoystick.drv.so.1
 + lib/wine/libkeyboard.so
 + lib/wine/liblz32.so
 + lib/wine/liblz32.so.1
 + lib/wine/liblzexpand.so
 + lib/wine/libmcianim.drv.so
 + lib/wine/libmcianim.drv.so.1
 + lib/wine/libmciavi.drv.so
 + lib/wine/libmciavi.drv.so.1
 + lib/wine/libmcicda.drv.so
 + lib/wine/libmcicda.drv.so.1
 + lib/wine/libmciseq.drv.so
 + lib/wine/libmciseq.drv.so.1
 + lib/wine/libmciwave.drv.so
 + lib/wine/libmciwave.drv.so.1
 + lib/wine/libmidimap.drv.so
 + lib/wine/libmidimap.drv.so.1
 + lib/wine/libmmsystem.so
 + lib/wine/libmpr.so
 + lib/wine/libmpr.so.1
 + lib/wine/libmsacm.drv.so
 + lib/wine/libmsacm.drv.so.1
 + lib/wine/libmsacm.so
 + lib/wine/libmsacm.so.1
 + lib/wine/libmsacm32.so
 + lib/wine/libmsacm32.so.1
 + lib/wine/libmsnet32.so
 + lib/wine/libmsnet32.so.1
 + lib/wine/libmsvfw32.so
 + lib/wine/libmsvfw32.so.1
 + lib/wine/libmsvideo.so
 + lib/wine/libodbc32.so
 + lib/wine/libodbc32.so.1
 + 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
 + lib/wine/liboleaut32.so
 + lib/wine/liboleaut32.so.1
 + lib/wine/libolecli.so
 + lib/wine/libolecli32.so
 + lib/wine/libolecli32.so.1
 + lib/wine/liboledlg.so
 + lib/wine/liboledlg.so.1
 + lib/wine/libolepro32.so
 + lib/wine/libolepro32.so.1
 + lib/wine/libolesvr.so
 + lib/wine/libolesvr32.so
 + lib/wine/libolesvr32.so.1
 + lib/wine/libpsapi.so
 + lib/wine/libpsapi.so.1
 + lib/wine/librasapi16.so
 + lib/wine/librasapi32.so
 + lib/wine/librasapi32.so.1
 + lib/wine/libriched32.so
 + lib/wine/libriched32.so.1
 + lib/wine/libsetupx.so
 + lib/wine/libsetupx.so.1
 + lib/wine/libshell.so
 + lib/wine/libshell32.so
 + lib/wine/libshell32.so.1
 + lib/wine/libshlwapi.so
 + lib/wine/libsound.so
 + lib/wine/libsound.so.1
 + lib/wine/libstorage.so
 + lib/wine/libstress.so
 + lib/wine/libstress.so.1
 + lib/wine/libtapi32.so
 + lib/wine/libtapi32.so.1
 + lib/wine/libttydrv.so
 + lib/wine/libttydrv.so.1
 + lib/wine/libtypelib.so
 + lib/wine/liburlmon.so
 + lib/wine/liburlmon.so.1
 + lib/wine/libuser.so
 + lib/wine/libuser32.so
 + lib/wine/libuser32.so.1
 + lib/wine/libver.so
 + lib/wine/libversion.so
 + lib/wine/libversion.so.1
 + lib/wine/libw32skrnl.so
 + lib/wine/libw32skrnl.so.1
 + lib/wine/libw32sys.so
 + lib/wine/libwin32s16.so
 + lib/wine/libwin87em.so
 + lib/wine/libwin87em.so.1
 + lib/wine/libwinaspi.so
 + lib/wine/libwindebug.so
 + lib/wine/libwindebug.so.1
 + lib/wine/libwine.so.1
 + lib/wine/libwineoss.drv.so
 + lib/wine/libwineoss.drv.so.1
 + lib/wine/libwing.so
 + lib/wine/libwing.so.1
 + lib/wine/libwininet.so
 + lib/wine/libwininet.so.1
 + lib/wine/libwinmm.so
 + lib/wine/libwinmm.so.1
 + lib/wine/libwinsock.so
 + lib/wine/libwinspool.drv.so
 + lib/wine/libwinspool.drv.so.1
 + lib/wine/libwnaspi32.so
 + lib/wine/libwnaspi32.so.1
 + lib/wine/libwsock32.so
 + lib/wine/libwsock32.so.1
 + lib/wine/libx11drv.so
 + lib/wine/libx11drv.so.1
 + 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
 *** /tmp/dKzsQx_	Tue Jun  6 20:52:14 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 ----
 *** /tmp/dBAUug_	Tue Jun  6 20:52:14 2000
 --- patches/patch-gc	Tue Jun  6 16:21:03 2000
 ***************
 *** 0 ****
 --- 1,522 ----
 + Index: Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/Makefile.in,v
 + retrieving revision 1.80
 + diff -r1.80 Makefile.in
 + 23c23
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/avifil32/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/avifil32/Makefile.in,v
 + retrieving revision 1.8
 + diff -r1.8 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/comctl32/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/comctl32/Makefile.in,v
 + retrieving revision 1.12
 + diff -r1.12 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/commdlg/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/commdlg/Makefile.in,v
 + retrieving revision 1.12
 + diff -r1.12 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/dciman32/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/dciman32/Makefile.in,v
 + retrieving revision 1.3
 + diff -r1.3 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/ddraw/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/ddraw/Makefile.in,v
 + retrieving revision 1.6
 + diff -r1.6 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/dinput/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/dinput/Makefile.in,v
 + retrieving revision 1.1
 + diff -r1.1 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/dplayx/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/dplayx/Makefile.in,v
 + retrieving revision 1.6
 + diff -r1.6 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/dsound/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/dsound/Makefile.in,v
 + retrieving revision 1.3
 + diff -r1.3 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/gdi/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/gdi/Makefile.in,v
 + retrieving revision 1.2
 + diff -r1.2 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/icmp/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/icmp/Makefile.in,v
 + retrieving revision 1.3
 + diff -r1.3 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/imagehlp/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/imagehlp/Makefile.in,v
 + retrieving revision 1.4
 + diff -r1.4 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/imm32/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/imm32/Makefile.in,v
 + retrieving revision 1.3
 + diff -r1.3 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/lzexpand/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/lzexpand/Makefile.in,v
 + retrieving revision 1.5
 + diff -r1.5 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/mpr/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/mpr/Makefile.in,v
 + retrieving revision 1.2
 + diff -r1.2 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/msacm/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/msacm/Makefile.in,v
 + retrieving revision 1.5
 + diff -r1.5 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/msacm32/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/msacm32/Makefile.in,v
 + retrieving revision 1.5
 + diff -r1.5 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/msnet32/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/msnet32/Makefile.in,v
 + retrieving revision 1.3
 + diff -r1.3 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/msvideo/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/msvideo/Makefile.in,v
 + retrieving revision 1.6
 + diff -r1.6 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/odbc32/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/odbc32/Makefile.in,v
 + retrieving revision 1.3
 + diff -r1.3 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/ole32/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/ole32/Makefile.in,v
 + retrieving revision 1.8
 + diff -r1.8 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/oleaut32/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/oleaut32/Makefile.in,v
 + retrieving revision 1.11
 + diff -r1.11 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/olecli/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/olecli/Makefile.in,v
 + retrieving revision 1.4
 + diff -r1.4 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/oledlg/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/oledlg/Makefile.in,v
 + retrieving revision 1.3
 + diff -r1.3 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/olepro32/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/olepro32/Makefile.in,v
 + retrieving revision 1.2
 + diff -r1.2 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/olesvr/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/olesvr/Makefile.in,v
 + retrieving revision 1.4
 + diff -r1.4 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/opengl32/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/opengl32/Makefile.in,v
 + retrieving revision 1.1
 + diff -r1.1 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/psapi/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/psapi/Makefile.in,v
 + retrieving revision 1.4
 + diff -r1.4 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/rasapi32/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/rasapi32/Makefile.in,v
 + retrieving revision 1.7
 + diff -r1.7 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/richedit/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/richedit/Makefile.in,v
 + retrieving revision 1.2
 + diff -r1.2 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/setupx/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/setupx/Makefile.in,v
 + retrieving revision 1.3
 + diff -r1.3 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/shell32/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/shell32/Makefile.in,v
 + retrieving revision 1.26
 + diff -r1.26 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/sound/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/sound/Makefile.in,v
 + retrieving revision 1.4
 + diff -r1.4 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/stress/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/stress/Makefile.in,v
 + retrieving revision 1.4
 + diff -r1.4 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/tapi32/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/tapi32/Makefile.in,v
 + retrieving revision 1.4
 + diff -r1.4 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/ttydrv/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/ttydrv/Makefile.in,v
 + retrieving revision 1.4
 + diff -r1.4 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/urlmon/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/urlmon/Makefile.in,v
 + retrieving revision 1.2
 + diff -r1.2 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/user/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/user/Makefile.in,v
 + retrieving revision 1.5
 + diff -r1.5 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/version/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/version/Makefile.in,v
 + retrieving revision 1.6
 + diff -r1.6 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/win32s/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/win32s/Makefile.in,v
 + retrieving revision 1.6
 + diff -r1.6 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/win87em/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/win87em/Makefile.in,v
 + retrieving revision 1.5
 + diff -r1.5 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/winaspi/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/winaspi/Makefile.in,v
 + retrieving revision 1.4
 + diff -r1.4 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/windebug/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/windebug/Makefile.in,v
 + retrieving revision 1.4
 + diff -r1.4 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/wing/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/wing/Makefile.in,v
 + retrieving revision 1.4
 + diff -r1.4 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/wininet/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/wininet/Makefile.in,v
 + retrieving revision 1.2
 + diff -r1.2 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/winmm/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/winmm/Makefile.in,v
 + retrieving revision 1.8
 + diff -r1.8 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/winmm/joystick/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/winmm/joystick/Makefile.in,v
 + retrieving revision 1.3
 + diff -r1.3 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/winmm/mcianim/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/winmm/mcianim/Makefile.in,v
 + retrieving revision 1.4
 + diff -r1.4 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/winmm/mciavi/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/winmm/mciavi/Makefile.in,v
 + retrieving revision 1.4
 + diff -r1.4 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/winmm/mcicda/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/winmm/mcicda/Makefile.in,v
 + retrieving revision 1.4
 + diff -r1.4 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/winmm/mciseq/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/winmm/mciseq/Makefile.in,v
 + retrieving revision 1.4
 + diff -r1.4 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/winmm/mciwave/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/winmm/mciwave/Makefile.in,v
 + retrieving revision 1.5
 + diff -r1.5 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/winmm/midimap/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/winmm/midimap/Makefile.in,v
 + retrieving revision 1.4
 + diff -r1.4 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/winmm/wavemap/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/winmm/wavemap/Makefile.in,v
 + retrieving revision 1.4
 + diff -r1.4 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/winmm/wineoss/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/winmm/wineoss/Makefile.in,v
 + retrieving revision 1.6
 + diff -r1.6 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/winsock/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/winsock/Makefile.in,v
 + retrieving revision 1.4
 + diff -r1.4 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/winspool/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/winspool/Makefile.in,v
 + retrieving revision 1.6
 + diff -r1.6 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 + Index: dlls/x11drv/Makefile.in
 + ===================================================================
 + RCS file: /home/wine/wine/dlls/x11drv/Makefile.in,v
 + retrieving revision 1.5
 + diff -r1.5 Makefile.in
 + 6c6
 + < SOVERSION = 1.0
 + ---
 + > SOVERSION = 1
 
 
 
 
Responsible-Changed-From-To: freebsd-ports->will 
Responsible-Changed-By: will 
Responsible-Changed-When: Tue Jun 6 17:45:57 PDT 2000 
Responsible-Changed-Why:  
I'm handling this right now. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=18877 
State-Changed-From-To: open->closed 
State-Changed-By: obrien 
State-Changed-When: Sat Jun 10 14:37:07 PDT 2000 
State-Changed-Why:  
applied. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=18877 
>Unformatted:
