Update to 2001.03.26.

PR:		ports/26435 (MAINTAINER)

12 files changed, 14 insertions, 80 deletions

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 3c54da1f7e10..15fafa43e83c 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	wine
-PORTVERSION=	2001.03.05
+PORTVERSION=	2001.03.26
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	ALPHA/wine/development
diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo
index cb773dc30c77..460a4dcf1580 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1 +1 @@
-MD5 (Wine-20010305.tar.gz) = 84e52b1219978be76b7d1095c3b89b63
+MD5 (Wine-20010326.tar.gz) = 2b8037c1aee32de2e725907901a6f3b2
diff --git a/emulators/wine-devel/files/patch-ba b/emulators/wine-devel/files/patch-ba
index e8a12001bc36..32b1b06d0387 100644
--- a/emulators/wine-devel/files/patch-ba
+++ b/emulators/wine-devel/files/patch-ba
@@ -1,6 +1,6 @@
---- Make.rules.in.orig	Fri Jan 12 07:32:44 2001
-+++ Make.rules.in	Sat Mar 10 09:16:59 2001
-@@ -25,7 +25,7 @@
+--- Make.rules.in.orig	Mon Mar 19 20:19:23 2001
++++ Make.rules.in	Sun Apr  8 14:31:40 2001
+@@ -25,7 +25,7 @@ SHELL     = /bin/sh
  CC        = @CC@
  CPP       = @CPP@
  CFLAGS    = @CFLAGS@
@@ -9,12 +9,7 @@
  X_CFLAGS  = @X_CFLAGS@
  X_LIBS    = @X_LIBS@
  XLIB      = @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@
-@@ -75,11 +75,12 @@
- 
- INSTALL         = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT  = @INSTALL_SCRIPT@
- INSTALL_DATA    = @INSTALL_DATA@
+@@ -80,7 +80,7 @@ INSTALL_DATA    = @INSTALL_DATA@
  prefix          = @prefix@
  exec_prefix     = @exec_prefix@
  bindir          = @bindir@
diff --git a/emulators/wine-devel/files/patch-tools_Makefile.in b/emulators/wine-devel/files/patch-tools_Makefile.in
deleted file mode 100644
index cf5751021b65..000000000000
--- a/emulators/wine-devel/files/patch-tools_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
---- tools/Makefile.in.orig	Fri Jan  5 04:45:50 2001
-+++ tools/Makefile.in	Sat Mar 10 09:31:33 2001
-@@ -44,9 +44,9 @@
- install:: $(PROGRAMS) $(INSTALLSUBDIRS:%=%/__install__)
- 	[ -d $(bindir) ] || $(MKDIR) $(bindir)
- 	$(INSTALL_PROGRAM) fnt2bdf $(bindir)/fnt2bdf
--	$(INSTALL_PROGRAM) winelauncher $(bindir)/winelauncher
--	$(INSTALL_PROGRAM) $(SRCDIR)/winemaker $(bindir)/winemaker
--	$(INSTALL_PROGRAM) $(SRCDIR)/wineshelllink $(bindir)/wineshelllink
-+	$(INSTALL_SCRIPT) winelauncher $(bindir)/winelauncher
-+	$(INSTALL_SCRIPT) $(SRCDIR)/winemaker $(bindir)/winemaker
-+	$(INSTALL_SCRIPT) $(SRCDIR)/wineshelllink $(bindir)/wineshelllink
- 
- uninstall:: $(INSTALLSUBDIRS:%=%/__uninstall__)
- 	$(RM) $(bindir)/fnt2bdf $(bindir)/winelauncher $(bindir)/winemaker $(bindir)/wineshelllink
diff --git a/emulators/wine-devel/files/patch-tools_specmaker_Makefile.in b/emulators/wine-devel/files/patch-tools_specmaker_Makefile.in
deleted file mode 100644
index 51587237d15e..000000000000
--- a/emulators/wine-devel/files/patch-tools_specmaker_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/specmaker/Makefile.in.orig	Mon Jan  8 06:52:39 2001
-+++ tools/specmaker/Makefile.in	Sat Mar 10 09:12:03 2001
-@@ -26,7 +26,7 @@
- install:: $(PROGRAMS)
- 	[ -d $(bindir) ] || $(MKDIR) $(bindir)
- 	$(INSTALL_PROGRAM) specmaker $(bindir)/specmaker
--	$(INSTALL_PROGRAM) $(SRCDIR)/function_grep.pl $(bindir)/function_grep.pl
-+	$(INSTALL_SCRIPT) $(SRCDIR)/function_grep.pl $(bindir)/function_grep.pl
- 
- uninstall::
- 	$(RM) $(bindir)/specmaker
diff --git a/emulators/wine-devel/pkg-message b/emulators/wine-devel/pkg-message
index 48ae6938bf4e..5021b322211c 100644
--- a/emulators/wine-devel/pkg-message
+++ b/emulators/wine-devel/pkg-message
@@ -1,7 +1,5 @@
 In order to use wine you need to build and install a new kernel with
