7 files changed, 248 insertions, 89 deletions

diff --git a/devel/dmake/Makefile b/devel/dmake/Makefile
index aed525b40c61..cdb9ac788900 100644
--- a/devel/dmake/Makefile
+++ b/devel/dmake/Makefile
@@ -1,21 +1,36 @@
 # New ports collection makefile for:	dmake
-# Version required:     4.0
+# Version required:     4.1
 # Date created:		31 July 1995
 # Whom:			nils@guru.ims.uni-stuttgart.de
 #
-# $Id: Makefile,v 1.2 1995/11/26 11:28:59 asami Exp $
+# $Id: Makefile,v 1.3 1997/08/11 18:01:59 fenner Exp $
 #
 
-DISTNAME=       dmake40
-PKGNAME=	dmake-4.0
-CATEGORIES=     devel
-MASTER_SITES=   ftp://plg.uwaterloo.ca/pub/dmake/
+DISTNAME=	dmake-v4.1-src-export.all-unknown-all
+PKGNAME=	dmake-4.1
+CATEGORIES=	devel
+MASTER_SITES=	ftp://plg.uwaterloo.ca/pub/dmake/
 
 MAINTAINER=	ports@FreeBSD.ORG
 
-WRKSRC=		$(WRKDIR)/dmake
+WRKSRC=		${WRKDIR}/dmake
 USE_GMAKE=	yes
 MAKEFILE=	makefile
 ALL_TARGET=	bsd43
