- Subject: Re: pkg/16150
- From: Masao Uebayashi <uebayasi@soum.co.jp>
- To: gnats@netbsd.org
- Date: Tue, 02 Apr 2002 00:06:49 +0900 (JST)
- Message-Id: <20020402.000649.68541123.uebayasi@soum.co.jp>
- Organisation: SOUM Corporation, Tokyo, Japan
I've just made the easiest fix which Marc Espie from OpenBSD suggested
in tech-pkg@netbsd.org.
Masao
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/japanese/canna-lib/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- Makefile 2001/02/16 15:25:11 1.7
+++ Makefile 2002/04/01 14:53:50
@@ -17,6 +17,7 @@
INSTALL_TARGET= install install.man
+USE_IMAKE= # defined
BUILD_DEFS+= USE_INET6
.include "../../mk/bsd.prefs.mk"
@@ -27,7 +28,7 @@
.endif
CANNAOWNER?= daemon
CANNAGROUP?= daemon
-DICT_DIR?= /var/dict
+DICT_DIR?= ${DISTDIR}/var/dict
MAKE_ENV+= CANNAOWNER=${CANNAOWNER} CANNAGROUP=${CANNAGROUP} \
DICT_DIR=${DICT_DIR} INET6=${INET6}
PLIST_SUBST= CANNAOWNER=${CANNAOWNER} \
@@ -45,9 +46,6 @@
@${SED} -e '/InstallProgram/d' ${WRKSRC}/cmd/${f}/Imakefile.orig \
> ${WRKSRC}/cmd/${f}/Imakefile
.endfor
-
-do-configure:
- @(cd ${WRKSRC}; ${XMKMF})
post-configure:
@${LN} -s ${WRKSRC}/server/*.h ${WRKSRC}/include
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/japanese/canna-lib/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo 2001/04/21 10:13:31 1.2
+++ distinfo 2002/04/01 14:53:50
@@ -9,7 +9,7 @@
SHA1 (Canna35b2-hack1.patch.gz) = 24ab2baf104ef9748f92bd5315d4100a7ee961ab
Size (Canna35b2-hack1.patch.gz) = 8384 bytes
SHA1 (patch-aa) = d74119cb2c37a3db1c5d5417c1e35362b1eac655
-SHA1 (patch-ab) = 38f3ad4e022299a4dfd8d9391b1742b0d0f02a71
+SHA1 (patch-ab) = f91d49fdc328be24e136603a6b7b40c19ed3e57c
SHA1 (patch-ac) = 8f910e59d71ef09434a40abde698d730ed7fc1c5
SHA1 (patch-ad) = dd2eb94e75dc4789e298aa1601280d32fbe5ec96
SHA1 (patch-ae) = e44c60ddf1e042ab5df1457b6723071c38baae02
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/japanese/canna-lib/patches/patch-ab,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-ab
--- patches/patch-ab 1999/08/02 04:37:09 1.1.1.1
+++ patches/patch-ab 2002/04/01 14:53:50
@@ -1,18 +1,36 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/08/02 04:37:09 sakamoto Exp $
+$NetBSD$
---- ./Imakefile.orig Wed Nov 27 16:01:34 1996
-+++ ./Imakefile Fri Jul 30 19:17:44 1999
-@@ -61,5 +61,5 @@
- do \
- (cd $$i ; echo "installing" "in $(CURRENT_DIR)/$$i..."; \
-- $(MAKE) $(MFLAGS) DESTDIR='$(DESTDIR)' install); \
-+ $(MAKE) $(MFLAGS) DESTDIR='$(DESTDIR)' install install.man); \
- done
+--- Imakefile.orig Fri Mar 22 14:40:18 2002
++++ Imakefile
+@@ -4,7 +4,7 @@
+ #define IHaveSubdirs
+ #define PassCDebugFlags
+ WORLDOPTS = -k
+- SUBDIRS = lib canna server cmd dic misc doc
++ SUBDIRS = lib canna cmd/forcpp cmd/kpdic dic/phono misc doc
+ INCLUDE = ./include/canna
+ AllTarget(cannaconf.h)
+ MakeSubdirs($(SUBDIRS))
+@@ -22,7 +22,7 @@
+ CANNAROOT = .
+ SERVERDIR = server dic/phono dic/ideo
+ CLIENTDIR = cmd dic/phono misc
+-SGSDIR = canna lib
++SGSDIR = lib canna dic/phono misc doc
-@@ -69,5 +69,5 @@
- do \
- (cd $$i ; echo "installing" "in $(CURRENT_DIR)/$$i..."; \
-- $(MAKE) $(MFLAGS) DESTDIR='$(DESTDIR)' install); \
-+ $(MAKE) $(MFLAGS) DESTDIR='$(DESTDIR)' install install.man); \
- done
+ install:: mkbindir mklibdir mkdicdir mkerrdir
+ instserver:: mkdicdir mkerrdir
+@@ -39,7 +39,12 @@
+ MakeDirectoriesLong(mkerrdir, $(ErrDir), $(cannaOwner), $(cannaGroup))
+ #endif
+-LinkFileList(includes,cannaconf.h,$(CANNAROOT)/include,..)
++/* LinkFileList(includes,cannaconf.h,$(CANNAROOT)/include,..) */
++includes:: cannaconf.h
++ @for flag in ${MAKEFLAGS} ''; do \
++ case "$$flag" in *=*) ;; *[i]*) set +e;; esac; done; \
++ echo " cd" $(CANNAROOT)/include; cd $(CANNAROOT)/include && \
++ for i in cannaconf.h; do (set -x; $(RM) $$i; $(LN) ../$$i .); done
+
+ canna::
+ @echo ""