From owner-svn-ports-all@FreeBSD.ORG  Thu Jan  2 20:02:28 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3BAFA3B1;
 Thu,  2 Jan 2014 20:02:28 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 279231DA5;
 Thu,  2 Jan 2014 20:02:28 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s02K2S69061240;
 Thu, 2 Jan 2014 20:02:28 GMT (envelope-from swills@svn.freebsd.org)
Received: (from swills@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s02K2SEO061239;
 Thu, 2 Jan 2014 20:02:28 GMT (envelope-from swills@svn.freebsd.org)
Message-Id: <201401022002.s02K2SEO061239@svn.freebsd.org>
From: Steve Wills <swills@FreeBSD.org>
Date: Thu, 2 Jan 2014 20:02:27 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r338480 - head/japanese/migemo
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.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Jan 2014 20:02:28 -0000

Author: swills
Date: Thu Jan  2 20:02:27 2014
New Revision: 338480
URL: http://svnweb.freebsd.org/changeset/ports/338480

Log:
  - Ruby 1.9 is default now, remove conditionalization for it
  
  With hat:	ruby@

Modified:
  head/japanese/migemo/Makefile   (contents, props changed)

Modified: head/japanese/migemo/Makefile
==============================================================================
--- head/japanese/migemo/Makefile	Thu Jan  2 19:58:54 2014	(r338479)
+++ head/japanese/migemo/Makefile	Thu Jan  2 20:02:27 2014	(r338480)
@@ -42,7 +42,6 @@ SKKDIC_FILE=	SKK-JISYO.L-20110813
 NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
-.if ${RUBY_VER} == 1.9
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-Makefile.am.ruby19 \
 		${PATCHDIR}/extra-patch-configure.in.ruby19 \
 		${PATCHDIR}/extra-patch-genchars.sh \
@@ -55,7 +54,6 @@ EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-
 		${PATCHDIR}/extra-patch-migemo-server \
 		${PATCHDIR}/extra-patch-migemo.rb.in \
 		${PATCHDIR}/extra-patch-tests_Makefile.am
-.endif
 
 .if ${ARCH} == "ia64"
 BROKEN=		Does not compile on ia64
@@ -67,7 +65,7 @@ post-extract:
 .endif
 
 post-patch:
-.if ${RUBY_VER} == 1.9 && ${SLAVE_PORT} == "no"
+.if ${SLAVE_PORT} == "no"
 	@cd ${WRKSRC} ; \
 	for f in ${SHEBANG_FILES} ; do \
 	${REINPLACE_CMD} -e 's:#!.*:#!${RUBY} -Ke:' $$f ; \
@@ -76,11 +74,7 @@ post-patch:
 
 post-configure:
 .if ${SLAVE_PORT} == "no"
-.if ${RUBY_VER} == 1.9
 	(cd ${WRKSRC}; ${CAT} SKK-JISYO.L | ${RUBY} -Ke migemo-convert.rb > migemo-dict)
-.else
-	(cd ${WRKSRC}; ${CAT} SKK-JISYO.L | ${RUBY} migemo-convert.rb > migemo-dict)
-.endif
 	${CP} ${AUTOMAKE_DIR}/config.guess ${WRKSRC}
 	${CP} ${AUTOMAKE_DIR}/config.sub ${WRKSRC}
 .endif