Date: Fri, 1 Mar 2024 18:12:59 GMT From: Gleb Popov <arrowd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 138eb13e8b73 - main - *: Move manpages to share/man Message-ID: <202403011812.421ICxCR046723@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=138eb13e8b73d136518d79ebd2820b827d8e1419 commit 138eb13e8b73d136518d79ebd2820b827d8e1419 Author: Chris Hutchinson <portmaster@bsdforge.com> AuthorDate: 2024-03-01 18:09:54 +0000 Commit: Gleb Popov <arrowd@FreeBSD.org> CommitDate: 2024-03-01 18:11:59 +0000 *: Move manpages to share/man PR: 277322 --- net/spread/Makefile | 4 +- net/spread/pkg-plist | 38 +++++----- net/turnserver/Makefile | 3 +- net/turnserver/pkg-plist | 18 ++--- net/wackamole/Makefile | 4 +- net/wackamole/pkg-plist | 6 +- print/trueprint/Makefile | 8 +- shells/rc/Makefile | 3 +- shells/rc/pkg-plist | 4 +- sysutils/afio/Makefile | 3 +- sysutils/afio/files/patch-Makefile | 2 +- sysutils/and/Makefile | 2 +- sysutils/and/files/patch-Makefile | 6 +- sysutils/and/pkg-plist | 6 +- sysutils/bkpupsd/Makefile | 3 + sysutils/bkpupsd/files/patch-Makefile | 6 +- sysutils/bkpupsd/pkg-plist | 2 +- sysutils/confctl/Makefile | 4 +- sysutils/fusefs-chironfs/Makefile | 5 +- sysutils/jailutils/Makefile | 2 + sysutils/jailutils/pkg-plist | 12 +-- sysutils/kldpatch/Makefile | 7 +- sysutils/lxterminal/Makefile | 3 +- sysutils/lxterminal/distinfo | 3 +- sysutils/lxterminal/pkg-plist | 2 +- sysutils/thefish/Makefile | 6 +- sysutils/upsdaemon/Makefile | 5 ++ sysutils/upsdaemon/pkg-plist | 2 +- www/httptunnel/Makefile | 5 +- www/httptunnel/distinfo | 3 +- x11-fm/pcmanfm/Makefile | 14 ++-- x11-fm/pcmanfm/pkg-plist | 2 +- x11-toolkits/iwidgets/Makefile | 15 ++-- x11-toolkits/iwidgets/files/patch-Makefile.in | 37 +++++++++ x11-toolkits/iwidgets/pkg-plist | 104 +++++++++++++------------- x11-wm/emerald/Makefile | 10 ++- x11-wm/emerald/pkg-plist | 4 +- x11/libfm/Makefile | 6 +- x11/libfm/pkg-plist | 4 +- x11/xvt/Makefile | 4 +- x11/xvt/pkg-plist | 2 +- 41 files changed, 223 insertions(+), 156 deletions(-) diff --git a/net/spread/Makefile b/net/spread/Makefile index 1d02040d51fa..e30a9c28dfe4 100644 --- a/net/spread/Makefile +++ b/net/spread/Makefile @@ -1,6 +1,6 @@ PORTNAME= spread PORTVERSION= 3.17.4 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= net perl5 MASTER_SITES= https://BSDforge.com/projects/source/net/spread/ DISTNAME= ${PORTNAME}-src-${PORTVERSION} @@ -47,6 +47,8 @@ OPTIONS_DEFINE= DOCS # bsd.port.mk doesn't allow us to use GNU_CONFIGURE and PERL_CONFIGURE together. PERL_CONFIGURE_ARGS= CC="${CC}" CCFLAGS="${CFLAGS}" PREFIX="${PREFIX}" \ INSTALLPRIVLIB="${PREFIX}/lib" INSTALLARCHLIB="${PREFIX}/lib" +# but works for MANPREFIX +GNU_CONFIGURE_MANPREFIX=${PREFIX}/share .include <bsd.port.options.mk> diff --git a/net/spread/pkg-plist b/net/spread/pkg-plist index 633e9322deb4..b94c41d7e1ff 100644 --- a/net/spread/pkg-plist +++ b/net/spread/pkg-plist @@ -13,25 +13,25 @@ lib/libspread.so.1 lib/libtspread.a lib/libtspread.so lib/libtspread.so.1 -man/man1/spflooder.1.gz -man/man1/spmonitor.1.gz -man/man1/spread.1.gz -man/man1/sptuser.1.gz -man/man1/spuser.1.gz -man/man3/libsp.3.gz -man/man3/SP_connect.3.gz -man/man3/SP_disconnect.3.gz -man/man3/SP_equal_group_ids.3.gz -man/man3/SP_error.3.gz -man/man3/SP_join.3.gz -man/man3/SP_leave.3.gz -man/man3/SP_multicast.3.gz -man/man3/SP_multigroup_multicast.3.gz -man/man3/SP_multigroup_scat_multicast.3.gz -man/man3/SP_poll.3.gz -man/man3/SP_receive.3.gz -man/man3/SP_scat_multicast.3.gz -man/man3/SP_scat_receive.3.gz +share/man/man1/spflooder.1.gz +share/man/man1/spmonitor.1.gz +share/man/man1/spread.1.gz +share/man/man1/sptuser.1.gz +share/man/man1/spuser.1.gz +share/man/man3/libsp.3.gz +share/man/man3/SP_connect.3.gz +share/man/man3/SP_disconnect.3.gz +share/man/man3/SP_equal_group_ids.3.gz +share/man/man3/SP_error.3.gz +share/man/man3/SP_join.3.gz +share/man/man3/SP_leave.3.gz +share/man/man3/SP_multicast.3.gz +share/man/man3/SP_multigroup_multicast.3.gz +share/man/man3/SP_multigroup_scat_multicast.3.gz +share/man/man3/SP_poll.3.gz +share/man/man3/SP_receive.3.gz +share/man/man3/SP_scat_multicast.3.gz +share/man/man3/SP_scat_receive.3.gz %%PERL5_MAN3%%/Spread.3.gz %%SITE_ARCH%%/Spread.pm %%SITE_ARCH%%/auto/Spread/Spread.so diff --git a/net/turnserver/Makefile b/net/turnserver/Makefile index e7a1c4085b8a..977f721ff6ec 100644 --- a/net/turnserver/Makefile +++ b/net/turnserver/Makefile @@ -1,5 +1,6 @@ PORTNAME= turnserver PORTVERSION= 4.6.2 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://turnserver.open-sys.org/downloads/extradocs/:xdocs \ http://coturn.net/turnserver/extradocs/:xdocs @@ -105,7 +106,7 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/turnutils_${f} ${STAGEDIR}${PREFIX}/bin/ .endfor (cd ${WRKSRC}/man/man1 && ${INSTALL_MAN} ${MANPAGES} \ - ${STAGEDIR}${PREFIX}/man/man1) + ${STAGEDIR}${PREFIX}/share/man/man1) ${MKDIR} ${STAGEDIR}${DATADIR} (cd ${WRKSRC}/turndb && ${INSTALL_DATA} schema.sql schema.userdb.redis \ schema.stats.redis ${STAGEDIR}${DATADIR}) diff --git a/net/turnserver/pkg-plist b/net/turnserver/pkg-plist index fdb3c73f99f0..c2d775512483 100644 --- a/net/turnserver/pkg-plist +++ b/net/turnserver/pkg-plist @@ -8,15 +8,15 @@ bin/turnutils_uclient lib/libturnclient.a %%SQLITE%%var/db/turndb etc/turnserver.conf.default -man/man1/turnserver.1.gz -man/man1/turnadmin.1.gz -man/man1/turnutils.1.gz -man/man1/turnutils_natdiscovery.1.gz -man/man1/turnutils_oauth.1.gz -man/man1/turnutils_peer.1.gz -man/man1/turnutils_stunclient.1.gz -man/man1/turnutils_uclient.1.gz -man/man1/coturn.1.gz +share/man/man1/turnserver.1.gz +share/man/man1/turnadmin.1.gz +share/man/man1/turnutils.1.gz +share/man/man1/turnutils_natdiscovery.1.gz +share/man/man1/turnutils_oauth.1.gz +share/man/man1/turnutils_peer.1.gz +share/man/man1/turnutils_stunclient.1.gz +share/man/man1/turnutils_uclient.1.gz +share/man/man1/coturn.1.gz %%DATADIR%%/schema.sql %%DATADIR%%/schema.userdb.redis %%DATADIR%%/schema.stats.redis diff --git a/net/wackamole/Makefile b/net/wackamole/Makefile index ade8a9ae9694..9aac5e4f7f24 100644 --- a/net/wackamole/Makefile +++ b/net/wackamole/Makefile @@ -1,6 +1,6 @@ PORTNAME= wackamole PORTVERSION= 2.1.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= https://BSDforge.com/projects/source/net/wackamole/ \ http://mirrors.omniti.com/wackamole/ @@ -19,7 +19,7 @@ LIB_DEPENDS= libspread.so:net/spread USES= tar:xz GNU_CONFIGURE= yes - +GNU_CONFIGURE_MANPREFIX=${PREFIX}/share CONFIGURE_ENV+= YACC=${YACC} .include <bsd.port.mk> diff --git a/net/wackamole/pkg-plist b/net/wackamole/pkg-plist index 3d0150b96760..3e947ca2e6c8 100644 --- a/net/wackamole/pkg-plist +++ b/net/wackamole/pkg-plist @@ -1,6 +1,6 @@ etc/wackamole.conf.sample sbin/wackamole sbin/wackatrl -man/man5/wackamole.conf.5.gz -man/man8/wackamole.8.gz -man/man8/wackatrl.8.gz +share/man/man5/wackamole.conf.5.gz +share/man/man8/wackamole.8.gz +share/man/man8/wackatrl.8.gz diff --git a/print/trueprint/Makefile b/print/trueprint/Makefile index 25c1d74f353a..3a5b4db194f4 100644 --- a/print/trueprint/Makefile +++ b/print/trueprint/Makefile @@ -1,18 +1,22 @@ PORTNAME= trueprint PORTVERSION= 5.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= print MASTER_SITES= GNU MAINTAINER= portmaster@BSDforge.com COMMENT= Print program listings on postscript printer +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING + USES= gettext gmake GNU_CONFIGURE= yes +GNU_CONFIGURE_MANPREFIX=${PREFIX}/share LDFLAGS+= -L${LOCALBASE}/lib -lintl INFO= trueprint -PLIST_FILES= bin/trueprint man/man1/trueprint.1.gz +PLIST_FILES= bin/trueprint share/man/man1/trueprint.1.gz .include <bsd.port.mk> diff --git a/shells/rc/Makefile b/shells/rc/Makefile index fdd9e2fe38b8..fef75308ea36 100644 --- a/shells/rc/Makefile +++ b/shells/rc/Makefile @@ -1,7 +1,7 @@ PORTNAME= rc DISTVERSIONPREFIX= v DISTVERSION= 1.7.4 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= shells plan9 MAINTAINER= portmaster@bsdforge.com @@ -16,6 +16,7 @@ USE_GITHUB= yes GH_ACCOUNT= rakitzis CPE_VENDOR= ${PORTNAME}_project GNU_CONFIGURE= yes +GNU_CONFIGURE_MANPREFIX=${PREFIX}/share CONFIGURE_ARGS= --with-history OPTIONS_DEFINE= READLINE diff --git a/shells/rc/pkg-plist b/shells/rc/pkg-plist index e173e7923016..0a7a1c2c7499 100644 --- a/shells/rc/pkg-plist +++ b/shells/rc/pkg-plist @@ -3,5 +3,5 @@ bin/- bin/-- bin/-p bin/--p -man/man1/history.1.gz -man/man1/rc.1.gz +share/man/man1/history.1.gz +share/man/man1/rc.1.gz diff --git a/sysutils/afio/Makefile b/sysutils/afio/Makefile index 81b4a0f2e087..ea922bd73719 100644 --- a/sysutils/afio/Makefile +++ b/sysutils/afio/Makefile @@ -1,5 +1,6 @@ PORTNAME= afio PORTVERSION= 2.5.2 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://members.chello.nl/~k.holtman/ @@ -16,7 +17,7 @@ ALL_TARGET= ${PORTNAME} SUB_FILES= pkg-message -PLIST_FILES= bin/afio man/man1/afio.1.gz +PLIST_FILES= bin/afio share/man/man1/afio.1.gz PORTDOCS= HISTORY README SCRIPTS PORTEXAMPLES= * diff --git a/sysutils/afio/files/patch-Makefile b/sysutils/afio/files/patch-Makefile index f9ab01181701..5c075f55baee 100644 --- a/sysutils/afio/files/patch-Makefile +++ b/sysutils/afio/files/patch-Makefile @@ -56,7 +56,7 @@ - cp afio /usr/local/bin - cp afio.1 /usr/share/man/man1 + ${BSD_INSTALL_PROGRAM} afio ${DESTDIR}${PREFIX}/bin -+ ${BSD_INSTALL_MAN} afio.1 ${DESTDIR}${PREFIX}/man/man1 ++ ${BSD_INSTALL_MAN} afio.1 ${DESTDIR}${PREFIX}/share/man/man1 # generate default list of -E extensions from manpage # note: on sun, I had to change awk command below to nawk or gawk diff --git a/sysutils/and/Makefile b/sysutils/and/Makefile index ebc7711d1dca..9a96e354ae3d 100644 --- a/sysutils/and/Makefile +++ b/sysutils/and/Makefile @@ -1,6 +1,6 @@ PORTNAME= and PORTVERSION= 1.2.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= SF diff --git a/sysutils/and/files/patch-Makefile b/sysutils/and/files/patch-Makefile index 996596bab5c7..69e23d788fd8 100644 --- a/sysutils/and/files/patch-Makefile +++ b/sysutils/and/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig Sat Jul 12 21:00:47 2003 -+++ Makefile Sun Jul 27 17:59:49 2003 +--- Makefile.orig 2024-02-27 11:19:04 UTC ++++ Makefile @@ -16,13 +16,13 @@ # (and.init.debian for Debian GNU/Linux or and.init for others; # leave empty for BSD!) @@ -27,7 +27,7 @@ +INSTALL_ETC=${PREFIX}/etc +INSTALL_INITD= +INSTALL_SBIN=$(PREFIX)/sbin -+INSTALL_MAN=$(PREFIX)/man ++INSTALL_MAN=$(PREFIX)/share/man # typical Debian or SuSE 7.x configuration #PREFIX=/usr diff --git a/sysutils/and/pkg-plist b/sysutils/and/pkg-plist index 1633c353b466..4762ac318967 100644 --- a/sysutils/and/pkg-plist +++ b/sysutils/and/pkg-plist @@ -1,6 +1,6 @@ etc/and.conf etc/and.priorities -man/man5/and.conf.5.gz -man/man5/and.priorities.5.gz -man/man8/and.8.gz +share/man/man5/and.conf.5.gz +share/man/man5/and.priorities.5.gz +share/man/man8/and.8.gz sbin/and diff --git a/sysutils/bkpupsd/Makefile b/sysutils/bkpupsd/Makefile index bea9893fd749..6744bcf4b791 100644 --- a/sysutils/bkpupsd/Makefile +++ b/sysutils/bkpupsd/Makefile @@ -1,9 +1,12 @@ PORTNAME= bkpupsd PORTVERSION= 1.0a +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= https://BSDforge.com/projects/source/sysutils/bkpupsd/ MAINTAINER= portmaster@BSDforge.com COMMENT= Simple UPS daemon for APC BK Pro(TM) +LICENSE= BSD2CLAUSE + .include <bsd.port.mk> diff --git a/sysutils/bkpupsd/files/patch-Makefile b/sysutils/bkpupsd/files/patch-Makefile index f31f1e1f32dc..eea94c5789d7 100644 --- a/sysutils/bkpupsd/files/patch-Makefile +++ b/sysutils/bkpupsd/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig 1997-08-04 01:02:37.000000000 +0800 -+++ Makefile 2013-11-08 20:53:42.000000000 +0800 +--- Makefile.orig 2024-02-27 11:19:04 UTC ++++ Makefile @@ -5,24 +5,22 @@ # ver 1.0 A # @@ -10,7 +10,7 @@ -SCRIPTDIR= /usr/local/libexec +#CC= /usr/bin/cc +SBINDIR= ${PREFIX}/sbin -+MANDIR= ${PREFIX}/man/man8 ++MANDIR= ${PREFIX}/share/man/man8 +SCRIPTDIR= ${PREFIX}/libexec/bkpupsd all: ./src/bkpupsd.c diff --git a/sysutils/bkpupsd/pkg-plist b/sysutils/bkpupsd/pkg-plist index 817973508278..a27f6fb47b8c 100644 --- a/sysutils/bkpupsd/pkg-plist +++ b/sysutils/bkpupsd/pkg-plist @@ -2,5 +2,5 @@ libexec/bkpupsd/bkpups.battlow libexec/bkpupsd/bkpups.failed libexec/bkpupsd/bkpups.restored libexec/bkpupsd/bkpups.shutdown -man/man8/bkpupsd.8.gz +share/man/man8/bkpupsd.8.gz sbin/bkpupsd diff --git a/sysutils/confctl/Makefile b/sysutils/confctl/Makefile index 5f462d707c3a..942f7967df41 100644 --- a/sysutils/confctl/Makefile +++ b/sysutils/confctl/Makefile @@ -1,5 +1,6 @@ PORTNAME= confctl PORTVERSION= 1.2 +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= portmaster@BSDforge.com @@ -12,7 +13,8 @@ USES= autoreconf USE_GITHUB= yes GH_ACCOUNT= trasz GNU_CONFIGURE= yes +GNU_CONFIGURE_MANPREFIX=${PREFIX}/share PLIST_FILES= bin/confctl \ - man/man1/confctl.1.gz + share/man/man1/confctl.1.gz .include <bsd.port.mk> diff --git a/sysutils/fusefs-chironfs/Makefile b/sysutils/fusefs-chironfs/Makefile index bbb660c8d496..27e9c0fe3f7a 100644 --- a/sysutils/fusefs-chironfs/Makefile +++ b/sysutils/fusefs-chironfs/Makefile @@ -1,6 +1,6 @@ PORTNAME= chironfs PORTVERSION= 1.1.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MASTER_SITES= https://BSDforge.com/projects/source/sysutils/chironfs/ PKGNAMEPREFIX= fusefs- @@ -14,8 +14,9 @@ LICENSE_FILE= ${WRKSRC}/doc/copyright USES= fuse localbase:ldflags GNU_CONFIGURE= yes +GNU_CONFIGURE_MANPREFIX=${PREFIX}/share -PLIST_FILES= bin/chironfs bin/chirctl man/man8/chironfs.8.gz +PLIST_FILES= bin/chironfs bin/chirctl share/man/man8/chironfs.8.gz PORTDOCS= * OPTIONS_DEFINE= DOCS diff --git a/sysutils/jailutils/Makefile b/sysutils/jailutils/Makefile index 7ac9d61ab840..2d760dd3bb0d 100644 --- a/sysutils/jailutils/Makefile +++ b/sysutils/jailutils/Makefile @@ -1,5 +1,6 @@ PORTNAME= jailutils PORTVERSION= 1.7 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://thewalter.net/stef/freebsd/jails/jailutils/ \ https://BSDforge.com/projects/source/sysutils/jailutils/ @@ -12,6 +13,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING GNU_CONFIGURE= yes +GNU_CONFIGURE_MANPREFIX=${PREFIX}/share PORTDOCS= AUTHORS ChangeLog diff --git a/sysutils/jailutils/pkg-plist b/sysutils/jailutils/pkg-plist index 7efd6febd3c9..1b8df9c36664 100644 --- a/sysutils/jailutils/pkg-plist +++ b/sysutils/jailutils/pkg-plist @@ -1,9 +1,9 @@ -man/man8/injail.8.gz -man/man8/jails.8.gz -man/man8/jid.8.gz -man/man8/jkill.8.gz -man/man8/jps.8.gz -man/man8/jstart.8.gz +share/man/man8/injail.8.gz +share/man/man8/jails.8.gz +share/man/man8/jid.8.gz +share/man/man8/jkill.8.gz +share/man/man8/jps.8.gz +share/man/man8/jstart.8.gz sbin/injail sbin/jails sbin/jid diff --git a/sysutils/kldpatch/Makefile b/sysutils/kldpatch/Makefile index b0aed996fc79..8ab8688429f0 100644 --- a/sysutils/kldpatch/Makefile +++ b/sysutils/kldpatch/Makefile @@ -1,5 +1,6 @@ PORTNAME= kldpatch PORTVERSION= 20090116 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= https://BSDforge.com/projects/source/sysutils/kldpatch/ DISTNAME= ${PORTVERSION}-${PORTNAME} @@ -8,14 +9,16 @@ MAINTAINER= portmaster@BSDforge.com COMMENT= Utility to patch modules and kernel WWW= http://info.iet.unipi.it/~luigi/FreeBSD/ +LICENSE= BSD2CLAUSE + USES= tar:tgz -PLIST_FILES= man/man8/${PORTNAME}.8.gz sbin/kldpatch +PLIST_FILES= share/man/man8/${PORTNAME}.8.gz sbin/kldpatch WRKSRC= ${WRKDIR}/${PORTNAME} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin - ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 ${STAGEDIR}${PREFIX}/man/man8 + ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 ${STAGEDIR}${PREFIX}/share/man/man8 .include <bsd.port.mk> diff --git a/sysutils/lxterminal/Makefile b/sysutils/lxterminal/Makefile index 23aa31ee6020..47286ab7ce54 100644 --- a/sysutils/lxterminal/Makefile +++ b/sysutils/lxterminal/Makefile @@ -1,6 +1,6 @@ PORTNAME= lxterminal PORTVERSION= 0.4.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= SF/lxde/LXTerminal%20%28terminal%20emulator%29/LXTerminal%200.4.x/ @@ -20,6 +20,7 @@ USE_GNOME= gtk20 glib20 cairo vte intltool USE_XORG= x11 xext GNU_CONFIGURE= yes +GNU_CONFIGURE_MANPREFIX=${PREFIX}/share CONFIGURE_ARGS= --enable-gtk3=no PORTDOCS= AUTHORS ChangeLog NEWS diff --git a/sysutils/lxterminal/distinfo b/sysutils/lxterminal/distinfo index aae943ab0773..e96cd54e2fa5 100644 --- a/sysutils/lxterminal/distinfo +++ b/sysutils/lxterminal/distinfo @@ -1,4 +1,3 @@ -TIMESTAMP = 1620260649 +TIMESTAMP = 1709064242 SHA256 (lxterminal-0.4.0.tar.xz) = 9db8748923b3fa09a82ae2210ed1fa4cdb4c45312009da9caed103d48f8e9be7 -SHA512 (lxterminal-0.4.0.tar.xz) = d1462bf9739c5e9022cbabe9f9c8f70bbb882c0aba7a39d1f87d804f4002056151165d7555cace6f439c0acfbdcd3c959a420993379f646d066f5d30af71232e SIZE (lxterminal-0.4.0.tar.xz) = 201856 diff --git a/sysutils/lxterminal/pkg-plist b/sysutils/lxterminal/pkg-plist index 2dce5ec9c98f..92e140db2968 100644 --- a/sysutils/lxterminal/pkg-plist +++ b/sysutils/lxterminal/pkg-plist @@ -1,5 +1,5 @@ bin/lxterminal -man/man1/lxterminal.1.gz +share/man/man1/lxterminal.1.gz share/applications/lxterminal.desktop share/icons/hicolor/128x128/apps/lxterminal.png %%NLS%%share/locale/af/LC_MESSAGES/lxterminal.mo diff --git a/sysutils/thefish/Makefile b/sysutils/thefish/Makefile index d341e90cf0e0..007135c2a611 100644 --- a/sysutils/thefish/Makefile +++ b/sysutils/thefish/Makefile @@ -1,6 +1,6 @@ PORTNAME= thefish PORTVERSION= 0.6.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= https://BSDforge.com/projects/source/sysutils/thefish/ @@ -23,10 +23,10 @@ USE_GNOME= gtk20 MAKE_ENV+= WITH_GTK=yes #.endif -PLIST_FILES= bin/thefish man/man1/thefish.1.gz +PLIST_FILES= bin/thefish share/man/man1/thefish.1.gz do-install: ${INSTALL_PROGRAM} ${WRKSRC}/thefish ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/thefish.1 ${STAGEDIR}${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/thefish.1 ${STAGEDIR}${PREFIX}/share/man/man1 .include <bsd.port.mk> diff --git a/sysutils/upsdaemon/Makefile b/sysutils/upsdaemon/Makefile index ca91794a5e3a..a790a3ad3e78 100644 --- a/sysutils/upsdaemon/Makefile +++ b/sysutils/upsdaemon/Makefile @@ -1,5 +1,6 @@ PORTNAME= upsdaemon PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= https://BSDforge.com/projects/sysutils/upsdaemon/ @@ -11,4 +12,8 @@ LICENSE= BSD2CLAUSE USE_RC_SUBR= upsdaemon +post-patch: + @${REINPLACE_CMD} "s,/man/man8,/share/man/man8,g" \ + ${WRKSRC}/Makefile + .include <bsd.port.mk> diff --git a/sysutils/upsdaemon/pkg-plist b/sysutils/upsdaemon/pkg-plist index 88f17be1e613..50130d647a54 100644 --- a/sysutils/upsdaemon/pkg-plist +++ b/sysutils/upsdaemon/pkg-plist @@ -1,4 +1,4 @@ sbin/upsdaemon libexec/upsdaemon/upsdaemon-alerts libexec/upsdaemon/upsdaemon.sh -man/man8/upsdaemon.8.gz +share/man/man8/upsdaemon.8.gz diff --git a/www/httptunnel/Makefile b/www/httptunnel/Makefile index aaee85bcbd01..dac40cfddfc7 100644 --- a/www/httptunnel/Makefile +++ b/www/httptunnel/Makefile @@ -1,6 +1,6 @@ PORTNAME= httptunnel PORTVERSION= 3.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www MAINTAINER= portmaster@BSDforge.com @@ -18,13 +18,14 @@ GH_TAGNAME= ebe2583 USE_RC_SUBR= hts htc GNU_CONFIGURE= yes +GNU_CONFIGURE_MANPREFIX=${PREFIX}/share CONFIGURE_ARGS= --quiet USERS= httptunnel GROUPS= httptunnel PLIST_FILES= bin/hts bin/htc \ - man/man1/hts.1.gz man/man1/htc.1.gz + share/man/man1/hts.1.gz share/man/man1/htc.1.gz OPTIONS_DEFINE= DEBUG diff --git a/www/httptunnel/distinfo b/www/httptunnel/distinfo index 0fa2a50ee8c5..05856fe12381 100644 --- a/www/httptunnel/distinfo +++ b/www/httptunnel/distinfo @@ -1,4 +1,3 @@ -TIMESTAMP = 1652378606 +TIMESTAMP = 1709065205 SHA256 (larsbrinkhoff-httptunnel-3.3-ebe2583_GH0.tar.gz) = f422c857638c7ce3deee4daa662e480a33be4be80f861b76e73c79a422f435f5 -SHA512 (larsbrinkhoff-httptunnel-3.3-ebe2583_GH0.tar.gz) = 64df60eb38d53ad4a8c44c6f6f31090e094eb72bb523524af496822707741fade46b4ed10477a14062348d0326b2c38a42c1a0eb4283787f45f364697883a18e SIZE (larsbrinkhoff-httptunnel-3.3-ebe2583_GH0.tar.gz) = 376230 diff --git a/x11-fm/pcmanfm/Makefile b/x11-fm/pcmanfm/Makefile index 9207a3db8f55..76b1bec717da 100644 --- a/x11-fm/pcmanfm/Makefile +++ b/x11-fm/pcmanfm/Makefile @@ -1,6 +1,6 @@ PORTNAME= pcmanfm PORTVERSION= 1.3.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-fm MASTER_SITES= SF/${PORTNAME}/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/PCManFM/ @@ -16,20 +16,22 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ FLAVORS= gtk2 gtk3 FLAVOR?= ${FLAVORS:[1]} -gtk3_PKGNAMESUFFIX= -gtk3 +USES= cpe desktop-file-utils gmake gnome gettext libtool localbase \ + pkgconfig tar:xz xorg gtk2_LIB_DEPENDS= libfm-gtk.so:x11/libfm@gtk2 -gtk3_LIB_DEPENDS= libfm-gtk3.so:x11/libfm@gtk3 - gtk2_CONFLICTS_INSTALL= pcmanfm-gtk3 + +gtk3_PKGNAMESUFFIX= -gtk3 + +gtk3_LIB_DEPENDS= libfm-gtk3.so:x11/libfm@gtk3 gtk3_CONFLICTS_INSTALL= pcmanfm -USES= cpe desktop-file-utils gmake gnome gettext libtool localbase \ - pkgconfig tar:xz xorg CPE_VENDOR= ${PORTNAME}_project USE_GNOME= cairo gdkpixbuf2 intltool USE_XORG= x11 GNU_CONFIGURE= yes +GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share .if ${FLAVOR:Mgtk2} USE_GNOME+= gtk20 diff --git a/x11-fm/pcmanfm/pkg-plist b/x11-fm/pcmanfm/pkg-plist index 1e34600ce5a8..bcf1d8d1cb42 100644 --- a/x11-fm/pcmanfm/pkg-plist +++ b/x11-fm/pcmanfm/pkg-plist @@ -1,7 +1,7 @@ bin/pcmanfm @sample etc/xdg/pcmanfm/default/pcmanfm.conf.sample include/pcmanfm-modules.h -man/man1/pcmanfm.1.gz +share/man/man1/pcmanfm.1.gz share/applications/pcmanfm-desktop-pref.desktop share/applications/pcmanfm.desktop %%NLS%%share/locale/ar/LC_MESSAGES/pcmanfm.mo diff --git a/x11-toolkits/iwidgets/Makefile b/x11-toolkits/iwidgets/Makefile index 4866372a1ff7..0a599c904895 100644 --- a/x11-toolkits/iwidgets/Makefile +++ b/x11-toolkits/iwidgets/Makefile @@ -1,6 +1,6 @@ PORTNAME= iwidgets PORTVERSION= 4.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits tk MASTER_SITES= SF/incrtcl/%5BIncr%20Widgets%5D/${PORTVERSION} DISTNAME= iwidgets${PORTVERSION} @@ -9,6 +9,11 @@ MAINTAINER= portmaster@bsdforge.com COMMENT= Iwidgets - [incr Widgets] companion to [incr Tk] WWW= https://sourceforge.net/projects/incrtcl/ +LICENSE= DTSTECH +LICENSE_NAME= DTSTECH +LICENSE_FILE= ${WRKSRC}/license.terms +LICENSE_PERMS= auto-accept + LIB_DEPENDS= libitk.so:x11-toolkits/itk NO_BUILD= yes @@ -25,14 +30,6 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.options.mk> -post-patch: - ${REINPLACE_CMD} -e 's,^MKINSTALLDIRS =.*,MKINSTALLDIRS=${MKDIR},' \ - -e 's,^INSTALL =.*,INSTALL=${INSTALL} -c,' \ - -e 's,^INSTALL_PROGRAM =.*,INSTALL_PROGRAM=${INSTALL_PROGRAM},' \ - -e 's,^INSTALL_DATA =.*,INSTALL_DATA=${INSTALL_DATA},' \ - -e 's,^INSTALL_SCRIPT =.*,INSTALL_SCRIPT=${INSTALL_SCRIPT},' \ - -e 's,@ITCL_VERSION@,3.3,g' ${WRKSRC}/Makefile.in - post-install: ${RM} ${STAGEDIR}${PREFIX}/lib/iwidgets ${LN} -s ${DISTNAME} ${STAGEDIR}${PREFIX}/lib/iwidgets diff --git a/x11-toolkits/iwidgets/files/patch-Makefile.in b/x11-toolkits/iwidgets/files/patch-Makefile.in new file mode 100644 index 000000000000..24d05260cee8 --- /dev/null +++ b/x11-toolkits/iwidgets/files/patch-Makefile.in @@ -0,0 +1,37 @@ +--- Makefile.in.orig 2024-02-27 13:21:17 UTC ++++ ./Makefile.in +@@ -9,7 +9,7 @@ + + # Current [incr Widgets] version; used in various names. + +-ITCL_VERSION = @ITCL_VERSION@ ++ITCL_VERSION = 3.3 + IWIDGETS_VERSION = @VERSION@ + + #---------------------------------------------------------------- +@@ -48,7 +48,7 @@ + BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin + + # Top-level directory in which to install manual entries: +-MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man/mann ++MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/share/man/mann + + # Directory containing Tcl source code (for library used during test): + TCL_SRC_DIR = @TCL_SRC_DIR@ +@@ -78,11 +78,11 @@ + # modify any of this stuff by hand. + #---------------------------------------------------------------- + +-INSTALL = $(TCLSH_PROG) `$(CYGPATH) $(ITCL_SRC_DIR)/../config/installFile.tcl` -c +-INSTALL_PROGRAM = $(INSTALL) +-INSTALL_DATA = $(INSTALL) -m 644 +-INSTALL_SCRIPT = $(INSTALL) -m 555 +-MKINSTALLDIRS = $(ITCL_SRC_DIR)/../config/mkinstalldirs ++INSTALL=install -c ++INSTALL_PROGRAM=install -s -m 555 ++INSTALL_DATA=install -m 0644 ++INSTALL_SCRIPT=install -m 555 ++MKINSTALLDIRS=/bin/mkdir -p + RANLIB = @RANLIB@ + LN_S = ln -s + TOP_DIR = $(srcdir) diff --git a/x11-toolkits/iwidgets/pkg-plist b/x11-toolkits/iwidgets/pkg-plist index 82be5059bd19..b276a017c200 100644 --- a/x11-toolkits/iwidgets/pkg-plist +++ b/x11-toolkits/iwidgets/pkg-plist @@ -190,55 +190,55 @@ lib/%%IWIDGETS%%/scripts/toolbar.itk lib/%%IWIDGETS%%/scripts/unknownimage.gif lib/%%IWIDGETS%%/scripts/watch.itk lib/iwidgets -man/mann/iwidgets_buttonbox.n.gz -man/mann/iwidgets_calendar.n.gz -man/mann/iwidgets_canvasprintbox.n.gz -man/mann/iwidgets_canvasprintdialog.n.gz -man/mann/iwidgets_checkbox.n.gz -man/mann/iwidgets_combobox.n.gz -man/mann/iwidgets_dateentry.n.gz -man/mann/iwidgets_datefield.n.gz -man/mann/iwidgets_dialog.n.gz -man/mann/iwidgets_dialogshell.n.gz -man/mann/iwidgets_disjointlistbox.n.gz -man/mann/iwidgets_entryfield.n.gz -man/mann/iwidgets_extbutton.n.gz -man/mann/iwidgets_extfileselectionbox.n.gz -man/mann/iwidgets_extfileselectiondialog.n.gz -man/mann/iwidgets_feedback.n.gz -man/mann/iwidgets_fileselectionbox.n.gz -man/mann/iwidgets_fileselectiondialog.n.gz -man/mann/iwidgets_finddialog.n.gz -man/mann/iwidgets_hierarchy.n.gz -man/mann/iwidgets_hyperhelp.n.gz -man/mann/iwidgets_labeledframe.n.gz -man/mann/iwidgets_labeledwidget.n.gz -man/mann/iwidgets_mainwindow.n.gz -man/mann/iwidgets_menubar.n.gz -man/mann/iwidgets_messagebox.n.gz -man/mann/iwidgets_messagedialog.n.gz -man/mann/iwidgets_notebook.n.gz -man/mann/iwidgets_optionmenu.n.gz -man/mann/iwidgets_panedwindow.n.gz -man/mann/iwidgets_promptdialog.n.gz -man/mann/iwidgets_pushbutton.n.gz -man/mann/iwidgets_radiobox.n.gz -man/mann/iwidgets_scopedobject.n.gz -man/mann/iwidgets_scrolledcanvas.n.gz -man/mann/iwidgets_scrolledframe.n.gz -man/mann/iwidgets_scrolledhtml.n.gz -man/mann/iwidgets_scrolledlistbox.n.gz -man/mann/iwidgets_scrolledtext.n.gz -man/mann/iwidgets_selectionbox.n.gz -man/mann/iwidgets_selectiondialog.n.gz -man/mann/iwidgets_shell.n.gz -man/mann/iwidgets_spindate.n.gz -man/mann/iwidgets_spinint.n.gz -man/mann/iwidgets_spinner.n.gz -man/mann/iwidgets_spintime.n.gz -man/mann/iwidgets_tabnotebook.n.gz -man/mann/iwidgets_tabset.n.gz -man/mann/iwidgets_timeentry.n.gz -man/mann/iwidgets_timefield.n.gz -man/mann/iwidgets_toolbar.n.gz -man/mann/iwidgets_watch.n.gz +share/man/mann/iwidgets_buttonbox.n.gz +share/man/mann/iwidgets_calendar.n.gz +share/man/mann/iwidgets_canvasprintbox.n.gz +share/man/mann/iwidgets_canvasprintdialog.n.gz +share/man/mann/iwidgets_checkbox.n.gz +share/man/mann/iwidgets_combobox.n.gz +share/man/mann/iwidgets_dateentry.n.gz +share/man/mann/iwidgets_datefield.n.gz +share/man/mann/iwidgets_dialog.n.gz +share/man/mann/iwidgets_dialogshell.n.gz +share/man/mann/iwidgets_disjointlistbox.n.gz +share/man/mann/iwidgets_entryfield.n.gz +share/man/mann/iwidgets_extbutton.n.gz +share/man/mann/iwidgets_extfileselectionbox.n.gz +share/man/mann/iwidgets_extfileselectiondialog.n.gz +share/man/mann/iwidgets_feedback.n.gz +share/man/mann/iwidgets_fileselectionbox.n.gz +share/man/mann/iwidgets_fileselectiondialog.n.gz +share/man/mann/iwidgets_finddialog.n.gz +share/man/mann/iwidgets_hierarchy.n.gz +share/man/mann/iwidgets_hyperhelp.n.gz +share/man/mann/iwidgets_labeledframe.n.gz +share/man/mann/iwidgets_labeledwidget.n.gz +share/man/mann/iwidgets_mainwindow.n.gz +share/man/mann/iwidgets_menubar.n.gz +share/man/mann/iwidgets_messagebox.n.gz +share/man/mann/iwidgets_messagedialog.n.gz +share/man/mann/iwidgets_notebook.n.gz +share/man/mann/iwidgets_optionmenu.n.gz +share/man/mann/iwidgets_panedwindow.n.gz +share/man/mann/iwidgets_promptdialog.n.gz +share/man/mann/iwidgets_pushbutton.n.gz +share/man/mann/iwidgets_radiobox.n.gz +share/man/mann/iwidgets_scopedobject.n.gz +share/man/mann/iwidgets_scrolledcanvas.n.gz +share/man/mann/iwidgets_scrolledframe.n.gz +share/man/mann/iwidgets_scrolledhtml.n.gz +share/man/mann/iwidgets_scrolledlistbox.n.gz +share/man/mann/iwidgets_scrolledtext.n.gz +share/man/mann/iwidgets_selectionbox.n.gz +share/man/mann/iwidgets_selectiondialog.n.gz +share/man/mann/iwidgets_shell.n.gz +share/man/mann/iwidgets_spindate.n.gz +share/man/mann/iwidgets_spinint.n.gz +share/man/mann/iwidgets_spinner.n.gz +share/man/mann/iwidgets_spintime.n.gz +share/man/mann/iwidgets_tabnotebook.n.gz +share/man/mann/iwidgets_tabset.n.gz +share/man/mann/iwidgets_timeentry.n.gz +share/man/mann/iwidgets_timefield.n.gz +share/man/mann/iwidgets_toolbar.n.gz +share/man/mann/iwidgets_watch.n.gz diff --git a/x11-wm/emerald/Makefile b/x11-wm/emerald/Makefile index 870018f9e531..32eeec14f5fa 100644 --- a/x11-wm/emerald/Makefile +++ b/x11-wm/emerald/Makefile @@ -1,6 +1,6 @@ PORTNAME= emerald PORTVERSION= 0.8.8 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= x11-wm MASTER_SITES= https://BSDforge.com/projects/source/x11-wm/emerald/ @@ -12,16 +12,18 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/compiz.pc:x11-wm/compiz -LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 \ +LIB_DEPENDS= libfreetype.so:print/freetype2 \ + libharfbuzz.so:print/harfbuzz \ + libfontconfig.so:x11-fonts/fontconfig \ libwnck-1.so:x11-toolkits/libwnck RUN_DEPENDS:= ${BUILD_DEPENDS} GNU_CONFIGURE= yes +GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share USES= desktop-file-utils gl gmake gnome libtool pathfix \ pkgconfig shared-mime-info tar:bzip2 xorg USE_GL= gl -USE_GNOME= cairo gtk20 intltool pango +USE_GNOME= cairo gdkpixbuf2 gtk20 intltool pango USE_XORG= x11 xrender USE_LDCONFIG= yes INSTALL_TARGET= install-strip diff --git a/x11-wm/emerald/pkg-plist b/x11-wm/emerald/pkg-plist index 691a563cc6d9..3ac18ba94724 100644 --- a/x11-wm/emerald/pkg-plist +++ b/x11-wm/emerald/pkg-plist @@ -23,8 +23,8 @@ lib/emerald/engines/libpixmap.a lib/emerald/engines/libzootreeves.so lib/emerald/engines/libzootreeves.a libdata/pkgconfig/emeraldengine.pc -man/man1/emerald-theme-manager.1.gz -man/man1/emerald.1.gz +share/man/man1/emerald-theme-manager.1.gz +share/man/man1/emerald.1.gz share/applications/emerald-theme-manager.desktop share/icons/hicolor/48x48/mimetypes/application-x-emerald-theme.png share/mime/packages/emerald.xml diff --git a/x11/libfm/Makefile b/x11/libfm/Makefile index 8242b8d5837a..24a5140b6d03 100644 --- a/x11/libfm/Makefile +++ b/x11/libfm/Makefile @@ -1,11 +1,11 @@ PORTNAME= libfm DISTVERSION= 1.3.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11 MASTER_SITES= SF/pcmanfm/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/LibFM/ MAINTAINER= portmaster@BSDforge.com -COMMENT?= Core library of PCManFM file manager +COMMENT= Core library of PCManFM file manager WWW= https://wiki.lxde.org/en/Libfm LICENSE= GPLv2+ LGPL20+ @@ -19,6 +19,7 @@ LIB_DEPENDS= libmenu-cache.so:x11/menu-cache \ libexif.so:graphics/libexif \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ + libharfbuzz.so:print/harfbuzz \ libfm-extra.so:x11/libfm-extra FLAVORS= gtk2 gtk3 @@ -37,6 +38,7 @@ USES+= gettext-tools gmake gnome libtool localbase \ USE_GNOME= intltool USE_LDCONFIG= yes GNU_CONFIGURE= yes +GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share CONFIGURE_ARGS= --sysconfdir=${LOCALBASE}/etc --disable-static .if ! defined(EXTRA_ONLY) diff --git a/x11/libfm/pkg-plist b/x11/libfm/pkg-plist index ed96d87df2cf..2cb79bf537e4 100644 --- a/x11/libfm/pkg-plist +++ b/x11/libfm/pkg-plist @@ -82,8 +82,8 @@ lib/libfm/modules/vfs-menu.so lib/libfm/modules/vfs-search.so libdata/pkgconfig/libfm-%%GTKVERSION%%.pc libdata/pkgconfig/libfm.pc *** 39 LINES SKIPPED ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202403011812.421ICxCR046723>