Index: sysutils/dptutil/Makefile
===================================================================
RCS file: /e/cvsync/cvsync/pkgsrc/sysutils/dptutil/Makefile,v
retrieving revision 1.12
diff -u -u -r1.12 Makefile
--- sysutils/dptutil/Makefile	27 Jan 2010 18:47:15 -0000	1.12
+++ sysutils/dptutil/Makefile	15 Jun 2011 01:36:40 -0000
@@ -2,7 +2,7 @@
 
 DISTNAME=		raidmgt-3.31
 PKGNAME=		dptutil-3.31
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		sysutils
 MASTER_SITES=		http://www.netbsd.org/~ad/raidmgt/
 
@@ -20,6 +20,42 @@
 USE_TOOLS+=		makedepend
 INSTALLATION_DIRS=	sbin
 
+SUBST_CLASSES+=		unpack
+SUBST_STAGE.unpack=	pre-configure
+SUBST_FILES.unpack=	\
+	dpteng/device.hh \
+	dpteng/dptsig.h \
+	dpteng/get_info.h \
+	dpteng/hba.hh \
+	dpteng/raid_dev.hh \
+	dpteng/mgr.hh \
+	dpteng/basic.hh \
+	dptutil/device.hh \
+	dptutil/dptsig.h \
+	dptutil/get_info.h \
+	dptutil/hba.hh \
+	dptutil/raid_dev.hh \
+	dptutil/mgr.hh \
+	dptutil/basic.hh \
+
+SUBST_SED.unpack+= -e 's|\# define PACK __attribute__ ((packed))|\# define PACK|'
+
+SUBST_CLASSES+=		extra-qual
+SUBST_STAGE.extra-qual=	pre-configure
+SUBST_FILES.extra-qual=	\
+	dptutil/setrate.hpp \
+	dptutil/zap.hpp \
+	dptutil/setcache.hpp \
+	dptutil/taskctrl.hpp \
+	dptutil/uartdmp.hpp \
+	dptutil/rmwflash.hpp \
+	dptutil/setscfg.hpp \
+	dptutil/segment.hpp \
+
+SUBST_SED.extra-qual+= -e 's|.*::|	|'
+
+
+
 post-patch:
 	${SED}	-e "s,@SBINDIR@,${PREFIX}/sbin,g"			\
 		${WRKSRC}/dpteng/makefile > ${WRKSRC}/dpteng/makefile.tmp
Index: sysutils/dptutil/distinfo
===================================================================
RCS file: /e/cvsync/cvsync/pkgsrc/sysutils/dptutil/distinfo,v
retrieving revision 1.4
diff -u -u -r1.4 distinfo
--- sysutils/dptutil/distinfo	24 Feb 2005 13:40:52 -0000	1.4
+++ sysutils/dptutil/distinfo	15 Jun 2011 01:36:40 -0000
@@ -19,3 +19,10 @@
 SHA1 (patch-an) = 8c18f8015c131690a3fdd9e8ee96b5576d70eb9a
 SHA1 (patch-ao) = 5b63d7312894a9d4ca4bf74da74914ef119fb7c6
 SHA1 (patch-ap) = 862a1c820ef43e08ac2143d6612d3177fc6dc628
