diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2013-03-07 17:08:13 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2013-03-07 17:08:13 +0000 |
| commit | 0f92912af4e1779abb0b9026feef250d3d904da1 (patch) | |
| tree | 311f7af88a51fde8c812bf534446ae4d53b06dd2 /Mk | |
| parent | b7df0651651ef059fd4db24d7b77113e72ad6c15 (diff) | |
| download | ports-0f92912af4e1779abb0b9026feef250d3d904da1.tar.gz ports-0f92912af4e1779abb0b9026feef250d3d904da1.zip | |
- Add new knob USE_LHA [1]
- Convert few ports to USE_LHA [1]
- Revert r303619 since CONFIGURE_ENV already sets CPPFLAGS and LDFLAGS by default. [2]
PR: 176187 [1]
174790 [2]
Submitted by: Christoph Mallon <christoph.mallon@gmx.de> [1]
Gerald Pfeifer <gerald@pfeifer.com> [2]
Notes
Notes:
svn path=/head/; revision=313600
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.commands.mk | 1 | ||||
| -rw-r--r-- | Mk/bsd.port.mk | 19 |
2 files changed, 15 insertions, 5 deletions
diff --git a/Mk/bsd.commands.mk b/Mk/bsd.commands.mk index d20d71832d90..4b8a4d035cb7 100644 --- a/Mk/bsd.commands.mk +++ b/Mk/bsd.commands.mk @@ -54,6 +54,7 @@ ID?= /usr/bin/id IDENT?= /usr/bin/ident JOT?= /usr/bin/jot LDCONFIG?= /sbin/ldconfig +LHA_CMD?= ${LOCALBASE}/bin/lha LN?= /bin/ln LS?= /bin/ls MKDIR?= /bin/mkdir -p diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 9ca06919450b..b3bdece01194 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -91,9 +91,9 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # Default: ${DISTNAME}${EXTRACT_SUFX} # EXTRACT_SUFX - Suffix for archive names # You never have to set both DISTFILES and EXTRACT_SUFX. -# Default: .tar.bz2 if USE_BZIP2 is set, .zip if USE_ZIP is -# set, .tar.xz if USE_XZ is set, .run if USE_MAKESELF is set, -# .tar.gz otherwise). +# Default: .tar.bz2 if USE_BZIP2 is set, .lzh if USE_LHA is set, +# .zip if USE_ZIP is set, .tar.xz if USE_XZ is set, .run if +# USE_MAKESELF is set, .tar.gz otherwise). # MASTER_SITES - Primary location(s) for distribution files if not found # locally. See bsd.sites.mk for common choices for # MASTER_SITES. @@ -303,6 +303,7 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # # USE_BZIP2 - If set, this port tarballs use bzip2, not gzip, for # compression. +# USE_LHA - If set, this port distfile uses lha for compression # USE_XZ - If set, this port tarballs use xz (or lzma) # for compression # USE_ZIP - If set, this port distfile uses zip, not tar w/[bg]zip @@ -1369,6 +1370,8 @@ ETCDIR?= ${PREFIX}/etc/${PORTNAME} .if defined(USE_BZIP2) EXTRACT_SUFX?= .tar.bz2 +.elif defined(USE_LHA) +EXTRACT_SUFX?= .lzh .elif defined(USE_ZIP) EXTRACT_SUFX?= .zip .elif defined(USE_XZ) @@ -1675,6 +1678,9 @@ PKG_DEPENDS+= ${LOCALBASE}/sbin/pkg:${PORTSDIR}/ports-mgmt/pkg .endif .endif +.if defined(USE_LHA) +EXTRACT_DEPENDS+= lha:${PORTSDIR}/archivers/lha +.endif .if defined(USE_ZIP) EXTRACT_DEPENDS+= ${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip .endif @@ -1730,7 +1736,6 @@ MAKE_ENV+= ${b}="${${b}}" LIB_DEPENDS+= readline.6:${PORTSDIR}/devel/readline CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -lreadline -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" .endif .endif @@ -2326,7 +2331,11 @@ PATCH_DIST_ARGS+= --suffix .orig TAR?= /usr/bin/tar # EXTRACT_SUFX is defined in .pre.mk section -.if defined(USE_ZIP) +.if defined(USE_LHA) +EXTRACT_CMD?= ${LHA_CMD} +EXTRACT_BEFORE_ARGS?= xfqw=${WRKDIR} +EXTRACT_AFTER_ARGS?= +.elif defined(USE_ZIP) EXTRACT_CMD?= ${UNZIP_CMD} EXTRACT_BEFORE_ARGS?= -qo EXTRACT_AFTER_ARGS?= -d ${WRKDIR} |