Date: Wed, 14 Jun 2006 01:41:41 +0900 (JST) From: KOMATSU Shinichiro <koma2@lovepeers.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: erwin@FreeBSD.org Subject: ports/98906: japanese/skkinput3: Use OPTIONS Message-ID: <20060613164141.6E1CB3F40A@saba.daemonfarm.org> Resent-Message-ID: <200606131650.k5DGoFUp033687@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 98906
>Category: ports
>Synopsis: japanese/skkinput3: Use OPTIONS
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue Jun 13 16:50:14 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: KOMATSU Shinichiro
>Release: FreeBSD 5.4-RELEASE-p10 i386
>Organization:
>Environment:
System: FreeBSD saba.daemonfarm.org 5.4-RELEASE-p10 FreeBSD 5.4-RELEASE-p10 #0: Wed Feb 1 03:56:17 JST 2006 root@www.my.domain:/usr/src/sys/i386/compile/DEDI i386
>Description:
Use OPTIONS and convert USE_SKK10 to WITH_SKK10.
Suggested by: erwin
>How-To-Repeat:
>Fix:
Index: japanese/skkinput3/Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/skkinput3/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- japanese/skkinput3/Makefile 9 May 2006 00:18:02 -0000 1.16
+++ japanese/skkinput3/Makefile 13 Jun 2006 16:28:25 -0000
@@ -16,24 +16,28 @@
USE_IMAKE= yes
+OPTIONS= DBSKKD "Use ja-dbskkd-cdb as skkserver" off \
+ RSKKSERV "Use ja-rskkserv as skkserver" off \
+ SKK10 "Use SKK10 elisps" off
+
NO_INSTALL_MANPAGES= yes
-.if defined(USE_SKK10)
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_SKK10)
PLIST_SUB= SKK8="@comment " SKK10=""
.else
PLIST_SUB= SKK8="" SKK10="@comment "
.endif
-.include <bsd.port.pre.mk>
-
# sanity check
.if defined(WITH_DBSKKD) && defined(WITH_RSKKSERV)
.error Cannot define both WITH_DBSKKD and WITH_RSKKSERV simultaneously.
.endif
-.if defined(WITH_DBSKKD) || exists(${LOCALBASE}/libexec/dbskkd-cdb) && !defined(WITH_RSKKSERV)
+.if defined(WITH_DBSKKD)
RUN_DEPENDS= ${LOCALBASE}/libexec/dbskkd-cdb:${PORTSDIR}/japanese/dbskkd-cdb
-.elif defined(WITH_RSKKSERV) || exists(${LOCALBASE}/libexec/rskkserv) && !defined(WITH_DBSKKD)
+.elif defined(WITH_RSKKSERV)
RUN_DEPENDS= ${LOCALBASE}/libexec/rskkserv:${PORTSDIR}/japanese/rskkserv
.else
RUN_DEPENDS= ${LOCALBASE}/sbin/skkserv:${PORTSDIR}/japanese/skkserv
@@ -41,7 +45,7 @@
DOCS= *.jis dot.skkinput ChangeLog
-.if defined(USE_SKK10)
+.if defined(WITH_SKK10)
post-patch:
${REINPLACE_CMD} -e '/\(#define.*UseSkk8\)/ s/^/XCOMM /' \
-e '/XCOMM.*#define.*UseSkk10/ s/XCOMM[[:space:]]*//' \
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060613164141.6E1CB3F40A>