+SHA1 (patch-dpteng_connect.hpp) = 4a36c1f0d4da462ed5acf19992f41bd962f13f7c
+SHA1 (patch-dpteng_raid.h) = 125caf22fb82831f4a06aa2110f39e365489fa24
+SHA1 (patch-dptutil_alarm.hpp) = f1ab4d54c26410d6405019621faf74435e3f1aff
+SHA1 (patch-dptutil_eventlog.hpp) = 62eda43ba15882a565c9bb4cced1213cd2851090
+SHA1 (patch-dptutil_expand.hpp) = 4a43961464f08f0398d73b34d3e782dba20d4c9c
+SHA1 (patch-dptutil_forcest.hpp) = 5981397d8a6d1ce7baddd48db51ec1bbb8054104
+SHA1 (patch-dptutil_namarray.hpp) = 41faa5ee3761c9933f40602f83cc9160f2d4c259
Index: sysutils/dptutil/patches/patch-dpteng_connect.hpp
===================================================================
RCS file: sysutils/dptutil/patches/patch-dpteng_connect.hpp
diff -N sysutils/dptutil/patches/patch-dpteng_connect.hpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sysutils/dptutil/patches/patch-dpteng_connect.hpp	15 Jun 2011 01:36:40 -0000
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- dpteng/connect.hpp.orig	2002-08-13 15:02:20.000000000 +0000
++++ dpteng/connect.hpp
+@@ -167,7 +167,7 @@ public:
+ 
+ // Constructor/Destructor.............................
+ 
+-			dptSCSIcon_C::dptSCSIcon_C();
++			dptSCSIcon_C();
+ 
+ // Message Handlers...................................
+ 
Index: sysutils/dptutil/patches/patch-dpteng_raid.h
===================================================================
RCS file: sysutils/dptutil/patches/patch-dpteng_raid.h
diff -N sysutils/dptutil/patches/patch-dpteng_raid.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sysutils/dptutil/patches/patch-dpteng_raid.h	15 Jun 2011 01:36:40 -0000
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- dpteng/raid.h.orig	2002-08-13 15:02:27.000000000 +0000
++++ dpteng/raid.h
+@@ -249,7 +249,7 @@ struct raidDef_S : public raidDefinition
+ 
+ // Constructor/Destructor.............................
+ 
+-			raidDef_S::raidDef_S();
++			raidDef_S();
+ 
+ };
+ #endif  // c++
Index: sysutils/dptutil/patches/patch-dptutil_alarm.hpp
===================================================================
RCS file: sysutils/dptutil/patches/patch-dptutil_alarm.hpp
diff -N sysutils/dptutil/patches/patch-dptutil_alarm.hpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sysutils/dptutil/patches/patch-dptutil_alarm.hpp	15 Jun 2011 01:36:40 -0000
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- dptutil/alarm.hpp.orig	2002-08-13 15:02:44.000000000 +0000
++++ dptutil/alarm.hpp
+@@ -32,7 +32,7 @@ enum AlarmCommand { None, On, Off, Enabl
+ class AlarmStatus:public Command
+ 	{
+ 	public:
+-		AlarmStatus::AlarmStatus( int hba, AlarmCommand cmd );							
++		AlarmStatus( int hba, AlarmCommand cmd );							
+ 		AlarmStatus( const AlarmStatus &new_AlarmStatus );
+ 		virtual	~AlarmStatus();
+ 		AlarmStatus	&operator = ( AlarmStatus &right );
Index: sysutils/dptutil/patches/patch-dptutil_eventlog.hpp
===================================================================
RCS file: sysutils/dptutil/patches/patch-dptutil_eventlog.hpp
diff -N sysutils/dptutil/patches/patch-dptutil_eventlog.hpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sysutils/dptutil/patches/patch-dptutil_eventlog.hpp	15 Jun 2011 01:36:40 -0000
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- dptutil/eventlog.hpp.orig	2002-08-13 15:02:47.000000000 +0000
++++ dptutil/eventlog.hpp
+@@ -51,7 +51,7 @@ class EventLog:public Command
+ 	{
+ 
+ 	public:
+-		EventLog::EventLog(SCSI_Addr_List *deviceList, 
++		EventLog(SCSI_Addr_List *deviceList, 
+             EventLogOptions cmd);
+ 		EventLog(const EventLog &new_EventLog);
+ 		virtual	~EventLog();
Index: sysutils/dptutil/patches/patch-dptutil_expand.hpp
===================================================================
RCS file: sysutils/dptutil/patches/patch-dptutil_expand.hpp
diff -N sysutils/dptutil/patches/patch-dptutil_expand.hpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sysutils/dptutil/patches/patch-dptutil_expand.hpp	15 Jun 2011 01:36:40 -0000
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- dptutil/expand.hpp.orig	2002-08-13 15:02:47.000000000 +0000
++++ dptutil/expand.hpp
+@@ -29,7 +29,7 @@
+ class Expand:public Command
+ {
+    public:
+-      Expand::Expand (SCSI_Address raid, SCSI_Addr_List *list);
++      Expand (SCSI_Address raid, SCSI_Addr_List *list);
+ 		Expand (const Expand &new_Expand);
+ 		virtual ~Expand();
+ 		Expand &operator = (Expand &right);
Index: sysutils/dptutil/patches/patch-dptutil_forcest.hpp
===================================================================
RCS file: sysutils/dptutil/patches/patch-dptutil_forcest.hpp
diff -N sysutils/dptutil/patches/patch-dptutil_forcest.hpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sysutils/dptutil/patches/patch-dptutil_forcest.hpp	15 Jun 2011 01:36:40 -0000
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- dptutil/forcest.hpp.orig	2002-08-13 15:02:47.000000000 +0000
++++ dptutil/forcest.hpp
+@@ -39,7 +39,7 @@ enum ForceStateOptions { Optimal, Fail, 
+ class ForceState:public Command
+ 	{
+ 	public:
+-		ForceState::ForceState(SCSI_Addr_List *deviceList, ForceStateOptions cmd);
++		ForceState(SCSI_Addr_List *deviceList, ForceStateOptions cmd);
+ 		ForceState(const ForceState &new_ForceState);
+ 		virtual	~ForceState();
+ 
Index: sysutils/dptutil/patches/patch-dptutil_namarray.hpp
===================================================================
RCS file: sysutils/dptutil/patches/patch-dptutil_namarray.hpp
diff -N sysutils/dptutil/patches/patch-dptutil_namarray.hpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sysutils/dptutil/patches/patch-dptutil_namarray.hpp	15 Jun 2011 01:36:40 -0000
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- dptutil/namarray.hpp.orig	2002-08-13 15:02:49.000000000 +0000
++++ dptutil/namarray.hpp
+@@ -32,7 +32,7 @@ class NameArray:public Command
+ {
+ 
+ 	public:
+-		NameArray::NameArray(SCSI_Address arrayToName, char *arrayName);
++		NameArray(SCSI_Address arrayToName, char *arrayName);
+ 		NameArray(const NameArray &new_NameArray);
+ 		virtual	~NameArray();
+