Date: Sun, 29 Dec 2013 17:35:16 GMT From: Jason Helfman <jgh@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/185271: japanese/xlockmore: merge port into x11/xlockmore using OPTIONS framework Message-ID: <201312291735.rBTHZGPZ022035@freefall.freebsd.org> Resent-Message-ID: <201312291740.rBTHe19a022331@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 185271
>Category: ports
>Synopsis: japanese/xlockmore: merge port into x11/xlockmore using OPTIONS framework
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Dec 29 17:40:01 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Jason Helfman
>Release: FreeBSD 11.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD freefall.freebsd.org 11.0-CURRENT FreeBSD 11.0-CURRENT #0 r259961: Fri Dec 27 21:56:39 UTC 2013 peter@freefall.freebsd.org:/usr/obj/usr/src/sys/FREEFALL amd64
>Description:
japanese/xlockmore can be merged into x11/xlockmore.
if you agree to this change, it can then be removed from the tree after the merge.
With this diff, I've also renmaed the the MAGICK option.
>How-To-Repeat:
>Fix:
Index: x11/xlockmore/Makefile
===================================================================
--- x11/xlockmore/Makefile (revision 337934)
+++ x11/xlockmore/Makefile (working copy)
@@ -25,7 +25,7 @@
PLIST_FILES= bin/xlock lib/X11/app-defaults/XLock man/man1/xlock.1.gz
OPTIONS_DEFINE= MESAGL MB SYSLOG DISABLE_ALLOW_ROOT NICE_ONLY BLANK_ONLY \
- KERBEROS4 BAD_PAM GTK2 TIME_BOMB CUSTOMIZATION MAGICK
+ KERBEROS4 BAD_PAM GTK2 TIME_BOMB CUSTOMIZATION IMAGEMAGICK JAPANESE
MESAGL_DESC= Mesa 3D (for GL modes)
MB_DESC= Xmb function series
@@ -38,6 +38,7 @@
XLOCK_GROUP_DESC= Allow xlock group to logout
TIME_BOMB_DESC= Allow autologout
CUSTOMIZATION_DESC= Allow tune through resource file
+JAPANESE_DESC= Japanese support
OPTIONS_RADIO= ONE
OPTIONS_RADIO_ONE= PAM XLOCK_GROUP
@@ -74,6 +75,12 @@
CONFIGURE_ARGS+= --enable-nice-only
.endif
+.if ${PORT_OPTIONS:MJAPANESE}
+PORT_OPTIONS+= MB
+XLOCKMORE_LANG= ja
+CATEGORIES+= japanese
+.endif
+
.if ${PORT_OPTIONS:MBAD_PAM}
CONFIGURE_ARGS+= --enable-bad-pam
.endif
@@ -125,7 +132,7 @@
CONFIGURE_ARGS+= --enable-customization
.endif
-.if ${PORT_OPTIONS:MMAGICK}
+.if ${PORT_OPTIONS:MIMAGEMAGICK}
LIB_DEPENDS+= libMagickCore.so:${PORTSDIR}/graphics/ImageMagick
.else
CONFIGURE_ARGS+= --without-magick
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312291735.rBTHZGPZ022035>