Date: Thu, 2 Jan 2014 20:02:27 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r338480 - head/japanese/migemo Message-ID: <201401022002.s02K2SEO061239@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401022002.s02K2SEO061239>