diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2014-09-18 12:31:24 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2014-09-18 12:31:24 +0000 |
| commit | 46cf4bcb84b99c5637a0b1539ab29ec6453cd483 (patch) | |
| tree | 4577ab4cc236d536b9a0cc3950ccda2713cedba5 /Mk | |
| parent | eeab05ac6242443a3a4c86d568f91baaf47daab6 (diff) | |
| download | ports-46cf4bcb84b99c5637a0b1539ab29ec6453cd483.tar.gz ports-46cf4bcb84b99c5637a0b1539ab29ec6453cd483.zip | |
Notes
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/Uses/imake.mk | 8 | ||||
| -rw-r--r-- | Mk/bsd.port.mk | 14 | ||||
| -rw-r--r-- | Mk/bsd.sanity.mk | 4 |
3 files changed, 3 insertions, 23 deletions
diff --git a/Mk/Uses/imake.mk b/Mk/Uses/imake.mk index f584be51a238..f6340c841f8b 100644 --- a/Mk/Uses/imake.mk +++ b/Mk/Uses/imake.mk @@ -23,14 +23,6 @@ IGNORE= USES=imake:${imake_ARGS:S/ /,/g} is not a valid argument imake_ARGS= .endif -.if defined(NO_INSTALL_MANPAGES) -imake_ARGS+= noman -.endif - -.if ! ${imake_ARGS:Mnoman} -MANCOMPRESSED?= yes -.endif - BUILD_DEPENDS+= imake:${PORTSDIR}/devel/imake .if defined(USE_GCC) diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index beaa8957cb21..24816171d557 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -574,8 +574,7 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # INSTALL_SCRIPT # - A command to install executable scripts. # INSTALL_DATA - A command to install sharable data. -# INSTALL_MAN - A command to install manpages. May or not compress, -# depending on the value of MANCOMPRESSED (see below). +# INSTALL_MAN - A command to install manpages. # COPYTREE_BIN # COPYTREE_SHARE # - Similiar to INSTALL_PROGRAM and INSTALL_DATA commands but @@ -1616,17 +1615,6 @@ MAKE_SHELL?= ${SH} CONFIGURE_ENV+= SHELL=${CONFIGURE_SHELL} CONFIG_SHELL=${CONFIGURE_SHELL} MAKE_ENV+= SHELL=${MAKE_SHELL} NO_LINT=YES -.if defined(MANCOMPRESSED) -.if ${MANCOMPRESSED} != yes && ${MANCOMPRESSED} != no && \ - ${MANCOMPRESSED} != maybe -check-makevars:: - @${ECHO_MSG} "${PKGNAME}: Makefile error: value of MANCOMPRESSED (is \"${MANCOMPRESSED}\") can only be \"yes\", \"no\" or \"maybe\"". - @${FALSE} -.endif -.endif - -MANCOMPRESSED?= no - .if defined(PATCHFILES) .if ${PATCHFILES:M*.zip}x != x PATCH_DEPENDS+= ${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip diff --git a/Mk/bsd.sanity.mk b/Mk/bsd.sanity.mk index d980bab6d279..bc63966fd8d0 100644 --- a/Mk/bsd.sanity.mk +++ b/Mk/bsd.sanity.mk @@ -140,10 +140,10 @@ DEV_WARNING+= "INSTALLS_EGGINFO is deprecated, please add the entry directly to SANITY_UNSUPPORTED= USE_OPENAL USE_FAM USE_MAKESELF USE_ZIP USE_LHA USE_CMAKE \ USE_READLINE USE_ICONV PERL_CONFIGURE PERL_MODBUILD \ USE_PERL5_BUILD USE_PERL5_RUN USE_DISPLAY USE_FUSE \ - USE_GETTEXT USE_GMAKE USE_SCONS USE_DRUPAL + USE_GETTEXT USE_GMAKE USE_SCONS USE_DRUPAL NO_INSTALL_MANPAGES SANITY_DEPRECATED= USE_XZ USE_BZIP2 USE_PYDISTUTILS PYTHON_CONCURRENT_INSTALL \ PYDISTUTILS_AUTOPLIST PYTHON_PY3K_PLIST_HACK PYDISTUTILS_NOEGGINFO \ - USE_PYTHON_PREFIX PYTHON_PKGNAMESUFFIX NO_INSTALL_MANPAGES + USE_PYTHON_PREFIX PYTHON_PKGNAMESUFFIX USE_OPENAL_ALT= USES=openal USE_FAM_ALT= USES=fam |