diff options
author | Baptiste Daroussin <bapt@FreeBSD.org> | 2024-01-10 16:27:45 +0000 |
---|---|---|
committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2024-01-10 16:27:53 +0000 |
commit | 72fa01913d6a670015d043dc5d92fa3d849f08ab (patch) | |
tree | d05da5bf55dcef351a6889c8391a8f3fc709f176 | |
parent | 2ed094adef32cc683a9a077f1c8eb2241754068a (diff) | |
download | ports-72fa01913d6a670015d043dc5d92fa3d849f08ab.tar.gz ports-72fa01913d6a670015d043dc5d92fa3d849f08ab.zip |
MAN?PREFIX: eleminate its usage and move man to share/man
64 files changed, 159 insertions, 136 deletions
diff --git a/sysutils/xxd/Makefile b/sysutils/xxd/Makefile index 2513448ccfca..be2f10bac197 100644 --- a/sysutils/xxd/Makefile +++ b/sysutils/xxd/Makefile @@ -37,6 +37,6 @@ VIM_DISTVERSION!= ${BSDMAKE} -f ${VIM_PORT}/Makefile -V DISTVERSION do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xxd ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKDOCS}/xxd.1 ${STAGEDIR}${MAN1PREFIX}/share/man/man1 + ${INSTALL_MAN} ${WRKDOCS}/xxd.1 ${STAGEDIR}${PREFIX}/share/man/man1 .include <bsd.port.post.mk> diff --git a/textproc/bat/Makefile b/textproc/bat/Makefile index cd73e7d68097..34969cb013b3 100644 --- a/textproc/bat/Makefile +++ b/textproc/bat/Makefile @@ -1,7 +1,7 @@ PORTNAME= bat DISTVERSIONPREFIX= v DISTVERSION= 0.23.0 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= textproc MAINTAINER= pizzamig@FreeBSD.org @@ -20,7 +20,7 @@ GH_ACCOUNT= sharkdp PLIST_FILES= bin/bat \ share/zsh/site-functions/_bat \ - man/man1/bat.1.gz + share/man/man1/bat.1.gz CARGO_CRATES= adler-1.0.2 \ aho-corasick-0.7.19 \ @@ -190,7 +190,7 @@ post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/bat ${FIND} ${WRKDIR}/target -name "bat.1" -exec ${CP} {} ${WRKSRC}/doc/bat.1 \; ${FIND} ${WRKDIR}/target -name "bat.zsh" -exec ${CP} {} ${WRKSRC}/doc/bat.zsh \; - ${INSTALL_MAN} ${WRKSRC}/doc/bat.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/doc/bat.1 ${STAGEDIR}${PREFIX}/share/man/man1 ${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions ${INSTALL_DATA} ${WRKSRC}/doc/bat.zsh ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_bat diff --git a/textproc/bsd-spell/Makefile b/textproc/bsd-spell/Makefile index 162fba1d8d9b..4268e1be8157 100644 --- a/textproc/bsd-spell/Makefile +++ b/textproc/bsd-spell/Makefile @@ -1,5 +1,5 @@ PORTNAME= bsd-spell -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX= v DISTVERSION= 1.0.1 CATEGORIES= textproc @@ -26,7 +26,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/usr.bin/spell/special.math ${STAGEDIR}${PREFIX}/share/dict ${INSTALL_DATA} ${WRKSRC}/usr.bin/spell/stop ${STAGEDIR}${PREFIX}/share/dict - ${INSTALL_MAN} ${WRKSRC}/usr.bin/spell/spell.1.gz ${STAGEDIR}${MAN1PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/usr.bin/deroff/deroff.1.gz ${STAGEDIR}${MAN1PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/usr.bin/spell/spell.1.gz ${STAGEDIR}${PREFIX}/share/man/man1 + ${INSTALL_MAN} ${WRKSRC}/usr.bin/deroff/deroff.1.gz ${STAGEDIR}${PREFIX}/share/man/man1 .include <bsd.port.mk> diff --git a/textproc/bsd-spell/pkg-plist b/textproc/bsd-spell/pkg-plist index 93d5e4177fcd..76edb9a3d79a 100644 --- a/textproc/bsd-spell/pkg-plist +++ b/textproc/bsd-spell/pkg-plist @@ -1,8 +1,8 @@ libexec/spellprog bin/bspell bin/deroff -man/man1/spell.1.gz -man/man1/deroff.1.gz +share/man/man1/spell.1.gz +share/man/man1/deroff.1.gz share/dict/american share/dict/british share/dict/special.4bsd diff --git a/textproc/colordiff/Makefile b/textproc/colordiff/Makefile index 3ea6ea7dbdc5..6381e09cdd88 100644 --- a/textproc/colordiff/Makefile +++ b/textproc/colordiff/Makefile @@ -22,7 +22,7 @@ post-patch: do-install: ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl ${STAGEDIR}${PREFIX}/bin/${PORTNAME} - ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1 ${INSTALL_DATA} ${WRKSRC}/colordiffrc ${STAGEDIR}${PREFIX}/etc/colordiffrc.sample .include <bsd.port.mk> diff --git a/textproc/colordiff/pkg-plist b/textproc/colordiff/pkg-plist index acb993aa94f7..5f87d7fcfd0c 100644 --- a/textproc/colordiff/pkg-plist +++ b/textproc/colordiff/pkg-plist @@ -1,3 +1,3 @@ bin/colordiff -man/man1/colordiff.1.gz +share/man/man1/colordiff.1.gz @sample etc/colordiffrc.sample diff --git a/textproc/diffstat/Makefile b/textproc/diffstat/Makefile index 7cf9e7d459a4..5b3faa36077e 100644 --- a/textproc/diffstat/Makefile +++ b/textproc/diffstat/Makefile @@ -1,5 +1,6 @@ PORTNAME= diffstat PORTVERSION= 1.65 +PORTREVISION= 1 CATEGORIES= textproc devel MASTER_SITES= https://invisible-mirror.net/archives/${PORTNAME}/ \ ftp://ftp.invisible-island.net/${PORTNAME}/ @@ -15,10 +16,10 @@ USES= tar:tgz GNU_CONFIGURE= yes MAKEFILE= makefile -PLIST_FILES= bin/diffstat man/man1/diffstat.1.gz +PLIST_FILES= bin/diffstat share/man/man1/diffstat.1.gz do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1 .include <bsd.port.mk> diff --git a/textproc/fldiff/Makefile b/textproc/fldiff/Makefile index 22cca6ff6e05..6bdaae9110fb 100644 --- a/textproc/fldiff/Makefile +++ b/textproc/fldiff/Makefile @@ -1,6 +1,6 @@ PORTNAME= fldiff PORTVERSION= 1.1 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= textproc MASTER_SITES= LOCAL/ehaupt DISTNAME= ${PORTNAME}-${PORTVERSION}-source @@ -32,7 +32,7 @@ post-patch: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/fldiff ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/fldiff.man ${STAGEDIR}${MAN1PREFIX}/man/man1/fldiff.1 + ${INSTALL_MAN} ${WRKSRC}/fldiff.man ${STAGEDIR}${PREFIX}/share/man/man1/fldiff.1 ${INSTALL_DATA} ${WRKSRC}/fldiff.desktop ${STAGEDIR}${PREFIX}/share/applications ${INSTALL_DATA} ${WRKSRC}/fldiff.png ${STAGEDIR}${PREFIX}/share/pixmaps @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/textproc/fldiff/pkg-plist b/textproc/fldiff/pkg-plist index bf337c5e2a48..d80ea8cc9f31 100644 --- a/textproc/fldiff/pkg-plist +++ b/textproc/fldiff/pkg-plist @@ -1,4 +1,4 @@ bin/fldiff -man/man1/fldiff.1.gz +share/man/man1/fldiff.1.gz share/applications/fldiff.desktop share/pixmaps/fldiff.png diff --git a/textproc/grap/Makefile b/textproc/grap/Makefile index 6b526221abe0..0682f44e6373 100644 --- a/textproc/grap/Makefile +++ b/textproc/grap/Makefile @@ -1,5 +1,6 @@ PORTNAME= grap PORTVERSION= 1.46 +PORTREVISION= 1 CATEGORIES= textproc graphics MASTER_SITES= http://www.lunabase.org/~faber/Vault/software/grap/ @@ -20,7 +21,7 @@ PORTEXAMPLES= * do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.doc \ - ${STAGEDIR}${MAN1PREFIX}/man/man1/${PORTNAME}.1 + ${STAGEDIR}${PREFIX}/share/man/man1/${PORTNAME}.1 @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/grap.defines ${WRKSRC}/grap.tex.defines \ ${STAGEDIR}${DATADIR} diff --git a/textproc/grap/pkg-plist b/textproc/grap/pkg-plist index b21f11fde08c..febeda0adb9e 100644 --- a/textproc/grap/pkg-plist +++ b/textproc/grap/pkg-plist @@ -1,4 +1,4 @@ bin/grap -man/man1/grap.1.gz +share/man/man1/grap.1.gz %%DATADIR%%/grap.defines %%DATADIR%%/grap.tex.defines diff --git a/textproc/hs-pandoc/Makefile b/textproc/hs-pandoc/Makefile index 3069334268ba..fd1ff8239ddb 100644 --- a/textproc/hs-pandoc/Makefile +++ b/textproc/hs-pandoc/Makefile @@ -1,6 +1,6 @@ PORTNAME= pandoc PORTVERSION= 3.1.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -266,6 +266,6 @@ BUILD_ARGS+= --disable-optimization post-install-EMBED_DATA-off: cd ${CABAL_DEPSDIR}/${PORTNAME}-${PORTVERSION} && ${COPYTREE_SHARE} data ${STAGEDIR}${DATADIR} post-install: - ${INSTALL_MAN} ${CABAL_DEPSDIR}/${PORTNAME}-${PORTVERSION}/man/pandoc.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 + ${INSTALL_MAN} ${CABAL_DEPSDIR}/${PORTNAME}-${PORTVERSION}/man/pandoc.1 ${STAGEDIR}${PREFIX}/share/man/man1 .include <bsd.port.post.mk> diff --git a/textproc/hs-pandoc/pkg-plist b/textproc/hs-pandoc/pkg-plist index 1c47a5014406..84d25ed43d0e 100644 --- a/textproc/hs-pandoc/pkg-plist +++ b/textproc/hs-pandoc/pkg-plist @@ -1,4 +1,4 @@ -man/man1/pandoc.1.gz +share/man/man1/pandoc.1.gz %%NO_EMBED_DATA%%%%DATADIR%%/data/abbreviations %%NO_EMBED_DATA%%%%DATADIR%%/data/bash_completion.tpl %%NO_EMBED_DATA%%%%DATADIR%%/data/creole.lua diff --git a/textproc/igor/Makefile b/textproc/igor/Makefile index ca2655b0d324..c2b64964ada9 100644 --- a/textproc/igor/Makefile +++ b/textproc/igor/Makefile @@ -1,5 +1,6 @@ PORTNAME= igor PORTVERSION= 1.595 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= http://docscripts.glenbarber.us/tags/${PORTNAME}/${PORTVERSION}/ @@ -16,13 +17,13 @@ NO_ARCH= yes NO_BUILD= yes PLIST_FILES= bin/${PORTNAME} \ - man/man1/${PORTNAME}.1.gz + share/man/man1/${PORTNAME}.1.gz post-patch: @${REINPLACE_CMD} 's|/usr/local|${PREFIX}|' ${WRKSRC}/${PORTNAME} ${WRKSRC}/${PORTNAME}.1 do-install: ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ - ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/ + ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1/ .include <bsd.port.mk> diff --git a/textproc/libsoldout/Makefile b/textproc/libsoldout/Makefile index ce33e3d342a3..5f41590a6065 100644 --- a/textproc/libsoldout/Makefile +++ b/textproc/libsoldout/Makefile @@ -1,5 +1,6 @@ PORTNAME= libsoldout DISTVERSION= 1.4 +PORTREVISION= 1 CATEGORIES= textproc devel MASTER_SITES= http://instinctive.eu/code/ @@ -23,7 +24,7 @@ do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/include/soldout ${INSTALL_DATA} ${WRKSRC}/*.h ${STAGEDIR}${PREFIX}/include/soldout ${INSTALL_DATA} ${WRKSRC}/libsoldout.a ${STAGEDIR}${PREFIX}/lib - ${INSTALL_MAN} ${WRKSRC}/mkd2*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/*.3 ${STAGEDIR}${MAN3PREFIX}/man/man3 + ${INSTALL_MAN} ${WRKSRC}/mkd2*.1 ${STAGEDIR}${PREFIX}/share/man/man1 + ${INSTALL_MAN} ${WRKSRC}/*.3 ${STAGEDIR}${PREFIX}/share/man/man3 .include <bsd.port.mk> diff --git a/textproc/libsoldout/pkg-plist b/textproc/libsoldout/pkg-plist index 040c31ac04e5..5609dc0d6fe4 100644 --- a/textproc/libsoldout/pkg-plist +++ b/textproc/libsoldout/pkg-plist @@ -8,11 +8,11 @@ include/soldout/renderers.h lib/libsoldout.a lib/libsoldout.so lib/libsoldout.so.1 -man/man1/mkd2html.1.gz -man/man1/mkd2latex.1.gz -man/man1/mkd2man.1.gz -man/man3/soldout.3.gz -man/man3/soldout_array.3.gz -man/man3/soldout_buffer.3.gz -man/man3/soldout_markdown.3.gz -man/man3/soldout_renderers.3.gz +share/man/man1/mkd2html.1.gz +share/man/man1/mkd2latex.1.gz +share/man/man1/mkd2man.1.gz +share/man/man3/soldout.3.gz +share/man/man3/soldout_array.3.gz +share/man/man3/soldout_buffer.3.gz +share/man/man3/soldout_markdown.3.gz +share/man/man3/soldout_renderers.3.gz diff --git a/textproc/re-flex/Makefile b/textproc/re-flex/Makefile index df4870253f5e..55166e342e79 100644 --- a/textproc/re-flex/Makefile +++ b/textproc/re-flex/Makefile @@ -1,5 +1,6 @@ PORTNAME= re-flex PORTVERSION= 3.5.1 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= textproc @@ -32,6 +33,6 @@ post-install: ${COPYTREE_SHARE} \* ${STAGEDIR}${PREFIX}/include/reflex) @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/lex.vim ${STAGEDIR}${DATADIR}/lex.vim - ${INSTALL_MAN} ${WRKSRC}/doc/man/reflex.1 ${STAGEDIR}/${MAN1PREFIX}/man/man1/ + ${INSTALL_MAN} ${WRKSRC}/doc/man/reflex.1 ${STAGEDIR}/${PREFIX}/share/man/man1/ .include <bsd.port.mk> diff --git a/textproc/re-flex/pkg-plist b/textproc/re-flex/pkg-plist index b1906428cf89..2cbca4ae5141 100644 --- a/textproc/re-flex/pkg-plist +++ b/textproc/re-flex/pkg-plist @@ -27,4 +27,4 @@ lib/cmake/reflex/ReflexConfig.cmake lib/cmake/reflex/ReflexTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/reflex/ReflexTargets.cmake %%DATADIR%%/lex.vim -man/man1/reflex.1.gz +share/man/man1/reflex.1.gz diff --git a/textproc/reflex/pkg-plist b/textproc/reflex/pkg-plist index 459f98336530..931a8a392ab9 100644 --- a/textproc/reflex/pkg-plist +++ b/textproc/reflex/pkg-plist @@ -2,5 +2,5 @@ bin/reflex bin/reflex++ include/reFlexLexer.h lib/librefl.a -man/man1/reflex++.1.gz -man/man1/reflex.1.gz +share/man/man1/reflex++.1.gz +share/man/man1/reflex.1.gz diff --git a/textproc/ripgrep/Makefile b/textproc/ripgrep/Makefile index 502b5a01dc08..d04c7dfcf912 100644 --- a/textproc/ripgrep/Makefile +++ b/textproc/ripgrep/Makefile @@ -1,6 +1,6 @@ PORTNAME= ripgrep DISTVERSION= 14.0.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc MAINTAINER= petteri.valkonen@iki.fi @@ -69,7 +69,7 @@ CARGO_CRATES= aho-corasick-1.1.2 \ PLIST_FILES= bin/rg \ etc/bash_completion.d/rg.bash \ - man/man1/rg.1.gz \ + share/man/man1/rg.1.gz \ share/fish/vendor_completions.d/rg.fish \ share/zsh/site-functions/_rg @@ -93,7 +93,7 @@ SIMD_VARS_i386= RUSTFLAGS+="-C target-feature=+sse2" post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/rg ${STAGEDIR}${PREFIX}/bin/rg --generate man > ${WRKDIR}/rg.1 - ${INSTALL_MAN} ${WRKDIR}/rg.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKDIR}/rg.1 ${STAGEDIR}${PREFIX}/share/man/man1 @${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d/ ${STAGEDIR}${PREFIX}/bin/rg --generate complete-bash > ${STAGEDIR}${PREFIX}/etc/bash_completion.d/rg.bash @${MKDIR} ${STAGEDIR}${PREFIX}/share/fish/vendor_completions.d/ diff --git a/textproc/sansi/Makefile b/textproc/sansi/Makefile index 7034a9934f95..0edb392046a1 100644 --- a/textproc/sansi/Makefile +++ b/textproc/sansi/Makefile @@ -1,5 +1,6 @@ PORTNAME= sansi PORTVERSION= 1.0.2 +PORTREVISION= 1 CATEGORIES= textproc sysutils MASTER_SITES= https://BSDforge.com/projects/source/textproc/sansi/ @@ -20,10 +21,10 @@ NO_BUILD= yes USES= tar:xz -PLIST_FILES= sbin/sansi man/man1/sansi.1.gz +PLIST_FILES= sbin/sansi share/man/man1/sansi.1.gz do-install: ${INSTALL_SCRIPT} ${WRKSRC}/sansi ${STAGEDIR}${PREFIX}/sbin - ${INSTALL_MAN} ${WRKSRC}/sansi.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/sansi.1 ${STAGEDIR}${PREFIX}/share/man/man1 .include <bsd.port.mk> diff --git a/textproc/uni2ascii/Makefile b/textproc/uni2ascii/Makefile index 08e8315834ce..1a3b2e8bdc06 100644 --- a/textproc/uni2ascii/Makefile +++ b/textproc/uni2ascii/Makefile @@ -1,5 +1,6 @@ PORTNAME= uni2ascii PORTVERSION= 4.18 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= http://billposer.org/Software/Downloads/ \ LOCAL/ehaupt @@ -15,13 +16,13 @@ GNU_CONFIGURE= yes MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" -PLIST_FILES= bin/uni2ascii bin/ascii2uni man/man1/uni2ascii.1.gz \ - man/man1/ascii2uni.1.gz +PLIST_FILES= bin/uni2ascii bin/ascii2uni share/man/man1/uni2ascii.1.gz \ + share/man/man1/ascii2uni.1.gz do-install: .for f in ${PORTNAME} ascii2uni ${INSTALL_PROGRAM} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/${f}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/${f}.1 ${STAGEDIR}${PREFIX}/share/man/man1 .endfor .include <bsd.port.mk> diff --git a/textproc/urlview/Makefile b/textproc/urlview/Makefile index c81839721a2c..d0cc289f49ef 100644 --- a/textproc/urlview/Makefile +++ b/textproc/urlview/Makefile @@ -1,6 +1,6 @@ PORTNAME= urlview PORTVERSION= 0.9.20131021 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc www MAINTAINER= uzsolt@uzsolt.hu @@ -17,7 +17,7 @@ GH_TAGNAME= 45443109 GNU_CONFIGURE= yes PLIST_FILES= bin/urlview \ etc/urlview.conf.sample \ - man/man1/urlview.1.gz + share/man/man1/urlview.1.gz post-patch: @${REINPLACE_CMD} -e 's,/etc,${PREFIX}&,' \ @@ -26,7 +26,7 @@ post-patch: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/urlview ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/urlview.man ${STAGEDIR}${MAN1PREFIX}/man/man1/urlview.1 + ${INSTALL_MAN} ${WRKSRC}/urlview.man ${STAGEDIR}${PREFIX}/share/man/man1/urlview.1 ${INSTALL_DATA} ${WRKSRC}/sample.urlview \ ${STAGEDIR}${PREFIX}/etc/urlview.conf.sample diff --git a/www/angie/Makefile b/www/angie/Makefile index f7c831f9fcb5..1f45373a10df 100644 --- a/www/angie/Makefile +++ b/www/angie/Makefile @@ -1,5 +1,6 @@ PORTNAME?= angie PORTVERSION= 1.3.1 +PORTREVISION= 1 CATEGORIES+= www MASTER_SITES+= https://download.angie.software/files/:angie DISTNAME= angie-${DISTVERSIONFULL} @@ -158,7 +159,7 @@ do-install: ${LN} -fs angie-nodebug ${STAGEDIR}${PREFIX}/sbin/angie - ${INSTALL_MAN} ${WRKSRC}/objs/angie.8 ${STAGEDIR}${MAN8PREFIX}/man/man8 + ${INSTALL_MAN} ${WRKSRC}/objs/angie.8 ${STAGEDIR}${PREFIX}/share/man/man8 .for i in CHANGES CHANGES.ru README.rst ${INSTALL_MAN} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor diff --git a/www/angie/pkg-plist b/www/angie/pkg-plist index 2c77c1a62d2e..28b3b43178bd 100644 --- a/www/angie/pkg-plist +++ b/www/angie/pkg-plist @@ -10,7 +10,7 @@ sbin/angie-nodebug sbin/angie %%DEBUG%%sbin/angie-debug -man/man8/angie.8.gz +share/man/man8/angie.8.gz %%DOCSDIR%%/CHANGES %%DOCSDIR%%/CHANGES.ru %%DOCSDIR%%/README.rst diff --git a/www/edbrowse/Makefile b/www/edbrowse/Makefile index c8274684bdb0..27e47f837327 100644 --- a/www/edbrowse/Makefile +++ b/www/edbrowse/Makefile @@ -1,7 +1,7 @@ PORTNAME= edbrowse DISTVERSIONPREFIX= v DISTVERSION= 3.8.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www editors MAINTAINER= alfix86@gmail.com @@ -25,14 +25,14 @@ MAKEFILE= makefile GH_ACCOUNT= CMB PLIST_FILES= bin/${PORTNAME} \ - man/man1/${PORTNAME}.1.gz + share/man/man1/${PORTNAME}.1.gz PORTDOCS= * OPTIONS_DEFINE= DOCS do-install: - ${INSTALL_MAN} ${WRKSRC}/doc/man-edbrowse-freebsd.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/${PORTNAME}.1 + ${INSTALL_MAN} ${WRKSRC}/doc/man-edbrowse-freebsd.1 ${STAGEDIR}${PREFIX}/share/man/man1/${PORTNAME}.1 ${INSTALL_PROGRAM} ${WRKSRC}/src/edbrowse ${STAGEDIR}${PREFIX}/bin post-install-DOCS-on: diff --git a/www/gatling/Makefile b/www/gatling/Makefile index 27380b88487e..1605e57a0eca 100644 --- a/www/gatling/Makefile +++ b/www/gatling/Makefile @@ -1,5 +1,6 @@ PORTNAME= gatling PORTVERSION= 0.16 +PORTREVISION= 1 CATEGORIES= www benchmarks ftp MASTER_SITES= https://www.fefe.de/gatling/ @@ -28,7 +29,7 @@ LDFLAGS+= -L${OPENSSLLIB} PLIST_FILES= ${PLIST_BIN:S,^,bin/,} \ ${PLIST_SBIN:S,^,sbin/,} \ - man/man8/gatling.8.gz \ + share/man/man8/gatling.8.gz \ sbin/gatling_wrapper PORTDOCS= CHANGES README README.antidos README.cgi README.ftp \ @@ -48,7 +49,7 @@ TLS_DESC= Build and install tlsgatling ZLIB_DESC= Compress outgoing data BENCHMARKS_MAKE_ENV= BENCHMARKS=1 -BENCHMARKS_PLIST_FILES= man/man1/bench.1.gz +BENCHMARKS_PLIST_FILES= share/man/man1/bench.1.gz BENCHMARKS_PORTDOCS= README.bindbench README.forkbench \ README.httpbench README.manymapbench \ README.mmapbench @@ -92,9 +93,9 @@ do-install: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} cd ${WRKSRC} && ${INSTALL_SCRIPT} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR} .if !empty(BENCH1) - cd ${WRKSRC} && ${INSTALL_MAN} ${BENCH1} ${STAGEDIR}${MAN1PREFIX}/man/man1 + cd ${WRKSRC} && ${INSTALL_MAN} ${BENCH1} ${STAGEDIR}${PREFIX}/share/man/man1 .endif - cd ${WRKSRC} && ${INSTALL_MAN} ${GATLING8} ${STAGEDIR}${MAN8PREFIX}/man/man8 + cd ${WRKSRC} && ${INSTALL_MAN} ${GATLING8} ${STAGEDIR}${PREFIX}/share/man/man8 do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/www/gist/Makefile b/www/gist/Makefile index 8bbe64566520..abe441372c64 100644 --- a/www/gist/Makefile +++ b/www/gist/Makefile @@ -1,6 +1,7 @@ PORTNAME= gist PORTVERSION= 6.0.0 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= www net MAINTAINER= changlp@cs.nctu.edu.tw @@ -22,13 +23,13 @@ NO_ARCH= yes NO_BUILD= yes PLIST_FILES= bin/gist \ - man/man1/gist.1.gz + share/man/man1/gist.1.gz post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/build/gist do-install: ${INSTALL_SCRIPT} ${WRKSRC}/build/gist ${STAGEDIR}${PREFIX}/bin/gist - ${INSTALL_MAN} ${WRKSRC}/build/gist.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/build/gist.1 ${STAGEDIR}${PREFIX}/share/man/man1 .include <bsd.port.mk> diff --git a/www/micro_httpd/Makefile b/www/micro_httpd/Makefile index 1be2b6d32a94..6e2965597098 100644 --- a/www/micro_httpd/Makefile +++ b/www/micro_httpd/Makefile @@ -1,5 +1,6 @@ PORTNAME= micro_httpd PORTVERSION= 2014.08.14 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://www.acme.com/software/micro_httpd/ DISTNAME= ${PORTNAME}_14Aug2014 @@ -14,7 +15,7 @@ USES= cpe CPE_VENDOR= acme WRKSRC= ${WRKDIR}/${PORTNAME} -PLIST_FILES= sbin/micro_httpd man/man8/micro_httpd.8.gz +PLIST_FILES= sbin/micro_httpd share/man/man8/micro_httpd.8.gz ALL_TARGET= ${PORTNAME} @@ -23,6 +24,6 @@ post-patch: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/micro_httpd ${STAGEDIR}${PREFIX}/sbin - ${INSTALL_MAN} ${WRKSRC}/micro_httpd.8 ${STAGEDIR}${MAN1PREFIX}/man/man8 + ${INSTALL_MAN} ${WRKSRC}/micro_httpd.8 ${STAGEDIR}${PREFIX}/share/man/man8 .include <bsd.port.mk> diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index 73f4a779b100..187c85c7ffc7 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -370,7 +370,7 @@ do-install-NAXSI-on: post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/share/vim/vimfiles cd ${WRKSRC}/contrib/vim && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/vim/vimfiles - ${INSTALL_MAN} ${WRKSRC}/objs/nginx.8 ${STAGEDIR}${MAN8PREFIX}/share/man/man8 + ${INSTALL_MAN} ${WRKSRC}/objs/nginx.8 ${STAGEDIR}${PREFIX}/share/man/man8 ${CAT} ${WRKSRC}/conf/nginx.conf >> ${STAGEDIR}${ETCDIR}/nginx.conf-dist post-install-WWW-on: diff --git a/www/nginx/Makefile b/www/nginx/Makefile index e18aca01d390..a5cb24a6812a 100644 --- a/www/nginx/Makefile +++ b/www/nginx/Makefile @@ -390,7 +390,7 @@ do-install-NAXSI-on: post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/share/vim/vimfiles cd ${WRKSRC}/contrib/vim && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/vim/vimfiles - ${INSTALL_MAN} ${WRKSRC}/objs/nginx.8 ${STAGEDIR}${MAN8PREFIX}/share/man/man8 + ${INSTALL_MAN} ${WRKSRC}/objs/nginx.8 ${STAGEDIR}${PREFIX}/share/man/man8 ${CAT} ${WRKSRC}/conf/nginx.conf >> ${STAGEDIR}${ETCDIR}/nginx.conf-dist post-install-WWW-on: diff --git a/www/oneshot/Makefile b/www/oneshot/Makefile index 73e8834fb530..36b4bf9b1003 100644 --- a/www/oneshot/Makefile +++ b/www/oneshot/Makefile @@ -1,7 +1,7 @@ PORTNAME= oneshot DISTVERSIONPREFIX= v DISTVERSION= 1.5.1 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= www MAINTAINER= lcook@FreeBSD.org @@ -51,6 +51,6 @@ post-install-DOCS-on: post-install-MANPAGES-on: ${INSTALL_MAN} ${GO_WRKSRC}/${PORTNAME}.1 \ - ${STAGEDIR}${MAN1PREFIX}/man/man1 + ${STAGEDIR}${PREFIX}/share/man/man1 .include <bsd.port.mk> diff --git a/www/oneshot/pkg-plist b/www/oneshot/pkg-plist index 189e15e7a6af..6443c77a65f7 100644 --- a/www/oneshot/pkg-plist +++ b/www/oneshot/pkg-plist @@ -1,2 +1,2 @@ bin/oneshot -%%MANPAGES%%man/man1/oneshot.1.gz +%%MANPAGES%%share/man/man1/oneshot.1.gz diff --git a/www/privoxy/Makefile b/www/privoxy/Makefile index 06fdbe72a227..96e72acf9b15 100644 --- a/www/privoxy/Makefile +++ b/www/privoxy/Makefile @@ -1,5 +1,6 @@ PORTNAME= privoxy PORTVERSION= 3.0.34 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= https://www.privoxy.org/sf-download-mirror/Sources/${PORTVERSION}%20(stable)/ \ SF/ijbswa/Sources/${PORTVERSION}%20%28stable%29 @@ -107,7 +108,7 @@ do-install: .for examplefile in config match-all.action trust user.action ${INSTALL_DATA} ${WRKSRC}/${examplefile} ${STAGEDIR}${EXAMPLESDIR}/ .endfor - ${INSTALL_MAN} ${WRKSRC}/privoxy.8 ${STAGEDIR}${MAN1PREFIX}/man/man8 + ${INSTALL_MAN} ${WRKSRC}/privoxy.8 ${STAGEDIR}${PREFIX}/share/man/man8 @${MKDIR} ${STAGEDIR}${DOCSDIR}/user-manual ${INSTALL_DATA} ${WRKSRC}/doc/webserver/user-manual/[a-z]* ${STAGEDIR}${DOCSDIR}/user-manual ${INSTALL_DATA} ${WRKSRC}/doc/webserver/p_doc.css ${STAGEDIR}${DOCSDIR}/user-manual diff --git a/www/privoxy/pkg-plist b/www/privoxy/pkg-plist index 5e6e4ad311fa..647e5210fa84 100644 --- a/www/privoxy/pkg-plist +++ b/www/privoxy/pkg-plist @@ -3,7 +3,7 @@ %%PRIVOXY_TOOLS%%bin/uagen.pl %%PRIVOXY_TOOLS%%bin/url-pattern-translator.pl sbin/privoxy -man/man8/privoxy.8.gz +share/man/man8/privoxy.8.gz etc/privoxy/default.action etc/privoxy/default.filter etc/privoxy/regression-tests.action diff --git a/www/py-django32/Makefile b/www/py-django32/Makefile index 0876f884a45b..d64b0fbf24c5 100644 --- a/www/py-django32/Makefile +++ b/www/py-django32/Makefile @@ -1,5 +1,6 @@ PORTNAME= django PORTVERSION= 3.2.23 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= PYPI \ https://media.djangoproject.com/releases/${PORTVERSION:R}/ @@ -26,7 +27,7 @@ USE_PYTHON= autoplist distutils NO_ARCH= yes DOCSDIR= ${PREFIX}/share/doc/py-django -PLIST_FILES= man/man1/django-admin.1.gz +PLIST_FILES= share/man/man1/django-admin.1.gz PORTDOCS= * SHEBANG_FILES= django/bin/django-admin.py \ @@ -56,7 +57,7 @@ post-build-HTMLDOCS-on: cd ${WRKSRC}/docs && ${GMAKE} html SPHINXBUILD=sphinx-build-${PYTHON_VER} post-install: - ${INSTALL_MAN} ${WRKSRC}/docs/man/* ${STAGEDIR}/${MAN1PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/docs/man/* ${STAGEDIR}/${PREFIX}/share/man/man1 @${ECHO_MSG} "" @${ECHO_MSG} " * See http://docs.djangoproject.com/ for complete documentation" @${ECHO_MSG} "" diff --git a/www/py-django42/Makefile b/www/py-django42/Makefile index 1b9a8f13afcd..54ab78464241 100644 --- a/www/py-django42/Makefile +++ b/www/py-django42/Makefile @@ -1,5 +1,6 @@ PORTNAME= django PORTVERSION= 4.2.9 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= PYPI \ https://media.djangoproject.com/releases/${PORTVERSION:R}/ @@ -25,7 +26,7 @@ USE_PYTHON= autoplist distutils NO_ARCH= yes DOCSDIR= ${PREFIX}/share/doc/py-django -PLIST_FILES= man/man1/django-admin.1.gz +PLIST_FILES= share/man/man1/django-admin.1.gz PORTDOCS= * SHEBANG_FILES= django/conf/project_template/manage.py-tpl @@ -53,7 +54,7 @@ post-build-HTMLDOCS-on: cd ${WRKSRC}/docs && ${MAKE} html SPHINXBUILD=sphinx-build-${PYTHON_VER} post-install: - ${INSTALL_MAN} ${WRKSRC}/docs/man/* ${STAGEDIR}/${MAN1PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/docs/man/* ${STAGEDIR}/${PREFIX}/share/man/man1 @${ECHO_MSG} "" @${ECHO_MSG} " * See http://docs.djangoproject.com/ for complete documentation" @${ECHO_MSG} "" diff --git a/www/py-django50/Makefile b/www/py-django50/Makefile index a77c4e3eedf5..adb382f283da 100644 --- a/www/py-django50/Makefile +++ b/www/py-django50/Makefile @@ -1,5 +1,6 @@ PORTNAME= django PORTVERSION= 5.0.1 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= PYPI \ https://media.djangoproject.com/releases/${PORTVERSION:R}/ @@ -25,7 +26,7 @@ USE_PYTHON= autoplist distutils NO_ARCH= yes DOCSDIR= ${PREFIX}/share/doc/py-django -PLIST_FILES= man/man1/django-admin.1.gz +PLIST_FILES= share/man/man1/django-admin.1.gz PORTDOCS= * SHEBANG_FILES= django/conf/project_template/manage.py-tpl @@ -59,7 +60,7 @@ post-build-HTMLDOCS-on: cd ${WRKSRC}/docs && ${MAKE} html SPHINXBUILD=sphinx-build-${PYTHON_VER} post-install: - ${INSTALL_MAN} ${WRKSRC}/docs/man/* ${STAGEDIR}/${MAN1PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/docs/man/* ${STAGEDIR}/${PREFIX}/man/man1 @${ECHO_MSG} "" @${ECHO_MSG} " * See http://docs.djangoproject.com/ for complete documentation" @${ECHO_MSG} "" diff --git a/www/shellinabox/Makefile b/www/shellinabox/Makefile index cb73c3c7fcea..096275d33299 100644 --- a/www/shellinabox/Makefile +++ b/www/shellinabox/Makefile @@ -1,7 +1,7 @@ PORTNAME= shellinabox PORTVERSION= 2.20 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= www MAINTAINER= olivier@FreeBSD.org @@ -46,7 +46,7 @@ post-patch: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/shellinaboxd ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/shellinaboxd.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/shellinaboxd.1 ${STAGEDIR}${PREFIX}/share/man/man1 @${MKDIR} ${STAGEDIR}${ETCDIR} .include <bsd.port.mk> diff --git a/www/shellinabox/pkg-plist b/www/shellinabox/pkg-plist index d2fac3959140..37179f388f9d 100644 --- a/www/shellinabox/pkg-plist +++ b/www/shellinabox/pkg-plist @@ -1,3 +1,3 @@ bin/shellinaboxd -man/man1/shellinaboxd.1.gz +share/man/man1/shellinaboxd.1.gz @dir(shellinabox,shellinabox,700) etc/shellinabox diff --git a/www/unit/Makefile b/www/unit/Makefile index e28eea21323d..108c399030ab 100644 --- a/www/unit/Makefile +++ b/www/unit/Makefile @@ -135,7 +135,7 @@ post-install: ${ECHO_CMD} @dir ${UNIT_TMPDIR} >> ${TMPPLIST} ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unit/modules ${INSTALL_MAN} ${WRKSRC}/build/share/man/man8/unitd.8 \ - ${STAGEDIR}${MAN8PREFIX}/share/man/man8 + ${STAGEDIR}${PREFIX}/share/man/man8 .endif .include "../../www/unit/version.mk" diff --git a/www/vger/Makefile b/www/vger/Makefile index b89983c87ec2..76593fcaf763 100644 --- a/www/vger/Makefile +++ b/www/vger/Makefile @@ -1,5 +1,6 @@ PORTNAME= vger PORTVERSION= 2.0.1 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= https://tildegit.org/solene/vger/archive/ DISTFILES= ${PORTVERSION}.tar.gz @@ -17,7 +18,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME} do-install: ${CP} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ - ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 ${STAGEDIR}${MAN8PREFIX}/man/man8/ + ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 ${STAGEDIR}${PREFIX}/share/man/man8/ post-install: @${MKDIR} ${STAGEDIR}${ETCDIR}/gemini diff --git a/www/vger/pkg-plist b/www/vger/pkg-plist index 6b0628e90ddc..96a7ac3ca9c8 100644 --- a/www/vger/pkg-plist +++ b/www/vger/pkg-plist @@ -1,3 +1,3 @@ bin/vger -man/man8/vger.8.gz +share/man/man8/vger.8.gz @dir %%ETCDIR%%/gemini diff --git a/www/webbrowser/Makefile b/www/webbrowser/Makefile index e91986574d7c..ef28ef54b7c9 100644 --- a/www/webbrowser/Makefile +++ b/www/webbrowser/Makefile @@ -1,5 +1,6 @@ PORTNAME= webbrowser PORTVERSION= 0.3 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://acadix.biz/Ports/distfiles/ @@ -14,8 +15,8 @@ USES= tar:xz do-install: ${INSTALL_SCRIPT} ${WRKSRC}/webbrowser ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/webbrowser.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/webbrowser.1 ${STAGEDIR}${PREFIX}/share/man/man1 -PLIST_FILES= bin/webbrowser man/man1/webbrowser.1.gz +PLIST_FILES= bin/webbrowser share/man/man1/webbrowser.1.gz .include <bsd.port.mk> diff --git a/www/xh/Makefile b/www/xh/Makefile index 25747d5f1a33..579e8b452043 100644 --- a/www/xh/Makefile +++ b/www/xh/Makefile @@ -1,7 +1,7 @@ PORTNAME= xh DISTVERSIONPREFIX= v DISTVERSION= 0.18.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= www MAINTAINER= lcook@FreeBSD.org @@ -28,7 +28,7 @@ COMPLETIONS_DESC= Install shell completions for bash, fish and zsh COMPLETIONS_PLIST_FILES= share/bash-completion/completions/${PORTNAME} \ share/fish/vendor_completions.d/${PORTNAME}.fish \ share/zsh/site-functions/_${PORTNAME} -MANPAGES_PLIST_FILES= man/man1/${PORTNAME}.1.gz +MANPAGES_PLIST_FILES= share/man/man1/${PORTNAME}.1.gz post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} @@ -47,6 +47,6 @@ post-install-DOCS-on: post-install-MANPAGES-on: ${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.1 \ - ${STAGEDIR}${MAN1PREFIX}/man/man1 + ${STAGEDIR}${PREFIX}/share/man/man1 .include <bsd.port.mk> diff --git a/x11-fm/doublecmd/Makefile b/x11-fm/doublecmd/Makefile index a17962131494..24734567f182 100644 --- a/x11-fm/doublecmd/Makefile +++ b/x11-fm/doublecmd/Makefile @@ -1,6 +1,7 @@ PORTNAME= doublecmd PORTVERSION= 1.1.8 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= x11-fm PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX} @@ -246,7 +247,7 @@ pre-install: @cd ${WRKSRC}/sdk && \ ${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/sdk/|' >> ${PLIST} - @${ECHO_CMD} "man/man1/doublecmd.1.gz" >> ${PLIST} + @${ECHO_CMD} "share/man/man1/doublecmd.1.gz" >> ${PLIST} do-install: @${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wcx @@ -341,7 +342,7 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/install/linux/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}/ - ${INSTALL_MAN} ${WRKSRC}/install/linux/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/ + ${INSTALL_MAN} ${WRKSRC}/install/linux/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1/ post-install: .if ${PORT_OPTIONS:MDOCS} diff --git a/x11-wm/aphelia/Makefile b/x11-wm/aphelia/Makefile index 84dc9b806053..58b5392b49c9 100644 --- a/x11-wm/aphelia/Makefile +++ b/x11-wm/aphelia/Makefile @@ -1,5 +1,6 @@ PORTNAME= aphelia DISTVERSION= g20190913 +PORTREVISION= 1 CATEGORIES= x11-wm MAINTAINER= eduardo@FreeBSD.org @@ -20,7 +21,7 @@ GH_TAGNAME= 8b06c4c USE_XORG= x11 PLIST_FILES= bin/aphelia \ - man/man1/aphelia.1.gz + share/man/man1/aphelia.1.gz do-build: ${CC} ${CFLAGS} -I${LOCALBASE}/include ${WRKSRC}/aphelia.c \ @@ -28,6 +29,6 @@ do-build: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/aphelia ${STAGEDIR}${PREFIX}/bin/aphelia - ${INSTALL_MAN} ${WRKSRC}/aphelia.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/aphelia.1 ${STAGEDIR}${PREFIX}/share/man/man1 .include <bsd.port.mk> diff --git a/x11-wm/mcwm/Makefile b/x11-wm/mcwm/Makefile index be99748fb3ac..e85a217fb514 100644 --- a/x11-wm/mcwm/Makefile +++ b/x11-wm/mcwm/Makefile @@ -1,5 +1,6 @@ PORTNAME= mcwm PORTVERSION= 20130209 +PORTREVISION= 1 CATEGORIES= x11-wm MASTER_SITES= http://hack.org/mc/hacks/mcwm/ @@ -17,7 +18,8 @@ LIB_DEPENDS= libxcb-util.so:x11/xcb-util \ USES= tar:bzip2 xorg USE_XORG= xcb -PLIST_FILES= bin/mcwm bin/hidden man/man1/mcwm.1.gz man/man1/hidden.1.gz +PLIST_FILES= bin/mcwm bin/hidden share/man/man1/mcwm.1.gz \ + share/man/man1/hidden.1.gz PORTDOCS= README NEWS OPTIONS_DEFINE= DOCS @@ -37,10 +39,10 @@ post-extract: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.man \ - ${STAGEDIR}${MAN1PREFIX}/man/man1/${PORTNAME}.1 + ${STAGEDIR}${PREFIX}/share/man/man1/${PORTNAME}.1 ${INSTALL_PROGRAM} ${WRKSRC}/hidden ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/hidden.man \ - ${STAGEDIR}${MAN1PREFIX}/man/man1/hidden.1 + ${STAGEDIR}${PREFIX}/share/man/man1/hidden.1 do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/x11-wm/sdorfehs/Makefile b/x11-wm/sdorfehs/Makefile index cdfbf7ff5d50..749e58c093d8 100644 --- a/x11-wm/sdorfehs/Makefile +++ b/x11-wm/sdorfehs/Makefile @@ -1,6 +1,7 @@ PORTNAME= sdorfehs DISTVERSIONPREFIX= v DISTVERSION= 1.5 +PORTREVISION= 1 CATEGORIES= x11-wm MAINTAINER= jrm@FreeBSD.org @@ -16,10 +17,10 @@ GH_ACCOUNT= jcs USE_XORG= x11 xft xrandr xres xtst PLIST_FILES= bin/${PORTNAME} \ - man/man1/${PORTNAME}.1.gz + share/man/man1/${PORTNAME}.1.gz do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1 .include <bsd.port.mk> diff --git a/x11-wm/spectrwm/Makefile b/x11-wm/spectrwm/Makefile index 5cfebabc4786..a3d75fed9169 100644 --- a/x11-wm/spectrwm/Makefile +++ b/x11-wm/spectrwm/Makefile @@ -1,7 +1,7 @@ PORTNAME= spectrwm DISTVERSIONPREFIX= SPECTRWM_ DISTVERSION= 3_4_1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm MAINTAINER= pyrus@bsdmail.com @@ -54,7 +54,7 @@ do-build: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin ${INSTALL_LIB} ${WRKSRC}/libswmhack.so ${STAGEDIR}${PREFIX}/lib - ${INSTALL_MAN} ${WRKSRC}/spectrwm.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/spectrwm.1 ${STAGEDIR}${PREFIX}/share/man/man1 ${INSTALL_DATA} ${WRKSRC}/spectrwm.conf ${STAGEDIR}${PREFIX}/etc/spectrwm.conf.sample do-install-EXAMPLES-on: diff --git a/x11-wm/spectrwm/pkg-plist b/x11-wm/spectrwm/pkg-plist index 794235a11450..03b0dcc32607 100644 --- a/x11-wm/spectrwm/pkg-plist +++ b/x11-wm/spectrwm/pkg-plist @@ -1,6 +1,6 @@ bin/spectrwm lib/libswmhack.so -man/man1/spectrwm.1.gz +share/man/man1/spectrwm.1.gz @sample etc/spectrwm.conf.sample %%PORTEXAMPLES%%%%EXAMPLESDIR%%/baraction.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/screenshot.sh diff --git a/x11/j4-dmenu-desktop/Makefile b/x11/j4-dmenu-desktop/Makefile index 464deee6e364..b2e0e8641943 100644 --- a/x11/j4-dmenu-desktop/Makefile +++ b/x11/j4-dmenu-desktop/Makefile @@ -23,7 +23,7 @@ PORTDOCS= README.md OPTIONS_DEFINE= DOCS post-install: - ${INSTALL_MAN} ${WRKSRC}/j4-dmenu-desktop.1 ${STAGEDIR}${MAN1PREFIX}/share/man/man1/ + ${INSTALL_MAN} ${WRKSRC}/j4-dmenu-desktop.1 ${STAGEDIR}${PREFIX}/share/man/man1/ post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/x11/srandrd/Makefile b/x11/srandrd/Makefile index edcd11a448fb..073f6bd48eaf 100644 --- a/x11/srandrd/Makefile +++ b/x11/srandrd/Makefile @@ -19,7 +19,7 @@ GH_ACCOUNT= jceb USE_XORG= x11 xinerama xrandr MAKE_ARGS= DISTDIR=${STAGEDIR} \ - MANPREFIX=${STAGEDIR}${MAN1PREFIX}/share/man \ + MANPREFIX=${STAGEDIR}${PREFIX}/share/man \ PREFIX=${PREFIX} PLIST_FILES= bin/${PORTNAME} \ diff --git a/x11/trayer/Makefile b/x11/trayer/Makefile index 66a30ae2e586..3e2ced0b0043 100644 --- a/x11/trayer/Makefile +++ b/x11/trayer/Makefile @@ -1,7 +1,7 @@ PORTNAME= trayer PORTVERSION= 1.1.8 DISTVERSIONPREFIX= ${PORTNAME}- -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MAINTAINER= madpilot@FreeBSD.org @@ -23,12 +23,12 @@ GH_PROJECT= ${PORTNAME}-srg PORTDOCS= README CREDITS CHANGELOG -PLIST_FILES= bin/trayer man/man1/trayer.1.gz +PLIST_FILES= bin/trayer share/man/man1/trayer.1.gz OPTIONS_DEFINE= DOCS post-install: - ${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1 ${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} diff --git a/x11/x3270/Makefile b/x11/x3270/Makefile index 6360f045a935..82f6075d74de 100644 --- a/x11/x3270/Makefile +++ b/x11/x3270/Makefile @@ -1,6 +1,6 @@ PORTNAME?= x3270 PORTVERSION= 4.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES?= x11 net MASTER_SITES= http://x3270.bgp.nu/download/04.02/ DISTFILES= suite3270-${PORTVERSION}ga10-src.tgz @@ -64,13 +64,13 @@ PLIST_SUB+= DBCS="@comment " post-install: .for m in b3270 c3270 pr3287 s3270 tcl3270 - @(cd ${WRKSRC} ; ${INSTALL_MAN} ${m}/${m}.man ${STAGEDIR}${MAN1PREFIX}/man/man1/${m}.1) + @(cd ${WRKSRC} ; ${INSTALL_MAN} ${m}/${m}.man ${STAGEDIR}${PREFIX}/share/man/man1/${m}.1) .endfor .if ! defined(C3270) - ${INSTALL_MAN} ${WRKSRC}/x3270/x3270.man ${STAGEDIR}${MAN5PREFIX}/man/man1/x3270.1 - ${INSTALL_MAN} ${WRKSRC}/x3270if/x3270if.man ${STAGEDIR}${MAN5PREFIX}/man/man1/x3270if.1 + ${INSTALL_MAN} ${WRKSRC}/x3270/x3270.man ${STAGEDIR}${PREFIX}/share/man/man1/x3270.1 + ${INSTALL_MAN} ${WRKSRC}/x3270if/x3270if.man ${STAGEDIR}${PREFIX}/share/man/man1/x3270if.1 .endif - ${INSTALL_MAN} ${WRKSRC}/c3270/ibm_hosts.man ${STAGEDIR}${MAN5PREFIX}/man/man5/ibm_hosts.5 + ${INSTALL_MAN} ${WRKSRC}/c3270/ibm_hosts.man ${STAGEDIR}${PREFIX}/share/man/man5/ibm_hosts.5 @(cd ${WRKSRC}/x3270/Examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) @(cd ${WRKSRC}/x3270 && ${COPYTREE_SHARE} html ${STAGEDIR}${EXAMPLESDIR}) diff --git a/x11/x3270/pkg-plist b/x11/x3270/pkg-plist index 1908f2f64497..42c965c0a394 100644 --- a/x11/x3270/pkg-plist +++ b/x11/x3270/pkg-plist @@ -25,11 +25,11 @@ etc/x3270/ibm_hosts %%X3270%%%%FONTSDIR%%/3270gt8.pcf.gz %%X3270%%%%FONTSDIR%%/3270h.pcf.gz @comment %%FONTSDIR%%/fonts.dir -man/man1/b3270.1.gz -man/man1/c3270.1.gz -man/man1/pr3287.1.gz -man/man1/s3270.1.gz -man/man1/tcl3270.1.gz -%%X3270%%man/man1/x3270.1.gz -%%X3270%%man/man1/x3270if.1.gz -man/man5/ibm_hosts.5.gz +share/man/man1/b3270.1.gz +share/man/man1/c3270.1.gz +share/man/man1/pr3287.1.gz +share/man/man1/s3270.1.gz +share/man/man1/tcl3270.1.gz +%%X3270%%share/man/man1/x3270.1.gz +%%X3270%%share/man/man1/x3270if.1.gz +share/man/man5/ibm_hosts.5.gz diff --git a/x11/xascii/Makefile b/x11/xascii/Makefile index e4ffcfd7c7cd..39e0701ee3e3 100644 --- a/x11/xascii/Makefile +++ b/x11/xascii/Makefile @@ -1,5 +1,6 @@ PORTNAME= xascii PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= http://komquats.com/distfiles/ \ http://people.freebsd.org/~cy/distfiles/ @@ -12,6 +13,6 @@ USE_XORG= x11 xt xaw MAKE_ARGS= PREFIX=${PREFIX} NO_WRKSUBDIR= yes -PLIST_FILES= bin/xascii man/man1/xascii.1.gz +PLIST_FILES= bin/xascii share/man/man1/xascii.1.gz .include <bsd.port.mk> diff --git a/x11/xascii/files/patch-Imakefile b/x11/xascii/files/patch-Imakefile index 0fa99debeb9f..43f5ca497128 100644 --- a/x11/xascii/files/patch-Imakefile +++ b/x11/xascii/files/patch-Imakefile @@ -4,7 +4,7 @@ LOCAL_LIBRARIES = XawClientLibs +BINDIR = ${PREFIX}/bin -+MANPATH = ${PREFIX}${MAN1PREFIX}/man ++MANPATH = ${PREFIX}/share/man + SRCS = xascii.c OBJS = xascii.o diff --git a/x11/xcut/Makefile b/x11/xcut/Makefile index 013498e2dc0b..cb9291a45935 100644 --- a/x11/xcut/Makefile +++ b/x11/xcut/Makefile @@ -1,6 +1,6 @@ PORTNAME= xcut PORTVERSION= 0.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11 MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-src/${PORTVERSION} \ http://acsys.anu.edu.au/~tpot/%SUBDIR%/ @@ -11,6 +11,6 @@ WWW= https://xcut.sourceforge.net/ USES= imake xorg USE_XORG= x11 -PLIST_FILES= bin/xcut man/man1/xcut.1.gz +PLIST_FILES= bin/xcut share/man/man1/xcut.1.gz .include <bsd.port.mk> diff --git a/x11/xcut/files/patch-Imakefile b/x11/xcut/files/patch-Imakefile index 1ac717af3517..7ce049f24903 100644 --- a/x11/xcut/files/patch-Imakefile +++ b/x11/xcut/files/patch-Imakefile @@ -6,8 +6,8 @@ -BINDIR=/usr/local/bin -MANPATH=/usr/local/man -+BINDIR=${LOCALBASE}/bin -+MANPATH=${LOCALBASE}${MAN1PREFIX}/man ++BINDIR=${PREFIX}/bin ++MANPATH=${PREFIX}/share/man MANSUFFIX=1 XCOMM Build xcut and manpage diff --git a/x11/xloadimage/Makefile b/x11/xloadimage/Makefile index a8671da60ca6..627136192e71 100644 --- a/x11/xloadimage/Makefile +++ b/x11/xloadimage/Makefile @@ -1,6 +1,6 @@ PORTNAME= xloadimage PORTVERSION= 4.1.24 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 graphics MASTER_SITES= DEBIAN_POOL DISTNAME= ${PORTNAME}.${VERSION} @@ -54,9 +54,9 @@ do-install: ${LN} -sf xloadimage xsetbg && \ ${LN} -sf xloadimage xview ) ${INSTALL_PROGRAM} ${WRKSRC}/uufilter ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/uufilter.man ${STAGEDIR}${MAN1PREFIX}/man/man1/uufilter.1 - ${INSTALL_MAN} ${WRKSRC}/xloadimage.man ${STAGEDIR}${MAN1PREFIX}/man/man1/xloadimage.1 - @(cd ${STAGEDIR}${MAN1PREFIX}/man/man1 && \ + ${INSTALL_MAN} ${WRKSRC}/uufilter.man ${STAGEDIR}${PREFIX}/share/man/man1/uufilter.1 + ${INSTALL_MAN} ${WRKSRC}/xloadimage.man ${STAGEDIR}${PREFIX}/share/man/man1/xloadimage.1 + @(cd ${STAGEDIR}${PREFIX}/share/man/man1 && \ ${LN} -sf xloadimage.1 xsetbg.1 && \ ${LN} -sf xloadimage.1 xview.1 ) ${INSTALL_DATA} ${WRKSRC}/xloadimagerc ${STAGEDIR}${PREFIX}/etc/xloadimagerc.sample diff --git a/x11/xloadimage/pkg-plist b/x11/xloadimage/pkg-plist index 67b5e2ec7150..df066c0b1023 100644 --- a/x11/xloadimage/pkg-plist +++ b/x11/xloadimage/pkg-plist @@ -2,8 +2,8 @@ bin/uufilter bin/xloadimage bin/xsetbg bin/xview -man/man1/uufilter.1.gz -man/man1/xloadimage.1.gz -man/man1/xsetbg.1.gz -man/man1/xview.1.gz +share/man/man1/uufilter.1.gz +share/man/man1/xloadimage.1.gz +share/man/man1/xsetbg.1.gz +share/man/man1/xview.1.gz @sample etc/xloadimagerc.sample diff --git a/x11/xsel-conrad/Makefile b/x11/xsel-conrad/Makefile index 1682ecdd3d30..e44b30d09b94 100644 --- a/x11/xsel-conrad/Makefile +++ b/x11/xsel-conrad/Makefile @@ -1,6 +1,6 @@ PORTNAME= xsel PORTVERSION= 1.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= http://www.vergenet.net/~conrad/software/xsel/download/ PKGNAMESUFFIX= -conrad @@ -20,14 +20,14 @@ CONFLICTS_INSTALL= xsel USES= autoreconf localbase xorg USE_XORG= x11 xt GNU_CONFIGURE= yes -PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz +PLIST_FILES= bin/${PORTNAME} share/man/man1/${PORTNAME}.1.gz PORTDOCS= ChangeLog README OPTIONS_DEFINE= DOCS do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ - ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1x ${STAGEDIR}${MAN1PREFIX}/man/man1/${PORTNAME}.1 + ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1x ${STAGEDIR}${PREFIX}/share/man/man1/${PORTNAME}.1 do-install-DOCS-on: (cd ${WRKSRC} && ${COPYTREE_SHARE} \ diff --git a/x11/xsettingsd/Makefile b/x11/xsettingsd/Makefile index 0f5ee6d4f670..7b8659d54c97 100644 --- a/x11/xsettingsd/Makefile +++ b/x11/xsettingsd/Makefile @@ -1,7 +1,7 @@ PORTNAME= xsettingsd DISTVERSIONPREFIX= v DISTVERSION= 1.0.0-2 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONSUFFIX= -g1b2bcca CATEGORIES= x11 @@ -19,8 +19,8 @@ USE_XORG= x11 PLIST_FILES= bin/dump_xsettings \ bin/xsettingsd \ - man/man1/dump_xsettings.1.gz \ - man/man1/xsettingsd.1.gz + share/man/man1/dump_xsettings.1.gz \ + share/man/man1/xsettingsd.1.gz .include <bsd.port.pre.mk> @@ -33,6 +33,6 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/dump_xsettings ${WRKSRC}/xsettingsd \ ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/dump_xsettings.1 ${WRKSRC}/xsettingsd.1 \ - ${STAGEDIR}${MAN1PREFIX}/man/man1 + ${STAGEDIR}${PREFIX}/share/man/man1 .include <bsd.port.post.mk> |