"We (actually, I) forgot to install the libraries that are part

of the Wine port, as well as the include files for winelib."

PR:		18877
Submitted by:	Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at>

8 files changed, 356 insertions, 18 deletions

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 5fb6b76f5490..7f2ffb5c95aa 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -1,3 +1,4 @@
+# ex:ts=8
 # New ports collection makefile for:    wine
 # Date created:         Sa   9 Nov 1996 00:52:22 MET
 # Whom:			se
@@ -49,17 +50,13 @@ 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:
-.for EXEC in wine server/wineserver tools/fnt2bdf windows/x11drv/wineclipsrv \
-	     programs/regapi/regapi
-	${INSTALL_PROGRAM} ${WRKSRC}/${EXEC} ${PREFIX}/bin
-.endfor
+	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
-	${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 \
diff --git a/emulators/wine-devel/files/patch-ba b/emulators/wine-devel/files/patch-ba
index 48cc7bf0a9f0..664cf844b121 100644
--- a/emulators/wine-devel/files/patch-ba
+++ b/emulators/wine-devel/files/patch-ba
@@ -14,3 +14,12 @@ diff -u -u -r1.17 Make.rules.in
  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
diff --git a/emulators/wine-devel/files/patch-gb b/emulators/wine-devel/files/patch-gb
new file mode 100644
index 000000000000..8ff5b9008257
--- /dev/null
+++ b/emulators/wine-devel/files/patch-gb
@@ -0,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 ----
diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
index 7e62af34d27a..83fcfebcff0c 100644
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -1,11 +1,13 @@
 bin/wine
 bin/wineserver
-bin/fnt2bdf
 bin/wineclipsrv
-bin/regapi
+bin/winedbg
 bin/regSet.sh
 etc/wine.conf.sample
-lib/libwine.so
+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
@@ -33,8 +35,152 @@ lib/wine/documentation/psdrv.reg
 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
-@exec /sbin/ldconfig -m %B
 @unexec /sbin/ldconfig -R
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 5fb6b76f5490..7f2ffb5c95aa 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,3 +1,4 @@
+# ex:ts=8
 # New ports collection makefile for:    wine
 # Date created:         Sa   9 Nov 1996 00:52:22 MET
 # Whom:			se
@@ -49,17 +50,13 @@ 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:
-.for EXEC in wine server/wineserver tools/fnt2bdf windows/x11drv/wineclipsrv \
-	     programs/regapi/regapi
-	${INSTALL_PROGRAM} ${WRKSRC}/${EXEC} ${PREFIX}/bin
-.endfor
+	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
-	${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 \
diff --git a/emulators/wine/files/patch-ba b/emulators/wine/files/patch-ba
index 48cc7bf0a9f0..664cf844b121 100644
--- a/emulators/wine/files/patch-ba
+++ b/emulators/wine/files/patch-ba
@@ -14,3 +14,12 @@ diff -u -u -r1.17 Make.rules.in
  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
diff --git a/emulators/wine/files/patch-gb b/emulators/wine/files/patch-gb
new file mode 100644
index 000000000000..8ff5b9008257
--- /dev/null
+++ b/emulators/wine/files/patch-gb
@@ -0,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 ----
diff --git a/emulators/wine/pkg-plist b/emulators/wine/pkg-plist
index 7e62af34d27a..83fcfebcff0c 100644
--- a/emulators/wine/pkg-plist
+++ b/emulators/wine/pkg-plist
@@ -1,11 +1,13 @@
 bin/wine
 bin/wineserver
-bin/fnt2bdf
 bin/wineclipsrv
-bin/regapi
+bin/winedbg
 bin/regSet.sh
 etc/wine.conf.sample
-lib/libwine.so
+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
@@ -33,8 +35,152 @@ lib/wine/documentation/psdrv.reg
 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
-@exec /sbin/ldconfig -m %B
 @unexec /sbin/ldconfig -R