From owner-svn-ports-all@freebsd.org Thu Jun 22 09:01:30 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 675C3D87160; Thu, 22 Jun 2017 09:01:30 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 360E073AF4; Thu, 22 Jun 2017 09:01:30 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5M91TXd029237; Thu, 22 Jun 2017 09:01:29 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5M91Toj029236; Thu, 22 Jun 2017 09:01:29 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201706220901.v5M91Toj029236@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Thu, 22 Jun 2017 09:01:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r444106 - head/japanese/ddskk X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Jun 2017 09:01:30 -0000 Author: amdmi3 Date: Thu Jun 22 09:01:29 2017 New Revision: 444106 URL: https://svnweb.freebsd.org/changeset/ports/444106 Log: - Fix LICENSE - Add LICENSE_FILE - Simplify installation - Switch to options helpers Modified: head/japanese/ddskk/Makefile Modified: head/japanese/ddskk/Makefile ============================================================================== --- head/japanese/ddskk/Makefile Thu Jun 22 08:25:17 2017 (r444105) +++ head/japanese/ddskk/Makefile Thu Jun 22 09:01:29 2017 (r444106) @@ -13,24 +13,24 @@ PKGNAMESUFFIX= -${EMACS_PORT_NAME} MAINTAINER= ports@FreeBSD.org COMMENT= Simple Kana to Kanji conversion program on Emacsen -LICENSE= GPLv2 +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/READMEs/COPYING -NO_ARCH= yes - USE_EMACS= yes MAKE_ARGS= PREFIX="${STAGEDIR}${PREFIX}" \ SKK_LISPDIR="${STAGEDIR}${PREFIX}/${SKK_LISPDIR}" \ SKK_INFODIR="${STAGEDIR}${PREFIX}/${INFO_PATH}" ALL_TARGET= elc info +NO_ARCH= yes INFO= skk PORTDOCS= * PORTEXAMPLES= * -OPTIONS_DEFINE= DOCS EXAMPLES - SKK_LISPDIR= ${EMACS_VERSION_SITE_LISPDIR}/skk +OPTIONS_DEFINE= DOCS EXAMPLES + post-patch: @${REINPLACE_CMD} -e \ '/skk-tut-file/s|@TUT@|${PREFIX}/share/skk/SKK.tut|' \ @@ -44,18 +44,19 @@ pre-build: post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/${SKK_LISPDIR} .for i in skk-lookup.el skk-jisx0213.el - (cd ${WRKDIR} && ${INSTALL_DATA} ${i} \ - ${STAGEDIR}${PREFIX}/${SKK_LISPDIR}) + ${INSTALL_DATA} ${WRKDIR}/${i} ${STAGEDIR}${PREFIX}/${SKK_LISPDIR} .endfor + +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in AUTHORS.ja CODENAME.ja Contributors FAQ.ja NEWS.ja README - (cd ${WRKSRC}/READMEs && ${INSTALL_DATA} ${i} \ - ${STAGEDIR}${DOCSDIR}) + ${INSTALL_DATA} ${WRKSRC}/READMEs/${i} ${STAGEDIR}${DOCSDIR} .endfor + +post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} .for i in Emacs.ad dot.emacs dot.skk - (cd ${WRKSRC}/etc && ${INSTALL_DATA} ${i} \ - ${STAGEDIR}${EXAMPLESDIR}) + ${INSTALL_DATA} ${WRKSRC}/etc/${i} ${STAGEDIR}${EXAMPLESDIR} .endfor .include