use a common patches directory and distinfo file, but use

patch-${MACHINE_ARCH}-a[a-z] for the patch file names so we
can find the right one per suggestions on tech-pkg.

8 files changed, 20 insertions, 19 deletions

diff --git a/net/citrix_ica/Makefile b/net/citrix_ica/Makefile
index f1463b6f9df..9c4afe459a8 100644
--- a/net/citrix_ica/Makefile
+++ b/net/citrix_ica/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/05/05 17:27:17 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.5 2001/05/08 23:58:44 dmcmahill Exp $
 #
 
 DISTNAME=	citrix_ica-client
@@ -32,8 +32,6 @@ NO_BIN_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
-DISTINFO_FILE=${.CURDIR}/distinfo.${MACHINE_ARCH}
-PATCHDIR=${.CURDIR}/patches.${MACHINE_ARCH}
 PLIST_SRC=	${PKGDIR}/PLIST.pre \
 		${PKGDIR}/PLIST.${MACHINE_ARCH} \
 		${PKGDIR}/PLIST.post
@@ -51,6 +49,11 @@ IGNORE=		"${PKGNAME} requires SVR4 compability - see compat_svr4(8)"
 .endif
 .endif
 
+PATCHDIR=${WRKDIR}/.patches
+pre-patch:
+	${MKDIR} ${PATCHDIR}
+	${CP} ${.CURDIR}/patches/patch-${MACHINE_ARCH}-* ${PATCHDIR}
+
 do-install:
 	${SED} s%DESTINATION%${CDIR}% ${FILESDIR}/response \
 		> ${WRKSRC}/response
diff --git a/net/citrix_ica/distinfo b/net/citrix_ica/distinfo
new file mode 100644
index 00000000000..5345e216637
--- /dev/null
+++ b/net/citrix_ica/distinfo
@@ -0,0 +1,10 @@
+$NetBSD: distinfo,v 1.4 2001/05/08 23:58:44 dmcmahill Exp $
+
+SHA1 (citrix/linuxx86.tar.gz) = d30a8b151c7503a61005b00c5d2a0e77301df259
+Size (citrix/linuxx86.tar.gz) = 1507974 bytes
+SHA1 (patch-i386-aa) = db6ec387f49feffdc02d6a495c14c8bef4433d16
+SHA1 (patch-i386-ab) = a688fa885d0a93ee7a8a02935de5024fa6fecc6c
+SHA1 (citrix/solaris.tar.Z) = 453eaf6cdbafd57485e71d497e634b616f747ace
+Size (citrix/solaris.tar.Z) = 1728307 bytes
+SHA1 (patch-sparc-aa) = 646df6b2908fc007d53be22176f2eff05041f6f8
+SHA1 (patch-sparc-ab) = 9f4f6939434156acedd18947155721237091db03
diff --git a/net/citrix_ica/distinfo.i386 b/net/citrix_ica/distinfo.i386
deleted file mode 100644
index 0d1c47d5a7c..00000000000
--- a/net/citrix_ica/distinfo.i386
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo.i386,v 1.2 2001/05/06 13:14:41 dmcmahill Exp $
-
-SHA1 (citrix/linuxx86.tar.gz) = d30a8b151c7503a61005b00c5d2a0e77301df259
-Size (citrix/linuxx86.tar.gz) = 1507974 bytes
-SHA1 (patch-aa) = db6ec387f49feffdc02d6a495c14c8bef4433d16
-SHA1 (patch-ab) = a688fa885d0a93ee7a8a02935de5024fa6fecc6c
diff --git a/net/citrix_ica/distinfo.sparc b/net/citrix_ica/distinfo.sparc
deleted file mode 100644
index 152af087ec9..00000000000
--- a/net/citrix_ica/distinfo.sparc
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo.sparc,v 1.1 2001/05/05 17:24:11 dmcmahill Exp $
-
-SHA1 (citrix/solaris.tar.Z) = 453eaf6cdbafd57485e71d497e634b616f747ace
-Size (citrix/solaris.tar.Z) = 1728307 bytes
-SHA1 (patch-aa) = 646df6b2908fc007d53be22176f2eff05041f6f8
-SHA1 (patch-ab) = 9f4f6939434156acedd18947155721237091db03
diff --git a/net/citrix_ica/patches.i386/patch-aa b/net/citrix_ica/patches/patch-i386-aa
index fc726a49fc6..b262e0198ad 100644
--- a/net/citrix_ica/patches.i386/patch-aa
+++ b/net/citrix_ica/patches/patch-i386-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1 2001/05/05 17:24:12 dmcmahill Exp $
+$NetBSD: patch-i386-aa,v 1.1 2001/05/08 23:58:45 dmcmahill Exp $
 
 --- linuxx86/hinst.orig	Tue Aug  8 20:24:55 2000
 +++ linuxx86/hinst
diff --git a/net/citrix_ica/patches.i386/patch-ab b/net/citrix_ica/patches/patch-i386-ab
index 54feb8760f2..91e02aacc63 100644
--- a/net/citrix_ica/patches.i386/patch-ab
+++ b/net/citrix_ica/patches/patch-i386-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1 2001/05/05 17:24:12 dmcmahill Exp $
+$NetBSD: patch-i386-ab,v 1.1 2001/05/08 23:58:45 dmcmahill Exp $
 
 --- setupwfc.orig	Tue Aug  8 20:24:35 2000
 +++ setupwfc
diff --git a/net/citrix_ica/patches.sparc/patch-aa b/net/citrix_ica/patches/patch-sparc-aa
index 5e9031b1381..6a8c16a0730 100644
--- a/net/citrix_ica/patches.sparc/patch-aa
+++ b/net/citrix_ica/patches/patch-sparc-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1 2001/05/05 17:24:13 dmcmahill Exp $
+$NetBSD: patch-sparc-aa,v 1.1 2001/05/08 23:58:46 dmcmahill Exp $
 
 --- solaris/hinst.orig	Fri Dec 15 12:06:19 2000
 +++ solaris/hinst	Sat May  5 12:55:03 2001
diff --git a/net/citrix_ica/patches.sparc/patch-ab b/net/citrix_ica/patches/patch-sparc-ab
index 57f63dda275..4a8c1c4d6a0 100644
--- a/net/citrix_ica/patches.sparc/patch-ab
+++ b/net/citrix_ica/patches/patch-sparc-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1 2001/05/05 17:24:13 dmcmahill Exp $
+$NetBSD: patch-sparc-ab,v 1.1 2001/05/08 23:58:46 dmcmahill Exp $
 
 --- setupwfc.orig	Fri Dec 15 12:05:20 2000
 +++ setupwfc	Fri May  4 21:46:40 2001