diff options
57 files changed, 46 insertions, 149 deletions
diff --git a/archivers/ruby-zlib/Makefile b/archivers/ruby-zlib/Makefile index a7023aafa42a..7e73240be068 100644 --- a/archivers/ruby-zlib/Makefile +++ b/archivers/ruby-zlib/Makefile @@ -34,6 +34,4 @@ post-install: .endfor .endif -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/databases/ruby-gdbm/Makefile b/databases/ruby-gdbm/Makefile index 0371ce595662..ecd4793d40bb 100644 --- a/databases/ruby-gdbm/Makefile +++ b/databases/ruby-gdbm/Makefile @@ -26,6 +26,4 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/ext/gdbm post-install: @${CAT} ${PKGMESSAGE} -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/databases/ruby-mysql/Makefile b/databases/ruby-mysql/Makefile index 3bd0e65fa997..05cd5865f9b6 100644 --- a/databases/ruby-mysql/Makefile +++ b/databases/ruby-mysql/Makefile @@ -29,6 +29,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/README.jp ${RUBY_DOCDIR}/mysql/ja .endif -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/databases/ruby-postgres/Makefile b/databases/ruby-postgres/Makefile index 50644b55f78e..46c3de66f7e0 100644 --- a/databases/ruby-postgres/Makefile +++ b/databases/ruby-postgres/Makefile @@ -42,6 +42,4 @@ post-install: .endfor .endif -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/databases/ruby14-gdbm/Makefile b/databases/ruby14-gdbm/Makefile index cc00963d393e..b2bc43eaa22b 100644 --- a/databases/ruby14-gdbm/Makefile +++ b/databases/ruby14-gdbm/Makefile @@ -28,6 +28,4 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/ext/gdbm post-install: @${CAT} ${PKGMESSAGE} -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/databases/rubygem-postgres/Makefile b/databases/rubygem-postgres/Makefile index 50644b55f78e..46c3de66f7e0 100644 --- a/databases/rubygem-postgres/Makefile +++ b/databases/rubygem-postgres/Makefile @@ -42,6 +42,4 @@ post-install: .endfor .endif -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/ruby-amstd/Makefile b/devel/ruby-amstd/Makefile index 6b841345fcea..932b5322ed7e 100644 --- a/devel/ruby-amstd/Makefile +++ b/devel/ruby-amstd/Makefile @@ -58,6 +58,4 @@ do-install: .endfor .endif -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/ruby-date2/Makefile b/devel/ruby-date2/Makefile index 843f93093658..2cde7a1903ff 100644 --- a/devel/ruby-date2/Makefile +++ b/devel/ruby-date2/Makefile @@ -48,6 +48,4 @@ do-install: .endfor .endif -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/ruby-filelock/Makefile b/devel/ruby-filelock/Makefile index f72f7dfbf702..5ab78056d018 100644 --- a/devel/ruby-filelock/Makefile +++ b/devel/ruby-filelock/Makefile @@ -35,6 +35,4 @@ post-install: .endfor .endif -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/ruby-intl/Makefile b/devel/ruby-intl/Makefile index b63088f1ffa7..db452428a294 100644 --- a/devel/ruby-intl/Makefile +++ b/devel/ruby-intl/Makefile @@ -33,6 +33,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/README.jp ${RUBY_DOCDIR}/intl/ja/ .endif -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/ruby-locale/Makefile b/devel/ruby-locale/Makefile index 4690175d9795..abda457e0b67 100644 --- a/devel/ruby-locale/Makefile +++ b/devel/ruby-locale/Makefile @@ -30,6 +30,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/README ${RUBY_DOCDIR}/locale/ .endif -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/ruby-optparse/Makefile b/devel/ruby-optparse/Makefile index 612402472411..b602fd60e923 100644 --- a/devel/ruby-optparse/Makefile +++ b/devel/ruby-optparse/Makefile @@ -40,6 +40,4 @@ do-install: .endfor .endif -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/ruby-property/Makefile b/devel/ruby-property/Makefile index 3b8428f2c246..5f9e2d9505a1 100644 --- a/devel/ruby-property/Makefile +++ b/devel/ruby-property/Makefile @@ -36,6 +36,4 @@ do-install: .endfor .endif -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/ruby-racc/Makefile b/devel/ruby-racc/Makefile index e4dd3a7cfee2..2b1712cf2220 100644 --- a/devel/ruby-racc/Makefile +++ b/devel/ruby-racc/Makefile @@ -73,6 +73,4 @@ do-install: .endif .endif -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/ruby-runit/Makefile b/devel/ruby-runit/Makefile index ed67857c9a6b..7fda12e42316 100644 --- a/devel/ruby-runit/Makefile +++ b/devel/ruby-runit/Makefile @@ -45,6 +45,4 @@ do-install: ${CP} -R ${WRKSRC}/doc_en/ ${RUBY_DOCDIR}/runit/ .endif -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/ruby-slang/Makefile b/devel/ruby-slang/Makefile index dea2e66647a9..569e2cd2df61 100644 --- a/devel/ruby-slang/Makefile +++ b/devel/ruby-slang/Makefile @@ -36,7 +36,6 @@ DOCS_EN= README changes.txt DOCS_JA= README.euc .include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" .if defined(PKGNAMEPREFIX) PKGNAMEPREFIX:= ${PKGNAMEPREFIX}${RUBY_PKGNAMEPREFIX} diff --git a/devel/ruby-strscan/Makefile b/devel/ruby-strscan/Makefile index 82f324a4c041..78b6d2c5eb21 100644 --- a/devel/ruby-strscan/Makefile +++ b/devel/ruby-strscan/Makefile @@ -41,6 +41,4 @@ do-install: .endfor .endif -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/ruby-unit/Makefile b/devel/ruby-unit/Makefile index ed67857c9a6b..7fda12e42316 100644 --- a/devel/ruby-unit/Makefile +++ b/devel/ruby-unit/Makefile @@ -45,6 +45,4 @@ do-install: ${CP} -R ${WRKSRC}/doc_en/ ${RUBY_DOCDIR}/runit/ .endif -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/swigruby/Makefile b/devel/swigruby/Makefile index 13f6a948ea9a..7eaf5635f7f3 100644 --- a/devel/swigruby/Makefile +++ b/devel/swigruby/Makefile @@ -40,6 +40,4 @@ post-install: .endfor .endif -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/ruby-opengl/Makefile b/graphics/ruby-opengl/Makefile index 18a05837f0d1..0bc68b2065ed 100644 --- a/graphics/ruby-opengl/Makefile +++ b/graphics/ruby-opengl/Makefile @@ -35,6 +35,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/README.EUC ${RUBY_DOCDIR}/opengl/ja/ .endif -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/japanese/rbnamazu/Makefile b/japanese/rbnamazu/Makefile index 9240189e57c9..e0e33c44f0fd 100644 --- a/japanese/rbnamazu/Makefile +++ b/japanese/rbnamazu/Makefile @@ -45,6 +45,4 @@ do-install: .endfor .endif -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/japanese/rskkserv/Makefile b/japanese/rskkserv/Makefile index c35e043eba00..715c79e0180f 100644 --- a/japanese/rskkserv/Makefile +++ b/japanese/rskkserv/Makefile @@ -51,6 +51,4 @@ do-install: ${CHMOD} ${BINMODE} ${STARTUP_SCRIPT}; \ fi -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/japanese/ruby-eb/Makefile b/japanese/ruby-eb/Makefile index 014abf717b7c..d210d637146c 100644 --- a/japanese/ruby-eb/Makefile +++ b/japanese/ruby-eb/Makefile @@ -23,7 +23,6 @@ NO_WRKSUBDIR= yes INSTALL_TARGET= site-install .include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" PKGNAMEPREFIX:= ${PKGNAMEPREFIX}${RUBY_PKGNAMEPREFIX} diff --git a/japanese/ruby-kakasi/Makefile b/japanese/ruby-kakasi/Makefile index 90ad0f620193..00497db6e379 100644 --- a/japanese/ruby-kakasi/Makefile +++ b/japanese/ruby-kakasi/Makefile @@ -26,7 +26,6 @@ DOCS_EN= ChangeLog README wdcnt.html DOCS_JA= README.jp .include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" PKGNAMEPREFIX:= ${PKGNAMEPREFIX}${RUBY_PKGNAMEPREFIX} diff --git a/japanese/ruby-uconv/Makefile b/japanese/ruby-uconv/Makefile index 52806533f885..a8dfb62a537a 100644 --- a/japanese/ruby-uconv/Makefile +++ b/japanese/ruby-uconv/Makefile @@ -25,7 +25,6 @@ EXAMPLES= euc2unicode.rb test_euc.txt test_euc.xml \ trilang.xml unicode2euc.rb xmlconv.rb .include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" PKGNAMEPREFIX:= ${PKGNAMEPREFIX}${RUBY_PKGNAMEPREFIX} diff --git a/lang/ruby-man/Makefile b/lang/ruby-man/Makefile index fab80c8ab25f..ab77764c78c3 100644 --- a/lang/ruby-man/Makefile +++ b/lang/ruby-man/Makefile @@ -28,6 +28,4 @@ do-install: ${MKDIR} ${DOCDIR} ${INSTALL_DATA} ${WRKSRC}/*.html ${DOCDIR} -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/lang/ruby-perl/Makefile b/lang/ruby-perl/Makefile index 73b12d6179d5..9c892dd0cb9a 100644 --- a/lang/ruby-perl/Makefile +++ b/lang/ruby-perl/Makefile @@ -45,6 +45,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/README.ja ${RUBY_DOCDIR}/perl/ja/ .endif -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/lang/ruby-python/Makefile b/lang/ruby-python/Makefile index dea3dc6c14d3..0ccefbaed5d2 100644 --- a/lang/ruby-python/Makefile +++ b/lang/ruby-python/Makefile @@ -35,6 +35,4 @@ post-install: ${RUBY_DOCDIR}/python/ja/ .endif -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/lang/ruby-tcltklib/Makefile b/lang/ruby-tcltklib/Makefile index 27b126fe5455..2de946cc6b25 100644 --- a/lang/ruby-tcltklib/Makefile +++ b/lang/ruby-tcltklib/Makefile @@ -50,7 +50,6 @@ TCL_DIR= `echo "${TCL_LIB}" | ${SED} 's/\([0-9]\)\([0-9]\)/\1.\2/'` TK_DIR= `echo "${TK_LIB}" | ${SED} 's/\([0-9]\)\([0-9]\)/\1.\2/'` .include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" .if defined(PKGNAMEPREFIX) PKGNAMEPREFIX:= ${PKGNAMEPREFIX}${RUBY_PKGNAMEPREFIX} diff --git a/lang/ruby-usersguide/Makefile b/lang/ruby-usersguide/Makefile index e782caf4c790..d5b8f4f1cb66 100644 --- a/lang/ruby-usersguide/Makefile +++ b/lang/ruby-usersguide/Makefile @@ -34,6 +34,4 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/* ${DOCDIR} ${LN} -fs uguide00.html ${DOCDIR}/index.html -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile index 9caefa4adf95..b6aa10235043 100644 --- a/lang/ruby/Makefile +++ b/lang/ruby/Makefile @@ -26,7 +26,6 @@ EMACSLISPDIR= ${PREFIX}/share/emacs/site-lisp XEMACSLISPDIR= ${PREFIX}/lib/xemacs/site-lisp .include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" .if !empty(RUBY_SUFFIX) CONFIGURE_ARGS+= --program-suffix="${RUBY_SUFFIX}" diff --git a/lang/ruby14-irb/Makefile b/lang/ruby14-irb/Makefile index e8722864d324..417094a2655f 100644 --- a/lang/ruby14-irb/Makefile +++ b/lang/ruby14-irb/Makefile @@ -38,6 +38,4 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/README* ${RUBY_DOCDIR}/irb .endif -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/lang/ruby14-tcltklib/Makefile b/lang/ruby14-tcltklib/Makefile index c2bcd743a0bb..0dc77650f4ba 100644 --- a/lang/ruby14-tcltklib/Makefile +++ b/lang/ruby14-tcltklib/Makefile @@ -52,7 +52,6 @@ TCL_DIR= `echo "${TCL_LIB}" | ${SED} 's/\([0-9]\)\([0-9]\)/\1.\2/'` TK_DIR= `echo "${TK_LIB}" | ${SED} 's/\([0-9]\)\([0-9]\)/\1.\2/'` .include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" .if defined(PKGNAMEPREFIX) PKGNAMEPREFIX:= ${PKGNAMEPREFIX}${RUBY_PKGNAMEPREFIX} diff --git a/lang/ruby14/Makefile b/lang/ruby14/Makefile index 2b20345a654c..0a333c7e5995 100644 --- a/lang/ruby14/Makefile +++ b/lang/ruby14/Makefile @@ -28,7 +28,6 @@ EMACSLISPDIR= ${PREFIX}/share/emacs/site-lisp XEMACSLISPDIR= ${PREFIX}/lib/xemacs/site-lisp .include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" .if !empty(RUBY_SUFFIX) CONFIGURE_ARGS+= --program-suffix="${RUBY_SUFFIX}" diff --git a/lang/ruby16/Makefile b/lang/ruby16/Makefile index 9caefa4adf95..b6aa10235043 100644 --- a/lang/ruby16/Makefile +++ b/lang/ruby16/Makefile @@ -26,7 +26,6 @@ EMACSLISPDIR= ${PREFIX}/share/emacs/site-lisp XEMACSLISPDIR= ${PREFIX}/lib/xemacs/site-lisp .include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" .if !empty(RUBY_SUFFIX) CONFIGURE_ARGS+= --program-suffix="${RUBY_SUFFIX}" diff --git a/mail/ruby-tmail/Makefile b/mail/ruby-tmail/Makefile index 3d488efa1fff..68e32d4b8be8 100644 --- a/mail/ruby-tmail/Makefile +++ b/mail/ruby-tmail/Makefile @@ -38,6 +38,4 @@ do-install: ${CP} -R ${WRKSRC}/README.ja ${WRKSRC}/doc.ja/ ${RUBY_DOCDIR}/tmail/ja/ .endif -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/mail/rubygem-tmail/Makefile b/mail/rubygem-tmail/Makefile index 3d488efa1fff..68e32d4b8be8 100644 --- a/mail/rubygem-tmail/Makefile +++ b/mail/rubygem-tmail/Makefile @@ -38,6 +38,4 @@ do-install: ${CP} -R ${WRKSRC}/README.ja ${WRKSRC}/doc.ja/ ${RUBY_DOCDIR}/tmail/ja/ .endif -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/math/ruby-bigfloat/Makefile b/math/ruby-bigfloat/Makefile index bfa3ca740d2b..3ffaa3d87d42 100644 --- a/math/ruby-bigfloat/Makefile +++ b/math/ruby-bigfloat/Makefile @@ -29,6 +29,4 @@ post-install: ${RUBY_DOCDIR}/bigfloat/ja .endif -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-mgmt/ruby-snmp/Makefile b/net-mgmt/ruby-snmp/Makefile index e85279e0191b..6749fabd10fa 100644 --- a/net-mgmt/ruby-snmp/Makefile +++ b/net-mgmt/ruby-snmp/Makefile @@ -40,6 +40,4 @@ post-install: .endfor .endif -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/ruby-drb/Makefile b/net/ruby-drb/Makefile index 7fd724a79b23..c3cbc2a7b910 100644 --- a/net/ruby-drb/Makefile +++ b/net/ruby-drb/Makefile @@ -34,6 +34,4 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/sample/* ${RUBY_EXAMPLESDIR}/drb .endif -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/ruby-snmp/Makefile b/net/ruby-snmp/Makefile index e85279e0191b..6749fabd10fa 100644 --- a/net/ruby-snmp/Makefile +++ b/net/ruby-snmp/Makefile @@ -40,6 +40,4 @@ post-install: .endfor .endif -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/ruby-uri/Makefile b/net/ruby-uri/Makefile index 46311c3f1872..f13d65ec03db 100644 --- a/net/ruby-uri/Makefile +++ b/net/ruby-uri/Makefile @@ -40,6 +40,4 @@ do-install: .endfor .endif -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/print/ruby-clibpdf/Makefile b/print/ruby-clibpdf/Makefile index b3ee58ca408d..43dbf6e6efd0 100644 --- a/print/ruby-clibpdf/Makefile +++ b/print/ruby-clibpdf/Makefile @@ -54,6 +54,4 @@ post-install: .endfor .endif -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/ruby-acl/Makefile b/security/ruby-acl/Makefile index 0def050eda6a..26f6a63ec916 100644 --- a/security/ruby-acl/Makefile +++ b/security/ruby-acl/Makefile @@ -45,6 +45,4 @@ do-install: .endfor .endif -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/ruby-tcpwrap/Makefile b/security/ruby-tcpwrap/Makefile index 8d9c193c2248..7e858b6f16d1 100644 --- a/security/ruby-tcpwrap/Makefile +++ b/security/ruby-tcpwrap/Makefile @@ -48,6 +48,4 @@ post-install: .endfor .endif -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/ruby-syslog/Makefile b/sysutils/ruby-syslog/Makefile index 979f37efdc86..80bea39e9dd9 100644 --- a/sysutils/ruby-syslog/Makefile +++ b/sysutils/ruby-syslog/Makefile @@ -30,6 +30,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/README ${RUBY_DOCDIR}/syslog/ .endif -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/textproc/ruby-html-parser/Makefile b/textproc/ruby-html-parser/Makefile index 5851fb3d1782..7b83af5c9a51 100644 --- a/textproc/ruby-html-parser/Makefile +++ b/textproc/ruby-html-parser/Makefile @@ -30,6 +30,4 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/README.html ${RUBY_DOCDIR}/html-parser/ .endif -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/textproc/ruby-rdtool/Makefile b/textproc/ruby-rdtool/Makefile index bb54add29ac0..cffd16f1ca55 100644 --- a/textproc/ruby-rdtool/Makefile +++ b/textproc/ruby-rdtool/Makefile @@ -74,6 +74,4 @@ post-install: .endif @${CAT} ${PKGMESSAGE} -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/textproc/ruby-xmlparser/Makefile b/textproc/ruby-xmlparser/Makefile index f281717caf8e..46bb6c11d13b 100644 --- a/textproc/ruby-xmlparser/Makefile +++ b/textproc/ruby-xmlparser/Makefile @@ -76,6 +76,4 @@ post-install: .endif @${CAT} ${PKGMESSAGE} -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-toolkits/ruby-fltk/Makefile b/x11-toolkits/ruby-fltk/Makefile index 25907fdb7023..8d96320d11d7 100644 --- a/x11-toolkits/ruby-fltk/Makefile +++ b/x11-toolkits/ruby-fltk/Makefile @@ -38,6 +38,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/README.jp ${RUBY_DOCDIR}/fltk/ja/ .endif -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-toolkits/ruby-gtk/Makefile b/x11-toolkits/ruby-gtk/Makefile index 2b7f8114137e..e992ce9b8c04 100644 --- a/x11-toolkits/ruby-gtk/Makefile +++ b/x11-toolkits/ruby-gtk/Makefile @@ -52,6 +52,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/doc/api-ja/* ${RUBY_DOCDIR}/gtk/ja .endif -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-toolkits/ruby-gtk2/Makefile b/x11-toolkits/ruby-gtk2/Makefile index 2b7f8114137e..e992ce9b8c04 100644 --- a/x11-toolkits/ruby-gtk2/Makefile +++ b/x11-toolkits/ruby-gtk2/Makefile @@ -52,6 +52,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/doc/api-ja/* ${RUBY_DOCDIR}/gtk/ja .endif -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-toolkits/ruby-qt/Makefile b/x11-toolkits/ruby-qt/Makefile index 22e2056580a3..2244913694be 100644 --- a/x11-toolkits/ruby-qt/Makefile +++ b/x11-toolkits/ruby-qt/Makefile @@ -54,6 +54,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/README.jp ${RUBY_DOCDIR}/qt/ja/ .endif -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-toolkits/ruby-qt2/Makefile b/x11-toolkits/ruby-qt2/Makefile index 22e2056580a3..2244913694be 100644 --- a/x11-toolkits/ruby-qt2/Makefile +++ b/x11-toolkits/ruby-qt2/Makefile @@ -54,6 +54,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/README.jp ${RUBY_DOCDIR}/qt/ja/ .endif -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-toolkits/ruby-tk/Makefile b/x11-toolkits/ruby-tk/Makefile index a9ffb4226c5c..6cf0fed4418c 100644 --- a/x11-toolkits/ruby-tk/Makefile +++ b/x11-toolkits/ruby-tk/Makefile @@ -30,7 +30,6 @@ TCLTKLIB_CATEGORY?= lang .endif .include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" .if defined(PKGNAMEPREFIX) PKGNAMEPREFIX:= ${PKGNAMEPREFIX}${RUBY_PKGNAMEPREFIX} diff --git a/x11-toolkits/ruby14-tk/Makefile b/x11-toolkits/ruby14-tk/Makefile index 46a1952871bb..49d80e9561db 100644 --- a/x11-toolkits/ruby14-tk/Makefile +++ b/x11-toolkits/ruby14-tk/Makefile @@ -32,7 +32,6 @@ TCLTKLIB_CATEGORY?= lang .endif .include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" .if defined(PKGNAMEPREFIX) PKGNAMEPREFIX:= ${PKGNAMEPREFIX}${RUBY_PKGNAMEPREFIX} diff --git a/x11/ruby-kde/Makefile b/x11/ruby-kde/Makefile index 46b37cf2f9d9..68a11abd6c5d 100644 --- a/x11/ruby-kde/Makefile +++ b/x11/ruby-kde/Makefile @@ -52,6 +52,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/README.jp.txt ${RUBY_DOCDIR}/kde/ja/ .endif -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/Mk/bsd.ruby.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> |