Date: Mon, 1 Sep 2014 20:15:31 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r366951 - in head/japanese: ng ng-canna Message-ID: <201409012015.s81KFVOB038855@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Mon Sep 1 20:15:30 2014 New Revision: 366951 URL: http://svnweb.freebsd.org/changeset/ports/366951 QAT: https://qat.redports.org/buildarchive/r366951/ Log: Resurrect ng-canna and stage it Stage ng PR: 193160 Submitted by: Ports fury Added: head/japanese/ng-canna/ - copied from r366898, head/japanese/ng-canna/ Modified: head/japanese/ng-canna/Makefile head/japanese/ng/Makefile head/japanese/ng/pkg-descr Modified: head/japanese/ng-canna/Makefile ============================================================================== --- head/japanese/ng-canna/Makefile Mon Sep 1 16:34:26 2014 (r366898) +++ head/japanese/ng-canna/Makefile Mon Sep 1 20:15:30 2014 (r366951) @@ -10,7 +10,6 @@ MASTERDIR= ${.CURDIR}/../ng DESCR= ${.CURDIR}/pkg-descr -WITH_CANNA= yes +OPTIONS_SLAVE= CANNA -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/japanese/ng/Makefile ============================================================================== --- head/japanese/ng/Makefile Mon Sep 1 20:09:03 2014 (r366950) +++ head/japanese/ng/Makefile Mon Sep 1 20:15:30 2014 (r366951) @@ -5,7 +5,7 @@ PORTNAME= ng PORTVERSION= 1.4.4 PORTREVISION= 2 CATEGORIES= japanese editors -MASTER_SITES= http://tomato.sakura.ne.jp/~amura/archives/ng/ +MASTER_SITES= http://tt.sakura.ne.jp/~amura/archives/ng/ PATCH_SITES= ${MASTER_SITES} PATCHFILES= ng-1.4.4-replace_bug.patch @@ -13,39 +13,37 @@ PATCHFILES= ng-1.4.4-replace_bug.patch MAINTAINER?= ports@FreeBSD.org COMMENT?= Light Emacs-clone with Japanese support -MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" LIBS="${LIBS}" -LIBS= -ltermcap - +MAKEFILE= sys/sysv/Makefile +MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" LIBS="${LDFLAGS}" ALL_TARGET= ng +CFLAGS+= -Wno-error=return-type +LDFLAGS+= -ltermcap + DOCSDIR= ${PREFIX}/share/doc/ja/${PORTNAME} -MYPORTDOCS= CHANGES.1_3 CHANGES.doc Ng.FAQ Ng.doc Ng.ref Ng.tut \ - README.Ng README.SKG -PORTDOCS= ${MYPORTDOCS:C/$/.euc-jp/} +CONFLICTS= ng-devel-[0-9]* +PORTDOCS= ${MYPORTDOCS:C/$/.euc-jp/} PLIST_FILES= bin/ng -NO_STAGE= yes -.include <bsd.port.pre.mk> - -.if defined(WITH_CANNA) -LIB_DEPENDS+= libcanna.so:${PORTSDIR}/japanese/canna-lib +OPTIONS_DEFINE= CANNA DOCS -CFLAGS+= -I${LOCALBASE}/include -DCANNA -LIBS+= -L${LOCALBASE}/lib -lcanna -.endif +CANNA_DESC= Canna support +CANNA_LIB_DEPENDS= libcanna.so:${PORTSDIR}/japanese/canna-lib +CANNA_CFLAGS= -I${LOCALBASE}/include -DCANNA +CANNA_LDFLAGS= -L${LOCALBASE}/lib -lcanna -post-patch: - @(cd ${WRKSRC}; ${LN} -sf sys/sysv/Makefile . ) +MYPORTDOCS= CHANGES.1_3 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.post.mk> +.include <bsd.port.mk> Modified: head/japanese/ng/pkg-descr ============================================================================== --- head/japanese/ng/pkg-descr Mon Sep 1 20:09:03 2014 (r366950) +++ head/japanese/ng/pkg-descr Mon Sep 1 20:15:30 2014 (r366951) @@ -1,13 +1,11 @@ -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 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(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/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409012015.s81KFVOB038855>