diff options
| -rw-r--r-- | databases/ruby-gdbm/Makefile | 8 | ||||
| -rw-r--r-- | lang/ruby-tcltklib/Makefile | 6 | ||||
| -rw-r--r-- | lang/ruby/Makefile | 9 | ||||
| -rw-r--r-- | lang/ruby/distinfo | 2 | ||||
| -rw-r--r-- | lang/ruby/pkg-plist | 5 | ||||
| -rw-r--r-- | lang/ruby16/Makefile | 9 | ||||
| -rw-r--r-- | lang/ruby16/distinfo | 2 | ||||
| -rw-r--r-- | lang/ruby16/pkg-plist | 5 | ||||
| -rw-r--r-- | x11-toolkits/ruby-tk/Makefile | 9 |
9 files changed, 25 insertions, 30 deletions
diff --git a/databases/ruby-gdbm/Makefile b/databases/ruby-gdbm/Makefile index 581d806..0371ce5 100644 --- a/databases/ruby-gdbm/Makefile +++ b/databases/ruby-gdbm/Makefile @@ -6,12 +6,12 @@ # PORTNAME= gdbm -PORTVERSION= ${RUBY_VERSION}.p3 +PORTVERSION= ${RUBY_VERSION} CATEGORIES= databases ruby MASTER_SITES= ${MASTER_SITE_RUBY} -#MASTER_SITE_SUBDIR= ${RUBY_VER} +MASTER_SITE_SUBDIR= ${RUBY_VER} PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} -DISTNAME= ruby-${PORTVERSION:S/.p/-preview/} +DISTNAME= ruby-${PORTVERSION} DIST_SUBDIR= ruby MAINTAINER= knu@FreeBSD.org @@ -21,7 +21,7 @@ LIB_DEPENDS= gdbm.2:${PORTSDIR}/databases/gdbm USE_RUBY= yes USE_RUBY_EXTCONF= yes -WRKSRC= ${WRKDIR}/ruby-${PORTVERSION:R}/ext/gdbm +WRKSRC= ${WRKDIR}/${DISTNAME}/ext/gdbm post-install: @${CAT} ${PKGMESSAGE} diff --git a/lang/ruby-tcltklib/Makefile b/lang/ruby-tcltklib/Makefile index d6384fd..27b126f 100644 --- a/lang/ruby-tcltklib/Makefile +++ b/lang/ruby-tcltklib/Makefile @@ -6,11 +6,11 @@ # PORTNAME= tcltklib -PORTVERSION= ${RUBY_VERSION}.p3 +PORTVERSION= ${RUBY_VERSION} CATEGORIES+= lang x11-toolkits ruby tcl${TCL_VERSION} tk${TK_VERSION} MASTER_SITES= ${MASTER_SITE_RUBY} #MASTER_SITE_SUBDIR= ${RUBY_VER} -DISTNAME= ruby-${PORTVERSION:S/.p/-preview/} +DISTNAME= ruby-${PORTVERSION} DIST_SUBDIR= ruby MAINTAINER?= yasuf@bsdclub.org @@ -21,7 +21,7 @@ LIB_DEPENDS= ${TCL_LIB}.1:${PORTSDIR}/${TCL_CATEGORY}/tcl${TCL_VERSION} \ USE_RUBY= yes USE_RUBY_EXTCONF= yes USE_XLIB= yes -WRKSRC= ${WRKDIR}/ruby-${PORTVERSION:R}/ext/tcltklib +WRKSRC= ${WRKDIR}/${DISTNAME}/ext/tcltklib CONFIGURE_ARGS= --with-tcllib="${TCL_LIB}" --with-tklib="${TK_LIB}" \ --with-tcl-lib="${LOCALBASE}/lib/${TCL_DIR}" \ --with-tk-lib="${LOCALBASE}/lib/${TK_DIR}" \ diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile index 0d9b8ba..9caefa4 100644 --- a/lang/ruby/Makefile +++ b/lang/ruby/Makefile @@ -6,11 +6,10 @@ # PORTNAME= ruby -PORTVERSION= ${RUBY_VERSION}.p3 +PORTVERSION= ${RUBY_VERSION} CATEGORIES= lang ruby ipv6 MASTER_SITES= ${MASTER_SITE_RUBY} -#MASTER_SITE_SUBDIR= ${RUBY_VER} -DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p/-preview/} +MASTER_SITE_SUBDIR= ${RUBY_VER} DIST_SUBDIR= ruby MAINTAINER= yasuf@bsdclub.org @@ -21,8 +20,6 @@ CONFIGURE_ARGS= --enable-shared MAN1= ruby${_RUBY_SUFFIX}.1 MLINKS= ruby${_RUBY_SUFFIX}.1 ruby.1 -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R} - ELISP_FILES= inf-ruby.el ruby-mode.el rubydb3x.el EMACSLISPDIR= ${PREFIX}/share/emacs/site-lisp @@ -36,7 +33,7 @@ CONFIGURE_ARGS+= --program-suffix="${RUBY_SUFFIX}" .endif .if ${OSVERSION} >= 400014 -CONFIGURE_ARGS+= --enable-ipv6 +CONFIGURE_ARGS+= --enable-ipv6 .endif post-patch: diff --git a/lang/ruby/distinfo b/lang/ruby/distinfo index bb24aba..78be989 100644 --- a/lang/ruby/distinfo +++ b/lang/ruby/distinfo @@ -1 +1 @@ -MD5 (ruby/ruby-1.6.0-preview3.tar.gz) = 22b0c65d4bbc71232f07265ad0a4a0c4 +MD5 (ruby/ruby-1.6.0.tar.gz) = fc35bbdc50c7512b838f45558744f75d diff --git a/lang/ruby/pkg-plist b/lang/ruby/pkg-plist index 860e3e7..b2326e1 100644 --- a/lang/ruby/pkg-plist +++ b/lang/ruby/pkg-plist @@ -102,13 +102,13 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%% @exec /bin/mkdir -p %D/%%RUBY_SITEARCHLIBDIR%% @dirrm %%RUBY_SITEARCHLIBDIR%% @dirrm %%RUBY_SITELIBDIR%% -@dirrm lib/ruby/site_ruby +@unexec rmdir %D/lib/ruby/site_ruby 2>/dev/null || true @dirrm %%RUBY_ARCHLIBDIR%% @dirrm %%RUBY_LIBDIR%%/cgi @dirrm %%RUBY_LIBDIR%%/irb @dirrm %%RUBY_LIBDIR%%/net @dirrm %%RUBY_LIBDIR%% -@dirrm lib/ruby +@unexec rmdir %D/lib/ruby 2>/dev/null || true %%RUBY_DOCDIR%%/README %%RUBY_DOCDIR%%/README.EXT %%RUBY_DOCDIR%%/README.EXT.jp @@ -195,6 +195,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%% share/emacs/site-lisp/inf-ruby.el share/emacs/site-lisp/ruby-mode.el share/emacs/site-lisp/rubydb3x.el +@comment share/emacs/site-lisp is created by mtree lib/xemacs/site-lisp/inf-ruby.el lib/xemacs/site-lisp/ruby-mode.el lib/xemacs/site-lisp/rubydb3x.el diff --git a/lang/ruby16/Makefile b/lang/ruby16/Makefile index 0d9b8ba..9caefa4 100644 --- a/lang/ruby16/Makefile +++ b/lang/ruby16/Makefile @@ -6,11 +6,10 @@ # PORTNAME= ruby -PORTVERSION= ${RUBY_VERSION}.p3 +PORTVERSION= ${RUBY_VERSION} CATEGORIES= lang ruby ipv6 MASTER_SITES= ${MASTER_SITE_RUBY} -#MASTER_SITE_SUBDIR= ${RUBY_VER} -DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p/-preview/} +MASTER_SITE_SUBDIR= ${RUBY_VER} DIST_SUBDIR= ruby MAINTAINER= yasuf@bsdclub.org @@ -21,8 +20,6 @@ CONFIGURE_ARGS= --enable-shared MAN1= ruby${_RUBY_SUFFIX}.1 MLINKS= ruby${_RUBY_SUFFIX}.1 ruby.1 -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R} - ELISP_FILES= inf-ruby.el ruby-mode.el rubydb3x.el EMACSLISPDIR= ${PREFIX}/share/emacs/site-lisp @@ -36,7 +33,7 @@ CONFIGURE_ARGS+= --program-suffix="${RUBY_SUFFIX}" .endif .if ${OSVERSION} >= 400014 -CONFIGURE_ARGS+= --enable-ipv6 +CONFIGURE_ARGS+= --enable-ipv6 .endif post-patch: diff --git a/lang/ruby16/distinfo b/lang/ruby16/distinfo index bb24aba..78be989 100644 --- a/lang/ruby16/distinfo +++ b/lang/ruby16/distinfo @@ -1 +1 @@ -MD5 (ruby/ruby-1.6.0-preview3.tar.gz) = 22b0c65d4bbc71232f07265ad0a4a0c4 +MD5 (ruby/ruby-1.6.0.tar.gz) = fc35bbdc50c7512b838f45558744f75d diff --git a/lang/ruby16/pkg-plist b/lang/ruby16/pkg-plist index 860e3e7..b2326e1 100644 --- a/lang/ruby16/pkg-plist +++ b/lang/ruby16/pkg-plist @@ -102,13 +102,13 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%% @exec /bin/mkdir -p %D/%%RUBY_SITEARCHLIBDIR%% @dirrm %%RUBY_SITEARCHLIBDIR%% @dirrm %%RUBY_SITELIBDIR%% -@dirrm lib/ruby/site_ruby +@unexec rmdir %D/lib/ruby/site_ruby 2>/dev/null || true @dirrm %%RUBY_ARCHLIBDIR%% @dirrm %%RUBY_LIBDIR%%/cgi @dirrm %%RUBY_LIBDIR%%/irb @dirrm %%RUBY_LIBDIR%%/net @dirrm %%RUBY_LIBDIR%% -@dirrm lib/ruby +@unexec rmdir %D/lib/ruby 2>/dev/null || true %%RUBY_DOCDIR%%/README %%RUBY_DOCDIR%%/README.EXT %%RUBY_DOCDIR%%/README.EXT.jp @@ -195,6 +195,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%% share/emacs/site-lisp/inf-ruby.el share/emacs/site-lisp/ruby-mode.el share/emacs/site-lisp/rubydb3x.el +@comment share/emacs/site-lisp is created by mtree lib/xemacs/site-lisp/inf-ruby.el lib/xemacs/site-lisp/ruby-mode.el lib/xemacs/site-lisp/rubydb3x.el diff --git a/x11-toolkits/ruby-tk/Makefile b/x11-toolkits/ruby-tk/Makefile index 6b8a035..a9ffb42 100644 --- a/x11-toolkits/ruby-tk/Makefile +++ b/x11-toolkits/ruby-tk/Makefile @@ -6,19 +6,18 @@ # PORTNAME= tk -PORTVERSION= ${RUBY_VERSION}.p3 +PORTVERSION= ${RUBY_VERSION} CATEGORIES+= x11-toolkits ruby tk${TK_VERSION} MASTER_SITES= ${MASTER_SITE_RUBY} -#MASTER_SITE_SUBDIR= ${RUBY_VER} -PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} -DISTNAME= ruby-${PORTVERSION:S/.p/-preview/} +MASTER_SITE_SUBDIR= ${RUBY_VER} +DISTNAME= ruby-${PORTVERSION} DIST_SUBDIR= ruby MAINTAINER?= yasuf@bsdclub.org RUN_DEPENDS= ${RUBY_ARCHLIBDIR}/tcltklib.so:${PORTSDIR}/${TCLTKLIB_CATEGORY}/ruby-tcltklib -WRKSRC= ${WRKDIR}/ruby-${PORTVERSION:R}/ext/tk +WRKSRC= ${WRKDIR}/${DISTNAME}/ext/tk USE_RUBY= yes USE_RUBY_EXTCONF= yes |
