diff options
| author | Jimmy Olgeni <olgeni@FreeBSD.org> | 2001-09-28 11:31:59 +0000 |
|---|---|---|
| committer | Jimmy Olgeni <olgeni@FreeBSD.org> | 2001-09-28 11:31:59 +0000 |
| commit | 98c35cf31e6db1a424fc9e01e091feec23d988c0 (patch) | |
| tree | 56e722a5c2f9cb0eff56d6e4453e677c062ae17e /lang/erlang | |
| parent | 7149da260419e3e3c35e346e82b08c2a31ff5201 (diff) | |
| download | ports-98c35cf31e6db1a424fc9e01e091feec23d988c0.tar.gz ports-98c35cf31e6db1a424fc9e01e091feec23d988c0.zip | |
* Point the default JAVABINDIR/JAVAPORT to the native jdk1.3
* Autodetect java, enable WITHOUT_JAVA if no java exists
* Remove useless PLIST_SUBs (plist is automatically generated)
* grep -> ${GREP}
Notes
Notes:
svn path=/head/; revision=48243
Diffstat (limited to 'lang/erlang')
| -rw-r--r-- | lang/erlang/Makefile | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile index 916081eac360..cd87574608ae 100644 --- a/lang/erlang/Makefile +++ b/lang/erlang/Makefile @@ -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 |