diff options
-rw-r--r-- | devel/rbenv/Makefile | 4 | ||||
-rw-r--r-- | devel/rbenv/distinfo | 6 | ||||
-rw-r--r-- | devel/rbenv/files/patch-src_configure | 12 | ||||
-rw-r--r-- | devel/rbenv/files/patch-src_shobj-conf | 281 | ||||
-rw-r--r-- | devel/rbenv/pkg-plist | 1 |
5 files changed, 4 insertions, 300 deletions
diff --git a/devel/rbenv/Makefile b/devel/rbenv/Makefile index 42de3f0424af..62e0fa55403c 100644 --- a/devel/rbenv/Makefile +++ b/devel/rbenv/Makefile @@ -1,9 +1,8 @@ # $FreeBSD$ PORTNAME= rbenv -PORTVERSION= 1.0.0 +PORTVERSION= 1.1.0 DISTVERSIONPREFIX= v -PORTREVISION= 2 CATEGORIES= devel ruby MAINTAINER= meta+ports@vmeta.jp @@ -27,7 +26,6 @@ post-patch: do-install: CC="${CC}" ${WRKSRC}/src/${CONFIGURE_CMD} ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC}/src - ${INSTALL_SCRIPT} ${WRKSRC}/bin/ruby-local-exec ${STAGEDIR}${PREFIX}/bin ( ${INSTALL_SCRIPT} ${WRKSRC}/libexec/* ${STAGEDIR}${PREFIX}/libexec/ ) @${LN} -sf ../libexec/rbenv ${STAGEDIR}${PREFIX}/bin/rbenv @${MKDIR} ${STAGEDIR}${DATADIR}/completions diff --git a/devel/rbenv/distinfo b/devel/rbenv/distinfo index 23f4de3f5b22..6b8aba352584 100644 --- a/devel/rbenv/distinfo +++ b/devel/rbenv/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1470184985 -SHA256 (rbenv-rbenv-v1.0.0_GH0.tar.gz) = 4658f2d8604ef847b39cb8216bb0d8a8aa000f504b6d06b30e008f92e6fa5210 -SIZE (rbenv-rbenv-v1.0.0_GH0.tar.gz) = 30298 +TIMESTAMP = 1480104668 +SHA256 (rbenv-rbenv-v1.1.0_GH0.tar.gz) = 070835ccb4a295a49712ded936be306433442129d5a8411dddf2f52e6732ce59 +SIZE (rbenv-rbenv-v1.1.0_GH0.tar.gz) = 31752 diff --git a/devel/rbenv/files/patch-src_configure b/devel/rbenv/files/patch-src_configure deleted file mode 100644 index dce5725dd9b9..000000000000 --- a/devel/rbenv/files/patch-src_configure +++ /dev/null @@ -1,12 +0,0 @@ ---- src/configure.orig 2016-08-08 20:15:45 UTC -+++ src/configure -@@ -21,6 +21,9 @@ case "$(uname -s)" in - Darwin* ) - host_os="darwin$(uname -r)" - ;; -+FreeBSD* ) -+ host_os="freebsd$(uname -r)" -+ ;; - OpenBSD* ) - host_os="openbsd$(uname -r)" - ;; diff --git a/devel/rbenv/files/patch-src_shobj-conf b/devel/rbenv/files/patch-src_shobj-conf deleted file mode 100644 index b60e578f5680..000000000000 --- a/devel/rbenv/files/patch-src_shobj-conf +++ /dev/null @@ -1,281 +0,0 @@ ---- src/shobj-conf.orig 2015-12-24 18:12:47 UTC -+++ src/shobj-conf -@@ -10,21 +10,23 @@ - # Chet Ramey - # chet@po.cwru.edu - --# Copyright (C) 1996-2002 Free Software Foundation, Inc. -+# Copyright (C) 1996-2014 Free Software Foundation, Inc. - # --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2, or (at your option) --# any later version. -+# This file is part of GNU Bash, the Bourne Again SHell. - # --# This program is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU General Public License for more details. -+# This program is free software: you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation, either version 3 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program. If not, see <http://www.gnu.org/licenses/>. - # --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. - - # - # defaults -@@ -62,7 +64,21 @@ while [ $# -gt 0 ]; do - esac - done - --case "${host_os}-${SHOBJ_CC}" in -+case "${host_os}-${SHOBJ_CC}-${host_vendor}" in -+nsk-cc-tandem) -+ SHOBJ_CFLAGS=-Wglobalized -+ case `uname -m` in -+ NSR*) -+ SHOBJ_CFLAGS="${SHOBJ_CFLAGS} -Wcall_shared" # default on TNS/E, needed on TNS/R -+ SHOBJ_LD=/usr/bin/ld # for TNS/R -+ ;; -+ NSE*|NEO*) -+ SHOBJ_LD=/usr/bin/eld -+ ;; -+ esac -+ SHOBJ_LDFLAGS='-shared -bglobalized -unres_symbols ignore' -+ ;; -+ - sunos4*-*gcc*) - SHOBJ_CFLAGS=-fpic - SHOBJ_LD=/usr/bin/ld -@@ -80,15 +96,17 @@ sunos4*) - ;; - - sunos5*-*gcc*|solaris2*-*gcc*) -- SHOBJ_CFLAGS=-fpic - SHOBJ_LD='${CC}' - ld_used=`gcc -print-prog-name=ld` - if ${ld_used} -V 2>&1 | grep GNU >/dev/null 2>&1; then - # This line works for the GNU ld - SHOBJ_LDFLAGS='-shared -Wl,-h,$@' -+ # http://sourceware.org/ml/binutils/2001-08/msg00361.html -+ SHOBJ_CFLAGS=-fPIC - else - # This line works for the Solaris linker in /usr/ccs/bin/ld - SHOBJ_LDFLAGS='-shared -Wl,-i -Wl,-h,$@' -+ SHOBJ_CFLAGS=-fpic - fi - - # SHLIB_XLDFLAGS='-R $(libdir)' -@@ -104,8 +122,8 @@ sunos5*|solaris2*) - SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)' - ;; - --# All versions of Linux or the semi-mythical GNU Hurd. --linux*-*|gnu*-*|k*bsd*-gnu-*) -+# All versions of Linux (including Gentoo/FreeBSD) or the semi-mythical GNU Hurd. -+linux*-*|gnu*-*|k*bsd*-gnu-*|freebsd*-gentoo) - SHOBJ_CFLAGS=-fPIC - SHOBJ_LD='${CC}' - SHOBJ_LDFLAGS='-shared -Wl,-soname,$@' -@@ -114,7 +132,7 @@ linux*-*|gnu*-*|k*bsd*-gnu-*) - SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)' - ;; - --freebsd2* | netbsd*) -+freebsd2*) - SHOBJ_CFLAGS=-fpic - SHOBJ_LD=ld - SHOBJ_LDFLAGS='-x -Bshareable' -@@ -124,8 +142,8 @@ freebsd2* | netbsd*) - ;; - - # FreeBSD-3.x ELF --freebsd[3-9]*|freebsdelf[3-9]*|freebsdaout[3-9]*|dragonfly*) -- SHOBJ_CFLAGS=-fpic -+freebsd3*|freebsdaout*) -+ SHOBJ_CFLAGS=-fPIC - SHOBJ_LD='${CC}' - - if [ -x /usr/bin/objformat ] && [ "`/usr/bin/objformat`" = "elf" ]; then -@@ -141,39 +159,20 @@ freebsd[3-9]*|freebsdelf[3-9]*|freebsdao - fi - ;; - --# Darwin/MacOS X --darwin1*) -- SHOBJ_STATUS=supported -- SHLIB_STATUS=supported -- -- SHOBJ_CFLAGS='' -- SHLIB_LIBSUFF='dylib' -- -+# FreeBSD-4.x and later have only ELF -+freebsd[4-9]*|freebsd1[0-9]*|freebsdelf*|dragonfly*) -+ SHOBJ_CFLAGS=-fPIC - SHOBJ_LD='${CC}' -- SHOBJ_LDFLAGS='-dynamiclib' -- ;; - --darwin8*) -- SHOBJ_STATUS=supported -- SHLIB_STATUS=supported -- -- SHOBJ_CFLAGS='-fno-common' -- -- SHOBJ_LD='MACOSX_DEPLOYMENT_TARGET=10.3 ${CC}' -- -- SHLIB_LIBVERSION='$(SHLIB_MAJOR)$(SHLIB_MINOR).$(SHLIB_LIBSUFF)' -- SHLIB_LIBSUFF='dylib' -- -- SHOBJ_LDFLAGS='-undefined dynamic_lookup' -- SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v' -+ SHOBJ_LDFLAGS='-shared -Wl,-soname,$@' -+ SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir)' - -- SHLIB_LIBS='-lncurses' # see if -lcurses works on MacOS X 10.1 -+ SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)' - ;; - --darwin*|macosx*) -- SHOBJ_STATUS=unsupported -- SHLIB_STATUS=supported -- -+# Darwin/MacOS X -+darwin*) -+ # Common definitions for all darwin/mac os x versions - SHOBJ_CFLAGS='-fno-common' - - SHOBJ_LD='${CC}' -@@ -181,19 +180,39 @@ darwin*|macosx*) - SHLIB_LIBVERSION='$(SHLIB_MAJOR)$(SHLIB_MINOR).$(SHLIB_LIBSUFF)' - SHLIB_LIBSUFF='dylib' - -+ # unused at this time -+ SHLIB_SONAME='$(libdir)/`echo $@ | sed "s:\\..*::"`.$(SHLIB_MAJOR).$(SHLIB_LIBSUFF)' -+ - case "${host_os}" in -- darwin[78]*) SHOBJ_LDFLAGS='' -- SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v' -+ # Darwin versions 1, 5, 6, 7 correspond to Mac OS X 10.0, 10.1, 10.2, -+ # and 10.3, respectively. -+ darwin[1-7].*) -+ SHOBJ_STATUS=unsupported -+ SHOBJ_LDFLAGS='-dynamic' -+ SHLIB_XLDFLAGS='-arch_only `/usr/bin/arch` -install_name $(libdir)/`echo $@ | sed "s:\\..*::"`.$(SHLIB_MAJOR).$(SHLIB_LIBSUFF) -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v' -+ ;; -+ # Darwin 8 == Mac OS X 10.4; Mac OS X 10.N == Darwin N+4 -+ *) -+ case "${host_os}" in -+ darwin[89]*|darwin1[012]*) -+ SHOBJ_ARCHFLAGS='-arch_only `/usr/bin/arch`' - ;; -- *) SHOBJ_LDFLAGS='-dynamic' -- SHLIB_XLDFLAGS='-arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v' -+ *) # Mac OS X 10.9 (Mavericks) and later -+ SHOBJ_ARCHFLAGS= -+ # for 32 and 64bit universal library -+ #SHOBJ_ARCHFLAGS='-arch i386 -arch x86_64' -+ #SHOBJ_CFLAGS=${SHOBJ_CFLAGS}' -arch i386 -arch x86_64' - ;; -+ esac -+ SHOBJ_LDFLAGS="-dynamiclib -dynamic -undefined dynamic_lookup ${SHOBJ_ARCHFLAGS}" -+ SHLIB_XLDFLAGS="-dynamiclib ${SHOBJ_ARCHFLAGS}"' -install_name $(libdir)/`echo $@ | sed "s:\\..*::"`.$(SHLIB_MAJOR).$(SHLIB_LIBSUFF) -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v' -+ ;; - esac - - SHLIB_LIBS='-lncurses' # see if -lcurses works on MacOS X 10.1 - ;; - --openbsd*) -+openbsd*|netbsd*|mirbsd*) - SHOBJ_CFLAGS=-fPIC - SHOBJ_LD='${CC}' - SHOBJ_LDFLAGS='-shared' -@@ -258,7 +277,7 @@ osf*) - SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)' - ;; - --aix4.[2-9]*-*gcc*) # lightly tested by jik@cisco.com -+aix4.[2-9]*-*gcc*|aix[5-9].*-*gcc*) # lightly tested by jik@cisco.com - SHOBJ_CFLAGS=-fpic - SHOBJ_LD='ld' - SHOBJ_LDFLAGS='-bdynamic -bnoentry -bexpall' -@@ -269,7 +288,7 @@ aix4.[2-9]*-*gcc*) # lightly tested by - SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)' - ;; - --aix4.[2-9]*) -+aix4.[2-9]*|aix[5-9].*) - SHOBJ_CFLAGS=-K - SHOBJ_LD='ld' - SHOBJ_LDFLAGS='-bdynamic -bnoentry -bexpall' -@@ -340,7 +359,7 @@ hpux10*-*gcc*) - SHOBJ_LD='${CC}' - # if you have problems linking here, moving the `-Wl,+h,$@' from - # SHLIB_XLDFLAGS to SHOBJ_LDFLAGS has been reported to work -- SHOBJ_LDFLAGS='-shared -Wl,-b -Wl,+s' -+ SHOBJ_LDFLAGS='-shared -fpic -Wl,-b -Wl,+s' - - SHLIB_XLDFLAGS='-Wl,+h,$@ -Wl,+b,$(libdir)' - SHLIB_LIBSUFF='sl' -@@ -500,20 +519,37 @@ msdos*) - - cygwin*) - SHOBJ_LD='$(CC)' -- SHOBJ_LDFLAGS='-shared -Wl,--enable-auto-import -Wl,--enable-auto-image-base -Wl,--export-all -Wl,--out-implib=$(@).a' -- SHLIB_LIBPREF='cyg' -- SHLIB_LIBSUFF='dll' -- SHLIB_LIBVERSION='$(SHLIB_DLLVERSION).$(SHLIB_LIBSUFF)' -- SHLIB_LIBS='$(TERMCAP_LIB)' -+ SHOBJ_LDFLAGS='-shared -Wl,--enable-auto-import -Wl,--enable-auto-image-base -Wl,--export-all -Wl,--out-implib=$(@).a' -+ SHLIB_LIBPREF='cyg' -+ SHLIB_LIBSUFF='dll' -+ SHLIB_LIBVERSION='$(SHLIB_DLLVERSION).$(SHLIB_LIBSUFF)' -+ SHLIB_LIBS='$(TERMCAP_LIB)' - - SHLIB_DOT= -- # For official cygwin releases, DLLVERSION will be defined in the -- # environment of configure, and will be incremented any time the API -- # changes in a non-backwards compatible manner. Otherwise, it is just -- # SHLIB_MAJOR. -- if [ -n "$DLLVERSION" ] ; then -+ # For official cygwin releases, DLLVERSION will be defined in the -+ # environment of configure, and will be incremented any time the API -+ # changes in a non-backwards compatible manner. Otherwise, it is just -+ # SHLIB_MAJOR. -+ if [ -n "$DLLVERSION" ] ; then - SHLIB_DLLVERSION="$DLLVERSION" -- fi -+ fi -+ ;; -+ -+mingw*) -+ SHOBJ_LD='$(CC)' -+ SHOBJ_LDFLAGS='-shared -Wl,--enable-auto-import -Wl,--enable-auto-image-base -Wl,--export-all -Wl,--out-implib=$(@).a' -+ SHLIB_LIBSUFF='dll' -+ SHLIB_LIBVERSION='$(SHLIB_DLLVERSION).$(SHLIB_LIBSUFF)' -+ SHLIB_LIBS='$(TERMCAP_LIB)' -+ -+ SHLIB_DOT= -+ # For official cygwin releases, DLLVERSION will be defined in the -+ # environment of configure, and will be incremented any time the API -+ # changes in a non-backwards compatible manner. Otherwise, it is just -+ # SHLIB_MAJOR. -+ if [ -n "$DLLVERSION" ] ; then -+ SHLIB_DLLVERSION="$DLLVERSION" -+ fi - ;; - - # diff --git a/devel/rbenv/pkg-plist b/devel/rbenv/pkg-plist index 8841e7ce40b6..25cc9ec2b93f 100644 --- a/devel/rbenv/pkg-plist +++ b/devel/rbenv/pkg-plist @@ -1,5 +1,4 @@ bin/rbenv -bin/ruby-local-exec etc/rbenv.d/exec/gem-rehash.bash etc/rbenv.d/exec/gem-rehash/rubygems_plugin.rb libexec/rbenv |