From 7b09b2f7645381cdf75c82e661d0f8cfdf8c8425 Mon Sep 17 00:00:00 2001 From: Akinori MUSHA Date: Thu, 7 Sep 2000 00:03:36 +0000 Subject: Split rubytk into ruby-tcltklib and ruby-tk. Approved by: Yasuhiro Fukuma (MAINTAINER) Repocopy ruby-* to ruby14-* and update ruby-* to 1.6.0-preview3. --- x11-toolkits/Makefile | 3 +- x11-toolkits/ruby-tk/Makefile | 92 +++++++++++--------------------------- x11-toolkits/ruby-tk/pkg-comment | 2 +- x11-toolkits/ruby-tk/pkg-descr | 2 +- x11-toolkits/ruby-tk/pkg-plist | 61 ++++++++++--------------- x11-toolkits/ruby14-tk/Makefile | 90 +++++++++++-------------------------- x11-toolkits/ruby14-tk/pkg-comment | 2 +- x11-toolkits/ruby14-tk/pkg-descr | 2 +- x11-toolkits/ruby14-tk/pkg-plist | 61 ++++++++++--------------- 9 files changed, 102 insertions(+), 213 deletions(-) (limited to 'x11-toolkits') diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile index f87427946b9e..a90fda9887cf 100644 --- a/x11-toolkits/Makefile +++ b/x11-toolkits/Makefile @@ -68,7 +68,8 @@ SUBDIR += ruby-gtk SUBDIR += ruby-qt SUBDIR += ruby-qt-i18n - SUBDIR += rubytk + SUBDIR += ruby-tk + SUBDIR += ruby14-tk SUBDIR += slingshot SUBDIR += thinice SUBDIR += tix diff --git a/x11-toolkits/ruby-tk/Makefile b/x11-toolkits/ruby-tk/Makefile index 69aaf6ed7a94..6b8a035ebf67 100644 --- a/x11-toolkits/ruby-tk/Makefile +++ b/x11-toolkits/ruby-tk/Makefile @@ -1,90 +1,48 @@ -# New ports collection makefile for: rubytk +# New ports collection makefile for: ruby-tk # Date created: 15 March 1999 # Whom: Yasuhiro Fukuma # # $FreeBSD$ # -PORTNAME= rubytk -PORTVERSION= 1.4.6 -CATEGORIES+= x11-toolkits ruby +PORTNAME= tk +PORTVERSION= ${RUBY_VERSION}.p3 +CATEGORIES+= x11-toolkits ruby tk${TK_VERSION} MASTER_SITES= ${MASTER_SITE_RUBY} -MASTER_SITE_SUBDIR= 1.4 -DISTNAME= ruby-${PORTVERSION} +#MASTER_SITE_SUBDIR= ${RUBY_VER} +PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} +DISTNAME= ruby-${PORTVERSION:S/.p/-preview/} DIST_SUBDIR= ruby MAINTAINER?= yasuf@bsdclub.org -BUILD_DEPENDS= ruby:${PORTSDIR}/lang/ruby -RUN_DEPENDS= ruby:${PORTSDIR}/lang/ruby -LIB_DEPENDS= ${TCL_LIB}.1:${PORTSDIR}/${TCL_CATEGORY}/tcl${TCL_VERSION} \ - ${TK_LIB}.1:${PORTSDIR}/${TK_CATEGORY}/tk${TK_VERSION} +RUN_DEPENDS= ${RUBY_ARCHLIBDIR}/tcltklib.so:${PORTSDIR}/${TCLTKLIB_CATEGORY}/ruby-tcltklib -USE_XLIB= yes -WRKSRC= ${WRKDIR}/${DISTNAME}/ext -CONFIGURE_ARGS= --with-tcllib="${TCL_LIB}" --with-tklib="${TK_LIB}" \ - --with-tcl-lib="${LOCALBASE}/lib/${TCL_DIR}" \ - --with-tk-lib="${LOCALBASE}/lib/${TK_DIR}" \ - --with-tcl-include="${LOCALBASE}/include/${TCL_DIR}" \ - --with-tk-include="${LOCALBASE}/include/${TK_DIR}" \ - --with-X11-dir="${X11BASE}" -PLIST_SUB+= RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}" +WRKSRC= ${WRKDIR}/ruby-${PORTVERSION:R}/ext/tk -RUBY_VER?= 1.4 -RUBY_ARCH?= ${ARCH}-freebsd${OSREL} +USE_RUBY= yes +USE_RUBY_EXTCONF= yes -DOCDIR= ${PREFIX}/share/doc/ruby -EXAMPLESDIR= ${PREFIX}/share/examples/ruby - -# Set these vars as the version numbers (without decimal points) of Tcl/Tk -# you want to use with Ruby/Tk. -# e.g.: make TCL_VERSION=42 TK_VERSION=76 WITH_TCL_JP=yes build -TCL_VERSION?= 82 TK_VERSION?= 82 -.if defined(WITH_TCL_JP) -TCL_CATEGORY= japanese -TK_CATEGORY= japanese -TCL_JP= jp +.if defined(WITH_TCLTK_JP) +TCLTKLIB_CATEGORY?= japanese .else -TCL_CATEGORY= lang -TK_CATEGORY= x11-toolkits -TCL_JP= # empty +TCLTKLIB_CATEGORY?= lang .endif -TCL_LIB= tcl${TCL_VERSION}${TCL_JP} -TK_LIB= tk${TK_VERSION}${TCL_JP} -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/'` - -RUBY?= ${LOCALBASE}/bin/ruby -EXTS= tcltklib tk - -do-configure: -.for dir in ${EXTS} - @${ECHO_MSG} "Configuring in ${dir}..." - @cd ${WRKSRC}/${dir}; ${SETENV} ${CONFIGURE_ENV} ${RUBY} extconf.rb ${CONFIGURE_ARGS} -.endfor - -do-build: -.for dir in ${EXTS} - @${ECHO_MSG} "Building in ${dir}..." - @cd ${WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${MAKE} ${ALL_TARGET} -.endfor +.include +.include "${PORTSDIR}/Mk/bsd.ruby.mk" -do-install: -.for dir in ${EXTS} - @${ECHO_MSG} "Installing in ${dir}..." - @cd ${WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${MAKE} ${INSTALL_TARGET} -.if !defined(NOPORTDOCS) - ${MKDIR} ${EXAMPLESDIR}/${dir} - ${INSTALL_DATA} ${WRKSRC}/${dir}/sample/* ${EXAMPLESDIR}/${dir} +.if defined(PKGNAMEPREFIX) +PKGNAMEPREFIX:= ${PKGNAMEPREFIX}${RUBY_PKGNAMEPREFIX} +.else +PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} .endif -.endfor + +post-install: .if !defined(NOPORTDOCS) - ${MKDIR} ${EXAMPLESDIR}/tcltklib/demo - ${INSTALL_DATA} ${WRKSRC}/tcltklib/demo/* ${EXAMPLESDIR}/tcltklib/demo - ${MKDIR} ${DOCDIR}/tcltklib - ${INSTALL_DATA} ${WRKSRC}/tcltklib/*.euc ${DOCDIR}/tcltklib + ${MKDIR} ${RUBY_EXAMPLESDIR}/tk + ${INSTALL_DATA} ${WRKSRC}/sample/* ${RUBY_EXAMPLESDIR}/tk/ .endif -.include +.include diff --git a/x11-toolkits/ruby-tk/pkg-comment b/x11-toolkits/ruby-tk/pkg-comment index 0048c6b238ee..b5d8d2d5dc56 100644 --- a/x11-toolkits/ruby-tk/pkg-comment +++ b/x11-toolkits/ruby-tk/pkg-comment @@ -1 +1 @@ -A Ruby interface to Tcl/Tk libraries +Ruby interface to the Tk widget set diff --git a/x11-toolkits/ruby-tk/pkg-descr b/x11-toolkits/ruby-tk/pkg-descr index 5338175ce86d..598f3c253bd7 100644 --- a/x11-toolkits/ruby-tk/pkg-descr +++ b/x11-toolkits/ruby-tk/pkg-descr @@ -1,4 +1,4 @@ -This is Ruby/Tk, a Ruby interface to Tcl/Tk libraries. +This is Ruby/Tk, a Ruby interface to the Tk widget set. It's a part of the official Ruby distribution. - Yasuhiro Fukuma diff --git a/x11-toolkits/ruby-tk/pkg-plist b/x11-toolkits/ruby-tk/pkg-plist index 8f13229dd143..0dfecbf1c8c0 100644 --- a/x11-toolkits/ruby-tk/pkg-plist +++ b/x11-toolkits/ruby-tk/pkg-plist @@ -1,38 +1,23 @@ -lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/tcltklib.so -lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/tkutil.so -lib/ruby/%%RUBY_VER%%/tcltk.rb -lib/ruby/%%RUBY_VER%%/tk.rb -lib/ruby/%%RUBY_VER%%/tkafter.rb -lib/ruby/%%RUBY_VER%%/tkbgerror.rb -lib/ruby/%%RUBY_VER%%/tkcanvas.rb -lib/ruby/%%RUBY_VER%%/tkclass.rb -lib/ruby/%%RUBY_VER%%/tkdialog.rb -lib/ruby/%%RUBY_VER%%/tkentry.rb -lib/ruby/%%RUBY_VER%%/tkfont.rb -lib/ruby/%%RUBY_VER%%/tkmenubar.rb -lib/ruby/%%RUBY_VER%%/tkmngfocus.rb -lib/ruby/%%RUBY_VER%%/tkpalette.rb -lib/ruby/%%RUBY_VER%%/tkscrollbox.rb -lib/ruby/%%RUBY_VER%%/tktext.rb -lib/ruby/%%RUBY_VER%%/tkvirtevent.rb -share/doc/ruby/tcltklib/MANUAL.euc -share/doc/ruby/tcltklib/README.euc -@dirrm share/doc/ruby/tcltklib -share/examples/ruby/tcltklib/batsu.gif -share/examples/ruby/tcltklib/maru.gif -share/examples/ruby/tcltklib/sample0.rb -share/examples/ruby/tcltklib/sample1.rb -share/examples/ruby/tcltklib/sample2.rb -share/examples/ruby/tcltklib/demo/lines0.tcl -share/examples/ruby/tcltklib/demo/lines1.rb -share/examples/ruby/tcltklib/demo/lines2.rb -@dirrm share/examples/ruby/tcltklib/demo -@dirrm share/examples/ruby/tcltklib -share/examples/ruby/tk/tkbiff.rb -share/examples/ruby/tk/tkbrowse.rb -share/examples/ruby/tk/tkdialog.rb -share/examples/ruby/tk/tkfrom.rb -share/examples/ruby/tk/tkhello.rb -share/examples/ruby/tk/tkline.rb -share/examples/ruby/tk/tktimer.rb -@dirrm share/examples/ruby/tk +%%RUBY_ARCHLIBDIR%%/tkutil.so +%%RUBY_LIBDIR%%/tk.rb +%%RUBY_LIBDIR%%/tkafter.rb +%%RUBY_LIBDIR%%/tkbgerror.rb +%%RUBY_LIBDIR%%/tkcanvas.rb +%%RUBY_LIBDIR%%/tkclass.rb +%%RUBY_LIBDIR%%/tkdialog.rb +%%RUBY_LIBDIR%%/tkentry.rb +%%RUBY_LIBDIR%%/tkfont.rb +%%RUBY_LIBDIR%%/tkmenubar.rb +%%RUBY_LIBDIR%%/tkmngfocus.rb +%%RUBY_LIBDIR%%/tkpalette.rb +%%RUBY_LIBDIR%%/tkscrollbox.rb +%%RUBY_LIBDIR%%/tktext.rb +%%RUBY_LIBDIR%%/tkvirtevent.rb +%%RUBY_EXAMPLESDIR%%/tk/tkbiff.rb +%%RUBY_EXAMPLESDIR%%/tk/tkbrowse.rb +%%RUBY_EXAMPLESDIR%%/tk/tkdialog.rb +%%RUBY_EXAMPLESDIR%%/tk/tkfrom.rb +%%RUBY_EXAMPLESDIR%%/tk/tkhello.rb +%%RUBY_EXAMPLESDIR%%/tk/tkline.rb +%%RUBY_EXAMPLESDIR%%/tk/tktimer.rb +@dirrm %%RUBY_EXAMPLESDIR%%/tk diff --git a/x11-toolkits/ruby14-tk/Makefile b/x11-toolkits/ruby14-tk/Makefile index 69aaf6ed7a94..a36920d45698 100644 --- a/x11-toolkits/ruby14-tk/Makefile +++ b/x11-toolkits/ruby14-tk/Makefile @@ -1,90 +1,50 @@ -# New ports collection makefile for: rubytk +# New ports collection makefile for: ruby-tk # Date created: 15 March 1999 # Whom: Yasuhiro Fukuma # # $FreeBSD$ # -PORTNAME= rubytk -PORTVERSION= 1.4.6 -CATEGORIES+= x11-toolkits ruby +PORTNAME= tk +PORTVERSION= ${RUBY_VERSION} +CATEGORIES+= x11-toolkits ruby tk${TK_VERSION} MASTER_SITES= ${MASTER_SITE_RUBY} -MASTER_SITE_SUBDIR= 1.4 +MASTER_SITE_SUBDIR= ${RUBY_VER} +PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} DISTNAME= ruby-${PORTVERSION} DIST_SUBDIR= ruby MAINTAINER?= yasuf@bsdclub.org -BUILD_DEPENDS= ruby:${PORTSDIR}/lang/ruby -RUN_DEPENDS= ruby:${PORTSDIR}/lang/ruby -LIB_DEPENDS= ${TCL_LIB}.1:${PORTSDIR}/${TCL_CATEGORY}/tcl${TCL_VERSION} \ - ${TK_LIB}.1:${PORTSDIR}/${TK_CATEGORY}/tk${TK_VERSION} +RUN_DEPENDS= ${RUBY_ARCHLIBDIR}/tcltklib.so:${PORTSDIR}/${TCLTKLIB_CATEGORY}/ruby14-tcltklib -USE_XLIB= yes -WRKSRC= ${WRKDIR}/${DISTNAME}/ext -CONFIGURE_ARGS= --with-tcllib="${TCL_LIB}" --with-tklib="${TK_LIB}" \ - --with-tcl-lib="${LOCALBASE}/lib/${TCL_DIR}" \ - --with-tk-lib="${LOCALBASE}/lib/${TK_DIR}" \ - --with-tcl-include="${LOCALBASE}/include/${TCL_DIR}" \ - --with-tk-include="${LOCALBASE}/include/${TK_DIR}" \ - --with-X11-dir="${X11BASE}" -PLIST_SUB+= RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}" +WRKSRC= ${WRKDIR}/${DISTNAME}/ext/tk -RUBY_VER?= 1.4 -RUBY_ARCH?= ${ARCH}-freebsd${OSREL} +RUBY_VER= 1.4 -DOCDIR= ${PREFIX}/share/doc/ruby -EXAMPLESDIR= ${PREFIX}/share/examples/ruby +USE_RUBY= yes +USE_RUBY_EXTCONF= yes -# Set these vars as the version numbers (without decimal points) of Tcl/Tk -# you want to use with Ruby/Tk. -# e.g.: make TCL_VERSION=42 TK_VERSION=76 WITH_TCL_JP=yes build -TCL_VERSION?= 82 TK_VERSION?= 82 -.if defined(WITH_TCL_JP) -TCL_CATEGORY= japanese -TK_CATEGORY= japanese -TCL_JP= jp +.if defined(WITH_TCLTK_JP) +TCLTKLIB_CATEGORY?= japanese .else -TCL_CATEGORY= lang -TK_CATEGORY= x11-toolkits -TCL_JP= # empty +TCLTKLIB_CATEGORY?= lang .endif -TCL_LIB= tcl${TCL_VERSION}${TCL_JP} -TK_LIB= tk${TK_VERSION}${TCL_JP} -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 +.include "${PORTSDIR}/Mk/bsd.ruby.mk" -RUBY?= ${LOCALBASE}/bin/ruby -EXTS= tcltklib tk - -do-configure: -.for dir in ${EXTS} - @${ECHO_MSG} "Configuring in ${dir}..." - @cd ${WRKSRC}/${dir}; ${SETENV} ${CONFIGURE_ENV} ${RUBY} extconf.rb ${CONFIGURE_ARGS} -.endfor - -do-build: -.for dir in ${EXTS} - @${ECHO_MSG} "Building in ${dir}..." - @cd ${WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${MAKE} ${ALL_TARGET} -.endfor - -do-install: -.for dir in ${EXTS} - @${ECHO_MSG} "Installing in ${dir}..." - @cd ${WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${MAKE} ${INSTALL_TARGET} -.if !defined(NOPORTDOCS) - ${MKDIR} ${EXAMPLESDIR}/${dir} - ${INSTALL_DATA} ${WRKSRC}/${dir}/sample/* ${EXAMPLESDIR}/${dir} +.if defined(PKGNAMEPREFIX) +PKGNAMEPREFIX:= ${PKGNAMEPREFIX}${RUBY_PKGNAMEPREFIX} +.else +PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} .endif -.endfor + +post-install: .if !defined(NOPORTDOCS) - ${MKDIR} ${EXAMPLESDIR}/tcltklib/demo - ${INSTALL_DATA} ${WRKSRC}/tcltklib/demo/* ${EXAMPLESDIR}/tcltklib/demo - ${MKDIR} ${DOCDIR}/tcltklib - ${INSTALL_DATA} ${WRKSRC}/tcltklib/*.euc ${DOCDIR}/tcltklib + ${MKDIR} ${RUBY_EXAMPLESDIR}/tk + ${INSTALL_DATA} ${WRKSRC}/sample/* ${RUBY_EXAMPLESDIR}/tk/ .endif -.include +.include diff --git a/x11-toolkits/ruby14-tk/pkg-comment b/x11-toolkits/ruby14-tk/pkg-comment index 0048c6b238ee..b5d8d2d5dc56 100644 --- a/x11-toolkits/ruby14-tk/pkg-comment +++ b/x11-toolkits/ruby14-tk/pkg-comment @@ -1 +1 @@ -A Ruby interface to Tcl/Tk libraries +Ruby interface to the Tk widget set diff --git a/x11-toolkits/ruby14-tk/pkg-descr b/x11-toolkits/ruby14-tk/pkg-descr index 5338175ce86d..598f3c253bd7 100644 --- a/x11-toolkits/ruby14-tk/pkg-descr +++ b/x11-toolkits/ruby14-tk/pkg-descr @@ -1,4 +1,4 @@ -This is Ruby/Tk, a Ruby interface to Tcl/Tk libraries. +This is Ruby/Tk, a Ruby interface to the Tk widget set. It's a part of the official Ruby distribution. - Yasuhiro Fukuma diff --git a/x11-toolkits/ruby14-tk/pkg-plist b/x11-toolkits/ruby14-tk/pkg-plist index 8f13229dd143..0dfecbf1c8c0 100644 --- a/x11-toolkits/ruby14-tk/pkg-plist +++ b/x11-toolkits/ruby14-tk/pkg-plist @@ -1,38 +1,23 @@ -lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/tcltklib.so -lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/tkutil.so -lib/ruby/%%RUBY_VER%%/tcltk.rb -lib/ruby/%%RUBY_VER%%/tk.rb -lib/ruby/%%RUBY_VER%%/tkafter.rb -lib/ruby/%%RUBY_VER%%/tkbgerror.rb -lib/ruby/%%RUBY_VER%%/tkcanvas.rb -lib/ruby/%%RUBY_VER%%/tkclass.rb -lib/ruby/%%RUBY_VER%%/tkdialog.rb -lib/ruby/%%RUBY_VER%%/tkentry.rb -lib/ruby/%%RUBY_VER%%/tkfont.rb -lib/ruby/%%RUBY_VER%%/tkmenubar.rb -lib/ruby/%%RUBY_VER%%/tkmngfocus.rb -lib/ruby/%%RUBY_VER%%/tkpalette.rb -lib/ruby/%%RUBY_VER%%/tkscrollbox.rb -lib/ruby/%%RUBY_VER%%/tktext.rb -lib/ruby/%%RUBY_VER%%/tkvirtevent.rb -share/doc/ruby/tcltklib/MANUAL.euc -share/doc/ruby/tcltklib/README.euc -@dirrm share/doc/ruby/tcltklib -share/examples/ruby/tcltklib/batsu.gif -share/examples/ruby/tcltklib/maru.gif -share/examples/ruby/tcltklib/sample0.rb -share/examples/ruby/tcltklib/sample1.rb -share/examples/ruby/tcltklib/sample2.rb -share/examples/ruby/tcltklib/demo/lines0.tcl -share/examples/ruby/tcltklib/demo/lines1.rb -share/examples/ruby/tcltklib/demo/lines2.rb -@dirrm share/examples/ruby/tcltklib/demo -@dirrm share/examples/ruby/tcltklib -share/examples/ruby/tk/tkbiff.rb -share/examples/ruby/tk/tkbrowse.rb -share/examples/ruby/tk/tkdialog.rb -share/examples/ruby/tk/tkfrom.rb -share/examples/ruby/tk/tkhello.rb -share/examples/ruby/tk/tkline.rb -share/examples/ruby/tk/tktimer.rb -@dirrm share/examples/ruby/tk +%%RUBY_ARCHLIBDIR%%/tkutil.so +%%RUBY_LIBDIR%%/tk.rb +%%RUBY_LIBDIR%%/tkafter.rb +%%RUBY_LIBDIR%%/tkbgerror.rb +%%RUBY_LIBDIR%%/tkcanvas.rb +%%RUBY_LIBDIR%%/tkclass.rb +%%RUBY_LIBDIR%%/tkdialog.rb +%%RUBY_LIBDIR%%/tkentry.rb +%%RUBY_LIBDIR%%/tkfont.rb +%%RUBY_LIBDIR%%/tkmenubar.rb +%%RUBY_LIBDIR%%/tkmngfocus.rb +%%RUBY_LIBDIR%%/tkpalette.rb +%%RUBY_LIBDIR%%/tkscrollbox.rb +%%RUBY_LIBDIR%%/tktext.rb +%%RUBY_LIBDIR%%/tkvirtevent.rb +%%RUBY_EXAMPLESDIR%%/tk/tkbiff.rb +%%RUBY_EXAMPLESDIR%%/tk/tkbrowse.rb +%%RUBY_EXAMPLESDIR%%/tk/tkdialog.rb +%%RUBY_EXAMPLESDIR%%/tk/tkfrom.rb +%%RUBY_EXAMPLESDIR%%/tk/tkhello.rb +%%RUBY_EXAMPLESDIR%%/tk/tkline.rb +%%RUBY_EXAMPLESDIR%%/tk/tktimer.rb +@dirrm %%RUBY_EXAMPLESDIR%%/tk -- cgit v1.2.3