From owner-svn-ports-head@FreeBSD.ORG Mon Sep 16 16:34:11 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id C1ED6826; Mon, 16 Sep 2013 16:34:11 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A079A2A8A; Mon, 16 Sep 2013 16:34:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8GGYBbk071049; Mon, 16 Sep 2013 16:34:11 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8GGYB1C071046; Mon, 16 Sep 2013 16:34:11 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201309161634.r8GGYB1C071046@svn.freebsd.org> From: Baptiste Daroussin Date: Mon, 16 Sep 2013 16:34:11 +0000 (UTC) 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 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Sep 2013 16:34:11 -0000 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- 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 -# +# Created by: Akinori MUSHA aka knu # $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