From c2a20805612221effcd7a6626ccab875c924949b Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Tue, 9 Jan 2024 13:47:08 +0100 Subject: [PATCH] MANPREFIX: eleminate its usage and move man to share/man --- www/html2wml/Makefile | 5 +++-- www/middleman/Makefile | 4 ++-- www/middleman/pkg-plist | 2 +- www/netstiff/Makefile | 5 +++-- www/retawq/Makefile | 6 +++--- www/rsstail/Makefile | 4 ++-- www/snarf/Makefile | 4 ++-- www/vimb/Makefile | 4 ++-- x11-clocks/astime/Makefile | 6 +++--- x11-clocks/eyeclock/Makefile | 4 ++-- x11-clocks/eyeclock/pkg-plist | 2 +- x11-clocks/wmblueclock/Makefile | 6 +++--- x11-fm/gentoo/Makefile | 2 +- x11-fm/gentoo/pkg-plist | 2 +- x11-fm/xdiskusage/Makefile | 5 +++-- x11-wm/awesome/Makefile | 4 ++-- x11-wm/awesome/pkg-plist | 36 ++++++++++++++++----------------- x11-wm/echinus/Makefile | 6 +++--- x11-wm/lwm/Makefile | 5 +++-- x11-wm/tvtwm/Makefile | 6 +++--- x11/gtkchtheme/Makefile | 6 +++--- x11/lsw/Makefile | 6 +++--- x11/lupe/Makefile | 5 +++-- x11/mrxvt-devel/Makefile | 4 ++-- x11/mrxvt-devel/pkg-plist | 2 +- x11/slock/Makefile | 3 ++- x11/slock/pkg-plist | 2 +- x11/xballoon/Makefile | 6 +++--- 28 files changed, 79 insertions(+), 73 deletions(-) diff --git a/www/html2wml/Makefile b/www/html2wml/Makefile index 1def135aae2b..25d92124deb0 100644 --- a/www/html2wml/Makefile +++ b/www/html2wml/Makefile @@ -1,5 +1,6 @@ PORTNAME= html2wml PORTVERSION= 0.4.11 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= SF/htmlwml/Html2Wml/${PORTVERSION} \ http://maddingue.free.fr/softwares/download/Html2Wml/ @@ -20,7 +21,7 @@ SHEBANG_FILES= html2wml.cgi NO_ARCH= yes PORTDOCS= * -PLIST_FILES= bin/html2wml man/man1/html2wml.1.gz +PLIST_FILES= bin/html2wml share/man/man1/html2wml.1.gz OPTIONS_DEFINE= DOCS @@ -37,7 +38,7 @@ do-install: ${INSTALL_SCRIPT} ${WRKSRC}/html2wml.cgi \ ${STAGEDIR}${PREFIX}/bin/html2wml ${INSTALL_MAN} ${WRKSRC}/doc/html2wml.man \ - ${STAGEDIR}${MANPREFIX}/man/man1/html2wml.1 + ${STAGEDIR}${PREFIX}/share/man/man1/html2wml.1 do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/www/middleman/Makefile b/www/middleman/Makefile index e479e28ba2fb..871d60bf9d0e 100644 --- a/www/middleman/Makefile +++ b/www/middleman/Makefile @@ -1,6 +1,6 @@ PORTNAME= middleman PORTVERSION= 1.9.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www MASTER_SITES= SF/middle-man/Source/${PORTNAME} @@ -38,7 +38,7 @@ post-patch: do-install: @${MKDIR} ${STAGEDIR}${MMAN_CACHE} - ${INSTALL_MAN} ${WRKSRC}/man/mman.8 ${STAGEDIR}${MANPREFIX}/man/man8 + ${INSTALL_MAN} ${WRKSRC}/man/mman.8 ${STAGEDIR}${PREFIX}/share/man/man8 ${INSTALL_PROGRAM} ${WRKSRC}/mman ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/config.xml \ ${STAGEDIR}${PREFIX}/etc/mman.xml.sample diff --git a/www/middleman/pkg-plist b/www/middleman/pkg-plist index 979edc6a0a5b..16c32516ee6a 100644 --- a/www/middleman/pkg-plist +++ b/www/middleman/pkg-plist @@ -1,7 +1,7 @@ bin/mman @sample etc/rc.d/mman.sh.sample @sample etc/mman.xml.sample -man/man8/mman.8.gz +share/man/man8/mman.8.gz %%PORTDOCS%%%%DOCSDIR%%/README.html %%PORTDOCS%%%%DOCSDIR%%/filter.pl @dir %%MMAN_CACHE%% diff --git a/www/netstiff/Makefile b/www/netstiff/Makefile index e4f1d2c2956e..06d4766f51dc 100644 --- a/www/netstiff/Makefile +++ b/www/netstiff/Makefile @@ -1,5 +1,6 @@ PORTNAME= netstiff PORTVERSION= 20080331 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://pkqs.net/~sbeyer/tools/netstiff/ DISTNAME= ${PORTNAME}_${PORTVERSION}.orig @@ -20,13 +21,13 @@ WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION} PORTDOCS= ChangeLog THANKSTO PLIST_FILES= bin/${PORTNAME} \ - man/man1/${PORTNAME}.1.gz + share/man/man1/${PORTNAME}.1.gz OPTIONS_DEFINE= DOCS do-install: ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1 do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/www/retawq/Makefile b/www/retawq/Makefile index e6cd9d726dc2..71dc3f8b6092 100644 --- a/www/retawq/Makefile +++ b/www/retawq/Makefile @@ -1,6 +1,6 @@ PORTNAME= retawq DISTVERSION= 0.2.6c -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= www MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-0.2.6c @@ -17,7 +17,7 @@ CONFIGURE_ARGS= --path-archprefix=${PREFIX} --path-prefix=${PREFIX} \ --enable-i18n --enable-local-cgi --enable-ipv6 PLIST_FILES= bin/retawq \ - man/man1/retawq.1.gz \ + share/man/man1/retawq.1.gz \ share/locale/de/LC_MESSAGES/retawq.mo \ share/locale/es/LC_MESSAGES/retawq.mo \ share/locale/fr/LC_MESSAGES/retawq.mo \ @@ -43,7 +43,7 @@ post-configure: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/retawq ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/docu/retawq.1 ${STAGEDIR}${MANPREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/docu/retawq.1 ${STAGEDIR}${PREFIX}/share/man/man1 .for lang in de es fr pt_BR @${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/${lang}/LC_MESSAGES ${INSTALL_DATA} ${WRKSRC}/i18n/${lang}.mo \ diff --git a/www/rsstail/Makefile b/www/rsstail/Makefile index 066da4a5d1d0..2751a0f68868 100644 --- a/www/rsstail/Makefile +++ b/www/rsstail/Makefile @@ -11,14 +11,14 @@ LICENSE= GPLv2 LIB_DEPENDS= libmrss.so:textproc/libmrss -MAKE_ENV= bindir="${PREFIX}/bin" mandir="${MANPREFIX}/man/man1" +MAKE_ENV= bindir="${PREFIX}/bin" mandir="${PREFIX}/share/man/man1" CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} USES= iconv tar:tgz PLIST_FILES= bin/${PORTNAME} \ - man/man1/${PORTNAME}.1.gz + share/man/man1/${PORTNAME}.1.gz post-patch: @${REINPLACE_CMD} -e \ diff --git a/www/snarf/Makefile b/www/snarf/Makefile index 2d8669342303..367bad54cab6 100644 --- a/www/snarf/Makefile +++ b/www/snarf/Makefile @@ -13,10 +13,10 @@ LICENSE_FILE= ${WRKSRC}/COPYING GNU_CONFIGURE= yes PLIST_FILES= bin/snarf \ - man/man1/snarf.1.gz + share/man/man1/snarf.1.gz do-install: ${INSTALL_PROGRAM} ${WRKSRC}/snarf ${STAGEDIR}${PREFIX}/bin/ - ${INSTALL_MAN} ${WRKSRC}/snarf.1 ${STAGEDIR}${MANPREFIX}/man/man1/ + ${INSTALL_MAN} ${WRKSRC}/snarf.1 ${STAGEDIR}${PREFIX}/share/man/man1/ .include diff --git a/www/vimb/Makefile b/www/vimb/Makefile index fd3d654c4a5a..eb323397a856 100644 --- a/www/vimb/Makefile +++ b/www/vimb/Makefile @@ -19,14 +19,14 @@ GH_ACCOUNT= fanglingsu GH_PROJECT= vimb USE_GNOME= cairo gdkpixbuf2 gtk30 -MAKE_ARGS= MANPREFIX=${STAGEDIR}${PREFIX}/man \ +MAKE_ARGS= MANPREFIX=${STAGEDIR}${PREFIX}/share/man \ V=1 \ version="${DISTVERSION}" LDFLAGS+= -Wl,--as-needed PLIST_FILES= bin/vimb \ lib/vimb/webext_main.so \ - man/man1/vimb.1.gz \ + share/man/man1/vimb.1.gz \ share/applications/vimb.desktop \ share/metainfo/vimb.metainfo.xml diff --git a/x11-clocks/astime/Makefile b/x11-clocks/astime/Makefile index c74d86f9ee57..59c974728d8d 100644 --- a/x11-clocks/astime/Makefile +++ b/x11-clocks/astime/Makefile @@ -1,6 +1,6 @@ PORTNAME= astime PORTVERSION= 2.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-clocks afterstep MASTER_SITES= AFTERSTEP/apps/astime/ \ http://tigr.net/afterstep/download/astime/ @@ -16,7 +16,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-xpm-includes=${LOCALBASE}/include \ --with-xpm-library=${LOCALBASE}/lib -PLIST_FILES= bin/astime man/man1/astime.1.gz +PLIST_FILES= bin/astime share/man/man1/astime.1.gz post-build: @${LN} -sf astime.man ${WRKSRC}/astime.1 @@ -25,6 +25,6 @@ do-install: (cd ${WRKSRC} && ${INSTALL_PROGRAM} astime \ ${STAGEDIR}${PREFIX}/bin) (cd ${WRKSRC} && ${INSTALL_MAN} astime.1 \ - ${STAGEDIR}${MANPREFIX}/man/man1) + ${STAGEDIR}${PREFIX}/share/man/man1) .include diff --git a/x11-clocks/eyeclock/Makefile b/x11-clocks/eyeclock/Makefile index e0d9006663a5..4988808dc3ba 100644 --- a/x11-clocks/eyeclock/Makefile +++ b/x11-clocks/eyeclock/Makefile @@ -1,6 +1,6 @@ PORTNAME= eyeclock PORTVERSION= 2.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-clocks MASTER_SITES= http://ftp.vector.co.jp/12/89/1347/ DISTNAME= eyeclk20 @@ -25,7 +25,7 @@ do-install: octopusclock punpunclock silicagelclock taroclock umeharaclock ${LN} -sf eyeclock ${STAGEDIR}${PREFIX}/bin/${link} .endfor - ${INSTALL_MAN} ${WRKSRC}/eyeclock.man ${STAGEDIR}${MANPREFIX}/man/man1/eyeclock.1 + ${INSTALL_MAN} ${WRKSRC}/eyeclock.man ${STAGEDIR}${PREFIX}/share/man/man1/eyeclock.1 ${INSTALL_DATA} ${WRKSRC}/EyeClock.daemon \ ${STAGEDIR}${PREFIX}/lib/X11/app-defaults/EyeClock @${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/EyeClock diff --git a/x11-clocks/eyeclock/pkg-plist b/x11-clocks/eyeclock/pkg-plist index 22f17fec3ee2..9ea67be9123e 100644 --- a/x11-clocks/eyeclock/pkg-plist +++ b/x11-clocks/eyeclock/pkg-plist @@ -95,4 +95,4 @@ lib/X11/EyeClock/taro_left_eye.xpm lib/X11/EyeClock/taro_right_core.xpm lib/X11/EyeClock/taro_right_eye.xpm lib/X11/app-defaults/EyeClock -man/man1/eyeclock.1.gz +share/man/man1/eyeclock.1.gz diff --git a/x11-clocks/wmblueclock/Makefile b/x11-clocks/wmblueclock/Makefile index 0d0a54d76774..af78de9372f7 100644 --- a/x11-clocks/wmblueclock/Makefile +++ b/x11-clocks/wmblueclock/Makefile @@ -1,6 +1,6 @@ PORTNAME= wmblueclock PORTVERSION= 0.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-clocks windowmaker MASTER_SITES= SUNSITE/X11/xutils @@ -13,10 +13,10 @@ LICENSE_FILE= ${WRKSRC}/COPYING USES= tar:bzip2 xorg USE_XORG= x11 xau xdmcp xext xpm -PLIST_FILES= bin/wmblueclock man/man1/${PORTNAME}.1.gz +PLIST_FILES= bin/wmblueclock share/man/man1/${PORTNAME}.1.gz 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 .include diff --git a/x11-fm/gentoo/Makefile b/x11-fm/gentoo/Makefile index c4a91cfe10b0..cb9e5169644e 100644 --- a/x11-fm/gentoo/Makefile +++ b/x11-fm/gentoo/Makefile @@ -31,7 +31,7 @@ post-patch: ${WRKSRC}/src/odmultibutton.c post-install: - ${INSTALL_MAN} ${WRKSRC}/docs/gentoo.1x ${STAGEDIR}${MANPREFIX}/man/man1/gentoo.1 + ${INSTALL_MAN} ${WRKSRC}/docs/gentoo.1x ${STAGEDIR}${PREFIX}/share/man/man1/gentoo.1 post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/x11-fm/gentoo/pkg-plist b/x11-fm/gentoo/pkg-plist index bb433094281b..1d0709e378b2 100644 --- a/x11-fm/gentoo/pkg-plist +++ b/x11-fm/gentoo/pkg-plist @@ -1,7 +1,7 @@ bin/gentoo etc/gentoogtkrc etc/gentoorc -man/man1/gentoo.1.gz +share/man/man1/gentoo.1.gz %%PORTDOCS%%%%DOCSDIR%%/BUGS %%PORTDOCS%%%%DOCSDIR%%/CONFIG-CHANGES %%PORTDOCS%%%%DOCSDIR%%/CREDITS diff --git a/x11-fm/xdiskusage/Makefile b/x11-fm/xdiskusage/Makefile index cc5d8a4a352b..1d9c6a1f17a6 100644 --- a/x11-fm/xdiskusage/Makefile +++ b/x11-fm/xdiskusage/Makefile @@ -1,5 +1,6 @@ PORTNAME= xdiskusage PORTVERSION= 1.54 +PORTREVISION= 1 CATEGORIES= x11-fm MASTER_SITES= http://xdiskusage.sourceforge.net/ \ http://www.gnu-darwin.org/distfiles/ @@ -21,7 +22,7 @@ USE_XORG= x11 xcursor xext xfixes xft xinerama xrender CXXFLAGS+= `fltk-config --cxxflags` LDFLAGS+= `fltk-config --ldflags` -PLIST_FILES= bin/xdiskusage man/man1/xdiskusage.1.gz +PLIST_FILES= bin/xdiskusage share/man/man1/xdiskusage.1.gz post-patch: @${REINPLACE_CMD} -e '/^configure:/d; /autoconf/d' \ @@ -31,6 +32,6 @@ post-patch: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xdiskusage ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/xdiskusage.1 ${STAGEDIR}${MANPREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/xdiskusage.1 ${STAGEDIR}${PREFIX}/share/man/man1 .include diff --git a/x11-wm/awesome/Makefile b/x11-wm/awesome/Makefile index e6d415f77b74..a751f0d009a9 100644 --- a/x11-wm/awesome/Makefile +++ b/x11-wm/awesome/Makefile @@ -1,7 +1,7 @@ PORTNAME= awesome PORTVERSION= 4.3 DISTVERSIONPREFIX= v -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= x11-wm @@ -38,7 +38,7 @@ GH_ACCOUNT= awesomewm SHEBANG_FILES= utils/awesome-client CMAKE_ARGS= -DSYSCONFDIR=${PREFIX}/etc \ - -DAWESOME_MAN_PATH=${MANPREFIX}/man \ + -DAWESOME_MAN_PATH=${PREFIX}/share/man \ -DGENERATE_DOC=OFF \ -DLUA_INCLUDE_DIR=${LUA_INCDIR} diff --git a/x11-wm/awesome/pkg-plist b/x11-wm/awesome/pkg-plist index f1891ba18638..845785ae5389 100644 --- a/x11-wm/awesome/pkg-plist +++ b/x11-wm/awesome/pkg-plist @@ -260,24 +260,24 @@ %%DATADIR%%/themes/zenburn/titlebar/sticky_normal_active.png %%DATADIR%%/themes/zenburn/titlebar/sticky_normal_inactive.png %%DATADIR%%/themes/zenburn/zenburn-background.png -%%MANPAGES%%man/de/man1/awesome-client.1.gz -%%MANPAGES%%man/de/man1/awesome.1.gz -%%MANPAGES%%man/de/man5/awesomerc.5.gz -%%MANPAGES%%man/es/man1/awesome-client.1.gz -%%MANPAGES%%man/es/man1/awesome.1.gz -%%MANPAGES%%man/es/man5/awesomerc.5.gz -%%MANPAGES%%man/fr/man1/awesome-client.1.gz -%%MANPAGES%%man/fr/man1/awesome.1.gz -%%MANPAGES%%man/fr/man5/awesomerc.5.gz -%%MANPAGES%%man/it/man1/awesome-client.1.gz -%%MANPAGES%%man/it/man1/awesome.1.gz -%%MANPAGES%%man/it/man5/awesomerc.5.gz -%%MANPAGES%%man/man1/awesome-client.1.gz -%%MANPAGES%%man/man1/awesome.1.gz -%%MANPAGES%%man/man5/awesomerc.5.gz -%%MANPAGES%%man/ru/man1/awesome-client.1.gz -%%MANPAGES%%man/ru/man1/awesome.1.gz -%%MANPAGES%%man/ru/man5/awesomerc.5.gz +%%MANPAGES%%share/man/de/man1/awesome-client.1.gz +%%MANPAGES%%share/man/de/man1/awesome.1.gz +%%MANPAGES%%share/man/de/man5/awesomerc.5.gz +%%MANPAGES%%share/man/es/man1/awesome-client.1.gz +%%MANPAGES%%share/man/es/man1/awesome.1.gz +%%MANPAGES%%share/man/es/man5/awesomerc.5.gz +%%MANPAGES%%share/man/fr/man1/awesome-client.1.gz +%%MANPAGES%%share/man/fr/man1/awesome.1.gz +%%MANPAGES%%share/man/fr/man5/awesomerc.5.gz +%%MANPAGES%%share/man/it/man1/awesome-client.1.gz +%%MANPAGES%%share/man/it/man1/awesome.1.gz +%%MANPAGES%%share/man/it/man5/awesomerc.5.gz +%%MANPAGES%%share/man/man1/awesome-client.1.gz +%%MANPAGES%%share/man/man1/awesome.1.gz +%%MANPAGES%%share/man/man5/awesomerc.5.gz +%%MANPAGES%%share/man/ru/man1/awesome-client.1.gz +%%MANPAGES%%share/man/ru/man1/awesome.1.gz +%%MANPAGES%%share/man/ru/man5/awesomerc.5.gz %%PORTDOCS%%%%DOCSDIR%%/00-authors.md %%PORTDOCS%%%%DOCSDIR%%/01-readme.md %%PORTDOCS%%%%DOCSDIR%%/02-contributing.md diff --git a/x11-wm/echinus/Makefile b/x11-wm/echinus/Makefile index cba7adbcfc45..ef2f09ee1572 100644 --- a/x11-wm/echinus/Makefile +++ b/x11-wm/echinus/Makefile @@ -1,6 +1,6 @@ PORTNAME= echinus PORTVERSION= 0.4.9 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-wm MASTER_SITES= http://plhk.ru/static/echinus/ @@ -25,7 +25,7 @@ PLIST_FILES= bin/echinus \ etc/echinus/iconify.xbm \ etc/echinus/max.xbm \ etc/echinus/echinusrc \ - man/man1/echinus.1.gz + share/man/man1/echinus.1.gz SUB_FILES= pkg-message @@ -34,7 +34,7 @@ post-patch: 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 @${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${FILES:S,^,${WRKSRC}/,} ${STAGEDIR}${ETCDIR}/ diff --git a/x11-wm/lwm/Makefile b/x11-wm/lwm/Makefile index 5ef10e406f31..db15572b47bf 100644 --- a/x11-wm/lwm/Makefile +++ b/x11-wm/lwm/Makefile @@ -1,5 +1,6 @@ PORTNAME= lwm PORTVERSION= 1.2.4 +PORTREVISION= 1 CATEGORIES= x11-wm MASTER_SITES= http://www.jfc.org.uk/files/lwm/ @@ -22,14 +23,14 @@ MAKE_ARGS= LDFLAGS="${LDFLAGS}" CFLAGS+= `pkg-config --cflags sm x11 xext ice` -DSHAPE LDFLAGS+= `pkg-config --libs sm x11 xext ice` -PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz +PLIST_FILES= bin/${PORTNAME} share/man/man1/${PORTNAME}.1.gz PORTDOCS= AUTHORS BUGS ChangeLog README TODO OPTIONS_DEFINE= DOCS do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.man ${STAGEDIR}${MANPREFIX}/man/man1/${PORTNAME}.1 + ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.man ${STAGEDIR}${PREFIX}/share/man/man1/${PORTNAME}.1 do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/x11-wm/tvtwm/Makefile b/x11-wm/tvtwm/Makefile index 3f5b94620e45..588f210b10c9 100644 --- a/x11-wm/tvtwm/Makefile +++ b/x11-wm/tvtwm/Makefile @@ -1,6 +1,6 @@ PORTNAME= tvtwm PORTVERSION= pl11 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm MASTER_SITES= XCONTRIB/window_managers DISTNAME= ${PORTNAME}.${PORTVERSION} @@ -21,10 +21,10 @@ CFLAGS+= -Wno-return-type WRKSRC= ${WRKDIR}/tvtwm PLIST_FILES= bin/tvtwm \ - man/man1/tvtwm.1.gz + share/man/man1/tvtwm.1.gz do-install: ${INSTALL_PROGRAM} ${WRKSRC}/tvtwm ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/tvtwm.man ${STAGEDIR}${MANPREFIX}/man/man1/tvtwm.1 + ${INSTALL_MAN} ${WRKSRC}/tvtwm.man ${STAGEDIR}${PREFIX}/share/man/man1/tvtwm.1 .include diff --git a/x11/gtkchtheme/Makefile b/x11/gtkchtheme/Makefile index f29584d6b9eb..cfa78a4d2d92 100644 --- a/x11/gtkchtheme/Makefile +++ b/x11/gtkchtheme/Makefile @@ -1,6 +1,6 @@ PORTNAME= gtkchtheme PORTVERSION= 0.3.1 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= x11 MASTER_SITES= http://plasmasturm.org/code/gtk-chtheme/ DISTNAME= gtk-chtheme-${PORTVERSION} @@ -16,10 +16,10 @@ USES= gmake gnome pkgconfig tar:bzip2 USE_GNOME= gtk20 PLIST_FILES= bin/gtk-chtheme \ - man/man1/gtk-chtheme.1.gz + share/man/man1/gtk-chtheme.1.gz do-install: ${INSTALL_PROGRAM} ${WRKSRC}/gtk-chtheme ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/gtk-chtheme.1 ${STAGEDIR}${MANPREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/gtk-chtheme.1 ${STAGEDIR}${PREFIX}/share/man/man1 .include diff --git a/x11/lsw/Makefile b/x11/lsw/Makefile index f585e5b0e7b0..b97be1ba99bc 100644 --- a/x11/lsw/Makefile +++ b/x11/lsw/Makefile @@ -1,6 +1,6 @@ PORTNAME= lsw PORTVERSION= 0.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 MASTER_SITES= http://dl.suckless.org/tools/ @@ -10,7 +10,7 @@ WWW= http://tools.suckless.org/lsw MAKE_ARGS= PREFIX="${PREFIX}" X11LIB="${LOCALBASE}/lib" \ X11INC="${LOCALBASE}/include" CC="${CC}" -PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz +PLIST_FILES= bin/${PORTNAME} share/man/man1/${PORTNAME}.1.gz LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE @@ -24,6 +24,6 @@ post-patch: 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 .include diff --git a/x11/lupe/Makefile b/x11/lupe/Makefile index 6f242e913a12..1c0ee7c0442b 100644 --- a/x11/lupe/Makefile +++ b/x11/lupe/Makefile @@ -1,5 +1,6 @@ PORTNAME= lupe PORTVERSION= 0.08c +PORTREVISION= 1 CATEGORIES= x11 accessibility MASTER_SITES= http://www2s.biglobe.ne.jp/~yav/soft/ DISTNAME= ${PORTNAME}${PORTVERSION:S/.//} @@ -20,7 +21,7 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -lX11 -lXext -lm PORTDOCS= ${PORTNAME}.doc -PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz +PLIST_FILES= bin/${PORTNAME} share/man/man1/${PORTNAME}.1.gz post-extract: @${LN} -sf ${PORTNAME}.man ${WRKSRC}/${PORTNAME}.1 @@ -31,7 +32,7 @@ do-build: 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 do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/x11/mrxvt-devel/Makefile b/x11/mrxvt-devel/Makefile index 693f61f759d7..25a8830f9d21 100644 --- a/x11/mrxvt-devel/Makefile +++ b/x11/mrxvt-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= mrxvt-devel PORTVERSION= 0.5.4 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= x11 MASTER_SITES= SF/materm/mrxvt%20source/${PORTVERSION} DISTNAME= mrxvt-${PORTVERSION} @@ -142,7 +142,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/share/mrxvtrc ${STAGEDIR}${PREFIX}/etc/mrxvt/mrxvtrc.sample ${INSTALL_DATA} ${WRKSRC}/share/default.menu ${STAGEDIR}${PREFIX}/etc/mrxvt/default.menu.sample ${INSTALL_DATA} ${WRKSRC}/share/submenus.menu ${STAGEDIR}${PREFIX}/etc/mrxvt/submenus.menu.sample - ${INSTALL_MAN} ${WRKSRC}/doc/mrxvt.1 ${STAGEDIR}${MANPREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/doc/mrxvt.1 ${STAGEDIR}${PREFIX}/share/man/man1 ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/scripts ${INSTALL_DATA} ${WRKSRC}/share/scripts/mrxvtset.pl ${STAGEDIR}${EXAMPLESDIR}/scripts ${INSTALL_DATA} ${WRKSRC}/share/scripts/settitle.c ${STAGEDIR}${EXAMPLESDIR}/scripts diff --git a/x11/mrxvt-devel/pkg-plist b/x11/mrxvt-devel/pkg-plist index f172c2199581..5e5fd413ddf7 100644 --- a/x11/mrxvt-devel/pkg-plist +++ b/x11/mrxvt-devel/pkg-plist @@ -2,7 +2,7 @@ bin/mrxvt etc/mrxvt/default.menu.sample etc/mrxvt/mrxvtrc.sample etc/mrxvt/submenus.menu.sample -man/man1/mrxvt.1.gz +share/man/man1/mrxvt.1.gz %%PORTDOCS%%%%DOCSDIR%%/README.greek %%PORTDOCS%%%%DOCSDIR%%/README.menu %%PORTDOCS%%%%DOCSDIR%%/README.xvt diff --git a/x11/slock/Makefile b/x11/slock/Makefile index 565bed7e5d7f..d2b8973fd71a 100644 --- a/x11/slock/Makefile +++ b/x11/slock/Makefile @@ -1,5 +1,6 @@ PORTNAME= slock DISTVERSION= 1.5 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= http://dl.suckless.org/tools/ @@ -15,7 +16,7 @@ CPE_VENDOR= suckless USE_XORG= x11 xext xorgproto xrandr xt MAKE_ARGS= PREFIX="${PREFIX}" X11LIB="${LOCALBASE}/lib" \ X11INC="${LOCALBASE}/include" CC="${CC}" \ - MANPREFIX="${MANPREFIX}/man" + MANPREFIX="${PREFIX}/share/man" post-patch: @${REINPLACE_CMD} -e 's|-I/usr/include||;s|-L/usr/lib||;s|= -Os|+=|'\ diff --git a/x11/slock/pkg-plist b/x11/slock/pkg-plist index 3228765d0388..05a06a8aebb1 100644 --- a/x11/slock/pkg-plist +++ b/x11/slock/pkg-plist @@ -1,2 +1,2 @@ @(,,4755) bin/slock -man/man1/slock.1.gz +share/man/man1/slock.1.gz diff --git a/x11/xballoon/Makefile b/x11/xballoon/Makefile index 1c8001038785..dafa351755bf 100644 --- a/x11/xballoon/Makefile +++ b/x11/xballoon/Makefile @@ -1,6 +1,6 @@ PORTNAME= xballoon PORTVERSION= 1.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11 MASTER_SITES= http://kozos.jp/myfreesoft/ @@ -13,7 +13,7 @@ USE_XORG= xpm xmu xaw ALL_TARGET= xballoon PLIST_FILES= bin/xballoon \ - man/man1/xballoon.1.gz + share/man/man1/xballoon.1.gz post-patch: @${REINPLACE_CMD} -e 's|/usr/X11R6|$${LOCALBASE}|g ; \ @@ -22,6 +22,6 @@ post-patch: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xballoon ${STAGEDIR}${PREFIX}/bin/xballoon - ${INSTALL_MAN} ${WRKSRC}/xballoon.man ${STAGEDIR}${MANPREFIX}/man/man1/xballoon.1 + ${INSTALL_MAN} ${WRKSRC}/xballoon.man ${STAGEDIR}${PREFIX}/share/man/man1/xballoon.1 .include