FreeBSD Bugzilla – Attachment 248802 Details for
Bug 277322
meta: man to share/man for all of my affected ports
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
patch for man to share/man conversion for all my ports (final phase)
share-man-final-phase.diff (text/plain), 46.11 KB, created by
Chris Hutchinson
on 2024-02-27 22:25:58 UTC
(
hide
)
Description:
patch for man to share/man conversion for all my ports (final phase)
Filename:
MIME Type:
Creator:
Chris Hutchinson
Created:
2024-02-27 22:25:58 UTC
Size:
46.11 KB
patch
obsolete
>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/files/patch-Makefile.in b/net/spread/files/patch-Makefile.in >index 2a8c851a23e1..dd06174e0651 100644 >--- a/net/spread/files/patch-Makefile.in >+++ b/net/spread/files/patch-Makefile.in >@@ -1,5 +1,5 @@ >---- ./Makefile.in.orig 2004-09-23 19:12:52.000000000 +0200 >-+++ ./Makefile.in 2012-07-20 21:55:23.000000000 +0200 >+--- ./Makefile.in.orig 2004-09-23 19:12:52 UTC >++++ ./Makefile.in > @@ -26,7 +26,7 @@ > #Rules: major -- inc for incompatible change > # : minor -- inc for bugfix or forward compatible change >diff --git a/net/spread/files/patch-auth-ip.c b/net/spread/files/patch-auth-ip.c >index 6a28acdab04a..47b4b1f3d9b2 100644 >--- a/net/spread/files/patch-auth-ip.c >+++ b/net/spread/files/patch-auth-ip.c >@@ -1,5 +1,5 @@ >---- auth-ip.c Fri Mar 5 11:32:46 2004 >-+++ auth-ip.c Thu Jul 15 21:38:09 2004 >+--- auth-ip.c 2024-02-27 09:46:12 UTC >++++ auth-ip.c > @@ -90,12 +90,9 @@ > /* load spread.access_ip file */ > if (NULL != (fp = fopen(file_name,"r")) ) >diff --git a/net/spread/files/patch-auth-pword.c b/net/spread/files/patch-auth-pword.c >index 3ff9f6426920..8729051b95ea 100644 >--- a/net/spread/files/patch-auth-pword.c >+++ b/net/spread/files/patch-auth-pword.c >@@ -1,5 +1,5 @@ >---- auth-pword.c Fri Mar 5 11:32:46 2004 >-+++ auth-pword.c Thu Jul 15 21:40:16 2004 >+--- auth-pword.c 2024-02-27 09:46:12 UTC >++++ auth-pword.c > @@ -118,12 +118,9 @@ > /* load spread.access_ip file */ > if (NULL != (fp = fopen(file_name,"r")) ) >diff --git a/net/spread/files/patch-configuration.c b/net/spread/files/patch-configuration.c >index c925a9bfa812..00052bed260d 100644 >--- a/net/spread/files/patch-configuration.c >+++ b/net/spread/files/patch-configuration.c >@@ -1,5 +1,5 @@ >---- configuration.c Mon Sep 27 00:15:48 2004 >-+++ configuration.c Tue Oct 4 14:40:51 2005 >+--- configuration.c 2024-02-27 09:46:12 UTC >++++ configuration.c > @@ -130,9 +130,6 @@ > > if (NULL != (yyin = fopen(file_name,"r")) ) >diff --git a/net/spread/files/patch-docs__spmonitor.1 b/net/spread/files/patch-docs__spmonitor.1 >index 982d5bb32913..d9cdddd3f790 100644 >--- a/net/spread/files/patch-docs__spmonitor.1 >+++ b/net/spread/files/patch-docs__spmonitor.1 >@@ -1,5 +1,5 @@ >---- docs/spmonitor.1 Thu Dec 13 02:01:49 2001 >-+++ docs/spmonitor.1 Mon Dec 8 00:00:34 2003 >+--- docs/spmonitor.1 2024-02-27 09:46:12 UTC >++++ docs/spmonitor.1 > @@ -27,13 +27,11 @@ > Use an alternate configuration file > .I config-file >diff --git a/net/spread/files/patch-docs__spread.1 b/net/spread/files/patch-docs__spread.1 >index 6dca20e2b73d..5989be927349 100644 >--- a/net/spread/files/patch-docs__spread.1 >+++ b/net/spread/files/patch-docs__spread.1 >@@ -1,5 +1,5 @@ >---- docs/spread.1 Thu Dec 13 02:03:19 2001 >-+++ docs/spread.1 Mon Dec 8 00:00:20 2003 >+--- docs/spread.1 2024-02-27 09:46:12 UTC >++++ docs/spread.1 > @@ -20,13 +20,11 @@ > Use an alternate configuration file > .I config-file >diff --git a/net/spread/files/patch-perl__Spread__Spread.pm b/net/spread/files/patch-perl__Spread__Spread.pm >index 05de71fa80e2..7d2b4b20faec 100644 >--- a/net/spread/files/patch-perl__Spread__Spread.pm >+++ b/net/spread/files/patch-perl__Spread__Spread.pm >@@ -2,8 +2,8 @@ > # Original Spread.pm plus included test script can be found here: > # https://cpan.metacpan.org/authors/id/J/JE/JESUS/Spread-3.17.4.4.tar.gz > =========================================================================== >---- ./perl/Spread/Spread.pm.orig 2002-09-26 15:54:46.000000000 +0200 >-+++ ./perl/Spread/Spread.pm 2012-08-25 20:16:53.000000000 +0200 >+--- ./perl/Spread/Spread.pm.orig 2024-02-27 09:46:12 UTC >++++ ./perl/Spread/Spread.pm > @@ -1,9 +1,8 @@ > # Filename: Spread.pm > # Author: Theo Schlossnagle <jesus@cnds.jhu.edu> >diff --git a/net/spread/files/patch-sample.spread.conf b/net/spread/files/patch-sample.spread.conf >index 1926dea8116c..6b7ac8b77cd9 100644 >--- a/net/spread/files/patch-sample.spread.conf >+++ b/net/spread/files/patch-sample.spread.conf >@@ -1,5 +1,5 @@ >---- sample.spread.conf Mon Dec 8 01:26:39 2003 >-+++ sample.spread.conf Mon Dec 8 01:26:53 2003 >+--- sample.spread.conf 2024-02-27 09:46:12 UTC >++++ sample.spread.conf > @@ -50,7 +50,7 @@ > # cause the daemons to log to "spreadlog_machine1.mydomain.com.log" and > # "spreadlog_machine2.mydomain.com.log" respectively. >diff --git a/net/spread/files/patch-session.c b/net/spread/files/patch-session.c >index c33d5523da84..ebe6955d57e0 100644 >--- a/net/spread/files/patch-session.c >+++ b/net/spread/files/patch-session.c >@@ -1,5 +1,5 @@ >---- session.c Tue Aug 5 21:35:52 2003 >-+++ session.c Tue Aug 5 21:31:30 2003 >+--- session.c Tue Aug 2024-02-27 09:46:12 UTC >++++ session.c > @@ -406,7 +406,7 @@ > Alarm( EXIT, "Sess_init: UNIX sock error\n" ); > >diff --git a/net/spread/files/patch-sp.c b/net/spread/files/patch-sp.c >index fc0df37e5496..ed5668740c04 100644 >--- a/net/spread/files/patch-sp.c >+++ b/net/spread/files/patch-sp.c >@@ -1,5 +1,5 @@ >---- sp.c Tue Oct 5 09:08:10 2004 >-+++ sp.c Tue Oct 4 14:44:27 2005 >+--- sp.c 2024-02-27 09:46:12 UTC >++++ sp.c > @@ -591,7 +591,7 @@ > set_large_socket_buffers(s); > >diff --git a/net/spread/files/patch-spread.c b/net/spread/files/patch-spread.c >index 3c8ef918cac6..2755ec042d1d 100644 >--- a/net/spread/files/patch-spread.c >+++ b/net/spread/files/patch-spread.c >@@ -1,5 +1,5 @@ >---- ./spread.c.orig 2006-11-20 05:53:13.000000000 +0100 >-+++ ./spread.c 2012-07-20 21:55:23.000000000 +0200 >+--- ./spread.c.orig 2006-11-20 05:53:13 UTC >++++ ./spread.c > @@ -48,6 +48,8 @@ > #include <pwd.h> > #include <unistd.h> >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/trafshow/Makefile b/net/trafshow/Makefile >index 97e79cd8e5f9..c9cfbcc2aff1 100644 >--- a/net/trafshow/Makefile >+++ b/net/trafshow/Makefile >@@ -1,6 +1,6 @@ > PORTNAME= trafshow > PORTVERSION= 5.2.3 >-PORTREVISION= 4 >+PORTREVISION= 5 > PORTEPOCH= 1 > CATEGORIES= net > MASTER_SITES= https://src.fedoraproject.org/rpms/trafshow/blob/f32/f/ \ >@@ -16,6 +16,7 @@ LICENSE= BSD2CLAUSE > USES= ncurses tar:tgz > GNU_CONFIGURE= yes > CONFIGURE_ENV= PTHREAD_LIBS="-lpthread" >+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share > ALL_TARGET= trafshow > > OPTIONS_DEFINE= IPV6 >diff --git a/net/trafshow/files/patch-show_dump.c b/net/trafshow/files/patch-show_dump.c >index a6426d831122..fe30591d7497 100644 >--- a/net/trafshow/files/patch-show_dump.c >+++ b/net/trafshow/files/patch-show_dump.c >@@ -1,5 +1,5 @@ >---- show_dump.c.orig Wed Apr 12 00:16:51 2006 >-+++ show_dump.c Wed Apr 12 00:18:21 2006 >+--- show_dump.c.orig 2024-02-27 09:57:19 UTC >++++ show_dump.c > @@ -21,6 +21,7 @@ > #include <sys/param.h> > #include <sys/types.h> >diff --git a/net/trafshow/files/patch-trafshow.c b/net/trafshow/files/patch-trafshow.c >index 9cb11dbec8d8..0f2c76fbc74e 100644 >--- a/net/trafshow/files/patch-trafshow.c >+++ b/net/trafshow/files/patch-trafshow.c >@@ -1,5 +1,5 @@ >---- trafshow.c.orig 2023-06-13 16:53:56.932059000 +0700 >-+++ trafshow.c 2023-06-13 16:57:12.824618000 +0700 >+--- trafshow.c.orig 2024-02-27 09:57:19 UTC >++++ trafshow.c > @@ -20,6 +20,7 @@ > #endif > #include <sys/types.h> >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..67ae68202b2a 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/print/trueprint/files/patch-src_getopt.c b/print/trueprint/files/patch-src_getopt.c >index 0d918bf2eaff..836d3cf54156 100644 >--- a/print/trueprint/files/patch-src_getopt.c >+++ b/print/trueprint/files/patch-src_getopt.c >@@ -1,5 +1,5 @@ >---- src/getopt.c.orig 2000-02-17 03:12:38.000000000 +0100 >-+++ src/getopt.c 2008-04-14 23:51:02.000000000 +0200 >+--- src/getopt.c.orig 2000-02-17 03:12:38 UTC >++++ src/getopt.c > @@ -34,6 +34,8 @@ > #include <config.h> > #endif >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/files/patch-Makefile.am b/shells/rc/files/patch-Makefile.am >index 3fdc4378b29d..657308d30fbf 100644 >--- a/shells/rc/files/patch-Makefile.am >+++ b/shells/rc/files/patch-Makefile.am >@@ -1,5 +1,5 @@ >---- Makefile.am.orig 2022-05-20 12:55:23.153147000 -0700 >-+++ Makefile.am 2022-05-20 12:58:05.878390000 -0700 >+--- Makefile.am.orig 2022-05-20 12:55:23 UTC >++++ Makefile.am > @@ -64,8 +64,9 @@ > > install-exec-hook: >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/files/patch-and-OpenBSD.c b/sysutils/and/files/patch-and-OpenBSD.c >index e08c56a23b42..5964f6817bc2 100644 >--- a/sysutils/and/files/patch-and-OpenBSD.c >+++ b/sysutils/and/files/patch-and-OpenBSD.c >@@ -1,5 +1,5 @@ >---- and-OpenBSD.c.orig Sat Mar 6 16:34:02 2004 >-+++ and-OpenBSD.c Thu Oct 6 16:11:57 2005 >+--- and-OpenBSD.c.orig 2024-02-27 11:19:04 UTC >++++ and-OpenBSD.c > @@ -91,10 +91,24 @@ > abort(); > } >diff --git a/sysutils/and/files/patch-and.c b/sysutils/and/files/patch-and.c >index cc857092a9d9..c9ac5c38d44e 100644 >--- a/sysutils/and/files/patch-and.c >+++ b/sysutils/and/files/patch-and.c >@@ -1,5 +1,5 @@ >---- and.c.orig Mon Apr 5 23:19:01 2004 >-+++ and.c Thu Oct 6 16:04:09 2005 >+--- and.c.orig 2024-02-27 11:19:04 UTC >++++ and.c > @@ -47,7 +47,11 @@ > #include <sys/types.h> > #include <signal.h> >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/files/patch-src__bkpupsd.c b/sysutils/bkpupsd/files/patch-src__bkpupsd.c >index 2886a2d2012e..17655c685713 100644 >--- a/sysutils/bkpupsd/files/patch-src__bkpupsd.c >+++ b/sysutils/bkpupsd/files/patch-src__bkpupsd.c >@@ -1,5 +1,5 @@ >---- src/bkpupsd.c.orig Sun Aug 3 20:11:23 1997 >-+++ src/bkpupsd.c Fri Dec 15 00:53:52 2006 >+--- src/bkpupsd.c.orig 2024-02-27 11:19:04 UTC >++++ src/bkpupsd.c > @@ -27,14 +27,17 @@ > */ > >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/cronolog-devel/Makefile b/sysutils/cronolog-devel/Makefile >index 663a05f945b8..8be0071a6f01 100644 >--- a/sysutils/cronolog-devel/Makefile >+++ b/sysutils/cronolog-devel/Makefile >@@ -1,6 +1,6 @@ > PORTNAME= cronolog > PORTVERSION= 1.7.1 >-PORTREVISION= 1 >+PORTREVISION= 2 > CATEGORIES= sysutils > MASTER_SITES= https://BSDforge.com/projects/source/sysutils/cronolog-devel/ > PKGNAMESUFFIX= -devel >@@ -18,8 +18,8 @@ SHEBANG_FILES= src/cronosplit > > PLIST_FILES= sbin/cronolog \ > sbin/cronosplit \ >- man/man1/cronolog.1m.gz \ >- man/man1/cronosplit.1m.gz >+ share/man/man1/cronolog.1m.gz \ >+ share/man/man1/cronosplit.1m.gz > > CONFLICTS= cronolog > >diff --git a/sysutils/cronolog-devel/files/patch-src__cronolog.c b/sysutils/cronolog-devel/files/patch-src__cronolog.c >index 460672cfa553..951d18fa2447 100644 >--- a/sysutils/cronolog-devel/files/patch-src__cronolog.c >+++ b/sysutils/cronolog-devel/files/patch-src__cronolog.c >@@ -1,5 +1,5 @@ >---- ./src/cronolog.c.orig 2010-12-02 13:41:57.000000000 -0800 >-+++ ./src/cronolog.c 2010-12-02 13:42:30.000000000 -0800 >+--- ./src/cronolog.c.orig 2024-02-27 11:19:04 UTC >++++ ./src/cronolog.c > @@ -84,8 +84,8 @@ > > #ifndef _WIN32 >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/thefish/files/patch-Makefile b/sysutils/thefish/files/patch-Makefile >index 09ede186f8af..a8cca90b014e 100644 >--- a/sysutils/thefish/files/patch-Makefile >+++ b/sysutils/thefish/files/patch-Makefile >@@ -1,5 +1,5 @@ >---- Makefile.orig 2015-11-09 12:52:16.212487000 -0800 >-+++ Makefile 2015-11-09 12:55:18.251402000 -0800 >+--- Makefile.orig 2024-02-27 11:19:04 UTC >++++ Makefile > @@ -19,11 +19,11 @@ > CXXFLAGS+= -Wall -g -DWITH_QT -I$(X11BASE)/include > .endif >diff --git a/sysutils/thefish/files/patch-main.c b/sysutils/thefish/files/patch-main.c >index 3d0b82955764..14d15fdf0e65 100644 >--- a/sysutils/thefish/files/patch-main.c >+++ b/sysutils/thefish/files/patch-main.c >@@ -1,5 +1,5 @@ >---- main.c.orig 2015-11-09 12:50:35.505718000 -0800 >-+++ main.c 2015-11-09 12:51:47.774569000 -0800 >+--- main.c.orig 2024-02-27 11:19:04 UTC >++++ main.c > @@ -49,8 +49,6 @@ > #include "qt_ui.h" > #endif >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/files/patch-Makefile b/sysutils/upsdaemon/files/patch-Makefile >index f40d990b6c57..1c9ce8527acd 100644 >--- a/sysutils/upsdaemon/files/patch-Makefile >+++ b/sysutils/upsdaemon/files/patch-Makefile >@@ -1,5 +1,5 @@ >---- Makefile.orig 2014-06-30 00:03:09.754282546 +0800 >-+++ Makefile 2014-06-30 00:03:37.920281904 +0800 >+--- Makefile.orig 2024-02-27 11:19:04 UTC >++++ Makefile > @@ -36,10 +36,10 @@ all: ./src/upsdaemon.c > ${CC} ${CFLAGS} -o ./upsdaemon ./src/upsdaemon.c > >diff --git a/sysutils/upsdaemon/files/patch-upsdaemon.c b/sysutils/upsdaemon/files/patch-upsdaemon.c >index 005167245b0f..32afcf566115 100644 >--- a/sysutils/upsdaemon/files/patch-upsdaemon.c >+++ b/sysutils/upsdaemon/files/patch-upsdaemon.c >@@ -1,5 +1,5 @@ >---- src/upsdaemon.c.orig 2006-06-20 01:50:23.000000000 +0100 >-+++ src/upsdaemon.c 2009-04-12 15:48:34.000000000 +0100 >+--- src/upsdaemon.c.orig 2024-02-27 11:19:04 UTC >++++ src/upsdaemon.c > @@ -32,6 +32,7 @@ > #include <errno.h> /* Error number definitions */ > #include <termios.h> /* POSIX terminal control definitions */ >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/www/links/Makefile b/www/links/Makefile >index a0bdc8a936a4..d52d5f3f0090 100644 >--- a/www/links/Makefile >+++ b/www/links/Makefile >@@ -1,6 +1,6 @@ > PORTNAME= links > PORTVERSION= 2.29 >-PORTREVISION= 3 >+PORTREVISION= 4 > PORTEPOCH= 1 > CATEGORIES= www > MASTER_SITES= http://links.twibright.com/download/ >@@ -12,18 +12,16 @@ WWW= http://links.twibright.com/ > LICENSE= GPLv2 > LICENSE_FILE= ${WRKSRC}/COPYING > >-CONFLICTS_INSTALL= links1 >- > LIB_DEPENDS= libzstd.so:archivers/zstd > >+USES= cpe localbase:ldflags ssl tar:bz2 >+CPE_VENDOR= twibright >+ > GNU_CONFIGURE= yes >+GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share > CONFIGURE_ARGS= --with-ssl --without-pmshell --without-atheos \ > --without-gpm --without-fb --without-windows >-GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share >- >-USES= cpe localbase:ldflags ssl tar:bz2 >- >-CPE_VENDOR= twibright >+CONFLICTS_INSTALL= links1 > > PLIST_FILES= bin/links share/man/man1/links.1.gz > >@@ -31,25 +29,25 @@ OPTIONS_DEFINE= BROTLI CIPHERSTRING DIRECTFB IPV6 SVG SVGALIB THREADS TRANS \ > UTF8 X11 > OPTIONS_DEFAULT= UTF8 X11 > >-BROTLI_LIB_DEPENDS= libbrotlidec.so:archivers/brotli >-BROTLI_CONFIGURE_WITH= brotli >- > CIPHERSTRING_DESC= Select the OpenSSL ciphers used via CIPHERSTRING > DIRECTFB_DESC= DirectFB graphics support > TRANS_DESC= Hack for background transparency > >+BROTLI_LIB_DEPENDS= libbrotlidec.so:archivers/brotli >+BROTLI_CONFIGURE_WITH= brotlis >+ > DIRECTFB_LIB_DEPENDS= libdirectfb.so:devel/directfb > DIRECTFB_CONFIGURE_WITH=directfb > > IPV6_CONFIGURE_WITH= ipv6 > >-SVG_CONFIGURE_WITH= librsvg >-SVG_USES= gnome >-SVG_USE= gnome=librsvg2,glib20,gdkpixbuf2,cairo >- > SVGALIB_LIB_DEPENDS= libvga.so:graphics/svgalib > SVGALIB_CONFIGURE_WITH= svgalib > >+SVG_USES= gnome >+SVG_USE= gnome=librsvg2,glib20,gdkpixbuf2,cairo >+SVG_CONFIGURE_WITH= librsvg >+ > THREADS_CFLAGS= -DHAVE_PTHREADS > THREADS_LDFLAGS=-pthread > >@@ -57,11 +55,11 @@ TRANS_EXTRA_PATCHES= ${FILESDIR}/extra-terminal.c.diff > > UTF8_CONFIGURE_ENABLE= utf8 > >-X11_USES= xorg >-X11_USE= xorg=x11,xorgproto > X11_LIB_DEPENDS= libevent.so:devel/libevent \ > libfontconfig.so:x11-fonts/fontconfig \ > libfreetype.so:print/freetype2 >+X11_USES= xorg >+X11_USE= xorg=x11,xorgproto > > X11_CONFIGURE_WITH= x > X11_PLIST_FILES= share/pixmaps/links.xpm >diff --git a/www/links/files/extra-terminal.c.diff b/www/links/files/extra-terminal.c.diff >index c180255767e5..af13abc77fc4 100644 >--- a/www/links/files/extra-terminal.c.diff >+++ b/www/links/files/extra-terminal.c.diff >@@ -1,5 +1,5 @@ >---- terminal.c.orig 2011-11-20 22:10:01.000000000 -0500 >-+++ terminal.c 2011-12-19 05:33:15.000000000 -0500 >+--- terminal.c.orig 2024-02-27 11:19:04 UTC >++++ terminal.c > @@ -891,6 +891,7 @@ > add_to_str(&a, &l, m); \ > m[1] = '4'; \ >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/files/patch-noitcl b/x11-toolkits/iwidgets/files/patch-noitcl >index ae5db7228024..e7e72cc43813 100644 >--- a/x11-toolkits/iwidgets/files/patch-noitcl >+++ b/x11-toolkits/iwidgets/files/patch-noitcl >@@ -1,5 +1,5 @@ >---- configure Thu Nov 29 15:51:34 2001 >-+++ configure Tue May 16 17:36:14 2006 >+--- configure 2024-02-27 11:19:04 UTC >++++ configure > @@ -818,9 +818,4 @@ > fi > >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/files/patch-themer_main.c b/x11-wm/emerald/files/patch-themer_main.c >index 2eb7c1054fba..ae904f35e3ad 100644 >--- a/x11-wm/emerald/files/patch-themer_main.c >+++ b/x11-wm/emerald/files/patch-themer_main.c >@@ -1,5 +1,5 @@ >---- themer/main.c.orig 2009-10-13 20:56:23.000000000 -0400 >-+++ themer/main.c 2010-11-24 15:45:57.000000000 -0500 >+--- themer/main.c.orig 2024-02-27 13:21:17 UTC >++++ themer/main.c > @@ -7,6 +7,103 @@ > #include <emerald.h> > #include <engine.h> >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 >-man/man1/libfm-pref-apps.1.gz >-man/man1/lxshortcut.1.gz >+share/man/man1/libfm-pref-apps.1.gz >+share/man/man1/lxshortcut.1.gz > share/applications/libfm-pref-apps.desktop > share/applications/lxshortcut.desktop > %%DATADIR%%/archivers.list >diff --git a/x11/xvt/Makefile b/x11/xvt/Makefile >index 0a69e79a73bc..9138fd1d0467 100644 >--- a/x11/xvt/Makefile >+++ b/x11/xvt/Makefile >@@ -1,6 +1,7 @@ > PORTNAME= xvt > PORTVERSION= 3.0.6 >-CATEGORIES+= x11 >+PORTREVISION= 1 >+CATEGORIES= x11 > MASTER_SITES= https://codeberg.org/BSDforge/${PORTNAME}/archive/ > > MAINTAINER= portmaster@BSDforge.com >@@ -15,6 +16,7 @@ USE_LDCONFIG= yes > USE_PERL5= build patch > USE_XORG= x11 xpm > GNU_CONFIGURE= yes >+GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share > > PORTDOCS= README.xvt xvt.1.html xvtRef.html xvtRef.txt > WRKSRC= ${WRKDIR}/${PORTNAME} >diff --git a/x11/xvt/pkg-plist b/x11/xvt/pkg-plist >index 5221b9e25a6b..e1e39f7f6027 100644 >--- a/x11/xvt/pkg-plist >+++ b/x11/xvt/pkg-plist >@@ -7,5 +7,5 @@ lib/libxvt.a > lib/libxvt.so > lib/libxvt.so.1 > lib/libxvt.so.1.0.0 >-man/man1/xvt.1.gz >+share/man/man1/xvt.1.gz > share/pixmaps/xvt.png
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Flags:
portmaster
:
maintainer-approval+
Actions:
View
|
Diff
Attachments on
bug 277322
:
248748
|
248783
|
248802
|
248866