* Split the version definition into Makefile.version.

* Complete CANNA_OWNER -> CANNA_USER change, which was mostly done by Julio
  Merino a few days ago.

4 files changed, 19 insertions, 16 deletions

diff --git a/inputmethod/canna/Makefile.common b/inputmethod/canna/Makefile.common
index b1e845917fa..5d16ef4d297 100644
--- a/inputmethod/canna/Makefile.common
+++ b/inputmethod/canna/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2003/07/29 19:53:19 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.5 2003/07/31 13:04:40 uebayasi Exp $
 #
 # Canna common makefile.
 #
@@ -19,21 +19,11 @@ PATCHDIR=	${.CURDIR}/../canna/patches
 # To be done.
 #USE_BUILDLINK2=	# defined
 
-# "Pkgsrc" version.
-CANNA_VERSION=	3.6pl3
+.include "Makefile.version"
 
 CANNA_SPOOL=	${DESTDIR}/var/spool/canna
 CANNA_MODE=	0755
 
-_CANNA_VERS=	\
-		CANNA_OWNER=${CANNA_OWNER} \
-		CANNA_GROUP=${CANNA_GROUP} \
-		CANNA_SPOOL=${CANNA_SPOOL} \
-		CANNA_MODE=${CANNA_MODE} \
-		IMDICTDIR=${IMDICTDIR}
-MAKE_ENV+=	${_CANNA_VERS}
-PLIST_SUBST+=	${_CANNA_VERS}
-
 # XXX IPv6 support.  To be done.
 #BUILD_DEFS+=	USE_INET6
 #.include "../../mk/bsd.prefs.mk"
diff --git a/inputmethod/canna/Makefile.version b/inputmethod/canna/Makefile.version
new file mode 100644
index 00000000000..825bf53091d
--- /dev/null
+++ b/inputmethod/canna/Makefile.version
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile.version,v 1.1 2003/07/31 13:04:40 uebayasi Exp $
+
+# "Pkgsrc" version.
+CANNA_VERSION=	3.6pl3
+
+_CANNA_VERS=	\
+		CANNA_USER=${CANNA_USER} \
+		CANNA_GROUP=${CANNA_GROUP} \
+		CANNA_SPOOL=${CANNA_SPOOL} \
+		CANNA_MODE=${CANNA_MODE} \
+		IMDICTDIR=${IMDICTDIR}
+MAKE_ENV+=	${_CANNA_VERS}
+PLIST_SUBST+=	${_CANNA_VERS}
diff --git a/inputmethod/canna/distinfo b/inputmethod/canna/distinfo
index 1af377da2a4..fc4cc8092b5 100644
--- a/inputmethod/canna/distinfo
+++ b/inputmethod/canna/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.1 2003/05/31 07:24:39 uebayasi Exp $
+$NetBSD: distinfo,v 1.2 2003/07/31 13:04:40 uebayasi Exp $
 
 SHA1 (Canna36p3.tar.gz) = 183c4e160babd49d5d8c542fbf06db980e3965da
 Size (Canna36p3.tar.gz) = 1441598 bytes
-SHA1 (patch-aa) = 6f5bf45212cf1127cb8b2f8f0c5eb0c778e1a908
+SHA1 (patch-aa) = eb21b7beaa66c4d0c5815599dc49b7c0b7eb3a40
 SHA1 (patch-ab) = b203ad0cb1285ffed0037e0eced3ae298bec5eb9
 SHA1 (patch-ac) = 8f9f999eb8abd9c8e3d3e5c66cf55150ce700919
 SHA1 (patch-ad) = d4b5720c206f81124e0d53e71590de86f66c524c
diff --git a/inputmethod/canna/patches/patch-aa b/inputmethod/canna/patches/patch-aa
index 3851c767739..5b487bf621c 100644
--- a/inputmethod/canna/patches/patch-aa
+++ b/inputmethod/canna/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1 2003/05/31 07:24:41 uebayasi Exp $
+$NetBSD: patch-aa,v 1.2 2003/07/31 13:04:40 uebayasi Exp $
 
 --- Canna.conf.orig	Sat Jan 25 17:47:47 2003
 +++ Canna.conf
@@ -33,7 +33,7 @@ $NetBSD: patch-aa,v 1.1 2003/05/31 07:24:41 uebayasi Exp $
  
 -cannaOwner = bin
 -cannaGroup = bin
-+cannaOwner = ${CANNA_OWNER}
++cannaOwner = ${CANNA_USER}
 +cannaGroup = ${CANNA_GROUP}
  
  #ifdef InstallAsUser