diff options
author | Joseph Koshy <jkoshy@FreeBSD.org> | 2007-09-02 05:48:55 +0000 |
---|---|---|
committer | Joseph Koshy <jkoshy@FreeBSD.org> | 2007-09-02 05:48:55 +0000 |
commit | 282e3928bbc944154a584ed80b27ea1915549e80 (patch) | |
tree | 4351839b84554ad8f9f9d8576efd2a37b6a23514 /lang/sml-nj-devel | |
parent | - Use SUB_FILES and SUB_LIST. [1] (diff) |
- Use SUB_FILES and SUB_LIST. [1]
- Minor tweaks to the port Makefile and pkg-install script.
Suggested by: sat [1]
Submitted by: Johannes 5 Joemann [MAINTAINER]
Notes
Notes:
svn path=/head/; revision=198626
Diffstat (limited to 'lang/sml-nj-devel')
-rw-r--r-- | lang/sml-nj-devel/Makefile | 16 | ||||
-rw-r--r-- | lang/sml-nj-devel/files/pkg-install.in | 6 |
2 files changed, 8 insertions, 14 deletions
diff --git a/lang/sml-nj-devel/Makefile b/lang/sml-nj-devel/Makefile index b9bf167a9293..f24c24392184 100644 --- a/lang/sml-nj-devel/Makefile +++ b/lang/sml-nj-devel/Makefile @@ -7,17 +7,17 @@ PORTNAME= smlnj PORTVERSION= 110.65 -PKGNAMESUFFIX= -devel CATEGORIES= lang MASTER_SITES= http://smlnj.cs.uchicago.edu/dist/working/${PORTVERSION}/ \ ftp://mirror.free.de/http/smlnj.cs.uchicago.edu/dist/working/${PORTVERSION}/ +PKGNAMESUFFIX= -devel DISTFILES= config.tgz runtime.tgz +DIST_SUBDIR= sml-nj/${PORTVERSION} EXTRACT_ONLY= config.tgz MAINTAINER= joemann@beefree.free.de COMMENT= A popular functional language from Bell Labs -DIST_SUBDIR= sml-nj/${PORTVERSION} NO_WRKSUBDIR= yes USE_GMAKE= yes @@ -26,7 +26,8 @@ ONLY_FOR_ARCHS= i386 OPTIONS= EVERYTHING "install everything from the SML/NJ distribution" off \ RECOMPILE "recompile the SML compiler - implies EVERYTHING" off -PKGINSTALL= ${WRKDIR}/.pkg-install +SUB_FILES= pkg-install +SUB_LIST= EXEBINDIR=${MLBINRELATIVE} EXENAMES="${MLEXE}" PKGDEINSTALL= ${PKGINSTALL} .include <bsd.port.pre.mk> @@ -82,10 +83,8 @@ pre-fetch: .if !defined(WITH_EVERYTHING) @${ECHO} 'Use make WITH_EVERYTHING=yes to also build/install' @${ECHO} ' eXene (X Windows toolkit),' - @${ECHO} ' ml-antlr (LL(k) parser generator),' @${ECHO} ' ml-burg (tree transformer),' @${ECHO} ' ml-nlffi (foreign function interface to C code),' - @${ECHO} ' ml-ulex (lexer generator with unicode support),' @${ECHO} ' nowhere (preprocessor for conditional patterns),' @${ECHO} ' various libraries, and all the sources.' .endif @@ -123,11 +122,6 @@ do-configure: ${ECHO_CMD} "request src-smlnj" ) \ > "${WRKDIR}/config/targets.customized" .endif -# The text of the pkg-install script depends on the programs which will -# be installed, see "post-install" below. - ${SED} -e 's?%%EXENAMES%%?${MLEXE}?g' \ - -e 's?%%EXEBINDIR%%?${MLBINRELATIVE}?g' \ - ${FILESDIR}/pkg-install.in > ${PKGINSTALL} # The build target patches, builds, and installs the system within WRKDIR. # base/runtime is not cleaned afterwards to avoid its recompilation during @@ -292,7 +286,7 @@ deinstall: # either to the currently installed sml-nj-devel package's version # or else to this port's version. SMLNJ_DEVEL_VERSION is an environment # variable used by multiexec-wrapper to select the executable -# from that smlnj-* package matching SMLNJ_DEVEL_VERSION. +# from that smlnj-devel-* package matching SMLNJ_DEVEL_VERSION. smlnj-devel-version: # XXX PKG_INFO not in bsd.commands.mk (20070818) @${EXPR} `pkg_info -q -O lang/sml-nj-devel` : '.*-\(.*\)' \ diff --git a/lang/sml-nj-devel/files/pkg-install.in b/lang/sml-nj-devel/files/pkg-install.in index 4750e0388775..cdc3840a86c7 100644 --- a/lang/sml-nj-devel/files/pkg-install.in +++ b/lang/sml-nj-devel/files/pkg-install.in @@ -1,7 +1,7 @@ #!/bin/sh # This file was automatically created - don't modify it! #%%SOURCEINFO-START%% -# source version: $Id: pkg-install.in,v 1.15 2007/08/19 17:04:15 joemann Exp $ +# source version: $Id: pkg-install.in,v 1.17 2007/08/30 13:09:47 joemann Exp $ # installed by port/package: %%SOURCEINFO-PACKAGE%% # installed from file: %%SOURCEINFO-FILE%% #%%SOURCEINFO-END%% @@ -98,7 +98,7 @@ fi EPOCH=1 CONFIG_FORMAT=1 MAJOR=1 -MINOR=0 +MINOR=1 VERSION=$EPOCH.$CONFIG_FORMAT.$MAJOR.$MINOR usage() { @@ -130,7 +130,7 @@ version() { which() { local name executable name="$1" - lookup_executable "$CALLED_NAME" + lookup_executable "$name" executable="$lookup_executable_result" [ -z "$executable" ] && return 1 echo "$executable" |