Only the default package will be named ruby-<version> now, to stop confusing users
Approved by: ruby (swills)
This commit is contained in:
parent
e4343d70fd
commit
ef5a8cdc90
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=327412
3 changed files with 4 additions and 18 deletions
|
@ -1,9 +1,5 @@
|
||||||
# New ports collection makefile for: ruby18
|
# Created by: Akinori MUSHA aka knu <knu@idaemons.org>
|
||||||
# Date created: 6 May 2001
|
|
||||||
# Whom: Akinori MUSHA aka knu <knu@idaemons.org>
|
|
||||||
#
|
|
||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
#
|
|
||||||
|
|
||||||
PORTNAME= ruby
|
PORTNAME= ruby
|
||||||
PORTVERSION= ${RUBY_PORTVERSION}
|
PORTVERSION= ${RUBY_PORTVERSION}
|
||||||
|
@ -59,25 +55,14 @@ _SUF2= ,${PORTEPOCH}
|
||||||
_SUF1= _${PORTREVISION}
|
_SUF1= _${PORTREVISION}
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
PKGNAMESUFFIX= #empty
|
|
||||||
|
|
||||||
#
|
|
||||||
# pthreads in earlier versions has problems with malloc after fork
|
|
||||||
#
|
|
||||||
.if ${OSVERSION} < 702000
|
|
||||||
WITHOUT_PTHREADS= yes
|
|
||||||
.endif
|
|
||||||
|
|
||||||
.if defined(WITHOUT_PTHREADS)
|
.if defined(WITHOUT_PTHREADS)
|
||||||
CONFIGURE_ARGS+=--disable-pthread
|
CONFIGURE_ARGS+=--disable-pthread
|
||||||
PKGNAMESUFFIX:= ${PKGNAMESUFFIX}+nopthreads
|
|
||||||
.else
|
.else
|
||||||
LDFLAGS+= ${PTHREAD_LIBS}
|
LDFLAGS+= ${PTHREAD_LIBS}
|
||||||
CONFIGURE_ARGS+=--enable-pthread
|
CONFIGURE_ARGS+=--enable-pthread
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${PORT_OPTIONS:MONIGURUMA}
|
.if ${PORT_OPTIONS:MONIGURUMA}
|
||||||
PKGNAMESUFFIX:= ${PKGNAMESUFFIX}+oniguruma
|
|
||||||
BUILD_DEPENDS+= ${NONEXISTENT}:${ONIGURUMA_PORTDIR}:patch
|
BUILD_DEPENDS+= ${NONEXISTENT}:${ONIGURUMA_PORTDIR}:patch
|
||||||
ONIGURUMA_PORTDIR=${PORTSDIR}/devel/oniguruma
|
ONIGURUMA_PORTDIR=${PORTSDIR}/devel/oniguruma
|
||||||
ONIGURUMA_WRKSRC=`cd ${ONIGURUMA_PORTDIR}; ${MAKE} -V WRKSRC`
|
ONIGURUMA_WRKSRC=`cd ${ONIGURUMA_PORTDIR}; ${MAKE} -V WRKSRC`
|
||||||
|
@ -99,6 +84,7 @@ CONFIGURE_ARGS+= --disable-install-doc
|
||||||
MLINKS= ${RUBY_NAME}.1 ruby.1
|
MLINKS= ${RUBY_NAME}.1 ruby.1
|
||||||
PLIST_SUB+= IF_DEFAULT=""
|
PLIST_SUB+= IF_DEFAULT=""
|
||||||
.else
|
.else
|
||||||
|
PKGNAMESUFFIX= ${RUBY_VER:C/\.//}
|
||||||
PLIST_SUB+= IF_DEFAULT="@comment "
|
PLIST_SUB+= IF_DEFAULT="@comment "
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
|
|
|
@ -60,7 +60,6 @@ _SUF2= ,${PORTEPOCH}
|
||||||
_SUF1= _${PORTREVISION}
|
_SUF1= _${PORTREVISION}
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
PKGNAMESUFFIX= #empty
|
|
||||||
CFLAGS+= ${PTHREAD_CFLAGS} # Keep this, else ruby will fail to load
|
CFLAGS+= ${PTHREAD_CFLAGS} # Keep this, else ruby will fail to load
|
||||||
LDFLAGS+= ${PTHREAD_LIBS} # libraries dependent op libpthread.
|
LDFLAGS+= ${PTHREAD_LIBS} # libraries dependent op libpthread.
|
||||||
|
|
||||||
|
@ -81,6 +80,7 @@ CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include ${CFLAGS}" \
|
||||||
MLINKS= ${RUBY_NAME}.1 ruby.1
|
MLINKS= ${RUBY_NAME}.1 ruby.1
|
||||||
PLIST_SUB+= IF_DEFAULT=""
|
PLIST_SUB+= IF_DEFAULT=""
|
||||||
.else
|
.else
|
||||||
|
PKGNAMESUFFIX= ${RUBY_VER:C/\.//}
|
||||||
PLIST_SUB+= IF_DEFAULT="@comment "
|
PLIST_SUB+= IF_DEFAULT="@comment "
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
|
|
|
@ -60,7 +60,6 @@ _SUF2= ,${PORTEPOCH}
|
||||||
_SUF1= _${PORTREVISION}
|
_SUF1= _${PORTREVISION}
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
PKGNAMESUFFIX= #empty
|
|
||||||
CFLAGS+= ${PTHREAD_CFLAGS} # Keep this, else ruby will fail to load
|
CFLAGS+= ${PTHREAD_CFLAGS} # Keep this, else ruby will fail to load
|
||||||
LDFLAGS+= ${PTHREAD_LIBS} # libraries dependent op libpthread.
|
LDFLAGS+= ${PTHREAD_LIBS} # libraries dependent op libpthread.
|
||||||
|
|
||||||
|
@ -85,6 +84,7 @@ CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include ${CFLAGS}" \
|
||||||
MLINKS= ${RUBY_NAME}.1 ruby.1
|
MLINKS= ${RUBY_NAME}.1 ruby.1
|
||||||
PLIST_SUB+= IF_DEFAULT=""
|
PLIST_SUB+= IF_DEFAULT=""
|
||||||
.else
|
.else
|
||||||
|
PKGNAMESUFFIX= ${RUBY_VER:C/\.//}
|
||||||
PLIST_SUB+= IF_DEFAULT="@comment "
|
PLIST_SUB+= IF_DEFAULT="@comment "
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue