Date: Mon, 16 Sep 2013 16:34:11 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r327412 - in head/lang: ruby18 ruby19 ruby20 Message-ID: <201309161634.r8GGYB1C071046@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Mon Sep 16 16:34:10 2013 New Revision: 327412 URL: http://svnweb.freebsd.org/changeset/ports/327412 Log: Only the default package will be named ruby-<version> now, to stop confusing users Approved by: ruby (swills) Modified: head/lang/ruby18/Makefile head/lang/ruby19/Makefile head/lang/ruby20/Makefile Modified: head/lang/ruby18/Makefile ============================================================================== --- head/lang/ruby18/Makefile Mon Sep 16 16:32:07 2013 (r327411) +++ head/lang/ruby18/Makefile Mon Sep 16 16:34:10 2013 (r327412) @@ -1,9 +1,5 @@ -# New ports collection makefile for: ruby18 -# Date created: 6 May 2001 -# Whom: Akinori MUSHA aka knu <knu@idaemons.org> -# +# Created by: Akinori MUSHA aka knu <knu@idaemons.org> # $FreeBSD$ -# PORTNAME= ruby PORTVERSION= ${RUBY_PORTVERSION} @@ -59,25 +55,14 @@ _SUF2= ,${PORTEPOCH} _SUF1= _${PORTREVISION} .endif -PKGNAMESUFFIX= #empty - -# -# pthreads in earlier versions has problems with malloc after fork -# -.if ${OSVERSION} < 702000 -WITHOUT_PTHREADS= yes -.endif - .if defined(WITHOUT_PTHREADS) CONFIGURE_ARGS+=--disable-pthread -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}+nopthreads .else LDFLAGS+= ${PTHREAD_LIBS} CONFIGURE_ARGS+=--enable-pthread .endif .if ${PORT_OPTIONS:MONIGURUMA} -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}+oniguruma BUILD_DEPENDS+= ${NONEXISTENT}:${ONIGURUMA_PORTDIR}:patch ONIGURUMA_PORTDIR=${PORTSDIR}/devel/oniguruma ONIGURUMA_WRKSRC=`cd ${ONIGURUMA_PORTDIR}; ${MAKE} -V WRKSRC` @@ -99,6 +84,7 @@ CONFIGURE_ARGS+= --disable-install-doc MLINKS= ${RUBY_NAME}.1 ruby.1 PLIST_SUB+= IF_DEFAULT="" .else +PKGNAMESUFFIX= ${RUBY_VER:C/\.//} PLIST_SUB+= IF_DEFAULT="@comment " .endif Modified: head/lang/ruby19/Makefile ============================================================================== --- head/lang/ruby19/Makefile Mon Sep 16 16:32:07 2013 (r327411) +++ head/lang/ruby19/Makefile Mon Sep 16 16:34:10 2013 (r327412) @@ -60,7 +60,6 @@ _SUF2= ,${PORTEPOCH} _SUF1= _${PORTREVISION} .endif -PKGNAMESUFFIX= #empty CFLAGS+= ${PTHREAD_CFLAGS} # Keep this, else ruby will fail to load LDFLAGS+= ${PTHREAD_LIBS} # libraries dependent op libpthread. @@ -81,6 +80,7 @@ CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/in MLINKS= ${RUBY_NAME}.1 ruby.1 PLIST_SUB+= IF_DEFAULT="" .else +PKGNAMESUFFIX= ${RUBY_VER:C/\.//} PLIST_SUB+= IF_DEFAULT="@comment " .endif Modified: head/lang/ruby20/Makefile ============================================================================== --- head/lang/ruby20/Makefile Mon Sep 16 16:32:07 2013 (r327411) +++ head/lang/ruby20/Makefile Mon Sep 16 16:34:10 2013 (r327412) @@ -60,7 +60,6 @@ _SUF2= ,${PORTEPOCH} _SUF1= _${PORTREVISION} .endif -PKGNAMESUFFIX= #empty CFLAGS+= ${PTHREAD_CFLAGS} # Keep this, else ruby will fail to load LDFLAGS+= ${PTHREAD_LIBS} # libraries dependent op libpthread. @@ -85,6 +84,7 @@ CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/in MLINKS= ${RUBY_NAME}.1 ruby.1 PLIST_SUB+= IF_DEFAULT="" .else +PKGNAMESUFFIX= ${RUBY_VER:C/\.//} PLIST_SUB+= IF_DEFAULT="@comment " .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309161634.r8GGYB1C071046>