From 50e496c6be28313640920321aa2973609548b415 Mon Sep 17 00:00:00 2001 From: Masafumi Max NAKANE Date: Fri, 13 Feb 2004 08:13:00 +0000 Subject: [PATCH] Update to 3.7p1 --- japanese/Canna/Makefile | 19 ++++++++++++++++--- japanese/Canna/distinfo | 2 +- japanese/Canna/files/patch-ac | 13 +++---------- japanese/Canna/pkg-plist | 3 +++ japanese/canna-lib/Makefile | 19 ++++++++++++++++--- japanese/canna-lib/distinfo | 2 +- japanese/canna-lib/files/patch-ac | 13 +++---------- japanese/canna-lib/pkg-plist | 3 +++ japanese/canna-server/Makefile | 19 ++++++++++++++++--- japanese/canna-server/distinfo | 2 +- japanese/canna-server/files/patch-ac | 13 +++---------- japanese/canna-server/pkg-plist | 3 +++ 12 files changed, 69 insertions(+), 42 deletions(-) diff --git a/japanese/Canna/Makefile b/japanese/Canna/Makefile index b905333c8358..636f9e4c13a1 100644 --- a/japanese/Canna/Makefile +++ b/japanese/Canna/Makefile @@ -7,20 +7,21 @@ # PORTNAME= Canna -PORTVERSION= 3.6p4 -PORTREVISION= 1 +PORTVERSION= 3.7p1 CATEGORIES= japanese MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP} -MASTER_SITE_SUBDIR= canna/6059 +MASTER_SITE_SUBDIR= canna/7449/ DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g} MAINTAINER= max@FreeBSD.org COMMENT= Kana-Kanji conversion system +USE_BZIP2= yes USE_IMAKE= yes USE_X_PREFIX= no ALL_TARGET= canna INSTALLS_SHLIB= yes +MAKE_ENV+= CC=$(CC) MANLANG="" ja MAN1= addwords.1 cannacheck.1 cannakill.1 cannaserver.1 cannastat.1 \ @@ -39,6 +40,11 @@ MLINKS= uilib.3 XKanjiControl.3 uilib.3 XLookupKanjiString.3 \ MANCOMPRESSED= no XFREE86_HTML_MAN= no +.if !defined(NOPORTDOCS) +PORTDOCS= canna.bib canna.sty Imakefile README.jp Makefile \ + intern lisp man +.endif + post-build: @${SED} -e "s,@RM@,${RM},g; s,@TOUCH@,${TOUCH},g; \ s,@CHOWN@,${CHOWN},g" ${FILESDIR}/canna.sh.in \ @@ -54,5 +60,12 @@ post-install: @${INSTALL_SCRIPT} ${WRKDIR}/canna.sh.sample ${PREFIX}/etc/rc.d/canna.sh.sample @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @${CAT} ${PKGMESSAGE} +.if !defined(NOPORTDOCS) + @${MKDIR} ${DOCSDIR} +.for f in ${PORTDOCS} + @${CP} -R ${WRKSRC}/doc/$f ${DOCSDIR} +.endfor + @${CHOWN} -R root:wheel ${DOCSDIR} +.endif .include diff --git a/japanese/Canna/distinfo b/japanese/Canna/distinfo index ff1c7bfeb063..39cd78c166d9 100644 --- a/japanese/Canna/distinfo +++ b/japanese/Canna/distinfo @@ -1 +1 @@ -MD5 (Canna36p4.tar.gz) = 4798ca358e9ecdb37dbb1f5d986832e1 +MD5 (Canna37p1.tar.bz2) = 849102b32a84cf48cddc150a1fcd83ad diff --git a/japanese/Canna/files/patch-ac b/japanese/Canna/files/patch-ac index 676f2d290887..a3bef982a0f9 100644 --- a/japanese/Canna/files/patch-ac +++ b/japanese/Canna/files/patch-ac @@ -1,13 +1,6 @@ ---- Canna.conf.orig Sat Jan 25 17:47:47 2003 -+++ Canna.conf Tue Feb 4 16:20:34 2003 -@@ -133,13 +133,14 @@ - /* rootにならずにインストールする時はこれを定義して下さい */ - /* #define InstallAsUser */ - /* 従来と互換のディレクトリ構造にする場合はこれを定義してください */ --#define ObsoleteInstallDir -+/* #define ObsoleteInstallDir */ - #ifdef InstallAsUser - # define DefCannaPrefix $(HOME)/canna +--- Canna.conf.orig Fri Jan 2 21:26:27 2004 ++++ Canna.conf Thu Jan 22 18:42:43 2004 +@@ -109,7 +109,8 @@ # define DefErrDir $(cannaPrefix)/log # define DefLibCannaDir $(cannaExecPrefix)/lib #else diff --git a/japanese/Canna/pkg-plist b/japanese/Canna/pkg-plist index 6211947fd8bf..107b6d59d2e0 100644 --- a/japanese/Canna/pkg-plist +++ b/japanese/Canna/pkg-plist @@ -3,6 +3,7 @@ bin/canlisp bin/cannacheck bin/cannastat bin/catdic +bin/chkconc bin/chmoddic bin/cpdic bin/crfreq @@ -33,6 +34,8 @@ include/canna/RK.h include/canna/jrkanji.h include/canna/keydef.h include/canna/mfdef.h +include/canna/pubconf.h +include/canna/sysdep.h share/canna/default.canna share/canna/dic/canna/bushu.cld share/canna/dic/canna/chimei.ctd diff --git a/japanese/canna-lib/Makefile b/japanese/canna-lib/Makefile index b905333c8358..636f9e4c13a1 100644 --- a/japanese/canna-lib/Makefile +++ b/japanese/canna-lib/Makefile @@ -7,20 +7,21 @@ # PORTNAME= Canna -PORTVERSION= 3.6p4 -PORTREVISION= 1 +PORTVERSION= 3.7p1 CATEGORIES= japanese MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP} -MASTER_SITE_SUBDIR= canna/6059 +MASTER_SITE_SUBDIR= canna/7449/ DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g} MAINTAINER= max@FreeBSD.org COMMENT= Kana-Kanji conversion system +USE_BZIP2= yes USE_IMAKE= yes USE_X_PREFIX= no ALL_TARGET= canna INSTALLS_SHLIB= yes +MAKE_ENV+= CC=$(CC) MANLANG="" ja MAN1= addwords.1 cannacheck.1 cannakill.1 cannaserver.1 cannastat.1 \ @@ -39,6 +40,11 @@ MLINKS= uilib.3 XKanjiControl.3 uilib.3 XLookupKanjiString.3 \ MANCOMPRESSED= no XFREE86_HTML_MAN= no +.if !defined(NOPORTDOCS) +PORTDOCS= canna.bib canna.sty Imakefile README.jp Makefile \ + intern lisp man +.endif + post-build: @${SED} -e "s,@RM@,${RM},g; s,@TOUCH@,${TOUCH},g; \ s,@CHOWN@,${CHOWN},g" ${FILESDIR}/canna.sh.in \ @@ -54,5 +60,12 @@ post-install: @${INSTALL_SCRIPT} ${WRKDIR}/canna.sh.sample ${PREFIX}/etc/rc.d/canna.sh.sample @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @${CAT} ${PKGMESSAGE} +.if !defined(NOPORTDOCS) + @${MKDIR} ${DOCSDIR} +.for f in ${PORTDOCS} + @${CP} -R ${WRKSRC}/doc/$f ${DOCSDIR} +.endfor + @${CHOWN} -R root:wheel ${DOCSDIR} +.endif .include diff --git a/japanese/canna-lib/distinfo b/japanese/canna-lib/distinfo index ff1c7bfeb063..39cd78c166d9 100644 --- a/japanese/canna-lib/distinfo +++ b/japanese/canna-lib/distinfo @@ -1 +1 @@ -MD5 (Canna36p4.tar.gz) = 4798ca358e9ecdb37dbb1f5d986832e1 +MD5 (Canna37p1.tar.bz2) = 849102b32a84cf48cddc150a1fcd83ad diff --git a/japanese/canna-lib/files/patch-ac b/japanese/canna-lib/files/patch-ac index 676f2d290887..a3bef982a0f9 100644 --- a/japanese/canna-lib/files/patch-ac +++ b/japanese/canna-lib/files/patch-ac @@ -1,13 +1,6 @@ ---- Canna.conf.orig Sat Jan 25 17:47:47 2003 -+++ Canna.conf Tue Feb 4 16:20:34 2003 -@@ -133,13 +133,14 @@ - /* rootにならずにインストールする時はこれを定義して下さい */ - /* #define InstallAsUser */ - /* 従来と互換のディレクトリ構造にする場合はこれを定義してください */ --#define ObsoleteInstallDir -+/* #define ObsoleteInstallDir */ - #ifdef InstallAsUser - # define DefCannaPrefix $(HOME)/canna +--- Canna.conf.orig Fri Jan 2 21:26:27 2004 ++++ Canna.conf Thu Jan 22 18:42:43 2004 +@@ -109,7 +109,8 @@ # define DefErrDir $(cannaPrefix)/log # define DefLibCannaDir $(cannaExecPrefix)/lib #else diff --git a/japanese/canna-lib/pkg-plist b/japanese/canna-lib/pkg-plist index 6211947fd8bf..107b6d59d2e0 100644 --- a/japanese/canna-lib/pkg-plist +++ b/japanese/canna-lib/pkg-plist @@ -3,6 +3,7 @@ bin/canlisp bin/cannacheck bin/cannastat bin/catdic +bin/chkconc bin/chmoddic bin/cpdic bin/crfreq @@ -33,6 +34,8 @@ include/canna/RK.h include/canna/jrkanji.h include/canna/keydef.h include/canna/mfdef.h +include/canna/pubconf.h +include/canna/sysdep.h share/canna/default.canna share/canna/dic/canna/bushu.cld share/canna/dic/canna/chimei.ctd diff --git a/japanese/canna-server/Makefile b/japanese/canna-server/Makefile index b905333c8358..636f9e4c13a1 100644 --- a/japanese/canna-server/Makefile +++ b/japanese/canna-server/Makefile @@ -7,20 +7,21 @@ # PORTNAME= Canna -PORTVERSION= 3.6p4 -PORTREVISION= 1 +PORTVERSION= 3.7p1 CATEGORIES= japanese MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP} -MASTER_SITE_SUBDIR= canna/6059 +MASTER_SITE_SUBDIR= canna/7449/ DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g} MAINTAINER= max@FreeBSD.org COMMENT= Kana-Kanji conversion system +USE_BZIP2= yes USE_IMAKE= yes USE_X_PREFIX= no ALL_TARGET= canna INSTALLS_SHLIB= yes +MAKE_ENV+= CC=$(CC) MANLANG="" ja MAN1= addwords.1 cannacheck.1 cannakill.1 cannaserver.1 cannastat.1 \ @@ -39,6 +40,11 @@ MLINKS= uilib.3 XKanjiControl.3 uilib.3 XLookupKanjiString.3 \ MANCOMPRESSED= no XFREE86_HTML_MAN= no +.if !defined(NOPORTDOCS) +PORTDOCS= canna.bib canna.sty Imakefile README.jp Makefile \ + intern lisp man +.endif + post-build: @${SED} -e "s,@RM@,${RM},g; s,@TOUCH@,${TOUCH},g; \ s,@CHOWN@,${CHOWN},g" ${FILESDIR}/canna.sh.in \ @@ -54,5 +60,12 @@ post-install: @${INSTALL_SCRIPT} ${WRKDIR}/canna.sh.sample ${PREFIX}/etc/rc.d/canna.sh.sample @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @${CAT} ${PKGMESSAGE} +.if !defined(NOPORTDOCS) + @${MKDIR} ${DOCSDIR} +.for f in ${PORTDOCS} + @${CP} -R ${WRKSRC}/doc/$f ${DOCSDIR} +.endfor + @${CHOWN} -R root:wheel ${DOCSDIR} +.endif .include diff --git a/japanese/canna-server/distinfo b/japanese/canna-server/distinfo index ff1c7bfeb063..39cd78c166d9 100644 --- a/japanese/canna-server/distinfo +++ b/japanese/canna-server/distinfo @@ -1 +1 @@ -MD5 (Canna36p4.tar.gz) = 4798ca358e9ecdb37dbb1f5d986832e1 +MD5 (Canna37p1.tar.bz2) = 849102b32a84cf48cddc150a1fcd83ad diff --git a/japanese/canna-server/files/patch-ac b/japanese/canna-server/files/patch-ac index 676f2d290887..a3bef982a0f9 100644 --- a/japanese/canna-server/files/patch-ac +++ b/japanese/canna-server/files/patch-ac @@ -1,13 +1,6 @@ ---- Canna.conf.orig Sat Jan 25 17:47:47 2003 -+++ Canna.conf Tue Feb 4 16:20:34 2003 -@@ -133,13 +133,14 @@ - /* rootにならずにインストールする時はこれを定義して下さい */ - /* #define InstallAsUser */ - /* 従来と互換のディレクトリ構造にする場合はこれを定義してください */ --#define ObsoleteInstallDir -+/* #define ObsoleteInstallDir */ - #ifdef InstallAsUser - # define DefCannaPrefix $(HOME)/canna +--- Canna.conf.orig Fri Jan 2 21:26:27 2004 ++++ Canna.conf Thu Jan 22 18:42:43 2004 +@@ -109,7 +109,8 @@ # define DefErrDir $(cannaPrefix)/log # define DefLibCannaDir $(cannaExecPrefix)/lib #else diff --git a/japanese/canna-server/pkg-plist b/japanese/canna-server/pkg-plist index 6211947fd8bf..107b6d59d2e0 100644 --- a/japanese/canna-server/pkg-plist +++ b/japanese/canna-server/pkg-plist @@ -3,6 +3,7 @@ bin/canlisp bin/cannacheck bin/cannastat bin/catdic +bin/chkconc bin/chmoddic bin/cpdic bin/crfreq @@ -33,6 +34,8 @@ include/canna/RK.h include/canna/jrkanji.h include/canna/keydef.h include/canna/mfdef.h +include/canna/pubconf.h +include/canna/sysdep.h share/canna/default.canna share/canna/dic/canna/bushu.cld share/canna/dic/canna/chimei.ctd