aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--japanese/ng-devel/Makefile42
-rw-r--r--japanese/ng-devel/pkg-descr17
-rw-r--r--japanese/ng-devel/pkg-plist11
3 files changed, 34 insertions, 36 deletions
diff --git a/japanese/ng-devel/Makefile b/japanese/ng-devel/Makefile
index eac26ce1ef1c..8eee8ffc1912 100644
--- a/japanese/ng-devel/Makefile
+++ b/japanese/ng-devel/Makefile
@@ -2,30 +2,42 @@
# $FreeBSD$
PORTNAME= ng
-PORTVERSION= 1.5.b1
+DISTVERSION= 1.5beta1
CATEGORIES= japanese editors
-MASTER_SITES= http://tomato.sakura.ne.jp/~amura/archives/ng/
-DISTNAME= ${PORTNAME}-1.5beta1
+MASTER_SITES= http://tt.sakura.ne.jp/~amura/archives/ng/
+PKGNAMESUFFIX= -devel
-MAINTAINER?= ports@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Light Emacs-clone with Japanese support
-ALL_TARGET= ng
GNU_CONFIGURE= yes
+ALL_TARGET= ng
+
+CFLAGS+= -Wno-error=return-type
-MYPORTDOCS= CHANGES.1_3 CHANGES.1_4 CHANGES.doc Ng.FAQ Ng.doc Ng.ref Ng.tut \
- README.Ng README.SKG
-PKGNAMESUFFIX= -devel
DOCSDIR= ${PREFIX}/share/doc/ja/${PORTNAME}
-NO_STAGE= yes
+CONFLICTS= ng-[0-9]*
+
+PORTDOCS= ${MYPORTDOCS:S/$/.euc-jp/}
+PLIST_FILES= bin/ng
+
+OPTIONS_DEFINE= CANNA DOCS
+
+CANNA_DESC= Canna support
+CANNA_LIB_DEPENDS= libcanna.so:${PORTSDIR}/japanese/canna-lib
+CANNA_CONFIGURE_ON= --enable-canna=${LOCALBASE}
+
+MYPORTDOCS= CHANGES.1_3 CHANGES.1_4 CHANGES.doc Ng.FAQ Ng.doc \
+ Ng.ref Ng.tut README.Ng README.SKG
+
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/ng ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
- ${MKDIR} ${DOCSDIR}
-.for file in ${MYPORTDOCS}
- ${INSTALL_DATA} ${WRKSRC}/docs/${file} ${DOCSDIR}/${file}.euc-jp
+ (cd ${WRKSRC} && ${INSTALL_PROGRAM} ng \
+ ${STAGEDIR}${PREFIX}/bin)
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for i in ${MYPORTDOCS}
+ (cd ${WRKSRC}/docs && ${INSTALL_DATA} ${i} \
+ ${STAGEDIR}${DOCSDIR}/${i:S/$/.euc-jp/})
.endfor
-.endif
.include <bsd.port.mk>
diff --git a/japanese/ng-devel/pkg-descr b/japanese/ng-devel/pkg-descr
index 2cffa25c798a..2d9b0402ee63 100644
--- a/japanese/ng-devel/pkg-descr
+++ b/japanese/ng-devel/pkg-descr
@@ -1,13 +1,10 @@
-Ng is a very light weight Emacs clone editor, written in C.
-It doesn't have Lisp(that means very limited customization
-is available). Since you can invoke it very quickly
-(compared with real GNU Emacs), it is useful in dealing with
-changing small file a bit.
-
-Ng(Nihongo Micro Gnu Emacs) is a Mg(Micro Gnu Emacs)'s
-japanese port. Ng supports EUC, JIS and SJIS code.
-Ng also have (rather simple) C-mode.
+Ng is a very light weight Emacs clone editor, written in C. It doesn't
+have Lisp, so only limited customization is possible. Since you can invoke
+it very quickly (compared with real GNU Emacs), it is particularly useful
+for editing files that only require small changes.
+Ng(Nihongo Micro Gnu Emacs) is a Mg (Micro Gnu Emacs)'s japanese port.
+Ng supports EUC, JIS and SJIS code. Ng also have (rather simple) C-mode.
It is also very useful even if you don't need Japanese support.
-WWW: http://tomato.sakura.ne.jp/~amura/ng/
+WWW: http://tt.sakura.ne.jp/~amura/ng/
diff --git a/japanese/ng-devel/pkg-plist b/japanese/ng-devel/pkg-plist
deleted file mode 100644
index 92f024d5c6c5..000000000000
--- a/japanese/ng-devel/pkg-plist
+++ /dev/null
@@ -1,11 +0,0 @@
-bin/ng
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES.1_3.euc-jp
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES.1_4.euc-jp
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES.doc.euc-jp
-%%PORTDOCS%%%%DOCSDIR%%/Ng.FAQ.euc-jp
-%%PORTDOCS%%%%DOCSDIR%%/Ng.doc.euc-jp
-%%PORTDOCS%%%%DOCSDIR%%/Ng.ref.euc-jp
-%%PORTDOCS%%%%DOCSDIR%%/Ng.tut.euc-jp
-%%PORTDOCS%%%%DOCSDIR%%/README.Ng.euc-jp
-%%PORTDOCS%%%%DOCSDIR%%/README.SKG.euc-jp
-%%PORTDOCS%%@dirrm %%DOCSDIR%%