Re-import of raidutil-3.31 as dptutil-3.31.

11 files changed, 245 insertions, 0 deletions

diff --git a/sysutils/dptutil/DESCR b/sysutils/dptutil/DESCR
new file mode 100644
index 00000000000..e81375928c0
--- /dev/null
+++ b/sysutils/dptutil/DESCR
@@ -0,0 +1,4 @@
+Adaptec raidutil and dpteng.  For use with DPT and Adaptec
+EATA and I2O RAID adapters.
+
+See also the "sysutils/storage-manager" package. 
diff --git a/sysutils/dptutil/Makefile b/sysutils/dptutil/Makefile
new file mode 100644
index 00000000000..8e0509843e6
--- /dev/null
+++ b/sysutils/dptutil/Makefile
@@ -0,0 +1,48 @@
+# $NetBSD: Makefile,v 1.1.1.1 2002/12/09 11:07:20 ad Exp $
+
+DISTNAME=		raidmgt
+PKGNAME=		dptutil-3.31
+WRKSRC=			${WRKDIR}
+CATEGORIES=		sysutils
+MASTER_SITES=		# empty
+EXTRACT_SUFX=		.tgz
+
+MAINTAINER=		ad@netbsd.org
+HOMEPAGE=		http://opensource.adaptec.com/
+COMMENT=		DPT/Adaptec Storage Management software (dputil)
+
+# Should work on other platforms, not yet tested.
+ONLY_FOR_PLATFORM=	NetBSD-*-i386
+
+RESTRICTED=		"Redistribution not permitted"
+NO_SRC_ON_FTP=		${RESTRICTED}
+NO_SRC_ON_CDROM=	${RESTRICTED}
+NO_BIN_ON_FTP=		${RESTRICTED}
+NO_BIN_ON_CDROM=	${RESTRICTED}
+
+CHECK_SHLIBS=		NO
+NO_CONFIGURE=		# defined
+INTERACTIVE_STAGE=	fetch
+
+DOWNLOAD=		http://mbserver.adaptec.com/index.php?bn=linux_downloads
+
+_FETCH_MESSAGE= \
+	${ECHO} "================================================================="; \
+	${ECHO} "  dputil and dpteng source (raidmgt.tgz) must be fetched"; \
+	${ECHO} "  into ${DISTDIR} from"; \
+	${ECHO} "  ${DOWNLOAD}."; \
+	${ECHO} "================================================================="
+
+post-patch:
+	${SED}	-e "s,@SBINDIR@,${PREFIX}/sbin,g"			\
+		${WRKDIR}/dpteng/makefile > ${WRKDIR}/dpteng/makefile.tmp
+	${MV} ${WRKDIR}/dpteng/makefile.tmp ${WRKDIR}/dpteng/makefile
+	${SED}	-e "s,@SBINDIR@,${PREFIX}/sbin,g"			\
+		${WRKDIR}/dptutil/makefile > ${WRKDIR}/dptutil/makefile.tmp
+	${MV} ${WRKDIR}/dptutil/makefile.tmp ${WRKDIR}/dptutil/makefile
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/dpteng/dpteng ${PREFIX}/sbin/dpteng
+	${INSTALL_PROGRAM} ${WRKSRC}/dptutil/raidutil ${PREFIX}/sbin/dptutil
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/dptutil/PLIST b/sysutils/dptutil/PLIST
new file mode 100644
index 00000000000..f6635be1162
--- /dev/null
+++ b/sysutils/dptutil/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2002/12/09 11:07:20 ad Exp $
+sbin/dpteng
+sbin/dptutil
diff --git a/sysutils/dptutil/distinfo b/sysutils/dptutil/distinfo
new file mode 100644
index 00000000000..94171452cef
--- /dev/null
+++ b/sysutils/dptutil/distinfo
@@ -0,0 +1,11 @@
+$NetBSD: distinfo,v 1.1.1.1 2002/12/09 11:07:20 ad Exp $
+
+SHA1 (raidmgt.tgz) = d67b954b9f089734a2a77a52ded1584ea12fa7ec
+Size (raidmgt.tgz) = 722714 bytes
+SHA1 (patch-ab) = 24c7cdcd9576651ac9cea30127ee474aa7f3ff28
+SHA1 (patch-ac) = fb9cad0e76f9f2aef416cc731e271cae8eade6ee
+SHA1 (patch-ad) = 57ff83cdbfc2acd384f4e3ee56ed0b6a103ab834
+SHA1 (patch-ae) = 95beb3e29891efd919f9051c0ea690f72fbc350f
+SHA1 (patch-af) = ea17ec9920ac5468f64c8279b681d4bdd6dd3a02
+SHA1 (patch-ag) = 9b08ca81ce8cbc80f94c0ffc5a8b69c89a65e07a
+SHA1 (patch-ai) = e40e81bc2896693ab9f51bf6dcec2e1667ea993a
diff --git a/sysutils/dptutil/patches/patch-ab b/sysutils/dptutil/patches/patch-ab
new file mode 100644
index 00000000000..3085188597d
--- /dev/null
+++ b/sysutils/dptutil/patches/patch-ab
@@ -0,0 +1,18 @@
+$NetBSD: patch-ab,v 1.1.1.1 2002/12/09 11:07:20 ad Exp $
+
+diff -ur dpteng/engcalls.c dpteng/engcalls.c
+--- odpteng/engcalls.c	Tue Aug 13 16:02:24 2002
++++ dpteng/engcalls.c	Fri Dec  6 09:04:44 2002
+@@ -118,6 +118,12 @@
+ char *CommEnginePathNameDefault = "/opt/SUNWhwrdg/dptcom";
+ char *DefaultPathName = "/opt/SUNWhwrdg/";
+ 
++#elif defined (__NetBSD__)
++
++char *EnginePathNameDefault = _NBSD_LIBEXEC "/dpteng &";
++char *CommEnginePathNameDefault = _NBSD_LIBEXEC "/dptcom &";
++char *DefaultPathName = _NBSD_LIBEXEC;
++
+ #else
+ 
+ char *EnginePathNameDefault = "/usr/dpt/dpteng &";
diff --git a/sysutils/dptutil/patches/patch-ac b/sysutils/dptutil/patches/patch-ac
new file mode 100644
index 00000000000..975de1bdc66
--- /dev/null
+++ b/sysutils/dptutil/patches/patch-ac
@@ -0,0 +1,26 @@
+$NetBSD: patch-ac,v 1.1.1.1 2002/12/09 11:07:20 ad Exp $
+
+diff -ur dpteng/makefile dpteng/makefile
+--- odpteng/makefile	Fri Aug 30 19:40:36 2002
++++ dpteng/makefile	Fri Dec  6 09:55:31 2002
+@@ -9,7 +9,10 @@
+ CPP_EXTENSION = .cpp
+ C_EXTENSION = .c
+ 
+-CFLAGS= $(INCLUDE_DIR) -D__UNIX__ -DMESSAGES -D_DPT_ACTIVE_ALIGNMENT -DI_WANT_SNI_DEBUG -DNEW_LOGGER -c
++CFLAGS= $(INCLUDE_DIR) -Dunix -D__unix__ -D_DPT_FREE_BSD -D__UNIX__ -DMESSAGES \
++	-D_DPT_ACTIVE_ALIGNMENT -D_DPT_DEFINE_SEMUN -DI_WANT_SNI_DEBUG \
++	-DNEW_LOGGER -DDEFAULT_PATH=\"@SBINDIR@\" \
++	-D_NBSD_LIBEXEC=\"@SBINDIR@\" -c
+ 
+ SRCS = \
+ 	addr_rng.cpp \
+@@ -105,7 +108,7 @@
+ 	rm -f *.o dpteng
+ 
+ depend :
+-	makedepend $(INCLUDE_DIR) -D_DPT_UNIX -D_DPT_LINUX -D__linux__ ${SRCS}
++	makedepend $(INCLUDE_DIR) -D_DPT_UNIX -D_DPT_FREE_BSD -D_DPT_DEFINE_SEMUN -D__unix__ -Dunix ${SRCS}
+ 
+ 
+ $(C_EXTENSION).o:
diff --git a/sysutils/dptutil/patches/patch-ad b/sysutils/dptutil/patches/patch-ad
new file mode 100644
index 00000000000..b93b43b7e47
--- /dev/null
+++ b/sysutils/dptutil/patches/patch-ad
@@ -0,0 +1,14 @@
+$NetBSD: patch-ad,v 1.1.1.1 2002/12/09 11:07:20 ad Exp $
+
+diff -ur dpteng/osd_defs.h dpteng/osd_defs.h
+--- odpteng/osd_defs.h	Tue Aug 13 16:02:26 2002
++++ dpteng/osd_defs.h	Fri Dec  6 07:48:17 2002
+@@ -56,7 +56,7 @@
+ # define _DPT_LINUX
+ #elif (defined(__bsdi__))
+ # define _DPT_BSDI
+-#elif (defined(__FreeBSD__))
++#elif (defined(__FreeBSD__)) || (defined(__NetBSD__))
+ # undef _DPT_FREE_BSD
+ # define _DPT_FREE_BSD
+ #else
diff --git a/sysutils/dptutil/patches/patch-ae b/sysutils/dptutil/patches/patch-ae
new file mode 100644
index 00000000000..e2d3269797a
--- /dev/null
+++ b/sysutils/dptutil/patches/patch-ae
@@ -0,0 +1,61 @@
+$NetBSD: patch-ae,v 1.1.1.1 2002/12/09 11:07:20 ad Exp $
+
+--- dpteng/osd_unix.c.orig	Fri Dec  6 07:56:59 2002
++++ dpteng/osd_unix.c	Sat Dec  7 17:15:49 2002
+@@ -3676,7 +3676,7 @@
+    uCHAR DataBuff[100];
+    EATA_CP pkt;
+    int IoctlRtn;
+-#  if (defined(_DPT_FREE_BSD))
++#  if (defined(_DPT_FREE_BSD)) && !defined(__NetBSD__)
+        int   c;
+        int   i2oMajorNode = 0;
+        FILE *fp = popen (
+@@ -3695,7 +3695,7 @@
+    NumEntries = 0;
+    for(i = 0; i < MAX_HAS; ++i)
+      {
+-#      if (defined(_DPT_BSDI) || defined(_DPT_FREE_BSD))
++#      if (defined(_DPT_BSDI) || defined(_DPT_FREE_BSD)) && !defined(__NetBSD__)
+        int created = 0;
+ #      endif
+ 
+@@ -3710,7 +3710,7 @@
+        IoctlRtn = osdSendIoctl(&HbaDevs[NumEntries],DPT_SIGNATURE,
+                                DataBuff,&pkt);
+ 
+-#      if (defined(_DPT_BSDI) || defined(_DPT_FREE_BSD))
++#      if (defined(_DPT_BSDI) || defined(_DPT_FREE_BSD)) && !defined(__NetBSD__)
+        /*
+         *   Use Alternate access.
+         */
+@@ -3758,7 +3758,7 @@
+            HbaDevs[NumEntries].IoAddress = 0xffffffff;
+            ++NumEntries;
+         }
+-#   if (defined(_DPT_BSDI) || defined(_DPT_FREE_BSD))
++#   if (defined(_DPT_BSDI) || defined(_DPT_FREE_BSD)) && !defined(__NetBSD__)
+          else if (created)
+       {
+          unlink (HbaDevs[NumEntries].NodeName);
+@@ -3777,8 +3777,10 @@
+         }
+        HbaDevs[NumEntries].Flags = 0;
+        strcpy(HbaDevs[NumEntries].NodeName,"/dev");
+-#      if (defined(_DPT_BSDI) || defined(_DPT_FREE_BSD))
++#      if (defined(_DPT_BSDI) || defined(_DPT_FREE_BSD)) && !defined(__NetBSD__)
+            strcat(HbaDevs[NumEntries].NodeName,"/rdptr");
++#      elif (defined(__NetBSD__))
++           strcat(HbaDevs[NumEntries].NodeName,"/dpt");
+ #      else
+            strcat(HbaDevs[NumEntries].NodeName,"/dptr");
+ #      endif
+@@ -3789,7 +3791,7 @@
+        mknod(HbaDevs[NumEntries].NodeName, S_IFCHR|S_IRUSR|S_IWUSR,
+         (MAJOR_NODE << 20) + (i << 10) + 0);
+ #      undef MAJOR_NODE
+-#      elif (defined(_DPT_FREE_BSD))
++#      elif (defined(_DPT_FREE_BSD)) && !defined(__NetBSD__)
+ #      define MAJOR_NODE 88
+        mknod(HbaDevs[NumEntries].NodeName, S_IFCHR|S_IRUSR|S_IWUSR,
+         (MAJOR_NODE << 8) + i);
diff --git a/sysutils/dptutil/patches/patch-af b/sysutils/dptutil/patches/patch-af
new file mode 100644
index 00000000000..87f24a51c12
--- /dev/null
+++ b/sysutils/dptutil/patches/patch-af
@@ -0,0 +1,18 @@
+$NetBSD: patch-af,v 1.1.1.1 2002/12/09 11:07:20 ad Exp $
+
+diff -ur dptutil/engcalls.c dptutil/engcalls.c
+--- odptutil/engcalls.c	Tue Aug 13 16:02:24 2002
++++ dptutil/engcalls.c	Fri Dec  6 09:04:44 2002
+@@ -118,6 +118,12 @@
+ char *CommEnginePathNameDefault = "/opt/SUNWhwrdg/dptcom";
+ char *DefaultPathName = "/opt/SUNWhwrdg/";
+ 
++#elif defined (__NetBSD__)
++
++char *EnginePathNameDefault = _NBSD_LIBEXEC "/dpteng &";
++char *CommEnginePathNameDefault = _NBSD_LIBEXEC "/dptcom &";
++char *DefaultPathName = _NBSD_LIBEXEC;
++
+ #else
+ 
+ char *EnginePathNameDefault = "/usr/dpt/dpteng &";
diff --git a/sysutils/dptutil/patches/patch-ag b/sysutils/dptutil/patches/patch-ag
new file mode 100644
index 00000000000..4fa6bf39948
--- /dev/null
+++ b/sysutils/dptutil/patches/patch-ag
@@ -0,0 +1,30 @@
+$NetBSD: patch-ag,v 1.1.1.1 2002/12/09 11:07:20 ad Exp $
+
+diff -ur dptutil/makefile dptutil/makefile
+--- odptutil/makefile	Fri Aug 30 19:50:02 2002
++++ dptutil/makefile	Fri Dec  6 09:05:21 2002
+@@ -11,11 +11,13 @@
+ 
+ DEBUG_FLAGS=-DDEBUG_ENTER_EXIT
+ DEBUG_FLAGS=
+-CFLAGS= -O3 -c $(I) -DMESSAGES \
++CFLAGS= -O2 -c $(I) -DMESSAGES \
+ 	$(extra_cflags) -D_DPT_ACTIVE_ALIGNMENT $(DEBUG_FLAGS) \
+ 	-Dtrue=1 -Dfalse=0 \
+ 	-DHORIZONTAL -DNEW_RSC_MGR -DNEW_RSC_HDR \
+-	-D_DPT_FLASH
++	-DDEFAULT_PATH=\"@SBINDIR@\" \
++	-D_NBSD_LIBEXEC=\"@SBINDIR@\" \
++	-D_DPT_FLASH -D_DPT_FREE_BSD -Dunix -D__unix__
+ 
+ LINK_FLAGS = -v
+ 
+@@ -140,7 +142,7 @@
+ 	$(LINK) $(LINK_FLAGS) -o $@ $(OBJS) $(LIBS)
+ 
+ depend :
+-	makedepend -DFLG_STAT_LAP=0x20 -D_DPT_UNIX -D_DPT_LINUX -D__linux__ -- ${CFLAGS} -- ${SRCS}
++	makedepend -DFLG_STAT_LAP=0x20 -D_DPT_UNIX -D_DPT_FREE_BSD -- ${CFLAGS} -- ${SRCS}
+ 
+ $(CPP_EXTENSION).o:
+ 	$(CC) $(CFLAGS) -c $<
diff --git a/sysutils/dptutil/patches/patch-ai b/sysutils/dptutil/patches/patch-ai
new file mode 100644
index 00000000000..c65d83f25dc
--- /dev/null
+++ b/sysutils/dptutil/patches/patch-ai
@@ -0,0 +1,12 @@
+$NetBSD: patch-ai,v 1.1.1.1 2002/12/09 11:07:20 ad Exp $
+
+--- /dev/null	Sat Dec  7 19:02:30 2002
++++ Makefile	Sat Dec  7 19:22:44 2002
+@@ -0,0 +1,7 @@
++all:
++	cd dpteng && make depend && make
++	cd dptutil && make depend && make
++
++clean:
++	cd dpteng && make clean
++	cd dptutil && make clean