diff options
author | jlam <jlam> | 2008-04-12 22:42:57 +0000 |
---|---|---|
committer | jlam <jlam> | 2008-04-12 22:42:57 +0000 |
commit | 9ff693053b2b42cd6a29b886e071ad01acdeefe2 (patch) | |
tree | fdd67c81079412bf94013749a954125434a9baca /lang/ruby18-base | |
parent | 4a580ef74536ed1f7c6a7ecd5a26e46a93aec9b3 (diff) | |
download | pkgsrc-9ff693053b2b42cd6a29b886e071ad01acdeefe2.tar.gz |
Convert to use PLIST_VARS instead of manually passing "@comment "
through PLIST_SUBST to the plist module.
Diffstat (limited to 'lang/ruby18-base')
-rw-r--r-- | lang/ruby18-base/Makefile | 9 | ||||
-rw-r--r-- | lang/ruby18-base/PLIST | 6 |
2 files changed, 7 insertions, 8 deletions
diff --git a/lang/ruby18-base/Makefile b/lang/ruby18-base/Makefile index f2266d52ca9..4f0ee529823 100644 --- a/lang/ruby18-base/Makefile +++ b/lang/ruby18-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2008/01/04 15:42:34 ghen Exp $ +# $NetBSD: Makefile,v 1.41 2008/04/12 22:43:02 jlam Exp $ # DISTNAME= ${RUBY_DISTNAME} @@ -57,10 +57,9 @@ CONFIGURE_ARGS+= --program-suffix=${RUBY_SUFFIX:Q} # # IRIX work around which should be fixed. # -.if ${OPSYS} == "IRIX" -PLIST_SUBST+= HAS_IO="@comment " -.else -PLIST_SUBST+= HAS_IO= +PLIST_VARS+= io +.if ${OPSYS} != "IRIX" +PLIST.io= yes .endif # diff --git a/lang/ruby18-base/PLIST b/lang/ruby18-base/PLIST index adc1be208c0..6deb309ed0a 100644 --- a/lang/ruby18-base/PLIST +++ b/lang/ruby18-base/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.12 2008/03/10 02:50:38 jlam Exp $ +@comment $NetBSD: PLIST,v 1.13 2008/04/12 22:43:02 jlam Exp $ bin/erb${RUBY_VER} bin/h2rb${RUBY_VER} bin/irb${RUBY_VER} @@ -83,7 +83,7 @@ ${RUBY_ARCHLIBDIR}/etc.${RUBY_DLEXT} ${RUBY_ARCHLIBDIR}/fcntl.${RUBY_DLEXT} ${RUBY_ARCHLIBDIR}/iconv.${RUBY_DLEXT} ${RUBY_ARCHLIBDIR}/intern.h -${HAS_IO}${RUBY_ARCHLIBDIR}/io/wait.${RUBY_DLEXT} +${PLIST.io}${RUBY_ARCHLIBDIR}/io/wait.${RUBY_DLEXT} ${RUBY_ARCHLIBDIR}/missing.h ${RUBY_ARCHLIBDIR}/nkf.${RUBY_DLEXT} ${RUBY_ARCHLIBDIR}/node.h @@ -109,7 +109,7 @@ ${RUBY_ARCHLIBDIR}/version.h ${RUBY_ARCHLIBDIR}/zlib.${RUBY_DLEXT} @exec ${MKDIR} %D/${RUBY_SITEARCHLIBDIR} ${RUBY_LIBDIR}/importenv.rb -${HAS_IO}${RUBY_LIBDIR}/io/nonblock.rb +${PLIST.io}${RUBY_LIBDIR}/io/nonblock.rb ${RUBY_LIBDIR}/ipaddr.rb ${RUBY_LIBDIR}/irb/cmd/chws.rb ${RUBY_LIBDIR}/irb/cmd/fork.rb |