svn commit: r378336 - in head: . japanese x11/xlockmore

[Jason Helfman]

Author: jgh
Date: Mon Feb  2 22:56:02 2015
New Revision: 378336
URL: https://svnweb.freebsd.org/changeset/ports/378336
QAT: https://qat.redports.org/buildarchive/r378336/

Log:
  - merge japanese/xlockmore into x11/xlockmore

Modified:
  head/MOVED
  head/japanese/Makefile
  head/x11/xlockmore/Makefile

Modified: head/MOVED
==============================================================================
--- head/MOVED	Mon Feb  2 22:34:01 2015	(r378335)
+++ head/MOVED	Mon Feb  2 22:56:02 2015	(r378336)
@@ -7418,3 +7418,4 @@ net-im/venom||2015-02-02|Has expired: No
 security/openssh-portable66|security/openssh-portable|2015-02-02|Has expired: security/openssh-portable now has all patches working. This port is obsolete.
 www/p5-WWW-Scraper-ISBN-Driver|www/p5-WWW-Scraper-ISBN|2015-02-02|Has expired: Merged to www/p5-WWW-Scraper-ISBN by upstream
 www/p5-WWW-Scraper-ISBN-Record|www/p5-WWW-Scraper-ISBN|2015-02-02|Has expired: Merged to www/p5-WWW-Scraper-ISBN by upstream
+japanese/xlockmore|x11/xlockmore|2015-02-02|Merged into x11/xlockmore

Modified: head/japanese/Makefile
==============================================================================
--- head/japanese/Makefile	Mon Feb  2 22:34:01 2015	(r378335)
+++ head/japanese/Makefile	Mon Feb  2 22:56:02 2015	(r378336)
@@ -288,7 +288,6 @@
     SUBDIR += wwasw-fpw
     SUBDIR += xdtp
     SUBDIR += xgate
-    SUBDIR += xlockmore
     SUBDIR += xpdf
     SUBDIR += xshodou
     SUBDIR += xtr

Modified: head/x11/xlockmore/Makefile
==============================================================================
--- head/x11/xlockmore/Makefile	Mon Feb  2 22:34:01 2015	(r378335)
+++ head/x11/xlockmore/Makefile	Mon Feb  2 22:56:02 2015	(r378336)
@@ -8,7 +8,7 @@ MASTER_SITES=	http://www.tux.org/~bagley
 		ftp://ibiblio.org/pub/Linux/X11/screensavers/ \
 		LOCAL/ehaupt
 
-MAINTAINER?=	jgh at FreeBSD.org
+MAINTAINER=	jgh at FreeBSD.org
 COMMENT=	Like XLock session locker/screen saver, but just more
 
 USES=		tar:bzip2
@@ -24,7 +24,7 @@ LIB_DEPENDS+=	libfreetype.so:${PORTSDIR}
 CONFIGURE_ENV+=	ac_freetype_includes="${LOCALBASE}/include/freetype2"
 
 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 MAGICK JP
 OPTIONS_SUB=	yes
 
 MESAGL_DESC=	Mesa 3D (for GL modes)
@@ -38,6 +38,7 @@ GTK2_DESC=	Build Gtk2 graphical shell
 XLOCK_GROUP_DESC=	Allow xlock group to logout
 TIME_BOMB_DESC=	Allow autologout
 CUSTOMIZATION_DESC=	Allow tune through resource file
+JP_DESC=	Japanese Language Support
 
 OPTIONS_RADIO=	ONE
 OPTIONS_RADIO_ONE=	PAM XLOCK_GROUP
@@ -94,8 +95,11 @@ CONFIGURE_ARGS+=	--enable-blank-only
 CONFIGURE_ARGS+=	--enable-use-mb
 .endif
 
-.if defined(XLOCKMORE_LANG)
+.if ${PORT_OPTIONS:MJP}
+XLOCKMORE_LANG=	ja
 CONFIGURE_ARGS+=	--with-lang=${XLOCKMORE_LANG}
+CATEGORIES+=	japanese
+PORT_OPTIONS+=	MB
 .endif
 
 .if ${PORT_OPTIONS:MSYSLOG}