aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2024-01-11 10:30:34 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2024-01-11 10:31:03 +0000
commite762d0756bd3dd0ecf51d412559453d5031e6155 (patch)
treeb4ed160695aa96324a53e32132f7101421119453
parent8ab6cbe60e1954261f2129b24e32ed8ac147c9f6 (diff)
downloadports-e762d0756bd3dd0ecf51d412559453d5031e6155.tar.gz
ports-e762d0756bd3dd0ecf51d412559453d5031e6155.zip
MANPREFIX: eliminate the use of MANPREFIX for x11*
While here move some manpages to share/man
-rw-r--r--x11-clocks/buici-clock/Makefile6
-rw-r--r--x11-clocks/dclock/Makefile6
-rw-r--r--x11-fm/deforaos-browser/Makefile4
-rw-r--r--x11-fm/deforaos-browser/pkg-plist18
-rw-r--r--x11-fonts/fnt/Makefile2
-rw-r--r--x11-wm/berry/Makefile3
-rw-r--r--x11-wm/blackbox/Makefile2
-rw-r--r--x11-wm/bspwm-devel/Makefile8
-rw-r--r--x11-wm/bspwm-devel/pkg-plist4
-rw-r--r--x11-wm/bspwm/Makefile8
-rw-r--r--x11-wm/bspwm/pkg-plist4
-rw-r--r--x11-wm/compton/Makefile6
-rw-r--r--x11-wm/cwm/Makefile7
-rw-r--r--x11-wm/deforaos-panel/Makefile2
-rw-r--r--x11-wm/deforaos-panel/pkg-plist28
-rw-r--r--x11-wm/evilwm/Makefile5
-rw-r--r--x11-wm/hs-xmonad/Makefile3
-rw-r--r--x11-wm/hs-xmonad/pkg-plist2
-rw-r--r--x11-wm/pwm/Makefile4
-rw-r--r--x11-wm/pwm/pkg-plist2
-rw-r--r--x11-wm/subtle/Makefile1
-rw-r--r--x11-wm/subtle/files/patch-Rakefile9
-rw-r--r--x11-wm/subtle/pkg-plist10
-rw-r--r--x11-wm/wmii-devel/Makefile4
-rw-r--r--x11-wm/wmii-devel/pkg-plist8
-rw-r--r--x11-wm/wmii/Makefile4
-rw-r--r--x11-wm/wmii/pkg-plist6
-rw-r--r--x11-wm/yeahwm/Makefile5
-rw-r--r--x11/cool-retro-term/Makefile4
-rw-r--r--x11/cool-retro-term/pkg-plist2
-rw-r--r--x11/deforaos-libdesktop/Makefile4
-rw-r--r--x11/deforaos-libdesktop/pkg-plist2
-rw-r--r--x11/deforaos-locker/Makefile4
-rw-r--r--x11/deforaos-locker/pkg-plist8
-rw-r--r--x11/flruler/Makefile5
-rw-r--r--x11/i3lock-color/Makefile3
-rw-r--r--x11/kitty/Makefile4
-rw-r--r--x11/pipeglade/Makefile4
-rw-r--r--x11/pipeglade/pkg-plist2
-rw-r--r--x11/slock/Makefile3
-rw-r--r--x11/sterm/Makefile11
-rw-r--r--x11/sxhkd/Makefile6
-rw-r--r--x11/wmblob/Makefile6
-rw-r--r--x11/xkb-switch/Makefile5
-rw-r--r--x11/xmenu/Makefile5
-rw-r--r--x11/xtrlock/Makefile3
-rw-r--r--x11/xtrlock/pkg-plist2
-rw-r--r--x11/xvattr/Makefile6
-rw-r--r--x11/xwit/Makefile6
49 files changed, 135 insertions, 131 deletions
diff --git a/x11-clocks/buici-clock/Makefile b/x11-clocks/buici-clock/Makefile
index 8f65566b32c7..7e4a48203990 100644
--- a/x11-clocks/buici-clock/Makefile
+++ b/x11-clocks/buici-clock/Makefile
@@ -1,6 +1,6 @@
PORTNAME= buici-clock
PORTVERSION= 0.4.9.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-clocks
MASTER_SITES= DEBIAN
DISTNAME= ${PORTNAME}_${PORTVERSION}
@@ -25,7 +25,7 @@ MAKE_JOBS_UNSAFE= yes
WRKSRC= ${WRKDIR}/buici
PLIST_FILES= bin/buici-clock \
- man/man1/buici-clock.1.gz
+ share/man/man1/buici-clock.1.gz
post-patch:
@${REINPLACE_CMD} -e \
@@ -34,6 +34,6 @@ post-patch:
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/buici-clock ${STAGEDIR}${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/buici-clock.1 ${STAGEDIR}${MANPREFIX}/man/man1
+ ${INSTALL_MAN} ${WRKSRC}/buici-clock.1 ${STAGEDIR}${PREFIX}/share/man/man1
.include <bsd.port.mk>
diff --git a/x11-clocks/dclock/Makefile b/x11-clocks/dclock/Makefile
index 7a81c67b8684..a39ca6f7615e 100644
--- a/x11-clocks/dclock/Makefile
+++ b/x11-clocks/dclock/Makefile
@@ -1,6 +1,6 @@
PORTNAME= dclock
PORTVERSION= 2.2.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-clocks
MASTER_SITES= http://opencircuitdesign.com/~tim/programs/dclock/archive/
@@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
PORTDOCS= README TODO
PLIST_FILES= bin/dclock \
lib/X11/app-defaults/DClock \
- man/man1/${PORTNAME}.1.gz \
+ share/man/man1/${PORTNAME}.1.gz \
%%DATADIR%%/sounds/bell.wav \
%%DATADIR%%/sounds/digital.wav
@@ -46,7 +46,7 @@ do-build:
do-install:
(cd ${WRKSRC} \
&& ${INSTALL_PROGRAM} dclock ${STAGEDIR}${PREFIX}/bin \
- && ${INSTALL_MAN} dclock.1 ${STAGEDIR}${MANPREFIX}/man/man1 \
+ && ${INSTALL_MAN} dclock.1 ${STAGEDIR}${PREFIX}/share/man/man1 \
&& ${INSTALL_DATA} Dclock.ad \
${STAGEDIR}${PREFIX}/lib/X11/app-defaults/DClock)
@${MKDIR} ${STAGEDIR}${DATADIR}/sounds
diff --git a/x11-fm/deforaos-browser/Makefile b/x11-fm/deforaos-browser/Makefile
index e74db3a097c5..832960c093db 100644
--- a/x11-fm/deforaos-browser/Makefile
+++ b/x11-fm/deforaos-browser/Makefile
@@ -1,6 +1,6 @@
PORTNAME= deforaos-browser
PORTVERSION= 0.5.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fm
MASTER_SITES= https://ftp.defora.org/pub/DeforaOS/Apps/Desktop/src/Browser/
DISTNAME= Browser-${PORTVERSION}
@@ -29,7 +29,7 @@ USE_GNOME= gtk30 cairo gdkpixbuf2
USE_XORG= x11
USE_LDCONFIG= yes
MAKE_ARGS+= PREFIX=${PREFIX}
-MAKE_ENV+= MANDIR=${STAGEDIR}${MANPREFIX}/man
+MAKE_ENV+= MANDIR=${STAGEDIR}${PREFIX}/share/man
CONFLICTS_INSTALL= schilyutils silo # bin/browser bin/copy
post-patch:
diff --git a/x11-fm/deforaos-browser/pkg-plist b/x11-fm/deforaos-browser/pkg-plist
index cda105b35d8d..d7add661bd00 100644
--- a/x11-fm/deforaos-browser/pkg-plist
+++ b/x11-fm/deforaos-browser/pkg-plist
@@ -33,15 +33,15 @@ libdata/pkgconfig/Browser.pc
%%PORTDOCS%%share/doc/Browser/README.md
%%PORTDOCS%%share/doc/Browser/pinentry-sudo-askpass
%%PORTDOCS%%share/doc/Browser/zenity-sudo-askpass
-%%PORTDOCS%%man/man1/browser.1.gz
-%%PORTDOCS%%man/man1/copy.1.gz
-%%PORTDOCS%%man/man1/delete.1.gz
-%%PORTDOCS%%man/man1/desktop.1.gz
-%%PORTDOCS%%man/man1/desktopctl.1.gz
-%%PORTDOCS%%man/man1/move.1.gz
-%%PORTDOCS%%man/man1/open.1.gz
-%%PORTDOCS%%man/man1/properties.1.gz
-%%PORTDOCS%%man/man1/view.1.gz
+%%PORTDOCS%%share/man/man1/browser.1.gz
+%%PORTDOCS%%share/man/man1/copy.1.gz
+%%PORTDOCS%%share/man/man1/delete.1.gz
+%%PORTDOCS%%share/man/man1/desktop.1.gz
+%%PORTDOCS%%share/man/man1/desktopctl.1.gz
+%%PORTDOCS%%share/man/man1/move.1.gz
+%%PORTDOCS%%share/man/man1/open.1.gz
+%%PORTDOCS%%share/man/man1/properties.1.gz
+%%PORTDOCS%%share/man/man1/view.1.gz
share/applications/org.defora.browser.desktop
share/applications/org.defora.browser-folder.desktop
share/applications/org.defora.desktop-settings.desktop
diff --git a/x11-fonts/fnt/Makefile b/x11-fonts/fnt/Makefile
index 87d761698506..f29355ad18c5 100644
--- a/x11-fonts/fnt/Makefile
+++ b/x11-fonts/fnt/Makefile
@@ -34,7 +34,7 @@ ZSH_PLIST_FILES= share/zsh/site-functions/_fnt
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 \
- ${STAGEDIR}${MANPREFIX}/share/man/man1
+ ${STAGEDIR}${PREFIX}/share/man/man1
do-install-ZSH-on:
@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions/
diff --git a/x11-wm/berry/Makefile b/x11-wm/berry/Makefile
index 97fb23c31da1..99dba73d04df 100644
--- a/x11-wm/berry/Makefile
+++ b/x11-wm/berry/Makefile
@@ -1,5 +1,6 @@
PORTNAME= berry
DISTVERSION= 0.1.12
+PORTREVISION= 1
CATEGORIES= x11-wm
MAINTAINER= lcook@FreeBSD.org
@@ -18,7 +19,7 @@ GH_ACCOUNT= JLErvin
USE_XORG= x11 xft xinerama
HAS_CONFIGURE= yes
-CONFIGURE_ARGS= --mandir=${MANPREFIX}/man \
+CONFIGURE_ARGS= --mandir=${PREFIX}/share/man \
--prefix=${PREFIX}
PLIST_FILES= bin/${PORTNAME} \
diff --git a/x11-wm/blackbox/Makefile b/x11-wm/blackbox/Makefile
index 22c3bf471a22..62b751bc4858 100644
--- a/x11-wm/blackbox/Makefile
+++ b/x11-wm/blackbox/Makefile
@@ -50,6 +50,6 @@ post-install:
post-install-TOOLS_ONLY-on:
@${REINPLACE_CMD} -E '/[^s]\/blackbox|bstyleconvert|lib|include/d' \
${TMPPLIST}
- ${INSTALL_MAN} ${MANPAGES:S#^#${WRKSRC}/doc/#} ${STAGEDIR}${MANPREFIX}/man/man1
+ ${INSTALL_MAN} ${MANPAGES:S#^#${WRKSRC}/doc/#} ${STAGEDIR}${PREFIX}/man/man1
.include <bsd.port.mk>
diff --git a/x11-wm/bspwm-devel/Makefile b/x11-wm/bspwm-devel/Makefile
index 907461eb0488..b1b469ed432f 100644
--- a/x11-wm/bspwm-devel/Makefile
+++ b/x11-wm/bspwm-devel/Makefile
@@ -1,6 +1,6 @@
PORTNAME= bspwm
DISTVERSION= 0.9.10.20230829
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm
PKGNAMESUFFIX= -devel
@@ -32,11 +32,11 @@ OPTIONS_SUB= yes
CONTRIB_DESC= Install contrib (shell completions, etc.)
do-install:
- ${MKDIR} ${STAGEDIR}${BINDIR} ${STAGEDIR}${MANPREFIX}/man/man1
+ ${MKDIR} ${STAGEDIR}${BINDIR} ${STAGEDIR}${PREFIX}/share/man/man1
${INSTALL_PROGRAM} ${WRKSRC}/bspc ${STAGEDIR}${PREFIX}/bin
${INSTALL_PROGRAM} ${WRKSRC}/bspwm ${STAGEDIR}${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/doc/bspc.1 ${STAGEDIR}${MANPREFIX}/man/man1
- ${INSTALL_MAN} ${WRKSRC}/doc/bspwm.1 ${STAGEDIR}${MANPREFIX}/man/man1
+ ${INSTALL_MAN} ${WRKSRC}/doc/bspc.1 ${STAGEDIR}${PREFIX}/share/man/man1
+ ${INSTALL_MAN} ${WRKSRC}/doc/bspwm.1 ${STAGEDIR}${PREFIX}/share/man/man1
post-install-CONTRIB-on:
${MKDIR} ${STAGEDIR}${PREFIX}/share/bash-completion/completions
diff --git a/x11-wm/bspwm-devel/pkg-plist b/x11-wm/bspwm-devel/pkg-plist
index 0ee88a1778f9..ccb39e51f773 100644
--- a/x11-wm/bspwm-devel/pkg-plist
+++ b/x11-wm/bspwm-devel/pkg-plist
@@ -1,7 +1,7 @@
bin/bspc
bin/bspwm
-man/man1/bspc.1.gz
-man/man1/bspwm.1.gz
+share/man/man1/bspc.1.gz
+share/man/man1/bspwm.1.gz
%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.md
%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTING.md
%%PORTDOCS%%%%DOCSDIR%%/INSTALL.md
diff --git a/x11-wm/bspwm/Makefile b/x11-wm/bspwm/Makefile
index 362ae6124191..6f6f743e1e12 100644
--- a/x11-wm/bspwm/Makefile
+++ b/x11-wm/bspwm/Makefile
@@ -1,6 +1,6 @@
PORTNAME= bspwm
DISTVERSION= 0.9.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm
MAINTAINER= jbo@FreeBSD.org
@@ -31,11 +31,11 @@ OPTIONS_SUB= yes
CONTRIB_DESC= Install contrib (shell completions, etc.)
do-install:
- ${MKDIR} ${STAGEDIR}${BINDIR} ${STAGEDIR}${MANPREFIX}/man/man1
+ ${MKDIR} ${STAGEDIR}${BINDIR} ${STAGEDIR}${PREFIX}/share/man/man1
${INSTALL_PROGRAM} ${WRKSRC}/bspc ${STAGEDIR}${PREFIX}/bin
${INSTALL_PROGRAM} ${WRKSRC}/bspwm ${STAGEDIR}${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/doc/bspc.1 ${STAGEDIR}${MANPREFIX}/man/man1
- ${INSTALL_MAN} ${WRKSRC}/doc/bspwm.1 ${STAGEDIR}${MANPREFIX}/man/man1
+ ${INSTALL_MAN} ${WRKSRC}/doc/bspc.1 ${STAGEDIR}${PREFIX}/share/man/man1
+ ${INSTALL_MAN} ${WRKSRC}/doc/bspwm.1 ${STAGEDIR}${PREFIX}/share/man/man1
post-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/x11-wm/bspwm/pkg-plist b/x11-wm/bspwm/pkg-plist
index 0ee88a1778f9..ccb39e51f773 100644
--- a/x11-wm/bspwm/pkg-plist
+++ b/x11-wm/bspwm/pkg-plist
@@ -1,7 +1,7 @@
bin/bspc
bin/bspwm
-man/man1/bspc.1.gz
-man/man1/bspwm.1.gz
+share/man/man1/bspc.1.gz
+share/man/man1/bspwm.1.gz
%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.md
%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTING.md
%%PORTDOCS%%%%DOCSDIR%%/INSTALL.md
diff --git a/x11-wm/compton/Makefile b/x11-wm/compton/Makefile
index 4f50331bde28..dcb769bbdc60 100644
--- a/x11-wm/compton/Makefile
+++ b/x11-wm/compton/Makefile
@@ -1,6 +1,6 @@
PORTNAME= compton
DISTVERSION= 20160907
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= x11-wm
MAINTAINER= parakleta@darkreality.org
@@ -55,9 +55,9 @@ DOCS_BUILD_DEPENDS= a2x:textproc/asciidoc \
xsltproc:textproc/libxslt \
docbook-xml>0:textproc/docbook-xml \
${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl
-DOCS_MAKE_ARGS= DOCDIR=${DOCSDIR} MANDIR=${MANPREFIX}/man/man1
+DOCS_MAKE_ARGS= DOCDIR=${DOCSDIR} MANDIR=${PREFIX}/share/man/man1
DOCS_ALL_TARGET= docs
-DOCS_PLIST_FILES= man/man1/compton.1.gz man/man1/compton-trans.1.gz
+DOCS_PLIST_FILES= share/man/man1/compton.1.gz share/man/man1/compton-trans.1.gz
DOCS_PORTDOCS= README.md cdbus-driver.sh
post-patch:
diff --git a/x11-wm/cwm/Makefile b/x11-wm/cwm/Makefile
index 2ba12c4da36c..5ed61e0e9a29 100644
--- a/x11-wm/cwm/Makefile
+++ b/x11-wm/cwm/Makefile
@@ -1,5 +1,6 @@
PORTNAME= cwm
DISTVERSION= 7.4
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= https://leahneukirchen.org/releases/
@@ -11,10 +12,10 @@ LICENSE= ISCL
USES= pkgconfig xorg
USE_XORG= x11 xft xrandr
-MAKE_ARGS= MANPREFIX="${MANPREFIX}/man"
+MAKE_ARGS= MANPREFIX="${PREFIX}/share/man"
PLIST_FILES= bin/cwm \
- man/man1/cwm.1.gz \
- man/man5/cwmrc.5.gz
+ share/man/man1/cwm.1.gz \
+ share/man/man5/cwmrc.5.gz
post-patch:
@${REINPLACE_CMD} 's@/usr/X11R6@${LOCALBASE}@' ${WRKSRC}/cwmrc.5
diff --git a/x11-wm/deforaos-panel/Makefile b/x11-wm/deforaos-panel/Makefile
index f71c30d353dd..1cf6b6ba868e 100644
--- a/x11-wm/deforaos-panel/Makefile
+++ b/x11-wm/deforaos-panel/Makefile
@@ -32,7 +32,7 @@ USE_GNOME= gtk30 cairo gdkpixbuf2
USE_XORG= x11
USE_LDCONFIG= yes
MAKE_ARGS+= PREFIX=${PREFIX}
-MAKE_ENV+= MANDIR=${STAGEDIR}${MANPREFIX}/man
+MAKE_ENV+= MANDIR=${STAGEDIR}${PREFIX}/share/man
post-patch:
${REINPLACE_CMD} -e 's|/lib/|/libdata/|g' \
diff --git a/x11-wm/deforaos-panel/pkg-plist b/x11-wm/deforaos-panel/pkg-plist
index 635e0b4c7408..2fe00852231d 100644
--- a/x11-wm/deforaos-panel/pkg-plist
+++ b/x11-wm/deforaos-panel/pkg-plist
@@ -47,20 +47,20 @@ lib/libPanel.so
lib/libPanel.so.0
lib/libPanel.so.0.0
libdata/pkgconfig/Panel.pc
-%%PORTDOCS%%man/html1/panel-embed.html.gz
-%%PORTDOCS%%man/html1/panel-message.html.gz
-%%PORTDOCS%%man/html1/panel-notify.html.gz
-%%PORTDOCS%%man/html1/panel.html.gz
-%%PORTDOCS%%man/html1/panelctl.html.gz
-%%PORTDOCS%%man/html1/settings.html.gz
-%%PORTDOCS%%man/html1/wifibrowser.html.gz
-%%PORTDOCS%%man/man1/panel-embed.1.gz
-%%PORTDOCS%%man/man1/panel-message.1.gz
-%%PORTDOCS%%man/man1/panel-notify.1.gz
-%%PORTDOCS%%man/man1/panel.1.gz
-%%PORTDOCS%%man/man1/panelctl.1.gz
-%%PORTDOCS%%man/man1/settings.1.gz
-%%PORTDOCS%%man/man1/wifibrowser.1.gz
+%%PORTDOCS%%share/man/html1/panel-embed.html.gz
+%%PORTDOCS%%share/man/html1/panel-message.html.gz
+%%PORTDOCS%%share/man/html1/panel-notify.html.gz
+%%PORTDOCS%%share/man/html1/panel.html.gz
+%%PORTDOCS%%share/man/html1/panelctl.html.gz
+%%PORTDOCS%%share/man/html1/settings.html.gz
+%%PORTDOCS%%share/man/html1/wifibrowser.html.gz
+%%PORTDOCS%%share/man/man1/panel-embed.1.gz
+%%PORTDOCS%%share/man/man1/panel-message.1.gz
+%%PORTDOCS%%share/man/man1/panel-notify.1.gz
+%%PORTDOCS%%share/man/man1/panel.1.gz
+%%PORTDOCS%%share/man/man1/panelctl.1.gz
+%%PORTDOCS%%share/man/man1/settings.1.gz
+%%PORTDOCS%%share/man/man1/wifibrowser.1.gz
share/applications/org.defora.panel-settings.desktop
share/applications/org.defora.settings.desktop
share/applications/org.defora.wifibrowser.desktop
diff --git a/x11-wm/evilwm/Makefile b/x11-wm/evilwm/Makefile
index a2d443b2d1fb..b9ac0f15a0c7 100644
--- a/x11-wm/evilwm/Makefile
+++ b/x11-wm/evilwm/Makefile
@@ -1,5 +1,6 @@
PORTNAME= evilwm
DISTVERSION= 1.4.2
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= http://www.6809.org.uk/evilwm/
@@ -15,11 +16,11 @@ LICENSE_NAME= AEWM License
USES= gmake localbase:ldflags xorg
USE_XORG= x11 xpm xext xrandr xrender
MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" prefix="${PREFIX}" \
- mandir="${MANPREFIX}/man"
+ mandir="${PREFIX}/share/man"
INSTALL_TARGET= install-strip
PLIST_FILES= bin/evilwm \
- man/man1/evilwm.1.gz \
+ share/man/man1/evilwm.1.gz \
share/applications/evilwm.desktop
PORTDOCS= *
diff --git a/x11-wm/hs-xmonad/Makefile b/x11-wm/hs-xmonad/Makefile
index 34173adfab85..46ef65bc3a1a 100644
--- a/x11-wm/hs-xmonad/Makefile
+++ b/x11-wm/hs-xmonad/Makefile
@@ -1,5 +1,6 @@
PORTNAME= xmonad
PORTVERSION= 0.17.1
+PORTREVISION= 1
CATEGORIES= x11-wm haskell
MAINTAINER= haskell@FreeBSD.org
@@ -24,7 +25,7 @@ CABAL_REVISION= 2
OPTIONS_DEFINE= EXAMPLES
post-install:
- ${INSTALL_MAN} ${WRKSRC}/man/xmonad.1 ${STAGEDIR}${MANPREFIX}/man/man1/
+ ${INSTALL_MAN} ${WRKSRC}/man/xmonad.1 ${STAGEDIR}${PREFIX}/share/man/man1/
post-install-EXAMPLES-on:
@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
diff --git a/x11-wm/hs-xmonad/pkg-plist b/x11-wm/hs-xmonad/pkg-plist
index 1d5518cf17e7..e4276b29cc41 100644
--- a/x11-wm/hs-xmonad/pkg-plist
+++ b/x11-wm/hs-xmonad/pkg-plist
@@ -1,4 +1,4 @@
-man/man1/xmonad.1.gz
+share/man/man1/xmonad.1.gz
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/build
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xmonad-config.cabal
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xmonad.hs
diff --git a/x11-wm/pwm/Makefile b/x11-wm/pwm/Makefile
index 965334305a46..c3c08b354f2d 100644
--- a/x11-wm/pwm/Makefile
+++ b/x11-wm/pwm/Makefile
@@ -1,6 +1,6 @@
PORTNAME= pwm
PORTVERSION= 2007.07.20
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-wm
MASTER_SITES= http://modeemi.fi/~tuomov/dl/ \
http://schot.a-eskwadraat.nl/files/
@@ -27,7 +27,7 @@ post-patch:
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/pwm ${STAGEDIR}${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/pwm.1x ${STAGEDIR}${MANPREFIX}/man/man1
+ ${INSTALL_MAN} ${WRKSRC}/pwm.1x ${STAGEDIR}${PREFIX}/share/man/man1
@${MKDIR} ${STAGEDIR}${PREFIX}/etc/pwm ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/etc/pwm/*.conf ${STAGEDIR}${PREFIX}/etc/pwm
${MV} ${STAGEDIR}${PREFIX}/etc/pwm/sample.conf ${STAGEDIR}${PREFIX}/etc/pwm/pwm.conf.sample
diff --git a/x11-wm/pwm/pkg-plist b/x11-wm/pwm/pkg-plist
index 6c3208df15cd..e4ac0c4cd471 100644
--- a/x11-wm/pwm/pkg-plist
+++ b/x11-wm/pwm/pkg-plist
@@ -5,6 +5,6 @@ etc/pwm/look-beoslike.conf
etc/pwm/look-brownsteel.conf
etc/pwm/menus-default.conf
@sample etc/pwm/pwm.conf.sample
-man/man1/pwm.1x.gz
+share/man/man1/pwm.1x.gz
%%PORTDOCS%%%%DOCSDIR%%/LICENSE
%%PORTDOCS%%%%DOCSDIR%%/config.txt
diff --git a/x11-wm/subtle/Makefile b/x11-wm/subtle/Makefile
index 3b0689645b29..423b0bb2ffac 100644
--- a/x11-wm/subtle/Makefile
+++ b/x11-wm/subtle/Makefile
@@ -1,5 +1,6 @@
PORTNAME= subtle
PORTVERSION= 0.11.3224
+PORTREVISION= 1
CATEGORIES= x11-wm ruby
MASTER_SITES= https://subtle.subforge.org/attachments/download/81/
DISTNAME= ${PORTNAME}-${PORTVERSION}-xi
diff --git a/x11-wm/subtle/files/patch-Rakefile b/x11-wm/subtle/files/patch-Rakefile
index a004dede2c5a..91b2a6d74db3 100644
--- a/x11-wm/subtle/files/patch-Rakefile
+++ b/x11-wm/subtle/files/patch-Rakefile
@@ -5,11 +5,10 @@
"cc" => ENV["CC"] || "gcc",
"destdir" => ENV["DESTDIR"] || "",
- "prefix" => "/usr",
-- "manprefix" => "$(prefix)/share/man",
++ "prefix" => ENV["PREFIX"] || "/usr",
+ "manprefix" => "$(prefix)/share/man",
- "bindir" => "$(destdir)/$(prefix)/bin",
- "sysconfdir" => "$(destdir)/etc",
-+ "prefix" => ENV["PREFIX"] || "/usr",
-+ "manprefix" => "%s/man" % (ENV["MANPREFIX"] || "$(prefix)/share"),
+ "bindir" => "$(destdir)$(prefix)/bin",
+ "sysconfdir" => "$(destdir)$(prefix)/etc",
"configdir" => "$(sysconfdir)/xdg/$(PKG_NAME)",
@@ -62,7 +61,7 @@
unless libs.nil?
# Update flags
@options["cpppath"] << " %s" % [ cflags ]
-@@ -495,6 +498,7 @@ task(:config) do
+@@ -495,6 +498,7 @@ Configuration.......: #{@options["configdir"]}
-----------------
Binaries............: #{@options["bindir"]}
Configuration.......: #{@options["configdir"]}
@@ -70,7 +69,7 @@
Extension...........: #{@options["extdir"]}
Xpm support.........: #{@options["xpm"]}
-@@ -503,6 +507,8 @@ Xinerama support....: #{@options["xinera
+@@ -503,6 +507,8 @@ Debugging messages..: #{@options["debug"]}
XRandR support......: #{@options["xrandr"]}
XTest support.......: #{@options["xtest"]}
Debugging messages..: #{@options["debug"]}
diff --git a/x11-wm/subtle/pkg-plist b/x11-wm/subtle/pkg-plist
index ab7e88c74a83..d0fff33b0d5c 100644
--- a/x11-wm/subtle/pkg-plist
+++ b/x11-wm/subtle/pkg-plist
@@ -11,8 +11,8 @@ etc/xdg/subtle/subtle.rb
%%RUBY_SITELIBDIR%%/subtle/sur/specification.rb
%%RUBY_SITELIBDIR%%/subtle/sur/test.rb
%%RUBY_SITELIBDIR%%/subtle/sur/version.rb
-man/man1/subtle.1.gz
-man/man1/subtler.1.gz
-man/man1/subtlext.1.gz
-man/man1/sur.1.gz
-man/man1/surserver.1.gz
+share/man/man1/subtle.1.gz
+share/man/man1/subtler.1.gz
+share/man/man1/subtlext.1.gz
+share/man/man1/sur.1.gz
+share/man/man1/surserver.1.gz
diff --git a/x11-wm/wmii-devel/Makefile b/x11-wm/wmii-devel/Makefile
index 937476bbfbfc..38e70e29069b 100644
--- a/x11-wm/wmii-devel/Makefile
+++ b/x11-wm/wmii-devel/Makefile
@@ -1,6 +1,6 @@
PORTNAME= wmii
PORTVERSION= 3.9.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-wm
MASTER_SITES= http://dl.suckless.org/wmii/
PKGNAMESUFFIX= -devel
@@ -23,7 +23,7 @@ USE_XORG= x11 xext xrandr xrender xinerama xft
MAKE_ARGS= PREFIX="${PREFIX}" INCLUDE="${LOCALBASE}/include" \
CC="${CC} -c" LD="${CC}" LIBIXP="-lixp" STATIC="" \
- MAN="${MANPREFIX}/man" DOC="${DOCSDIR}"
+ MAN="${PREFIX}/share/man" DOC="${DOCSDIR}"
MAKE_ENV= noisycc=1 # unmute build commands, useful for logs
OPTIONS_DEFINE= DOCS
diff --git a/x11-wm/wmii-devel/pkg-plist b/x11-wm/wmii-devel/pkg-plist
index cedee2256301..30790656f34a 100644
--- a/x11-wm/wmii-devel/pkg-plist
+++ b/x11-wm/wmii-devel/pkg-plist
@@ -29,10 +29,10 @@ bin/wmiir
%%ETCDIR%%/welcome
%%ETCDIR%%/wmiirc
lib/libwmii_hack.so
-man/man1/wimenu.1.gz
-man/man1/wmii.1.gz
-man/man1/wmii9menu.1.gz
-man/man1/wmiir.1.gz
+share/man/man1/wimenu.1.gz
+share/man/man1/wmii.1.gz
+share/man/man1/wmii9menu.1.gz
+share/man/man1/wmiir.1.gz
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/alternative_wmiircs/README
%%PORTDOCS%%%%DOCSDIR%%/alternative_wmiircs/plan9port/README
diff --git a/x11-wm/wmii/Makefile b/x11-wm/wmii/Makefile
index c6a3b7f892e2..26430d37cca5 100644
--- a/x11-wm/wmii/Makefile
+++ b/x11-wm/wmii/Makefile
@@ -1,6 +1,6 @@
PORTNAME= wmii
DISTVERSION= 3.6 # this is stable version; for 3.9.x, use -devel port
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= x11-wm
MASTER_SITES= http://dl.suckless.org/wmii/
@@ -19,7 +19,7 @@ USE_XORG= x11 xorgproto xt xext
CONFLICTS= wmii-devel
-MAKE_ARGS= PREFIX="${PREFIX}" MAN="${MANPREFIX}/man" \
+MAKE_ARGS= PREFIX="${PREFIX}" MAN="${PREFIX}/share/man" \
INCLUDE="${LOCALBASE}/include" \
INCX11="-I${LOCALBASE}/include" \
LIBX11="-L${LOCALBASE}/lib -lX11 -lixp" \
diff --git a/x11-wm/wmii/pkg-plist b/x11-wm/wmii/pkg-plist
index 67482a196940..ffe544f7fdac 100644
--- a/x11-wm/wmii/pkg-plist
+++ b/x11-wm/wmii/pkg-plist
@@ -7,6 +7,6 @@ bin/wmiistartrc
etc/wmii-3.5/rc.wmii
etc/wmii-3.5/welcome
etc/wmii-3.5/wmiirc
-man/man1/wmii.1.gz
-man/man1/wmiiloop.1.gz
-man/man1/wmiir.1.gz
+share/man/man1/wmii.1.gz
+share/man/man1/wmiiloop.1.gz
+share/man/man1/wmiir.1.gz
diff --git a/x11-wm/yeahwm/Makefile b/x11-wm/yeahwm/Makefile
index 3e56e42b7b06..eb5766fa763f 100644
--- a/x11-wm/yeahwm/Makefile
+++ b/x11-wm/yeahwm/Makefile
@@ -1,5 +1,6 @@
PORTNAME= yeahwm
PORTVERSION= 0.3.5
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= http://phrat.de/
DISTNAME= ${PORTNAME}_${PORTVERSION}
@@ -14,7 +15,7 @@ MAKE_ARGS= CC="${CC}" XROOT="${LOCALBASE}"
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-PLIST_FILES= bin/yeahwm man/man1/yeahwm.1.gz
+PLIST_FILES= bin/yeahwm share/man/man1/yeahwm.1.gz
PORTDOCS= README*
OPTIONS_DEFINE= DOCS MOTIF
@@ -31,7 +32,7 @@ post-patch-MOTIF-off:
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/yeahwm ${STAGEDIR}${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/yeahwm.1 ${STAGEDIR}${MANPREFIX}/man/man1
+ ${INSTALL_MAN} ${WRKSRC}/yeahwm.1 ${STAGEDIR}${PREFIX}/share/man/man1
do-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/x11/cool-retro-term/Makefile b/x11/cool-retro-term/Makefile
index 23fc3f8e40d3..ad6cebf28692 100644
--- a/x11/cool-retro-term/Makefile
+++ b/x11/cool-retro-term/Makefile
@@ -1,6 +1,6 @@
PORTNAME= cool-retro-term
PORTVERSION= 1.1.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MAINTAINER= danfe@FreeBSD.org
@@ -31,6 +31,6 @@ post-patch:
post-install:
${INSTALL_MAN} ${WRKSRC}/packaging/debian/cool-retro-term.1 \
- ${STAGEDIR}${MANPREFIX}/man/man1
+ ${STAGEDIR}${PREFIX}/share/man/man1
.include <bsd.port.mk>
diff --git a/x11/cool-retro-term/pkg-plist b/x11/cool-retro-term/pkg-plist
index 84f0c33a5ed1..bf3948efa65f 100644
--- a/x11/cool-retro-term/pkg-plist
+++ b/x11/cool-retro-term/pkg-plist
@@ -40,7 +40,7 @@ bin/cool-retro-term
%%QT_QMLDIR%%/QMLTermWidget/kb-layouts/vt420pc.keytab
%%QT_QMLDIR%%/QMLTermWidget/libqmltermwidget.so
%%QT_QMLDIR%%/QMLTermWidget/qmldir
-man/man1/cool-retro-term.1.gz
+share/man/man1/cool-retro-term.1.gz
share/applications/cool-retro-term.desktop
share/icons/hicolor/128x128/apps/cool-retro-term.png
share/icons/hicolor/256x256/apps/cool-retro-term.png
diff --git a/x11/deforaos-libdesktop/Makefile b/x11/deforaos-libdesktop/Makefile
index 467776d76007..7b53d64397e2 100644
--- a/x11/deforaos-libdesktop/Makefile
+++ b/x11/deforaos-libdesktop/Makefile
@@ -1,6 +1,6 @@
PORTNAME= libdesktop
PORTVERSION= 0.4.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= https://ftp.defora.org/pub/DeforaOS/Apps/Desktop/src/libDesktop/
PKGNAMEPREFIX= deforaos-
@@ -22,7 +22,7 @@ USE_GNOME= gtk30 cairo gdkpixbuf2
USE_LDCONFIG= yes
USE_XORG+= x11
MAKE_ARGS+= PREFIX=${PREFIX}
-MAKE_ENV+= MANDIR=${STAGEDIR}${MANPREFIX}/man
+MAKE_ENV+= MANDIR=${STAGEDIR}${PREFIX}/share/man
MAKE_JOBS_UNSAFE= yes
OPTIONS_DEFINE= DOCS
diff --git a/x11/deforaos-libdesktop/pkg-plist b/x11/deforaos-libdesktop/pkg-plist
index 4cd661a0bba6..779166275e7a 100644
--- a/x11/deforaos-libdesktop/pkg-plist
+++ b/x11/deforaos-libdesktop/pkg-plist
@@ -38,4 +38,4 @@ libdata/pkgconfig/libDesktop.pc
%%PORTDOCS%%share/gtk-doc/html/libDesktop/style.css
%%PORTDOCS%%share/gtk-doc/html/libDesktop/up-insensitive.png
%%PORTDOCS%%share/gtk-doc/html/libDesktop/up.png
-%%PORTDOCS%%man/man1/widget.1.gz
+%%PORTDOCS%%share/man/man1/widget.1.gz
diff --git a/x11/deforaos-locker/Makefile b/x11/deforaos-locker/Makefile
index 0f8f0449f7fe..7cb81cdd6eff 100644
--- a/x11/deforaos-locker/Makefile
+++ b/x11/deforaos-locker/Makefile
@@ -1,6 +1,6 @@
PORTNAME= locker
PORTVERSION= 0.4.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= https://ftp.defora.org/pub/DeforaOS/Apps/Desktop/src/Locker/
PKGNAMEPREFIX= deforaos-
@@ -24,7 +24,7 @@ USE_GNOME= gtk30 cairo gdkpixbuf2
USE_XORG= x11 xext
MAKE_ARGS+= PREFIX=${PREFIX}
MAKE_ARGS+= LDFLAGS=${LDFLAGS:Q}
-MAKE_ENV+= MANDIR=${STAGEDIR}${MANPREFIX}/man
+MAKE_ENV+= MANDIR=${STAGEDIR}${PREFIX}/share/man
LDFLAGS+= -lXext
OPTIONS_DEFINE= DOCS NLS
diff --git a/x11/deforaos-locker/pkg-plist b/x11/deforaos-locker/pkg-plist
index de1c2602432e..1d1ba4b699c4 100644
--- a/x11/deforaos-locker/pkg-plist
+++ b/x11/deforaos-locker/pkg-plist
@@ -15,10 +15,10 @@ lib/Locker/demos/xterm.so
lib/Locker/plugins/openmoko.so
lib/Locker/plugins/suspend.so
lib/Locker/plugins/systray.so
-%%PORTDOCS%%man/html1/locker.html.gz
-%%PORTDOCS%%man/html1/lockerctl.html.gz
-%%PORTDOCS%%man/man1/locker.1.gz
-%%PORTDOCS%%man/man1/lockerctl.1.gz
+%%PORTDOCS%%share/man/html1/locker.html.gz
+%%PORTDOCS%%share/man/html1/lockerctl.html.gz
+%%PORTDOCS%%share/man/man1/locker.1.gz
+%%PORTDOCS%%share/man/man1/lockerctl.1.gz
share/applications/org.defora.locker-settings.desktop
share/doc/Locker/COPYING
share/doc/Locker/README.md
diff --git a/x11/flruler/Makefile b/x11/flruler/Makefile
index 1bd89a2e5b15..ca739286503c 100644
--- a/x11/flruler/Makefile
+++ b/x11/flruler/Makefile
@@ -1,5 +1,6 @@
PORTNAME= flruler
PORTVERSION= 1.05
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${WWW}
@@ -15,7 +16,7 @@ USES= gmake perl5 xorg
USE_PERL5= build
USE_XORG= x11 xcursor xext xfixes xft xinerama
-PLIST_FILES= bin/flruler man/man1/flruler.1.gz \
+PLIST_FILES= bin/flruler share/man/man1/flruler.1.gz \
share/icons/hicolor/128x128/apps/flruler.png
PORTDOCS= *
@@ -31,7 +32,7 @@ post-patch:
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
${INSTALL_DATA} ${WRKSRC}/docs/${PORTNAME}.1 \
- ${STAGEDIR}${MANPREFIX}/man/man1
+ ${STAGEDIR}${PREFIX}/share/man/man1
@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/128x128/apps
${INSTALL_DATA} ${WRKSRC}/misc/flruler-icon.png \
${STAGEDIR}${PREFIX}/share/icons/hicolor/128x128/apps/${PORTNAME}.png
diff --git a/x11/i3lock-color/Makefile b/x11/i3lock-color/Makefile
index 348ee7cfaec6..bdbf371ddf42 100644
--- a/x11/i3lock-color/Makefile
+++ b/x11/i3lock-color/Makefile
@@ -31,8 +31,7 @@ USE_XORG= x11 xcb xext xinerama xorgproto xrandr xt
GNU_CONFIGURE= yes
MAKE_ARGS= PREFIX="${PREFIX}" X11LIB="${LOCALBASE}/lib" \
- X11INC="${LOCALBASE}/include" CC="${CC}" \
- MANDIR="${MANPREFIX}/man"
+ X11INC="${LOCALBASE}/include" CC="${CC}"
LDFLAGS+= ${ICONV_LIB}
diff --git a/x11/kitty/Makefile b/x11/kitty/Makefile
index 255af9fdd566..0fefb10d3a15 100644
--- a/x11/kitty/Makefile
+++ b/x11/kitty/Makefile
@@ -122,8 +122,8 @@ do-install:
${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
${INSTALL_DATA} ${WRKSRC}/terminfo/kitty.terminfo \
${STAGEDIR}${PREFIX}/share/misc/
- ${INSTALL_MAN} ${BUILD_DIR}/share/man/man1/kitty.1 ${STAGEDIR}${MANPREFIX}/share/man/man1
- ${INSTALL_MAN} ${BUILD_DIR}/share/man/man5/kitty.conf.5 ${STAGEDIR}${MANPREFIX}/share/man/man5
+ ${INSTALL_MAN} ${BUILD_DIR}/share/man/man1/kitty.1 ${STAGEDIR}${PREFIX}/share/man/man1
+ ${INSTALL_MAN} ${BUILD_DIR}/share/man/man5/kitty.conf.5 ${STAGEDIR}${PREFIX}/share/man/man5
${STRIP_CMD} ${_STRIP_TARGETS:S|^|${STAGEDIR}${DATADIR}/|}
do-install-DOCS-on:
diff --git a/x11/pipeglade/Makefile b/x11/pipeglade/Makefile
index e08d1150c471..b7b2548bceb6 100644
--- a/x11/pipeglade/Makefile
+++ b/x11/pipeglade/Makefile
@@ -1,6 +1,6 @@
PORTNAME= pipeglade
PORTVERSION= 4.7.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11 devel
MAINTAINER= trebbu@googlemail.com
@@ -20,7 +20,7 @@ OPTIONS_SUB= yes
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
- ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1/
+ ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1/
post-install-EXAMPLES-on:
${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
diff --git a/x11/pipeglade/pkg-plist b/x11/pipeglade/pkg-plist
index 1d3722ab94e1..95996f89e707 100644
--- a/x11/pipeglade/pkg-plist
+++ b/x11/pipeglade/pkg-plist
@@ -1,5 +1,5 @@
bin/pipeglade
-man/man1/pipeglade.1.gz
+share/man/man1/pipeglade.1.gz
%%EXAMPLES%%%%EXAMPLESDIR%%/clock.sh
%%EXAMPLES%%%%EXAMPLESDIR%%/clock.ui
%%EXAMPLES%%%%EXAMPLESDIR%%/echo.sh
diff --git a/x11/slock/Makefile b/x11/slock/Makefile
index 6ef21e760d83..a154286b71e9 100644
--- a/x11/slock/Makefile
+++ b/x11/slock/Makefile
@@ -15,8 +15,7 @@ USES= cpe xorg
CPE_VENDOR= suckless
USE_XORG= x11 xext xorgproto xrandr xt
MAKE_ARGS= PREFIX="${PREFIX}" X11LIB="${LOCALBASE}/lib" \
- X11INC="${LOCALBASE}/include" CC="${CC}" \
- MANPREFIX="${PREFIX}/share/man"
+ X11INC="${LOCALBASE}/include" CC="${CC}"
post-patch:
@${REINPLACE_CMD} -e 's|-I/usr/include||;s|-L/usr/lib||;s|= -Os|+=|'\
diff --git a/x11/sterm/Makefile b/x11/sterm/Makefile
index bce7879dd15c..39258d3cb42c 100644
--- a/x11/sterm/Makefile
+++ b/x11/sterm/Makefile
@@ -17,7 +17,9 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
USES= pkgconfig xorg
USE_XORG= x11 xext xft
-PLIST_FILES= bin/st man/man1/st.1.gz
+PLIST_FILES= bin/st share/man/man1/st.1.gz
+MAKE_ARGS= PREFIX="${PREFIX}" VERSION="${PORTVERSION}" \
+ X11INC="${LOCALBASE}/include" X11LIB="${LOCALBASE}/lib"
# This way we avoid running tic on st.info which does not work as expected.
BINARY_ALIAS= tic=true
@@ -45,12 +47,7 @@ post-patch:
@${ECHO_MSG} "creating config.h from ${ST_CONF}"
@${LN} -sf ${ST_CONF} ${WRKSRC}/config.h
.endif
- @${REINPLACE_CMD} -e 's|^VERSION = .*|VERSION = ${PORTVERSION}|' \
- -e 's|^PREFIX = .*|PREFIX = ${PREFIX}|' \
- -e "s|^MANPREFIX = .*|MANPREFIX = ${MANPREFIX}/man|" \
- -e "s|^X11INC = .*|X11INC = ${LOCALBASE}/include|" \
- -e "s|^X11LIB = .*|X11LIB = ${LOCALBASE}/lib|" \
- -e "s|^CPPFLAGS =|CPPFLAGS +=|" \
+ @${REINPLACE_CMD} -e "s|^CPPFLAGS =|CPPFLAGS +=|" \
${WRKSRC}/config.mk
post-install:
diff --git a/x11/sxhkd/Makefile b/x11/sxhkd/Makefile
index 4e9f58f16642..362d81edd83c 100644
--- a/x11/sxhkd/Makefile
+++ b/x11/sxhkd/Makefile
@@ -1,5 +1,6 @@
PORTNAME= sxhkd
PORTVERSION= 0.6.2
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= o.hushchenkov@gmail.com
@@ -20,14 +21,13 @@ GH_ACCOUNT= baskerville
PORTEXAMPLES= *
PLIST_FILES= bin/sxhkd \
- man/man1/sxhkd.1.gz
+ share/man/man1/sxhkd.1.gz
OPTIONS_DEFINE= EXAMPLES
do-install:
- ${MKDIR} ${STAGEDIR}${BINDIR} ${STAGEDIR}${MANPREFIX}/man/man1
${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
+ ${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1
post-install-EXAMPLES-on:
${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
diff --git a/x11/wmblob/Makefile b/x11/wmblob/Makefile
index 439a08d846b6..4ef60e4f35ad 100644
--- a/x11/wmblob/Makefile
+++ b/x11/wmblob/Makefile
@@ -1,6 +1,6 @@
PORTNAME= wmblob
PORTVERSION= 1.0.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 windowmaker
MASTER_SITES= https://BSDforge.com/projects/source/x11/wmblob/
@@ -15,10 +15,10 @@ USE_XORG= xpm
USE_GNOME= gtk20
GNU_CONFIGURE= yes
-PLIST_FILES= bin/wmblob man/man1/wmblob.1.gz
+PLIST_FILES= bin/wmblob share/man/man1/wmblob.1.gz
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/src/wmblob ${STAGEDIR}${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/doc/wmblob.1 ${STAGEDIR}${MANPREFIX}/man/man1
+ ${INSTALL_MAN} ${WRKSRC}/doc/wmblob.1 ${STAGEDIR}${PREFIX}/share/man/man1
.include <bsd.port.mk>
diff --git a/x11/xkb-switch/Makefile b/x11/xkb-switch/Makefile
index abd01ce11871..e2011d545f4a 100644
--- a/x11/xkb-switch/Makefile
+++ b/x11/xkb-switch/Makefile
@@ -1,5 +1,6 @@
PORTNAME= xkb-switch
PORTVERSION= 1.8.5
+PORTREVIDSION= 1
CATEGORIES= x11
MAINTAINER= dmgk@FreeBSD.org
@@ -14,7 +15,7 @@ GH_ACCOUNT= ierton
USE_XORG= x11 xkbfile
USE_LDCONFIG= yes
-CMAKE_ARGS= -DMAN_COMPRESSION="gz" -DMANDIR="${MANPREFIX}/man"
+CMAKE_ARGS= -DMAN_COMPRESSION="gz" -DMANDIR="${MANPREFIX}/share/man"
OPTIONS_DEFINE= DOCS
@@ -22,7 +23,7 @@ PLIST_FILES= bin/xkb-switch \
lib/libxkbswitch.so \
lib/libxkbswitch.so.1 \
lib/libxkbswitch.so.1.8.5 \
- man/man1/xkb-switch.1.gz
+ share/man/man1/xkb-switch.1.gz
PORTDOCS= README.md
diff --git a/x11/xmenu/Makefile b/x11/xmenu/Makefile
index 7a0f1e47469a..53133f90d050 100644
--- a/x11/xmenu/Makefile
+++ b/x11/xmenu/Makefile
@@ -1,6 +1,7 @@
PORTNAME= xmenu
DISTVERSIONPREFIX= v
DISTVERSION= 4.6.1
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= lcook@FreeBSD.org
@@ -19,11 +20,11 @@ GH_ACCOUNT= phillbush
USE_XORG= x11 xft xinerama
MAKE_ARGS= FREETYPEINC="${LOCALBASE}/include/freetype2" \
- MANPREFIX="${PREFIX}/man" \
+ MANPREFIX="${PREFIX}/share/man" \
PREFIX="${PREFIX}"
PLIST_FILES= bin/${PORTNAME} \
- man/man1/${PORTNAME}.1.gz
+ share/man/man1/${PORTNAME}.1.gz
PORTDOCS= CHANGELOG README.md
PORTEXAMPLES= icons/* xmenu.sh
diff --git a/x11/xtrlock/Makefile b/x11/xtrlock/Makefile
index 21bfe991bf4f..d068c93e4492 100644
--- a/x11/xtrlock/Makefile
+++ b/x11/xtrlock/Makefile
@@ -1,5 +1,6 @@
PORTNAME= xtrlock
PORTVERSION= 2.15
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= DEBIAN
DISTNAME= ${PORTNAME}_${PORTVERSION}
@@ -29,6 +30,6 @@ do-build:
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/xtrlock ${STAGEDIR}${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/xtrlock.man ${STAGEDIR}${MANPREFIX}/man/man1/${PORTNAME}.1
+ ${INSTALL_MAN} ${WRKSRC}/xtrlock.man ${STAGEDIR}${PREFIX}/share/man/man1/${PORTNAME}.1
.include <bsd.port.mk>
diff --git a/x11/xtrlock/pkg-plist b/x11/xtrlock/pkg-plist
index da33696db497..432e4e470fd2 100644
--- a/x11/xtrlock/pkg-plist
+++ b/x11/xtrlock/pkg-plist
@@ -1,2 +1,2 @@
@(,,4555) bin/xtrlock
-man/man1/xtrlock.1.gz
+share/man/man1/xtrlock.1.gz
diff --git a/x11/xvattr/Makefile b/x11/xvattr/Makefile
index 87347e35ec87..a355890fcf08 100644
--- a/x11/xvattr/Makefile
+++ b/x11/xvattr/Makefile
@@ -1,6 +1,6 @@
PORTNAME= xvattr
DISTVERSION= 1.3
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= x11
MASTER_SITES= LOCAL/fuz
DISTNAME= xvattr_${DISTVERSION}.orig
@@ -20,7 +20,7 @@ USE_GNOME= cairo gdkpixbuf2 gtk20
USE_XORG= x11 xv
PLIST_FILES= bin/xvattr bin/gxvattr \
- man/man1/${PORTNAME}.1.gz
+ share/man/man1/${PORTNAME}.1.gz
CFLAGS+= -DVERSION=\"${PORTVERSION}\"
WRKSRC= ${WRKDIR}/xvattr-${DISTVERSION}
@@ -37,6 +37,6 @@ do-build:
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
${INSTALL_PROGRAM} ${WRKSRC}/g${PORTNAME} ${STAGEDIR}${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
+ ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1
.include <bsd.port.mk>
diff --git a/x11/xwit/Makefile b/x11/xwit/Makefile
index 7d863468d574..6fe3d7d45760 100644
--- a/x11/xwit/Makefile
+++ b/x11/xwit/Makefile
@@ -1,6 +1,6 @@
PORTNAME= xwit
PORTVERSION= 3.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11
MASTER_SITES= XCONTRIB/utilities:source1 LOCAL/ehaupt:source2
DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}:source1 \
@@ -12,13 +12,13 @@ COMMENT= X interface tool
USES= imake xorg
USE_XORG= x11 xext
-PLIST_FILES= bin/xwit man/man1/xwit.1.gz
+PLIST_FILES= bin/xwit share/man/man1/xwit.1.gz
EXTRA_PATCHES= ${WRKDIR}/${PORTNAME}-patchset-${PORTVERSION}/patch-*
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/${PORTNAME}._man \
- ${STAGEDIR}${MANPREFIX}/man/man1/${PORTNAME}.1
+ ${STAGEDIR}${PREFIX}/share/man/man1/${PORTNAME}.1
.include <bsd.port.mk>