-options USER_LDT, SYSVSHM, SYSVSEM, and SYSVMSG.  Before you do that,
-you may want to apply the patches in %%PREFIX%%/lib/wine to your
-kernel sources, see the README.patch there.
+options USER_LDT, SYSVSHM, SYSVSEM, and SYSVMSG.
 
 And the port now also installs some of wine's doc files which
 describe additional things that are not in the manual pages, see
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 3c54da1f7e10..15fafa43e83c 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	wine
-PORTVERSION=	2001.03.05
+PORTVERSION=	2001.03.26
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	ALPHA/wine/development
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index cb773dc30c77..460a4dcf1580 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1 +1 @@
-MD5 (Wine-20010305.tar.gz) = 84e52b1219978be76b7d1095c3b89b63
+MD5 (Wine-20010326.tar.gz) = 2b8037c1aee32de2e725907901a6f3b2
diff --git a/emulators/wine/files/patch-ba b/emulators/wine/files/patch-ba
index e8a12001bc36..32b1b06d0387 100644
--- a/emulators/wine/files/patch-ba
+++ b/emulators/wine/files/patch-ba
@@ -1,6 +1,6 @@
---- Make.rules.in.orig	Fri Jan 12 07:32:44 2001
-+++ Make.rules.in	Sat Mar 10 09:16:59 2001
-@@ -25,7 +25,7 @@
+--- Make.rules.in.orig	Mon Mar 19 20:19:23 2001
++++ Make.rules.in	Sun Apr  8 14:31:40 2001
+@@ -25,7 +25,7 @@ SHELL     = /bin/sh
  CC        = @CC@
  CPP       = @CPP@
  CFLAGS    = @CFLAGS@
@@ -9,12 +9,7 @@
  X_CFLAGS  = @X_CFLAGS@
  X_LIBS    = @X_LIBS@
  XLIB      = @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@
-@@ -75,11 +75,12 @@
- 
- INSTALL         = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT  = @INSTALL_SCRIPT@
- INSTALL_DATA    = @INSTALL_DATA@
+@@ -80,7 +80,7 @@ INSTALL_DATA    = @INSTALL_DATA@
  prefix          = @prefix@
  exec_prefix     = @exec_prefix@
  bindir          = @bindir@
diff --git a/emulators/wine/files/patch-tools_Makefile.in b/emulators/wine/files/patch-tools_Makefile.in
deleted file mode 100644
index cf5751021b65..000000000000
--- a/emulators/wine/files/patch-tools_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
---- tools/Makefile.in.orig	Fri Jan  5 04:45:50 2001
-+++ tools/Makefile.in	Sat Mar 10 09:31:33 2001
-@@ -44,9 +44,9 @@
- install:: $(PROGRAMS) $(INSTALLSUBDIRS:%=%/__install__)
- 	[ -d $(bindir) ] || $(MKDIR) $(bindir)
- 	$(INSTALL_PROGRAM) fnt2bdf $(bindir)/fnt2bdf
--	$(INSTALL_PROGRAM) winelauncher $(bindir)/winelauncher
--	$(INSTALL_PROGRAM) $(SRCDIR)/winemaker $(bindir)/winemaker
--	$(INSTALL_PROGRAM) $(SRCDIR)/wineshelllink $(bindir)/wineshelllink
-+	$(INSTALL_SCRIPT) winelauncher $(bindir)/winelauncher
-+	$(INSTALL_SCRIPT) $(SRCDIR)/winemaker $(bindir)/winemaker
-+	$(INSTALL_SCRIPT) $(SRCDIR)/wineshelllink $(bindir)/wineshelllink
- 
- uninstall:: $(INSTALLSUBDIRS:%=%/__uninstall__)
- 	$(RM) $(bindir)/fnt2bdf $(bindir)/winelauncher $(bindir)/winemaker $(bindir)/wineshelllink
diff --git a/emulators/wine/files/patch-tools_specmaker_Makefile.in b/emulators/wine/files/patch-tools_specmaker_Makefile.in
deleted file mode 100644
index 51587237d15e..000000000000
--- a/emulators/wine/files/patch-tools_specmaker_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/specmaker/Makefile.in.orig	Mon Jan  8 06:52:39 2001
-+++ tools/specmaker/Makefile.in	Sat Mar 10 09:12:03 2001
-@@ -26,7 +26,7 @@
- install:: $(PROGRAMS)
- 	[ -d $(bindir) ] || $(MKDIR) $(bindir)
- 	$(INSTALL_PROGRAM) specmaker $(bindir)/specmaker
--	$(INSTALL_PROGRAM) $(SRCDIR)/function_grep.pl $(bindir)/function_grep.pl
-+	$(INSTALL_SCRIPT) $(SRCDIR)/function_grep.pl $(bindir)/function_grep.pl
- 
- uninstall::
- 	$(RM) $(bindir)/specmaker
diff --git a/emulators/wine/pkg-message b/emulators/wine/pkg-message
index 48ae6938bf4e..5021b322211c 100644
--- a/emulators/wine/pkg-message
+++ b/emulators/wine/pkg-message
@@ -1,7 +1,5 @@
 In order to use wine you need to build and install a new kernel with
-options USER_LDT, SYSVSHM, SYSVSEM, and SYSVMSG.  Before you do that,
-you may want to apply the patches in %%PREFIX%%/lib/wine to your
-kernel sources, see the README.patch there.
+options USER_LDT, SYSVSHM, SYSVSEM, and SYSVMSG.
 
 And the port now also installs some of wine's doc files which
 describe additional things that are not in the manual pages, see