From 5c2847616b42548b9698af2621bb57b034c87754 Mon Sep 17 00:00:00 2001 From: Makoto Fujiwara Date: Sun, 26 Apr 2015 10:14:45 +0000 Subject: [PATCH] - Honor ${EMACS_PKGNAME_PREFIX} for PKGNAME - Add emacs*/modules.mk - Remove trailing empty lines --- tamago-tsunagi/Makefile | 4 +++- tamago-tsunagi/options.mk | 4 +--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tamago-tsunagi/Makefile b/tamago-tsunagi/Makefile index 52f1074fc5..745945dd7c 100644 --- a/tamago-tsunagi/Makefile +++ b/tamago-tsunagi/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.3 2015/04/04 15:15:44 makoto Exp $ +# $NetBSD: Makefile,v 1.4 2015/04/26 10:14:45 makoto Exp $ DISTNAME= tamago-tsunagi-5.0.7.1 +PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} CATEGORIES= inputmethod MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP:=tamago-tsunagi/62701/} @@ -16,4 +17,5 @@ GNU_CONFIGURE= yes .include "options.mk" +.include "../../wip/emacs-current/modules.mk" .include "../../mk/bsd.pkg.mk" diff --git a/tamago-tsunagi/options.mk b/tamago-tsunagi/options.mk index 72681deab6..41402ac78b 100644 --- a/tamago-tsunagi/options.mk +++ b/tamago-tsunagi/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2015/04/05 07:25:45 makoto Exp $ +# $NetBSD: options.mk,v 1.3 2015/04/26 10:14:45 makoto Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.tamago-tsunagi PKG_SUPPORTED_OPTIONS= freewnn canna sj3 anthy PKG_SUGGESTED_OPTIONS= freewnn canna sj3 anthy @@ -20,5 +20,3 @@ DEPENDS+= sj3-server-[0-9]*:../../inputmethod/sj3-server .if !empty(PKG_OPTIONS:Manthy) DEPENDS+= anthy-[0-9]*:../../inputmethod/anthy .endif - -