cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Point the default JAVABINDIR/JAVAPORT to the native jdk1.3

Browse Source 
* Autodetect java, enable WITHOUT_JAVA if no java exists
* Remove useless PLIST_SUBs (plist is automatically generated)
* grep -> ${GREP}
This commit is contained in:
Jimmy Olgeni 2001-09-28 11:31:59 +00:00
parent 7149da2604
commit 98c35cf31e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=48243
2 changed files with 22 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lang/erlang/Makefile
View File

@ -22,7 +22,13 @@ PATCH_DIST_STRIP= -p1
MAINTAINER= olgeni@FreeBSD.org
BUILD_DEPENDS= ${JAVAPORT}
# Set JAVABINDIR to where you have javac, if different from below
JAVABINDIR?= ${LOCALBASE}/jdk1.3.1/bin
JAVAPORT?= ${JAVABINDIR}/javac:${PORTSDIR}/java/jdk13
.if !exists(${JAVABINDIR}/java)
WITHOUT_JAVA= yes
.endif
CONFIGURE_TARGET= # Empty
@ -61,31 +67,17 @@ UPDATED_PACKAGES= erts lib/compiler lib/erl_interface \
# this is the case (that I could think of at least) was to make sure
# JAVABINDIR is added to the PATH, using the *_ENV macros.
BUILD_DEPENDS+= ${JAVAPORT}
# The following UPDATED_PACKAGES depend on java.
UPDATED_PACKAGES+= lib/jinterface
# Set JAVABINDIR to where you have javac, if different from below
JAVABINDIR?= ${LOCALBASE}/jdk1.2.2/bin
JAVAPORT?= ${JAVABINDIR}/javac:${PORTSDIR}/java/jdk12-beta
# Make sure javabindir is in the path
CONFIGURE_ENV+= PATH=${PATH}:${JAVABINDIR}
MAKE_ENV+= PATH=${PATH}:${JAVABINDIR}
SCRIPT_ENV+= PATH=${PATH}:${JAVABINDIR}
.endif
.if !defined(WITHOUT_X11)
PLIST_SUB+= WITHOUT_X11=""
.else
PLIST_SUB+= WITHOUT_X11="@comment "
.endif
.if !defined(WITHOUT_JAVA)
PLIST_SUB+= WITHOUT_JAVA=""
.else
PLIST_SUB+= WITHOUT_JAVA="@comment "
.endif
# If X11 is not used, skip gs and etk applications.
pre-build:
.if defined(WITHOUT_X11)
@ -141,11 +133,11 @@ post-install:
sslapp=`ls -d ${PREFIX}/lib/erlang/lib/ssl-* | tail -1`; \
cd $$sslapp/priv/obj && ${MAKE} && strip ../bin/ssl_esock
@cd ${PREFIX} ; find lib/erlang/* -type f -o -type l \
| grep -v "^lib/erlang/man" \
| ${GREP} -v "^lib/erlang/man" \
| sort \
> ${WRKDIR}/PLIST.lib-erlang
@cd ${PREFIX} ; find lib/erlang/* -type d | sort -r \
| grep -v "^lib/erlang/man" \
| ${GREP} -v "^lib/erlang/man" \
| ${SED} -e 's/^/@dirrm /g' \
>> ${WRKDIR}/PLIST.lib-erlang

30
lang/erlang14/Makefile
View File

@ -22,7 +22,13 @@ PATCH_DIST_STRIP= -p1
MAINTAINER= olgeni@FreeBSD.org
BUILD_DEPENDS= ${JAVAPORT}
# Set JAVABINDIR to where you have javac, if different from below
JAVABINDIR?= ${LOCALBASE}/jdk1.3.1/bin
JAVAPORT?= ${JAVABINDIR}/javac:${PORTSDIR}/java/jdk13
.if !exists(${JAVABINDIR}/java)
WITHOUT_JAVA= yes
.endif
CONFIGURE_TARGET= # Empty
@ -61,31 +67,17 @@ UPDATED_PACKAGES= erts lib/compiler lib/erl_interface \
# this is the case (that I could think of at least) was to make sure
# JAVABINDIR is added to the PATH, using the *_ENV macros.
BUILD_DEPENDS+= ${JAVAPORT}
# The following UPDATED_PACKAGES depend on java.
UPDATED_PACKAGES+= lib/jinterface
# Set JAVABINDIR to where you have javac, if different from below
JAVABINDIR?= ${LOCALBASE}/jdk1.2.2/bin
JAVAPORT?= ${JAVABINDIR}/javac:${PORTSDIR}/java/jdk12-beta
# Make sure javabindir is in the path
CONFIGURE_ENV+= PATH=${PATH}:${JAVABINDIR}
MAKE_ENV+= PATH=${PATH}:${JAVABINDIR}
SCRIPT_ENV+= PATH=${PATH}:${JAVABINDIR}
.endif
.if !defined(WITHOUT_X11)
PLIST_SUB+= WITHOUT_X11=""
.else
PLIST_SUB+= WITHOUT_X11="@comment "
.endif
.if !defined(WITHOUT_JAVA)
PLIST_SUB+= WITHOUT_JAVA=""
.else
PLIST_SUB+= WITHOUT_JAVA="@comment "
.endif
# If X11 is not used, skip gs and etk applications.
pre-build:
.if defined(WITHOUT_X11)
@ -141,11 +133,11 @@ post-install:
sslapp=`ls -d ${PREFIX}/lib/erlang/lib/ssl-* | tail -1`; \
cd $$sslapp/priv/obj && ${MAKE} && strip ../bin/ssl_esock
@cd ${PREFIX} ; find lib/erlang/* -type f -o -type l \
| grep -v "^lib/erlang/man" \
| ${GREP} -v "^lib/erlang/man" \
| sort \
> ${WRKDIR}/PLIST.lib-erlang
@cd ${PREFIX} ; find lib/erlang/* -type d | sort -r \
| grep -v "^lib/erlang/man" \
| ${GREP} -v "^lib/erlang/man" \
| ${SED} -e 's/^/@dirrm /g' \
>> ${WRKDIR}/PLIST.lib-erlang