svn commit: r370907 - in head/japanese: gedy gsuica

[Hajimu UMEMOTO]

Author: ume
Date: Wed Oct 15 11:45:45 2014
New Revision: 370907
URL: https://svnweb.freebsd.org/changeset/ports/370907
QAT: https://qat.redports.org/buildarchive/r370907/

Log:
  - Fix segmentation fault with recent Ruby-GNOME2.
  - Use USES=shebangfix.

Modified:
  head/japanese/gedy/Makefile
  head/japanese/gsuica/Makefile

Modified: head/japanese/gedy/Makefile
==============================================================================
--- head/japanese/gedy/Makefile	Wed Oct 15 11:32:09 2014	(r370906)
+++ head/japanese/gedy/Makefile	Wed Oct 15 11:45:45 2014	(r370907)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gedy
 PORTVERSION=	0.9.0
-#PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	japanese ruby
 MASTER_SITES=	http://homepage3.nifty.com/slokar/pasori/
 DISTNAME=	${PORTNAME}
@@ -19,6 +19,9 @@ RUN_DEPENDS=	rubygem-gtk2>0:${PORTSDIR}/
 		${RUBY_SITEARCHLIBDIR}/pasori.so:${PORTSDIR}/devel/libpafe-ruby
 
 USE_RUBY=		yes
+USES=		shebangfix
+SHEBANG_FILES=	${PORTNAME}
+ruby_OLD_CMD=	/usr/bin/ruby1.9.3
 
 EXTRACT_CMD=		${CP}
 EXTRACT_BEFORE_ARGS=	-p
@@ -28,18 +31,11 @@ NO_BUILD=		yes
 
 PLIST_FILES=	bin/${PORTNAME}
 
-.include <bsd.port.pre.mk>
-
-.if ${RUBY_DEFAULT_VER} != ${RUBY_VER}
-IGNORE=		requires RUBY_DEFAULT_VER=${RUBY_VER}
-.endif
-
 post-patch:
-	@${REINPLACE_CMD} -e 's,#! /usr/bin/ruby1.9.3,#!${RUBY},g' \
-			  ${WRKSRC}/${PORTNAME}
+	@${REINPLACE_CMD} -e 's/Gdk::Atom.new(0)/Gdk::Selection::CLIPBOARD/g' \
+		${WRKSRC}/${PORTNAME}
 
 do-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} \
-		${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/japanese/gsuica/Makefile
==============================================================================
--- head/japanese/gsuica/Makefile	Wed Oct 15 11:32:09 2014	(r370906)
+++ head/japanese/gsuica/Makefile	Wed Oct 15 11:45:45 2014	(r370907)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gsuica
 PORTVERSION=	0.9.1
-#PORTREVISION=	0
+PORTREVISION=	2
 CATEGORIES=	japanese ruby
 MASTER_SITES=	http://homepage3.nifty.com/slokar/pasori/
 DISTNAME=	${PORTNAME}
@@ -19,6 +19,9 @@ RUN_DEPENDS=	rubygem-gtk2>0:${PORTSDIR}/
 		${RUBY_SITEARCHLIBDIR}/pasori.so:${PORTSDIR}/devel/libpafe-ruby
 
 USE_RUBY=	yes
+USES=		shebangfix
+SHEBANG_FILES=	${PORTNAME}
+ruby_OLD_CMD=	/usr/bin/ruby1.9.3
 
 EXTRACT_CMD=		${CP}
 EXTRACT_BEFORE_ARGS=	-p
@@ -28,19 +31,12 @@ NO_BUILD=		yes
 
 PLIST_FILES=	bin/${PORTNAME}
 
-.include <bsd.port.pre.mk>
-
-.if ${RUBY_DEFAULT_VER} != ${RUBY_VER}
-IGNORE=		requires RUBY_DEFAULT_VER=${RUBY_VER}
-.endif
-
 post-patch:
-	@${REINPLACE_CMD} -e 's,#! /usr/bin/ruby1.9.3,#!${RUBY},g' \
-			  ${WRKSRC}/${PORTNAME}
+	@${REINPLACE_CMD} -e 's/Gdk::Atom.new(0)/Gdk::Selection::CLIPBOARD/g' \
+		${WRKSRC}/${PORTNAME}
 
 do-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} \
-		${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
 # Fetch station code database
 station-code-fetch:
@@ -58,4 +54,4 @@ station-code-fetch:
 station-code-install:
 	@(cd ${WRKDIR}; ${SH} station_code_conv.sh StationCode.xls)
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>