diff options
| -rw-r--r-- | Mk/bsd.port.mk | 17 | ||||
| -rw-r--r-- | Mk/bsd.sanity.mk | 2 |
2 files changed, 3 insertions, 16 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 8f6e782e4157..29c2be44b95c 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -93,8 +93,8 @@ 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, .lzh if USE_LHA is set, -# .tar.xz if USE_XZ is set, .tar.gz otherwise). +# Default: .tar.bz2 if USE_BZIP2 is set, .tar.xz if USE_XZ 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. @@ -328,7 +328,6 @@ 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_GCC - If set, this port requires this version of gcc, either in @@ -1521,8 +1520,6 @@ ${_f}_ARGS:= ${f:C/^[^\:]*\://g} .if defined(USE_BZIP2) EXTRACT_SUFX?= .tar.bz2 -.elif defined(USE_LHA) -EXTRACT_SUFX?= .lzh .elif defined(USE_XZ) EXTRACT_SUFX?= .tar.xz .else @@ -1693,10 +1690,6 @@ PKG_DEPENDS+= ${LOCALBASE}/sbin/pkg:${PORTSDIR}/${PKGNG_ORIGIN} .endif .endif -.if defined(USE_LHA) -EXTRACT_DEPENDS+= lha:${PORTSDIR}/archivers/lha -.endif - .if defined(USE_GCC) .include "${PORTSDIR}/Mk/bsd.gcc.mk" .endif @@ -2160,11 +2153,6 @@ PATCH_DIST_ARGS+= --suffix .orig TAR?= /usr/bin/tar # EXTRACT_SUFX is defined in .pre.mk section -.if defined(USE_LHA) -EXTRACT_CMD?= ${LHA_CMD} -EXTRACT_BEFORE_ARGS?= xfqw=${WRKDIR} -EXTRACT_AFTER_ARGS?= -.else EXTRACT_CMD?= ${TAR} EXTRACT_BEFORE_ARGS?= -xf .if defined(EXTRACT_PRESERVE_OWNERSHIP) @@ -2172,7 +2160,6 @@ EXTRACT_AFTER_ARGS?= .else EXTRACT_AFTER_ARGS?= --no-same-owner --no-same-permissions .endif -.endif # Figure out where the local mtree file is .if !defined(MTREE_FILE) && !defined(NO_MTREE) diff --git a/Mk/bsd.sanity.mk b/Mk/bsd.sanity.mk index f6e4a942d525..65f5f1fb9758 100644 --- a/Mk/bsd.sanity.mk +++ b/Mk/bsd.sanity.mk @@ -177,7 +177,7 @@ DEV_ERROR+= 'USE_ZIP is unsupported, please use USES=zip' .endif .if defined(USE_LHA) -DEV_WARNING+= 'USE_LHA is deprecated, please use USES=lha' +DEV_ERROR+= 'USE_LHA is deprecated, please use USES=lha' .endif .if defined(USE_XZ) |