+MAN1=		dmake.1
+
+do-configure:
+.for f in limits.h string.h dirent.h
+	@${RM} -f ${WRKSRC}/unix/bsd43/$f
+.endfor
+	 @${CP} ${WRKSRC}/unix/startup.h ${WRKSRC}/unix/startup.h.orig
+	@${SED} s:/usr/local:${PREFIX}: ${WRKSRC}/unix/startup.h.orig \
+	  > ${WRKSRC}/unix/startup.h
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/dmake ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/man/dmake.tf ${PREFIX}/man/man1/dmake.1
+	${MKDIR} ${PREFIX}/lib/dmake/startup
+	${CP} -R ${WRKSRC}/startup/* ${PREFIX}/lib/dmake/startup
 
 .include <bsd.port.mk>
diff --git a/devel/dmake/distinfo b/devel/dmake/distinfo
index cd0355b517ce..ffdb4445ab0c 100644
--- a/devel/dmake/distinfo
+++ b/devel/dmake/distinfo
@@ -1 +1 @@
-MD5 (dmake40.tar.gz) = e2858117a717a72332a5be5ceecf6f8a
+MD5 (dmake-v4.1-src-export.all-unknown-all.tar.gz) = 5841be5f11b8294e95edc1f28cc11c5b
diff --git a/devel/dmake/files/patch-aa b/devel/dmake/files/patch-aa
index 1ff5ad32213d..19aac5a1f520 100644
--- a/devel/dmake/files/patch-aa
+++ b/devel/dmake/files/patch-aa
@@ -1,72 +1,30 @@
-*** unix/bsd43/make.sh.orig	Thu Oct  6 18:26:53 1994
---- unix/bsd43/make.sh	Sat Aug  5 18:39:51 1995
-***************
-*** 1,3 ****
---- 1,5 ----
-+ if [ ! -x dmake ]
-+ then
-  mkdir objects
-  cc -c -I. -Iunix -Iunix/bsd43 -O infer.c
-  mv infer.o objects
-***************
-*** 51,69 ****
-  mv runargv.o objects
-  cc -c -I. -Iunix -Iunix/bsd43 -O unix/dcache.c
-  mv dcache.o objects
-- cc -c -I. -Iunix -Iunix/bsd43 -O unix/bsd43/putenv.c
-- mv putenv.o objects
-- cc -c -I. -Iunix -Iunix/bsd43 -O unix/bsd43/tempnam.c
-- mv tempnam.o objects
-- cc -c -I. -Iunix -Iunix/bsd43 -O unix/bsd43/utime.c
-- mv utime.o objects
-- cc -c -I. -Iunix -Iunix/bsd43 -O unix/bsd43/setvbuf.c
-- mv setvbuf.o objects
-  cc -O -o dmake  objects/infer.o objects/make.o objects/stat.o objects/expand.o \
-  objects/dmstring.o objects/hash.o objects/dag.o objects/dmake.o objects/path.o \
-  objects/imacs.o objects/sysintf.o objects/parse.o objects/getinp.o \
-  objects/quit.o objects/state.o objects/dmdump.o objects/macparse.o \
-  objects/rulparse.o objects/percent.o objects/function.o objects/arlib.o \
-  objects/dirbrk.o objects/rmprq.o objects/ruletab.o objects/runargv.o \
-! objects/dcache.o objects/putenv.o objects/tempnam.o objects/utime.o objects/setvbuf.o 
-  cp unix/bsd43/startup.mk startup.mk
---- 53,64 ----
-  mv runargv.o objects
-  cc -c -I. -Iunix -Iunix/bsd43 -O unix/dcache.c
-  mv dcache.o objects
-  cc -O -o dmake  objects/infer.o objects/make.o objects/stat.o objects/expand.o \
-  objects/dmstring.o objects/hash.o objects/dag.o objects/dmake.o objects/path.o \
-  objects/imacs.o objects/sysintf.o objects/parse.o objects/getinp.o \
-  objects/quit.o objects/state.o objects/dmdump.o objects/macparse.o \
-  objects/rulparse.o objects/percent.o objects/function.o objects/arlib.o \
-  objects/dirbrk.o objects/rmprq.o objects/ruletab.o objects/runargv.o \
-! objects/dcache.o 
-  cp unix/bsd43/startup.mk startup.mk
-+ fi
-*** unix/runargv.c-dist	Sat Aug  5 18:17:21 1995
---- unix/runargv.c	Sat Aug  5 18:17:38 1995
-***************
-*** 77,83 ****
---- 77,85 ----
-  char	*cmd;
-  {
-     extern  int  errno;
-+ #ifndef __FreeBSD__
-     extern  char *sys_errlist[];
-+ #endif
-     int          pid;
-     char         **argv;
-  
-*** makefile.orig	Thu Oct  6 18:30:22 1994
---- makefile	Sat Aug  5 18:58:26 1995
-***************
-*** 89,91 ****
---- 89,97 ----
-  	  tccswp msc40swp msc50swp msc51swp msc60swp \
-  	  bcc    bccswp   ztc      ztcswp
-  $(DOS_VER) :; make.bat $@
-+ 
-+ install:
-+ 	install -c -s -m 755 dmake ${PREFIX}/bin
-+ 	mkdir -p ${PREFIX}/lib/dmake
-+ 	chmod 755 ${PREFIX}/lib/dmake
-+ 	install -c -m 444 startup.mk ${PREFIX}/lib/dmake
+--- unix/bsd43/make.sh.orig	Wed Jul 16 01:02:35 1997
++++ unix/bsd43/make.sh	Mon Sep  8 03:01:42 1997
+@@ -1,3 +1,5 @@
++if [ ! -x dmake ]
++then
+ mkdir objects
+ cc -c -I. -Iunix -Iunix/bsd43 -O infer.c
+ mv infer.o objects
+@@ -51,19 +53,12 @@
+ mv runargv.o objects
+ cc -c -I. -Iunix -Iunix/bsd43 -O unix/dcache.c
+ mv dcache.o objects
+-cc -c -I. -Iunix -Iunix/bsd43 -O unix/bsd43/putenv.c
+-mv putenv.o objects
+-cc -c -I. -Iunix -Iunix/bsd43 -O unix/bsd43/tempnam.c
+-mv tempnam.o objects
+-cc -c -I. -Iunix -Iunix/bsd43 -O unix/bsd43/utime.c
+-mv utime.o objects
+-cc -c -I. -Iunix -Iunix/bsd43 -O unix/bsd43/setvbuf.c
+-mv setvbuf.o objects
+ cc -O -o dmake  objects/infer.o objects/make.o objects/stat.o objects/expand.o \
+ objects/dmstring.o objects/hash.o objects/dag.o objects/dmake.o objects/path.o \
+ objects/imacs.o objects/sysintf.o objects/parse.o objects/getinp.o \
+ objects/quit.o objects/state.o objects/dmdump.o objects/macparse.o \
+ objects/rulparse.o objects/percent.o objects/function.o objects/arlib.o \
+ objects/dirbrk.o objects/rmprq.o objects/ruletab.o objects/runargv.o \
+-objects/dcache.o objects/putenv.o objects/tempnam.o objects/utime.o objects/setvbuf.o 
++objects/dcache.o 
+ cp unix/bsd43/template.mk startup/config.mk
++fi
diff --git a/devel/dmake/files/patch-ab b/devel/dmake/files/patch-ab
new file mode 100644
index 000000000000..5c67bcfbe6bb
--- /dev/null
+++ b/devel/dmake/files/patch-ab
@@ -0,0 +1,12 @@
+--- unix/runargv.c.orig	Wed Jul 16 01:02:34 1997
++++ unix/runargv.c	Mon Sep  8 03:01:42 1997
+@@ -68,7 +68,9 @@
+ char	*cmd;
+ {
+    extern  int  errno;
++#ifndef __FreeBSD__
+    extern  char *sys_errlist[];
++#endif
+    int          pid;
+    char         **argv;
+ 
diff --git a/devel/dmake/files/patch-ac b/devel/dmake/files/patch-ac
new file mode 100644
index 000000000000..ed21d6ae45e3
--- /dev/null
+++ b/devel/dmake/files/patch-ac
@@ -0,0 +1,10 @@
+--- unix/dcache.c.orig	Wed Jul 16 01:02:34 1997
++++ unix/dcache.c	Mon Sep  8 03:20:56 1997
+@@ -35,6 +35,7 @@
+ #undef __WIN32__
+ #endif
+ 
++#include <sys/types.h>
+ #include <dirent.h>
+ #include "extern.h"
+ #include "sysintf.h"
diff --git a/devel/dmake/pkg-descr b/devel/dmake/pkg-descr
index 67bcb8af22ec..871b89f360e7 100644
--- a/devel/dmake/pkg-descr
+++ b/devel/dmake/pkg-descr
@@ -1,8 +1,8 @@
-dmake Version 4.0
-=================
-FULL RELEASE OF DMAKE, REPLACES VERSIONS 3.8, and 3.9 (never posted)
-
-Nature: This distribution advances dmake to Version 4.0, patch level 0.
-------- The release is an attempt at addressing obscure faults in dmake
-	and at providing some much needed new functionality.  See below
-	for details of enhancements and bug fixes.
+dmake is different from other versions of Make in that it supports significant

+enhancements.  See the WWW page for the detail.

+

+The dmake home page can be found at:

+

+   http://dmake.wticorp.com/

+

+Visit there for the latest in dmake related information.

diff --git a/devel/dmake/pkg-plist b/devel/dmake/pkg-plist
index bf540c38d2ae..f5524c0cdd9b 100644
--- a/devel/dmake/pkg-plist
+++ b/devel/dmake/pkg-plist
@@ -1,2 +1,166 @@
 bin/dmake
-lib/dmake/startup.mk
+man/man1/dmake.1.gz
+lib/dmake/startup/templates/tos/template.mk
+lib/dmake/startup/templates/msdos/borland/bcc30/template.mk
+lib/dmake/startup/templates/msdos/borland/bcc40/template.mk
+lib/dmake/startup/templates/msdos/borland/bcc45/template.mk
+lib/dmake/startup/templates/msdos/borland/bcc50/template.mk
+lib/dmake/startup/templates/msdos/borland/tcc20/template.mk
+lib/dmake/startup/templates/msdos/microsft/msc51/template.mk
+lib/dmake/startup/templates/msdos/microsft/msc60/template.mk
+lib/dmake/startup/templates/os2/ibm/icc/template.mk
+lib/dmake/startup/templates/qssl/template.mk
+lib/dmake/startup/templates/mac/template.mk
+lib/dmake/startup/templates/unix/solaris/gnu/template.mk
+lib/dmake/startup/templates/unix/solaris/template.mk
+lib/dmake/startup/templates/unix/bsd43/uw/template.mk
+lib/dmake/startup/templates/unix/bsd43/vf/template.mk
+lib/dmake/startup/templates/unix/bsd43/template.mk
+lib/dmake/startup/templates/unix/coherent/ver40/template.mk
+lib/dmake/startup/templates/unix/coherent/ver42/template.mk
+lib/dmake/startup/templates/unix/linux/gnu/template.mk
+lib/dmake/startup/templates/unix/386ix/template.mk
+lib/dmake/startup/templates/unix/sysvr1/template.mk
+lib/dmake/startup/templates/unix/sysvr3/pwd/template.mk
+lib/dmake/startup/templates/unix/sysvr3/template.mk
+lib/dmake/startup/templates/unix/sysvr4/template.mk
+lib/dmake/startup/templates/unix/xenix/pwd/template.mk
+lib/dmake/startup/templates/unix/xenix/template.mk
+lib/dmake/startup/templates/win95/borland/bcc50/template.mk
+lib/dmake/startup/templates/win95/microsft/vpp40/template.mk
+lib/dmake/startup/templates/winnt/borland/bcc50/template.mk
+lib/dmake/startup/templates/winnt/microsft/vpp40/template.mk
+lib/dmake/startup/win95/borland/macros.mk
+lib/dmake/startup/win95/microsft/macros.mk
+lib/dmake/startup/win95/macros.mk
+lib/dmake/startup/win95/recipes.mk
+lib/dmake/startup/unix/386ix/macros.mk
+lib/dmake/startup/unix/bsd43/macros.mk
+lib/dmake/startup/unix/bsd43/recipes.mk
+lib/dmake/startup/unix/coherent/macros.mk
+lib/dmake/startup/unix/coherent/recipes.mk
+lib/dmake/startup/unix/linux/gnu/macros.mk
+lib/dmake/startup/unix/linux/macros.mk
+lib/dmake/startup/unix/sysvr3/gnu/macros.mk
+lib/dmake/startup/unix/sysvr3/macros.mk
+lib/dmake/startup/unix/sysvr4/macros.mk
+lib/dmake/startup/unix/solaris/macros.mk
+lib/dmake/startup/unix/sysvr1/macros.mk
+lib/dmake/startup/unix/xenix/macros.mk
+lib/dmake/startup/unix/recipes.mk
+lib/dmake/startup/unix/macros.mk
+lib/dmake/startup/tos/macros.mk
+lib/dmake/startup/os2/ibm/macros.mk
+lib/dmake/startup/os2/macros.mk
+lib/dmake/startup/winnt/borland/macros.mk
+lib/dmake/startup/winnt/microsft/macros.mk
+lib/dmake/startup/winnt/macros.mk
+lib/dmake/startup/winnt/recipes.mk
+lib/dmake/startup/mac/macros.mk
+lib/dmake/startup/msdos/borland/tcc20/macros.mk
+lib/dmake/startup/msdos/borland/bcc40/macros.mk
+lib/dmake/startup/msdos/borland/bcc45/macros.mk
+lib/dmake/startup/msdos/borland/bcc30/macros.mk
+lib/dmake/startup/msdos/borland/bcc50/macros.mk
+lib/dmake/startup/msdos/borland/bcc50.32/macros.mk
+lib/dmake/startup/msdos/borland/macros.mk
+lib/dmake/startup/msdos/microsft/macros.mk
+lib/dmake/startup/msdos/zortech/macros.mk
+lib/dmake/startup/msdos/macros.mk
+lib/dmake/startup/msdos/recipes.mk
+lib/dmake/startup/qssl/qnx/macros.mk
+lib/dmake/startup/qssl/qnx/recipes.mk
+lib/dmake/startup/qssl/macros.mk
+lib/dmake/startup/qssl/recipes.mk
+lib/dmake/startup/Windows_NT/borland/macros.mk
+lib/dmake/startup/Windows_NT/microsft/macros.mk
+lib/dmake/startup/Windows_NT/macros.mk
+lib/dmake/startup/Windows_NT/recipes.mk
+lib/dmake/startup/startup.mk
+lib/dmake/startup/summary
+lib/dmake/startup/config.mk
+lib/dmake/startup/template.mk
+@dirrm lib/dmake/startup/winnt/microsft
+@dirrm lib/dmake/startup/winnt/borland
+@dirrm lib/dmake/startup/winnt
+@dirrm lib/dmake/startup/win95/microsft
+@dirrm lib/dmake/startup/win95/borland
+@dirrm lib/dmake/startup/win95
+@dirrm lib/dmake/startup/unix/xenix
+@dirrm lib/dmake/startup/unix/sysvr4
+@dirrm lib/dmake/startup/unix/sysvr3/gnu
+@dirrm lib/dmake/startup/unix/sysvr3
+@dirrm lib/dmake/startup/unix/sysvr1
+@dirrm lib/dmake/startup/unix/solaris
+@dirrm lib/dmake/startup/unix/linux/gnu
+@dirrm lib/dmake/startup/unix/linux
+@dirrm lib/dmake/startup/unix/coherent
+@dirrm lib/dmake/startup/unix/bsd43
+@dirrm lib/dmake/startup/unix/386ix
+@dirrm lib/dmake/startup/unix
+@dirrm lib/dmake/startup/tos
+@dirrm lib/dmake/startup/templates/winnt/microsft/vpp40
+@dirrm lib/dmake/startup/templates/winnt/microsft
+@dirrm lib/dmake/startup/templates/winnt/borland/bcc50
+@dirrm lib/dmake/startup/templates/winnt/borland
+@dirrm lib/dmake/startup/templates/winnt
+@dirrm lib/dmake/startup/templates/win95/microsft/vpp40
+@dirrm lib/dmake/startup/templates/win95/microsft
+@dirrm lib/dmake/startup/templates/win95/borland/bcc50
+@dirrm lib/dmake/startup/templates/win95/borland
+@dirrm lib/dmake/startup/templates/win95
+@dirrm lib/dmake/startup/templates/unix/xenix/pwd
+@dirrm lib/dmake/startup/templates/unix/xenix
+@dirrm lib/dmake/startup/templates/unix/sysvr4
+@dirrm lib/dmake/startup/templates/unix/sysvr3/pwd
+@dirrm lib/dmake/startup/templates/unix/sysvr3
+@dirrm lib/dmake/startup/templates/unix/sysvr1
+@dirrm lib/dmake/startup/templates/unix/solaris/gnu
+@dirrm lib/dmake/startup/templates/unix/solaris
+@dirrm lib/dmake/startup/templates/unix/linux/gnu
+@dirrm lib/dmake/startup/templates/unix/linux
+@dirrm lib/dmake/startup/templates/unix/coherent/ver42
+@dirrm lib/dmake/startup/templates/unix/coherent/ver40
+@dirrm lib/dmake/startup/templates/unix/coherent
+@dirrm lib/dmake/startup/templates/unix/bsd43/vf
+@dirrm lib/dmake/startup/templates/unix/bsd43/uw
+@dirrm lib/dmake/startup/templates/unix/bsd43
+@dirrm lib/dmake/startup/templates/unix/386ix
+@dirrm lib/dmake/startup/templates/unix
+@dirrm lib/dmake/startup/templates/tos
+@dirrm lib/dmake/startup/templates/qssl
+@dirrm lib/dmake/startup/templates/os2/ibm/icc
+@dirrm lib/dmake/startup/templates/os2/ibm
+@dirrm lib/dmake/startup/templates/os2
+@dirrm lib/dmake/startup/templates/msdos/microsft/msc60
+@dirrm lib/dmake/startup/templates/msdos/microsft/msc51
+@dirrm lib/dmake/startup/templates/msdos/microsft
+@dirrm lib/dmake/startup/templates/msdos/borland/tcc20
+@dirrm lib/dmake/startup/templates/msdos/borland/bcc50
+@dirrm lib/dmake/startup/templates/msdos/borland/bcc45
+@dirrm lib/dmake/startup/templates/msdos/borland/bcc40
+@dirrm lib/dmake/startup/templates/msdos/borland/bcc30
+@dirrm lib/dmake/startup/templates/msdos/borland
+@dirrm lib/dmake/startup/templates/msdos
+@dirrm lib/dmake/startup/templates/mac
+@dirrm lib/dmake/startup/templates
+@dirrm lib/dmake/startup/qssl/qnx
+@dirrm lib/dmake/startup/qssl
+@dirrm lib/dmake/startup/os2/ibm
+@dirrm lib/dmake/startup/os2
+@dirrm lib/dmake/startup/msdos/zortech
+@dirrm lib/dmake/startup/msdos/microsft
+@dirrm lib/dmake/startup/msdos/borland/tcc20
+@dirrm lib/dmake/startup/msdos/borland/bcc50.32
+@dirrm lib/dmake/startup/msdos/borland/bcc50
+@dirrm lib/dmake/startup/msdos/borland/bcc45
+@dirrm lib/dmake/startup/msdos/borland/bcc40
+@dirrm lib/dmake/startup/msdos/borland/bcc30
+@dirrm lib/dmake/startup/msdos/borland
+@dirrm lib/dmake/startup/msdos
+@dirrm lib/dmake/startup/mac
+@dirrm lib/dmake/startup/Windows_NT/microsft
+@dirrm lib/dmake/startup/Windows_NT/borland
+@dirrm lib/dmake/startup/Windows_NT
+@dirrm lib/dmake/startup
+@dirrm lib/dmake