diff options
29 files changed, 76 insertions, 190 deletions
diff --git a/Mk/Uses/manpages.mk b/Mk/Uses/manpages.mk deleted file mode 100644 index 611cdc1981b1..000000000000 --- a/Mk/Uses/manpages.mk +++ /dev/null @@ -1,120 +0,0 @@ -# $FreeBSD$ -# -# Provide support for manpages -# -# MAINTAINER: dinoex@FreeBSD.org -# -# Feature: manpages -# Usage: USES=manpages or USES=manpages:ARGS -# Valid ARGS: install -# will install the manpages from MANSRC -# -# -# MAN<sect> - A list of manpages, categorized by section. For -# example, if your port has "man/man1/foo.1" and -# "man/mann/bar.n", set "MAN1=foo.1" and "MANN=bar.n". -# The available sections chars are "123456789LN". -# MAN<sect>_<lang> -# - If your port does not install all man pages for all -# languages in MANLANG, language specific pages for -# a language can be specified with this. For example, -# if the port installs foo.1 in English, Japanese, and -# German, bar.1 in English only, and baz.3 in German -# only, set -# MANLANG= "" de ja -# MAN1= foo.1 -# MAN1_EN= bar.1 -# MAN3_DE= baz.3 -# MANPREFIX - The directory prefix for ${MAN<sect>} and ${MLINKS}. -# Default: ${PREFIX} -# MAN<sect>PREFIX -# - If manual pages of some sections install in different -# locations than others, use these. -# Default: ${MANPREFIX} -# MANSRC - The directory where the manpages are copied from -# during install. -# Default: ${WRKSRC} -# -# -# NO_INSTALL_MANPAGES -# - If set, this port doesn't want to install any manpages. -# Default: not set, i.e. manpages are installed by default. -# - -.if !defined(_INCLUDE_USES_MANPAGES_MK) -_INCLUDE_USES_MANPAGES_MK= yes - -MANSRC?= ${WRKSRC} -#MANPREFIX?= ${PREFIX} -# -#MANDIRS+= ${MANPREFIX}/man -#.for sect in 1 2 3 4 5 6 7 8 9 L N -#MAN${sect}PREFIX?= ${MANPREFIX} -#.endfor - -MANLANG?= "" # english only by default - -#MANEXT= .gz - -#.for manlang in ${MANLANG:S%^%man/%:S%^man/""$%man%} -# -#.for sect in 1 2 3 4 5 6 7 8 9 L N -## MAN${sect} is for man pages installed for all languages in MANLANG for a given -## section. -#.if defined(MAN${sect}) -#_MANPAGES+= ${MAN${sect}:S%^%${MAN${sect}PREFIX}/${manlang}/man${sect:L}/%} -#.endif -# -## Language specific MAN${sect} variables are for man pages installed in that -## language, but not necessarily all languages in MANLANG. -#.if defined(MAN${sect}_${manlang:S%^man/%%:U}) -#_MANPAGES+= ${MAN${sect}_${manlang:S%^man/%%:U}:S%^%${MAN${sect}PREFIX}/${manlang}/man${sect:L}/%} -#.endif -# -#.endfor -# -#.endfor -# -## Special case for English, since it is defined with "" in MANLANG rather than -## a language name and does not have man pages installed in a lang subdirectory -## of MAN${sect}PREFIX. -#.for sect in 1 2 3 4 5 6 7 8 9 L N -#.if defined(MAN${sect}_EN) -#_MANPAGES+= ${MAN${sect}_EN:S%^%${MAN${sect}PREFIX}/man/man${sect:L}/%} -#.endif -#.endfor - -#__MANPAGES:= ${_MANPAGES:S%^${PREFIX}/%%:S%$%.gz%} - -.if !defined(NO_INSTALL_MANPAGES) -PLIST_FILES+= ${__MANPAGES} -.endif - -.if defined(manpages_ARGS) -.if ${manpages_ARGS} == "install" - -install-all-manpages: - -.if !defined(NO_INSTALL_MANPAGES) -.for manlang in ${MANLANG:S%^%man/%:S%^man/""$%man%} - -.for sect in 1 2 3 4 5 6 7 8 9 L N -# MAN${sect} is for man pages installed for all languages in MANLANG for a given -# section. -.if defined(MAN${sect}) -.for i in ${MAN${sect}} - ${INSTALL_MAN} ${MANSRC}/${i} \ - ${STAGEDIR}${MAN${sect}PREFIX}/${manlang}/man${sect:L}/ -.endfor -.endif - -.endfor - -.endfor -.endif - -.endif -.endif - -.endif - diff --git a/archivers/lha-ac/Makefile b/archivers/lha-ac/Makefile index 1132d300cb63..7a5ef6a9d6cf 100644 --- a/archivers/lha-ac/Makefile +++ b/archivers/lha-ac/Makefile @@ -15,7 +15,6 @@ COMMENT= Archive files using LZSS and Huffman compression (.lzh files) RESTRICTED= no permission to redistribute -#USES= manpages GNU_CONFIGURE= yes PLIST_FILES= bin/lha-ac MANLANG= ja diff --git a/converters/mpack/Makefile b/converters/mpack/Makefile index e8be3a6195d8..2ed83b25647c 100644 --- a/converters/mpack/Makefile +++ b/converters/mpack/Makefile @@ -13,8 +13,7 @@ COMMENT= External MIME packer/unpacker WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} GNU_CONFIGURE= yes -USES= manpages -PLIST_FILES= bin/mpack bin/munpack -MAN1= mpack.1 munpack.1 +PLIST_FILES= bin/mpack bin/munpack \ + man/man1/mpack.1.gz man/man1/munpack.1.gz .include <bsd.port.mk> diff --git a/devel/gperf/Makefile b/devel/gperf/Makefile index d68d265c1105..5af2d97bcab0 100644 --- a/devel/gperf/Makefile +++ b/devel/gperf/Makefile @@ -12,18 +12,14 @@ COMMENT= Generates perfect hash functions for sets of keywords LICENSE= GPLv2 CONFLICTS= ace+tao-[0-9]* +MAKE_JOBS_UNSAFE= yes +# avoid GPL3 +PORTSCOUT= skipv:3.0.4 -USES= manpages GNU_CONFIGURE= yes -MAKE_JOBS_UNSAFE= yes CONFIGURE_ARGS+= --docdir=${DOCSDIR} - -MAN1= gperf.1 INFO= gperf -# avoid GPL3 -PORTSCOUT= skipv:3.0.4 - regression-test: test test: build diff --git a/devel/gperf/pkg-plist b/devel/gperf/pkg-plist index 4f5a6e2302e9..2575b4bd0a58 100644 --- a/devel/gperf/pkg-plist +++ b/devel/gperf/pkg-plist @@ -1,3 +1,4 @@ bin/gperf +man/man1/gperf.1.gz %%DOCSDIR%%/gperf.html @dirrm %%DOCSDIR%% diff --git a/german/dtaus/Makefile b/german/dtaus/Makefile index 84794f2cdb6f..272d5b3a0c46 100644 --- a/german/dtaus/Makefile +++ b/german/dtaus/Makefile @@ -10,13 +10,10 @@ COMMENT= Belegloser DatenTraegerAUStausch LICENSE= GPLv2 -USES= manpages:install ALL_TARGET= dtaus -PLIST_FILES= bin/dtaus +PLIST_FILES= bin/dtaus man/man1/dtaus.1.gz man/man5/dtaus.5.gz PORTDOCS= ChangeLog README TODO dtaus.txt PORTEXAMPLES= dtaus.cls sample.ctl -MAN1= dtaus.1 -MAN5= dtaus.5 .include <bsd.port.options.mk> @@ -24,8 +21,10 @@ do-configure: ${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|g' \ ${WRKSRC}/bigint.c ${WRKSRC}/dtaus.c -do-install: install-all-manpages +do-install: ${INSTALL_PROGRAM} ${WRKSRC}/dtaus ${STAGEDIR}${PREFIX}/bin/ + ${INSTALL_MAN} ${WRKSRC}/dtaus.1 ${STAGEDIR}${MANPREFIX}/man/man1/ + ${INSTALL_MAN} ${WRKSRC}/dtaus.5 ${STAGEDIR}${MANPREFIX}/man/man5/ .if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR} .for doc in ${PORTDOCS} diff --git a/irc/iroffer-dinoex/Makefile b/irc/iroffer-dinoex/Makefile index 37ef88c0707b..8a576859f928 100644 --- a/irc/iroffer-dinoex/Makefile +++ b/irc/iroffer-dinoex/Makefile @@ -15,14 +15,11 @@ LICENSE= GPLv2 CONFLICTS= iroffer-1* iroffer-lamm-1.* -USES= manpages:install HAS_CONFIGURE= yes CONFIGURE_SCRIPT= Configure CONFIGURE_ARGS= CC="${CC}" LDFLAGS="${LDFLAGS}" LOCALBASE="${LOCALBASE}" ALL_TARGET= all-lang doc USE_RC_SUBR= iroffer-dinoex -MAN1= iroffer.1 -MAN7= xdcc.7 IROFFER_DOCS= README README.modDinoex LIESMICH.modDinoex \ LICENSE THANKS TODO \ @@ -66,11 +63,13 @@ CONFIGURE_ARGS+= -ruby .include "${PORTSDIR}/Mk/bsd.ruby.mk" .endif -do-install: install-all-manpages +do-install: ${INSTALL_PROGRAM} ${WRKSRC}/iroffer ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_PROGRAM} ${WRKSRC}/iroffer-de ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_PROGRAM} ${WRKSRC}/iroffer-it ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_PROGRAM} ${WRKSRC}/iroffer-fr ${STAGEDIR}${PREFIX}/bin/ + ${INSTALL_MAN} ${WRKSRC}/iroffer.1 ${STAGEDIR}${MANPREFIX}/man/man1/ + ${INSTALL_MAN} ${WRKSRC}/xdcc.7 ${STAGEDIR}${MANPREFIX}/man/man7/ .if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ${IROFFER_DOCS} diff --git a/irc/iroffer-dinoex/pkg-plist b/irc/iroffer-dinoex/pkg-plist index 2e7cb2e1c705..a29e406ee9cc 100644 --- a/irc/iroffer-dinoex/pkg-plist +++ b/irc/iroffer-dinoex/pkg-plist @@ -2,6 +2,8 @@ bin/iroffer bin/iroffer-de bin/iroffer-fr bin/iroffer-it +man/man1/iroffer.1.gz +man/man7/xdcc.7.gz %%PORTDOCS%%%%DOCSDIR%%/INSTALL-linux-de.html %%PORTDOCS%%%%DOCSDIR%%/INSTALL-linux-de.txt %%PORTDOCS%%%%DOCSDIR%%/INSTALL-linux-en.html diff --git a/mail/noattach/Makefile b/mail/noattach/Makefile index 311fb6325aec..40e29126e55e 100644 --- a/mail/noattach/Makefile +++ b/mail/noattach/Makefile @@ -9,13 +9,11 @@ MASTER_SITES= ftp://ftp.rhnet.is/pub/noattach/ MAINTAINER= dinoex@FreeBSD.org COMMENT= An attachment filter for Sendmail Milter -USES= manpages:install GNU_CONFIGURE= yes -USE_RC_SUBR= noattach +USE_RC_SUBR= noattach CFLAGS+= ${PTHREAD_CFLAGS:S=""==} DOCSFILES= AUTHORS THANKS INSTALL NEWS README TODO ChangeLog SAMPLEFILES= README noattach.patterns noattach.patterns.johncon -MAN8= noattach.8 .include <bsd.port.pre.mk> @@ -30,8 +28,9 @@ pre-configure: ${REINPLACE_CMD} -e 's=-pthread=${PTHREAD_LIBS}=' \ ${WRKSRC}/configure -do-install: install-all-manpages +do-install: ${INSTALL_PROGRAM} ${WRKSRC}/noattach ${STAGEDIR}${PREFIX}/libexec/noattach + ${INSTALL_MAN} ${WRKSRC}/noattach.8 ${STAGEDIR}${MANPREFIX}/man/man8/ ${INSTALL_DATA} ${WRKSRC}/examples/noattach.patterns \ ${STAGEDIR}${PREFIX}/etc/noattach.patterns-dist .if ${PORT_OPTIONS:MDOCS} diff --git a/mail/noattach/pkg-plist b/mail/noattach/pkg-plist index 105eea249351..f3047b618dda 100644 --- a/mail/noattach/pkg-plist +++ b/mail/noattach/pkg-plist @@ -1,5 +1,6 @@ -libexec/noattach etc/noattach.patterns-dist +libexec/noattach +man/man8/noattach.8.gz %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/NEWS diff --git a/mail/ripmime/Makefile b/mail/ripmime/Makefile index 0bf2524eea18..148db5ef91b6 100644 --- a/mail/ripmime/Makefile +++ b/mail/ripmime/Makefile @@ -13,9 +13,7 @@ COMMENT= Extracts attached files out of a MIME encoded email package MAKE_JOBS_UNSAFE= yes -USES= manpages:install -PLIST_FILES= bin/ripmime -MAN1= ripmime.1 +PLIST_FILES= bin/ripmime man/man1/ripmime.1.gz pre-build: @${REINPLACE_CMD} -e 's!CC=!CC?=!; s!/usr/local!${PREFIX}!; \ @@ -23,8 +21,9 @@ pre-build: ${WRKSRC}/Makefile ${WRKSRC}/ripOLE/Makefile \ ${WRKSRC}/tnef/Makefile -do-install: install-all-manpages +do-install: ${INSTALL_PROGRAM} ${WRKSRC}/ripmime ${STAGEDIR}${PREFIX}/bin/ + ${INSTALL_MAN} ${WRKSRC}/ripmime.1 ${STAGEDIR}${MANPREFIX}/man/man1/ post-install: @${CAT} ${PKGMESSAGE} diff --git a/mail/sma/Makefile b/mail/sma/Makefile index 18007ad04998..6df79a2240a9 100644 --- a/mail/sma/Makefile +++ b/mail/sma/Makefile @@ -10,11 +10,9 @@ MASTER_SITE_SUBDIR= dinoex MAINTAINER= dinoex@FreeBSD.org COMMENT= Program that analyses Sendmail log entries -USES= manpages:install ALL_TARGET= sma SAMPLEFILES= sma.conf DOCSFILES= BUGS COPYRIGHT HISTORY README TODO -MAN8= sma.8 .include <bsd.port.options.mk> @@ -23,8 +21,9 @@ do-configure: -e "s,CFLAGS = -Wall -O,CFLAGS+= ," \ ${WRKSRC}/Makefile -do-install: install-all-manpages +do-install: ${INSTALL_PROGRAM} ${WRKSRC}/sma ${STAGEDIR}${PREFIX}/bin/sma + ${INSTALL_MAN} ${WRKSRC}/sma.8 ${STAGEDIR}${MANPREFIX}/man/man8/ .if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ${DOCSFILES} diff --git a/mail/sma/pkg-plist b/mail/sma/pkg-plist index b94b01f9d557..725e1d3643dd 100644 --- a/mail/sma/pkg-plist +++ b/mail/sma/pkg-plist @@ -1,4 +1,5 @@ bin/sma +man/man8/sma.8.gz %%PORTDOCS%%%%DOCSDIR%%/BUGS %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT %%PORTDOCS%%%%DOCSDIR%%/HISTORY diff --git a/net-mgmt/bsnmp-jails/Makefile b/net-mgmt/bsnmp-jails/Makefile index 5c90c37d7c26..79bf391dcd94 100644 --- a/net-mgmt/bsnmp-jails/Makefile +++ b/net-mgmt/bsnmp-jails/Makefile @@ -11,13 +11,12 @@ COMMENT= A bsnmpd module to measure statistics about jails LICENSE= BSD LICENSE_FILE= ${WRKSRC}/COPYING -USES= manpages GNU_CONFIGURE= yes PLIST_FILES= lib/snmp_jails.so lib/snmp_jails.so.0 \ lib/snmp_jails.a lib/snmp_jails.la \ - libexec/jail-measure -MAN8= bsnmp-jails.8 + libexec/jail-measure \ + man/man8/bsnmp-jails.8.gz post-patch: ${REINPLACE_CMD} -e 's|freebsd1|freebsd1.|' \ diff --git a/news/pgpmoose/Makefile b/news/pgpmoose/Makefile index 231e7c4a667a..6f377022ecbe 100644 --- a/news/pgpmoose/Makefile +++ b/news/pgpmoose/Makefile @@ -14,7 +14,6 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= dinoex@FreeBSD.org COMMENT= PGP Moose - signatures for moderated newsgroups -USES= manpages:install NO_WRKSUBDIR= yes BIN1= pmapp pmcanon pmcheck pmnewsgroups \ pmdaemon pmcancel @@ -27,9 +26,12 @@ post-patch: ${REINPLACE_CMD} -e "s=/usr/local/news=${NEWSCTL}=" \ ${WRKSRC}/pmapp -do-install: install-all-manpages +do-install: .for i in ${BIN1} - @${INSTALL_SCRIPT} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/bin/ + ${INSTALL_SCRIPT} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/bin/ +.endfor +.for i in ${MAN1} + ${INSTALL_MAN} ${WRKSRC}/${i} ${STAGEDIR}${MANPREFIX}/man/man1/ .endfor .include <bsd.port.mk> diff --git a/news/pgpmoose/pkg-plist b/news/pgpmoose/pkg-plist index bb7153f8f8ee..14ca4e6bfdec 100644 --- a/news/pgpmoose/pkg-plist +++ b/news/pgpmoose/pkg-plist @@ -4,3 +4,9 @@ bin/pmcheck bin/pmnewsgroups bin/pmdaemon bin/pmcancel +man/man1/pmapp.1.gz +man/man1/pmcancel.1.gz +man/man1/pmcanon.1.gz +man/man1/pmcheck.1.gz +man/man1/pmdaemon.1.gz +man/man1/pmnewsgroups.1.gz diff --git a/ports-mgmt/pkg_jail/Makefile b/ports-mgmt/pkg_jail/Makefile index 0c7966f12ab1..55ee6f930d2b 100644 --- a/ports-mgmt/pkg_jail/Makefile +++ b/ports-mgmt/pkg_jail/Makefile @@ -11,17 +11,19 @@ COMMENT= Manage your own package jail NO_BUILD= yes -USES= manpages:install -MANSRC= ${FILESDIR} -PLIST_FILES= bin/pkg_jail bin/pkg_update +PLIST_FILES= bin/pkg_jail bin/pkg_update \ + man/man1/pkg_jail.1.gz man/man1/pkg_update.1.gz PORTDOCS= README MAN1= pkg_jail.1 pkg_update.1 .include <bsd.port.options.mk> -do-install: install-all-manpages +do-install: ${INSTALL_SCRIPT} ${FILESDIR}/pkg_jail ${FILESDIR}/pkg_update \ ${STAGEDIR}${PREFIX}/bin/ +.for i in ${MAN1} + ${INSTALL_MAN} ${FILESDIR}/${i} ${STAGEDIR}${MANPREFIX}/man/man1/ +.endfor .if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${FILESDIR}/README ${STAGEDIR}${DOCSDIR}/ diff --git a/security/pgp/Makefile b/security/pgp/Makefile index 3c3fe9f6417f..8ed0b1168c91 100644 --- a/security/pgp/Makefile +++ b/security/pgp/Makefile @@ -13,13 +13,11 @@ COMMENT= PGP International version - Public-Key encryption for the masses ONLY_FOR_ARCHS= i386 alpha amd64 sparc64 -USES= manpages WRKSRC= ${WRKDIR}/src MAKEFILE= makefile ALL_TARGET= freebsd-${ARCH:S/x86_64/amd64/} MAKE_ENV= OS_CFLAGS="${CFLAGS}" PGPLIB= ${STAGEDIR}${PREFIX}/share/pgp -MAN1= pgp.1 pgp2.1 post-extract: cd ${WRKDIR}; ${TAR} -xf pgp263ii.tar; \ @@ -35,6 +33,6 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/../config.txt ${PGPLIB}/config.txt-dist post-install: - @${INSTALL_MAN} ${STAGEDIR}${PREFIX}/man/man1/pgp.1 ${STAGEDIR}${PREFIX}/man/man1/pgp2.1 + ${INSTALL_MAN} ${STAGEDIR}${PREFIX}/man/man1/pgp.1 ${STAGEDIR}${PREFIX}/man/man1/pgp2.1 .include <bsd.port.mk> diff --git a/security/pgp/pkg-plist b/security/pgp/pkg-plist index 465373618d72..7000f9b047bc 100644 --- a/security/pgp/pkg-plist +++ b/security/pgp/pkg-plist @@ -1,4 +1,6 @@ bin/pgp +man/man1/pgp.1.gz +man/man1/pgp2.1.gz share/pgp/pgp.hlp share/pgp/pgpdoc1.txt share/pgp/pgpdoc2.txt diff --git a/security/pgpin/Makefile b/security/pgpin/Makefile index 737b265eedce..e34c5f68b6ca 100644 --- a/security/pgpin/Makefile +++ b/security/pgpin/Makefile @@ -11,12 +11,10 @@ EXTRACT_SUFX= .tgz MAINTAINER= dinoex@FreeBSD.org COMMENT= PGP International version - improved for use in IN-CA -USES= manpages WRKSRC= ${WRKDIR}/pgp263in/src MAKEFILE= makefile ALL_TARGET= freebsd-${ARCH} OS_CFLAGS="${CFLAGS}" PGPLIB= ${STAGEDIR}${PREFIX}/lib/pgpin -MAN1= pgpin.1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/pgp ${STAGEDIR}${PREFIX}/bin/pgpin diff --git a/security/pgpin/pkg-plist b/security/pgpin/pkg-plist index 727f6a60b8c1..05cc3438031f 100644 --- a/security/pgpin/pkg-plist +++ b/security/pgpin/pkg-plist @@ -9,4 +9,5 @@ lib/pgpin/language.txt-dist @unexec if cmp -s %D/lib/pgpin/config.txt %D/lib/pgpin/config.txt-dist; then rm -f %D/lib/pgpin/config.txt; fi lib/pgpin/config.txt-dist @exec [ ! -f %B/config.txt ] && cp %B/%f %B/config.txt +man/man1/pgpin.1.gz @dirrm lib/pgpin diff --git a/sysutils/ua/Makefile b/sysutils/ua/Makefile index b8f7b72567da..43c79a4bcf08 100644 --- a/sysutils/ua/Makefile +++ b/sysutils/ua/Makefile @@ -10,17 +10,19 @@ COMMENT= Finds sets of identical files LICENSE= GPLv2 -USES= manpages GNU_CONFIGURE= yes - -PLIST_FILES= bin/kua bin/ua +PLIST_FILES= bin/kua bin/ua \ + man/man1/kua.1.gz man/man1/ua.1.gz PORTDOCS= README MAN1= kua.1 ua.1 .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MDOCS} post-install: +.for i in ${MAN1} + ${INSTALL_MAN} ${WRKSRC}/${i} ${STAGEDIR}${MANPREFIX}/man/man1/ +.endfor +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/ .endif diff --git a/sysutils/zidrav/Makefile b/sysutils/zidrav/Makefile index 60a3c66fd48c..ddba37fa39d8 100644 --- a/sysutils/zidrav/Makefile +++ b/sysutils/zidrav/Makefile @@ -12,12 +12,11 @@ COMMENT= A file corruption detection and repair program LICENSE= GPLv2 -USES= manpages:install ALL_TARGET= zidrav -PLIST_FILES= bin/zidrav -MAN1= zidrav.1 +PLIST_FILES= bin/zidrav man/man1/zidrav.1.gz -do-install: install-all-manpages +do-install: ${INSTALL_PROGRAM} ${WRKSRC}/zidrav ${STAGEDIR}${PREFIX}/bin/ + ${INSTALL_MAN} ${WRKSRC}/zidrav.1 ${STAGEDIR}${MANPREFIX}/man/man1/ .include <bsd.port.mk> diff --git a/textproc/agrep/Makefile b/textproc/agrep/Makefile index 00d94140f86a..90d6729bf7b7 100644 --- a/textproc/agrep/Makefile +++ b/textproc/agrep/Makefile @@ -15,23 +15,22 @@ COMMENT= Approximate grep (fast approximate pattern-matching tool) NO_CDROM= no redistribution for profit -USES= manpages:install ALL_TARGET= MAKE_ARGS= CFLAGS="${CFLAGS}" -PLIST_FILES= bin/agrep +PLIST_FILES= bin/agrep man/man1/agrep.1.gz PORTDOCS= COPYRIGHT agrep.algorithms agrep.ps.1.Z agrep.ps.2.Z -MAN1= agrep.1 .include <bsd.port.options.mk> post-extract: ${CP} ${DISTDIR}/agrep.ps.1.Z ${DISTDIR}/agrep.ps.2.Z ${WRKSRC}/ -do-install: install-all-manpages - @${INSTALL_PROGRAM} ${WRKSRC}/agrep ${STAGEDIR}${PREFIX}/bin/ +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/agrep ${STAGEDIR}${PREFIX}/bin/ + ${INSTALL_MAN} ${WRKSRC}/agrep.1 ${STAGEDIR}${MANPREFIX}/man/man1/ .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${STAGEDIR}${DOCSDIR} - @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/ + ${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/ .endif .include <bsd.port.mk> diff --git a/www/tidy/Makefile b/www/tidy/Makefile index 001e35202c5f..27a3338bc076 100644 --- a/www/tidy/Makefile +++ b/www/tidy/Makefile @@ -15,10 +15,8 @@ COMMENT= Fixes and tidies up HTML files LICENSE= BSD LICENSE_FILE= ${FILESDIR}/COPYRIGHT -USES= manpages ALL_TARGET= tidy DOCFILES= Overview.html tidy.gif release-notes.html grid.gif -MAN1= tidy4.1 .include <bsd.port.options.mk> diff --git a/www/tidy/pkg-plist b/www/tidy/pkg-plist index 8bf253a6b7b3..04f3cb8e87a8 100644 --- a/www/tidy/pkg-plist +++ b/www/tidy/pkg-plist @@ -1,4 +1,5 @@ bin/tidy4 +man/man1/tidy4.1.gz %%PORTDOCS%%%%DOCSDIR%%/Overview.html %%PORTDOCS%%%%DOCSDIR%%/grid.gif %%PORTDOCS%%%%DOCSDIR%%/release-notes.html diff --git a/x11-clocks/asclock/Makefile b/x11-clocks/asclock/Makefile index 9286ce174077..565a33cb8038 100644 --- a/x11-clocks/asclock/Makefile +++ b/x11-clocks/asclock/Makefile @@ -15,10 +15,9 @@ COMMENT= Afterstep clock with some language extensions CONFLICTS= asclock-gtk-[0-9]* asclock-xlib-[0-9]* -USES= imake manpages +USES= imake USE_XORG= xpm xext x11 -MAN1= asclock.1 -PLIST_FILES= bin/asclock +PLIST_FILES= bin/asclock man/man1/asclock.1.gz pre-configure: (cd ${WRKSRC}; \ diff --git a/x11-wm/afterstep/Makefile b/x11-wm/afterstep/Makefile index a673cf5552b6..d4d94a39fd0a 100644 --- a/x11-wm/afterstep/Makefile +++ b/x11-wm/afterstep/Makefile @@ -8,7 +8,7 @@ CATEGORIES= x11-wm afterstep MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= dinoex DISTNAME= AfterStep-${PORTVERSION} -PKGNAMESUFFIX= 1 +PKGNAMESUFFIX= 1${PKGNAMESUFFIX2} MAINTAINER= dinoex@FreeBSD.org COMMENT= Window manager originally based on the Bowman NeXTstep clone @@ -19,13 +19,12 @@ CONFLICTS?= afterstep-2* PORTSCOUT= limit:^1\.[0-9.]*$$ NO_LATEST_LINK= yes -USES= imake manpages +USES= imake USE_XORG= xpm xext x11 USE_CSTD= gnu89 INSTALL_TARGET= install install.man MANCOMPRESSED= yes CFLAGS+= -Wno-return-type -MAN1= afterstep.1 Animate.1 Audio.1 Auto.1 Banner.1 Pager.1 Wharf.1 SRCDIRS= afterstep \ modules/Animate modules/Audio modules/Auto \ diff --git a/x11-wm/afterstep/pkg-plist b/x11-wm/afterstep/pkg-plist index c009455c097e..cb2b5d598e53 100644 --- a/x11-wm/afterstep/pkg-plist +++ b/x11-wm/afterstep/pkg-plist @@ -55,6 +55,13 @@ lib/X11/afterstep/sounds/meepmeep.au lib/X11/afterstep/sounds/small-step.au lib/X11/afterstep/sounds/train.au lib/X11/afterstep/system.steprc +man/man1/afterstep.1.gz +man/man1/Animate.1.gz +man/man1/Audio.1.gz +man/man1/Auto.1.gz +man/man1/Banner.1.gz +man/man1/Pager.1.gz +man/man1/Wharf.1.gz @dirrm lib/X11/afterstep/backgrounds @dirrm lib/X11/afterstep/doc @dirrm lib/X11/afterstep/sounds |