*: Move manpages to share/man

PR:		277322

26 files changed, 141 insertions, 101 deletions

diff --git a/deskutils/bigyear/Makefile b/deskutils/bigyear/Makefile
index 48ea524f2fe1..958e2efa3da9 100644
--- a/deskutils/bigyear/Makefile
+++ b/deskutils/bigyear/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	bigyear
 PORTVERSION=	20010226
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	https://BSDforge.com/projects/source/deskutils/bigyear/
@@ -8,18 +9,17 @@ DISTNAME=	${PORTNAME}
 MAINTAINER=	portmaster@BSDforge.com
 COMMENT=	Program to print a large (one month per page) calendar
 
-DEPRECATED=    Last release in 2001 and dead upstream, consider using deskutils/pal
-EXPIRATION_DATE=2024-02-29
+LICENSE=	BSD0CLAUSE
 
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}"
 
-PLIST_FILES=	bin/bigyear man/man1/bigyear.1.gz
+PLIST_FILES=	bin/bigyear share/man/man1/bigyear.1.gz
 
 post-extract:
 	@${RM} ${WRKSRC}/bigyear
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bigyear ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/bigyear.1 ${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/bigyear.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/devel/clig/Makefile b/devel/clig/Makefile
index 9eb169143e07..d5acf07dae17 100644
--- a/devel/clig/Makefile
+++ b/devel/clig/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	clig
 PORTVERSION=	1.9.11.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel tcl
 MASTER_SITES=	https://BSDforge.com/projects/source/devel/clig/
 
@@ -26,10 +26,6 @@ OPTIONS_DEFINE=	DOCS
 post-patch:
 	@${RM} ${WRKSRC}/example/.cvsignore
 	@${FIND} -d ${WRKSRC} -type d -and -name CVS -exec ${RM} -r {} \;
-	@${REINPLACE_CMD} -e 's|/usr/bin/tclsh|${TCLSH}|; \
-		s|/doc/|/share/doc/|; \
-		s|-$$(VERSION)||;' \
-			${WRKSRC}/makefile
 	@${REINPLACE_CMD} -e "s|tclsh|${TCLSH}|" \
 		${WRKSRC}/man/fixman
 
diff --git a/devel/clig/files/patch-install b/devel/clig/files/patch-install
index 01af6fbd1075..4a412d761a92 100644
--- a/devel/clig/files/patch-install
+++ b/devel/clig/files/patch-install
@@ -1,5 +1,5 @@
---- install.orig	2000-01-16 18:15:32.000000000 +0100
-+++ install	2013-09-26 15:30:00.000000000 +0200
+--- install.orig	2000-01-16 18:15:32 UTC
++++ install
 @@ -64,9 +64,11 @@
  }
  
diff --git a/devel/clig/files/patch-makefile b/devel/clig/files/patch-makefile
index 7c7a407f5b40..f99c6d058076 100644
--- a/devel/clig/files/patch-makefile
+++ b/devel/clig/files/patch-makefile
@@ -1,5 +1,35 @@
---- makefile.orig	2013-09-26 15:22:07.000000000 +0200
-+++ makefile	2013-09-26 15:22:46.000000000 +0200
+--- makefile.orig	2004-08-04 02:56:37 UTC
++++ makefile
+@@ -14,7 +14,7 @@
+ exec_prefix =$(prefix)
+ 
+ # Name of subdirectory to be used beyond DOCDIR and LIBDIR
+-cligdir =clig-$(VERSION)
++cligdir =clig
+ 
+ 
+ 
+@@ -31,16 +31,16 @@
+ 
+ # Directory in which to install manual entry for clig, the program
+ M1SUFFIX =1
+-MAN1DIR =$(prefix)/man/man$(M1SUFFIX)
++MAN1DIR =$(prefix)/share/man/man$(M1SUFFIX)
+ 
+ # Directory in which to install manual entries for clig, the Tcl-package.
+ MnSUFFIX =n
+-MANnDIR =$(prefix)/man/man$(MnSUFFIX)
++MANnDIR =$(prefix)/share/man/man$(MnSUFFIX)
+ 
+ # Directory were to put release notes, changeLogs, News etc.
+-DOCDIR =$(prefix)/doc/$(cligdir)
++DOCDIR =$(prefix)/share/doc/$(cligdir)
+ 
+-TCLSH=/usr/bin/tclsh
++TCLSH=/usr/local/bin/tclsh8.6
+ 
+ ######################################################################## 
+ #
 @@ -104,4 +104,5 @@
             M1SUFFIX=$(M1SUFFIX) \
  	   MANnDIR=$(build_root)$(MANnDIR) MnFILES="$(MnFILES.f)" \
diff --git a/devel/clig/pkg-plist b/devel/clig/pkg-plist
index ea4a62a7d390..e5e1cb065132 100644
--- a/devel/clig/pkg-plist
+++ b/devel/clig/pkg-plist
@@ -55,17 +55,17 @@ lib/clig/tcllib/parse.tcl
 lib/clig/tcllib/setSpec.tcl
 lib/clig/tcllib/usage.tcl
 lib/clig/tcllib/version.tcl
-man/man1/clig.1.gz
-man/mann/clig_Commandline.n.gz
-man/mann/clig_Description.n.gz
-man/mann/clig_Double.n.gz
-man/mann/clig_Flag.n.gz
-man/mann/clig_Float.n.gz
-man/mann/clig_Int.n.gz
-man/mann/clig_Long.n.gz
-man/mann/clig_Name.n.gz
-man/mann/clig_Rest.n.gz
-man/mann/clig_String.n.gz
-man/mann/clig_Usage.n.gz
-man/mann/clig_Version.n.gz
-man/mann/clig_parseCmdline.n.gz
+share/man/man1/clig.1.gz
+share/man/mann/clig_Commandline.n.gz
+share/man/mann/clig_Description.n.gz
+share/man/mann/clig_Double.n.gz
+share/man/mann/clig_Flag.n.gz
+share/man/mann/clig_Float.n.gz
+share/man/mann/clig_Int.n.gz
+share/man/mann/clig_Long.n.gz
+share/man/mann/clig_Name.n.gz
+share/man/mann/clig_Rest.n.gz
+share/man/mann/clig_String.n.gz
+share/man/mann/clig_Usage.n.gz
+share/man/mann/clig_Version.n.gz
+share/man/mann/clig_parseCmdline.n.gz
diff --git a/dns/fastresolve/Makefile b/dns/fastresolve/Makefile
index 4defb614d363..80736ea35e93 100644
--- a/dns/fastresolve/Makefile
+++ b/dns/fastresolve/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	fastresolve
 PORTVERSION=	2.10
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	dns
 MASTER_SITES=	https://BSDforge.com/projects/source/dns/fastresolve/
 
@@ -16,6 +16,7 @@ RUN_DEPENDS=	p5-BerkeleyDB>=0:databases/p5-BerkeleyDB
 
 USES=		bdb localbase:ldflags perl5 tar:bzip2
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ENV=	PERL=${PERL} \
 		djm_cv_lib_db_Dbopen=yes
 
diff --git a/dns/fastresolve/pkg-plist b/dns/fastresolve/pkg-plist
index 97bacdb2422d..ada257ac8d08 100644
--- a/dns/fastresolve/pkg-plist
+++ b/dns/fastresolve/pkg-plist
@@ -8,16 +8,16 @@ bin/rebuild-dom-db
 bin/rebuild-ip-db
 bin/reresolve
 bin/make-report
-man/man1/btree-dump.1.gz
-man/man1/convert-dom-db.1.gz
-man/man1/convert-ip-db.1.gz
-man/man1/dns-terror.1.gz
-man/man1/expire-ip-db.1.gz
-man/man1/getdominfo.1.gz
-man/man1/make-report.1.gz
-man/man1/rebuild-dom-db.1.gz
-man/man1/rebuild-ip-db.1.gz
-man/man1/reresolve.1.gz
+share/man/man1/btree-dump.1.gz
+share/man/man1/convert-dom-db.1.gz
+share/man/man1/convert-ip-db.1.gz
+share/man/man1/dns-terror.1.gz
+share/man/man1/expire-ip-db.1.gz
+share/man/man1/getdominfo.1.gz
+share/man/man1/make-report.1.gz
+share/man/man1/rebuild-dom-db.1.gz
+share/man/man1/rebuild-ip-db.1.gz
+share/man/man1/reresolve.1.gz
 %%DATADIR%%/AddrCycle.pm
 %%DATADIR%%/analog.cfg
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
diff --git a/dns/hesiod/Makefile b/dns/hesiod/Makefile
index e9708c26f8b5..79597e749bb5 100644
--- a/dns/hesiod/Makefile
+++ b/dns/hesiod/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	hesiod
 PORTVERSION=	3.2.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	dns
 MASTER_SITES=	https://BSDforge.com/projects/source/dns/hesiod/
 
@@ -16,6 +16,7 @@ OPTIONS_DEFAULT=IDN
 USES=		cpe libtool pathfix
 CPE_VENDOR=	${PORTNAME}_project
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
diff --git a/dns/hesiod/pkg-plist b/dns/hesiod/pkg-plist
index 25d2761cf9fc..9273bf0760db 100644
--- a/dns/hesiod/pkg-plist
+++ b/dns/hesiod/pkg-plist
@@ -5,20 +5,20 @@ lib/libhesiod.so
 lib/libhesiod.so.0
 lib/libhesiod.so.0.0.0
 libdata/pkgconfig/hesiod.pc
-man/man1/hesinfo.1.gz
-man/man3/hesiod.3.gz
-man/man3/hesiod_end.3.gz
-man/man3/hesiod_free_list.3.gz
-man/man3/hesiod_free_passwd.3.gz
-man/man3/hesiod_free_postoffice.3.gz
-man/man3/hesiod_free_servent.3.gz
-man/man3/hesiod_free_string.3.gz
-man/man3/hesiod_getmailhost.3.gz
-man/man3/hesiod_getpwnam.3.gz
-man/man3/hesiod_getpwuid.3.gz
-man/man3/hesiod_getservbyname.3.gz
-man/man3/hesiod_init.3.gz
-man/man3/hesiod_parse_result.3.gz
-man/man3/hesiod_resolve.3.gz
-man/man3/hesiod_to_bind.3.gz
-man/man5/hesiod.conf.5.gz
+share/man/man1/hesinfo.1.gz
+share/man/man3/hesiod.3.gz
+share/man/man3/hesiod_end.3.gz
+share/man/man3/hesiod_free_list.3.gz
+share/man/man3/hesiod_free_passwd.3.gz
+share/man/man3/hesiod_free_postoffice.3.gz
+share/man/man3/hesiod_free_servent.3.gz
+share/man/man3/hesiod_free_string.3.gz
+share/man/man3/hesiod_getmailhost.3.gz
+share/man/man3/hesiod_getpwnam.3.gz
+share/man/man3/hesiod_getpwuid.3.gz
+share/man/man3/hesiod_getservbyname.3.gz
+share/man/man3/hesiod_init.3.gz
+share/man/man3/hesiod_parse_result.3.gz
+share/man/man3/hesiod_resolve.3.gz
+share/man/man3/hesiod_to_bind.3.gz
+share/man/man5/hesiod.conf.5.gz
diff --git a/editors/2bsd-vi/Makefile b/editors/2bsd-vi/Makefile
index 38977c0c3c46..907b13b69b0f 100644
--- a/editors/2bsd-vi/Makefile
+++ b/editors/2bsd-vi/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	vi
 PORTVERSION=	050325
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	editors
 MASTER_SITES=	SF/ex-${PORTNAME}/ex-${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	2bsd-
diff --git a/editors/2bsd-vi/files/patch-Makefile b/editors/2bsd-vi/files/patch-Makefile
index cbf2c5337856..60fdf390ac6d 100644
--- a/editors/2bsd-vi/files/patch-Makefile
+++ b/editors/2bsd-vi/files/patch-Makefile
@@ -1,17 +1,13 @@
---- Makefile.orig	2005-03-24 23:50:09 UTC
+--- Makefile.orig	2005-03-24 15:50:09 UTC
 +++ Makefile
-@@ -79,10 +79,9 @@
+@@ -79,7 +79,6 @@
  # Destinations for installation. $(PRESERVEDIR) is used for recovery files.
  # It will get mode 1777.
  #
 -PREFIX		= /usr/local
  BINDIR		= $(PREFIX)/bin
  LIBEXECDIR	= $(PREFIX)/libexec
--MANDIR		= $(PREFIX)/share/man
-+MANDIR		= $(PREFIX)/man
- PRESERVEDIR	= /var/preserve
- 
- #
+ MANDIR		= $(PREFIX)/share/man
 @@ -94,7 +93,7 @@
  #
  # A BSD-like install program. GNU install will fit well here, too.
@@ -56,7 +52,7 @@
  INCLUDE	= /usr/include
  OBJS	= ex.o ex_addr.o ex_cmds.o ex_cmds2.o ex_cmdsub.o \
  		ex_data.o ex_extern.o ex_get.o ex_io.o ex_put.o ex_re.o \
-@@ -296,13 +292,6 @@
+@@ -296,24 +292,13 @@
  # install in standard place
  
  install-man:
@@ -70,14 +66,15 @@
  	$(INSTALL) -c -m 644 ex.1 $(DESTDIR)$(MANDIR)/man1/ex.1
  	$(INSTALL) -c -m 644 vi.1 $(DESTDIR)$(MANDIR)/man1/vi.1
  	ln -s ex.1 $(DESTDIR)$(MANDIR)/man1/edit.1
-@@ -310,10 +299,6 @@
+ 	ln -s vi.1 $(DESTDIR)$(MANDIR)/man1/vedit.1
  	ln -s vi.1 $(DESTDIR)$(MANDIR)/man1/view.1
  
- install: all install-man
+-install: all install-man
 -	rm -f $(DESTDIR)$(BINDIR)/ex $(DESTDIR)$(BINDIR)/edit \
 -		$(DESTDIR)$(BINDIR)/vedit $(DESTDIR)$(BINDIR)/vi \
 -		$(DESTDIR)$(BINDIR)/view
 -	test -d $(DESTDIR)$(BINDIR) || mkdir -p $(DESTDIR)$(BINDIR)
++install: all install-man
  # special provisions for sticky install
  	if test -f $(DESTDIR)$(BINDIR)/ex; \
  	then	test -f $(DESTDIR)$(BINDIR)/ex.old.$$$$ && exit 1; \
diff --git a/editors/2bsd-vi/pkg-plist b/editors/2bsd-vi/pkg-plist
index 6300a67c103d..9aaf39f207d9 100644
--- a/editors/2bsd-vi/pkg-plist
+++ b/editors/2bsd-vi/pkg-plist
@@ -5,9 +5,9 @@ bin/vi
 bin/view
 libexec/exrecover
 libexec/expreserve
-man/man1/edit.1.gz
-man/man1/ex.1.gz
-man/man1/vedit.1.gz
-man/man1/vi.1.gz
-man/man1/view.1.gz
+share/man/man1/edit.1.gz
+share/man/man1/ex.1.gz
+share/man/man1/vedit.1.gz
+share/man/man1/vi.1.gz
+share/man/man1/view.1.gz
 @dir(,,1777) %%PRESERVEDIR%%
diff --git a/graphics/autotrace/Makefile b/graphics/autotrace/Makefile
index 6c6bf2461ff2..74fd1891494c 100644
--- a/graphics/autotrace/Makefile
+++ b/graphics/autotrace/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	autotrace
 PORTVERSION=	0.31.1
-PORTREVISION=	34
+PORTREVISION=	35
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/AutoTrace/${PORTVERSION}
 
@@ -16,6 +16,7 @@ LIB_DEPENDS=	libpng.so:graphics/png
 USES=		cpe pathfix pkgconfig libtool
 CPE_VENDOR=	autotrace_project
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 USE_LDCONFIG=	yes
 CPPFLAGS+=	$$(libpng-config --I_opts)
 LDFLAGS+=	$$(libpng-config --L_opts)
diff --git a/graphics/autotrace/pkg-plist b/graphics/autotrace/pkg-plist
index 29059a21c219..9377878f6339 100644
--- a/graphics/autotrace/pkg-plist
+++ b/graphics/autotrace/pkg-plist
@@ -10,5 +10,5 @@ lib/libautotrace.so
 lib/libautotrace.so.3
 lib/libautotrace.so.3.0.0
 libdata/pkgconfig/autotrace.pc
-man/man1/autotrace.1.gz
+share/man/man1/autotrace.1.gz
 share/aclocal/autotrace.m4
diff --git a/graphics/gdtclft/Makefile b/graphics/gdtclft/Makefile
index 5fecbaf6ce3f..e2b007af63d6 100644
--- a/graphics/gdtclft/Makefile
+++ b/graphics/gdtclft/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	Gdtclft
 PORTVERSION=	2.2.5
-PORTREVISION=	18
+PORTREVISION=	19
 CATEGORIES=	graphics tcl
 MASTER_SITES=	https://BSDforge.com/projects/source/graphics/gdtclft/
 DISTNAME=	${PORTNAME}${PORTVERSION}
@@ -9,6 +9,11 @@ MAINTAINER=	portmaster@bsdforge.com
 COMMENT=	TCL interface to the Thomas Boutell's Gd library
 WWW=		http://graphviz.org/cgi-bin/man?gdtclft
 
+LICENSE=	GRAPHVIZ
+LICENSE_NAME=	GRAPHVIZ
+LICENSE_FILE=	${WRKSRC}/license.terms
+LICENSE_PERMS=	auto-accept
+
 LIB_DEPENDS=	libgd.so:graphics/gd \
 		libpng.so:graphics/png
 
@@ -23,12 +28,12 @@ MANNPAGE=	gdtclft.n
 GDTCLDIR=	lib/tcl${TCL_VER}/gdtclft
 PLIST_FILES=	${GDTCLDIR}/pkgIndex.tcl
 PLIST_FILES+=	${GDTCLDIR}/libGdtclft2.so
-PLIST_FILES+=	man/mann/${MANNPAGE}.gz
+PLIST_FILES+=	share/man/mann/${MANNPAGE}.gz
 
 post-patch:
 	${REINPLACE_CMD} -Ee 's,[[:space:]]+$$,,' ${WRKSRC}/${MANNPAGE}
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/${MANNPAGE} ${STAGEDIR}${PREFIX}/man/mann
+	${INSTALL_MAN} ${WRKSRC}/${MANNPAGE} ${STAGEDIR}${PREFIX}/share/man/mann
 
 .include <bsd.port.mk>
diff --git a/graphics/gdtclft/files/Makefile.bsd b/graphics/gdtclft/files/Makefile.bsd
index a75addfe8e40..4b67a7f61b32 100644
--- a/graphics/gdtclft/files/Makefile.bsd
+++ b/graphics/gdtclft/files/Makefile.bsd
@@ -22,7 +22,7 @@ pkgIndex.tcl:
 
 DIR	= lib/tcl${TCL_VER}/gdtclft
 LIBDIR	= ${PREFIX}/${DIR}
-MANDIR	= ${PREFIX}/man/man
+MANDIR	= ${PREFIX}/share/man/man
 
 ${STAGEDIR}${LIBDIR}:
 	${MKDIR} $@
diff --git a/irc/ezbounce/Makefile b/irc/ezbounce/Makefile
index 93e3c74a2bd8..7791f64f63af 100644
--- a/irc/ezbounce/Makefile
+++ b/irc/ezbounce/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	ezbounce
 PORTVERSION=	1.99.15
-PORTREVISION=	26
+PORTREVISION=	27
 CATEGORIES=	irc
 MASTER_SITES=	https://BSDforge.com/projects/source/irc/ezbounce/
 
@@ -8,8 +8,8 @@ MAINTAINER=	portmaster@BSDforge.com
 COMMENT=	Highly configurable IRC Proxy
 WWW=		https://sourceforge.net/projects/ezbounce/
 
-DEPRECATED=	Abandonware, last release in 2009 and dead upstream. Consider using irc/soju or irc/znc
-EXPIRATION_DATE=2024-02-29
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 OPTIONS_DEFINE=	DOCS SSL COMPRESS
 OPTIONS_DEFAULT=SSL COMPRESS
@@ -22,6 +22,7 @@ COMPRESS_CONFIGURE_WITH=boost
 COMPRESS_DESC=		Chat log compression (requires boost)
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 USES=		compiler:c++0x cpe gmake
 USE_GCC=	yes
 
@@ -39,7 +40,7 @@ post-patch:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ezbounce ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_DATA} ${WRKSRC}/ezb.conf.default ${STAGEDIR}${PREFIX}/etc
-	${INSTALL_MAN}	${WRKSRC}/docs/ezbounce.1 ${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_MAN}	${WRKSRC}/docs/ezbounce.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/irc/ezbounce/pkg-plist b/irc/ezbounce/pkg-plist
index 0e055d42aee4..d9be0617ce25 100644
--- a/irc/ezbounce/pkg-plist
+++ b/irc/ezbounce/pkg-plist
@@ -1,6 +1,6 @@
 @sample etc/ezb.conf.default etc/ezb.conf
 sbin/ezbounce
-man/man1/ezbounce.1.gz
+share/man/man1/ezbounce.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
diff --git a/misc/hotkeys/Makefile b/misc/hotkeys/Makefile
index fe7a5b2c2193..076262b1b231 100644
--- a/misc/hotkeys/Makefile
+++ b/misc/hotkeys/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	hotkeys
 PORTVERSION=	0.5.7.1
-PORTREVISION=	20
+PORTREVISION=	21
 CATEGORIES=	misc
 MASTER_SITES=	https://BSDforge.com/projects/source/misc/hotkeys/${PORTVERSION}/
 DISTNAME=	hotkeys_${PORTVERSION}
@@ -12,12 +12,17 @@ WWW=		http://ypwong.org/hotkeys/
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libxml2.so:textproc/libxml2
+LIB_DEPENDS=	libharfbuzz.so:print/harfbuzz \
+		libfreetype.so:print/freetype2 \
+		libxml2.so:textproc/libxml2 \
+		libfontconfig.so:x11-fonts/fontconfig
 
-USES=		bdb gmake xorg
-USE_XORG=	x11 xft xkbfile xmu
+USES=		bdb gettext-runtime gmake xorg
+USE_GNOME=	glib20 pango
+USE_XORG=	x11 xext xft xinerama xkbfile xmu
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--with-db3-inc=${BDB_INCLUDE_DIR} \
 		--with-db3-lib=${BDB_LIB_DIR} \
 		--with-db-name=${BDB_LIB_NAME}
diff --git a/misc/hotkeys/pkg-plist b/misc/hotkeys/pkg-plist
index 2738e4cbf4e2..f12691acf3cd 100644
--- a/misc/hotkeys/pkg-plist
+++ b/misc/hotkeys/pkg-plist
@@ -1,6 +1,6 @@
 bin/hotkeys
 @sample etc/hotkeys.conf.sample
-man/man1/hotkeys.1.gz
+share/man/man1/hotkeys.1.gz
 %%DATADIR%%/splash.png
 %%DATADIR%%/acerwl.def
 %%DATADIR%%/btc9000.def
diff --git a/net-mgmt/tcptrack/Makefile b/net-mgmt/tcptrack/Makefile
index a9567c5fa8e2..c277c10a1efc 100644
--- a/net-mgmt/tcptrack/Makefile
+++ b/net-mgmt/tcptrack/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	tcptrack
 PORTVERSION=	1.4.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-mgmt
 MASTER_SITES=	https://BSDforge.com/projects/source/net-mgmt/tcptrack/ \
 		http://pkgs.fedoraproject.org/repo/pkgs/tcptrack/tcptrack-1.4.2.tar.gz/dacf71a6b5310caf1203a2171b598610/
@@ -16,8 +16,9 @@ USES=		ncurses
 USE_CXXSTD=	c++14
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 
-PLIST_FILES=	bin/tcptrack man/man1/tcptrack.1.gz
+PLIST_FILES=	bin/tcptrack share/man/man1/tcptrack.1.gz
 
 .include <bsd.port.pre.mk>
 
diff --git a/net-mgmt/tcptrack/files/patch-IPAddress.h b/net-mgmt/tcptrack/files/patch-IPAddress.h
index e61740418644..f175470adb96 100644
--- a/net-mgmt/tcptrack/files/patch-IPAddress.h
+++ b/net-mgmt/tcptrack/files/patch-IPAddress.h
@@ -1,5 +1,5 @@
---- src/IPAddress.h.orig	2010-09-29 03:23:24.000000000 +0200
-+++ src/IPAddress.h	2015-08-20 23:35:26.583907000 +0200
+--- src/IPAddress.h.orig	2010-09-29 03:23:24 UTC
++++ src/IPAddress.h
 @@ -16,7 +16,7 @@ public:
  
  	virtual int GetType() const = 0;
diff --git a/net-mgmt/tcptrack/files/patch-IPv6Address.cc b/net-mgmt/tcptrack/files/patch-IPv6Address.cc
index 49f87845dff4..08a7ab9c90cb 100644
--- a/net-mgmt/tcptrack/files/patch-IPv6Address.cc
+++ b/net-mgmt/tcptrack/files/patch-IPv6Address.cc
@@ -1,5 +1,5 @@
---- src/IPv6Address.cc.orig	2010-09-28 03:35:16.000000000 +0200
-+++ src/IPv6Address.cc	2014-07-18 10:19:48.000000000 +0200
+--- src/IPv6Address.cc.orig	2010-09-28 03:35:16 UTC
++++ src/IPv6Address.cc
 @@ -7,6 +7,8 @@
  #include "IPv6Address.h"
  #include "util.h"
diff --git a/net-mgmt/tcptrack/files/patch-headers.h b/net-mgmt/tcptrack/files/patch-headers.h
index f27275183eaf..8bae286a5a9a 100644
--- a/net-mgmt/tcptrack/files/patch-headers.h
+++ b/net-mgmt/tcptrack/files/patch-headers.h
@@ -1,5 +1,5 @@
---- src/headers.h-orig	2014-07-18 09:58:12.000000000 +0200
-+++ src/headers.h	2014-07-18 09:58:31.000000000 +0200
+--- src/headers.h-orig	2014-07-18 09:58:12 UTC
++++ src/headers.h
 @@ -120,7 +120,6 @@
      #define TH_URG 0x20
      #define TH_ECE 0x40
diff --git a/net-mgmt/tcptrack/files/patch-util.cc b/net-mgmt/tcptrack/files/patch-util.cc
index e00bc3561db6..40b8dbb5f0c4 100644
--- a/net-mgmt/tcptrack/files/patch-util.cc
+++ b/net-mgmt/tcptrack/files/patch-util.cc
@@ -1,5 +1,5 @@
---- src/util.cc-orig	2014-07-18 09:55:37.000000000 +0200
-+++ src/util.cc	2014-07-18 09:56:11.000000000 +0200
+--- src/util.cc-orig	2014-07-18 09:55:37 UTC
++++ src/util.cc
 @@ -22,6 +22,7 @@
  #include "util.h"
  #include <stdio.h>
diff --git a/net/pen/Makefile b/net/pen/Makefile
index 672d54984831..568bb0606c40 100644
--- a/net/pen/Makefile
+++ b/net/pen/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	pen
 PORTVERSION=	0.34.1
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://siag.nu/pub/pen/
 
@@ -13,6 +14,7 @@ USES=		cpe ssl
 CPE_VENDOR=	${PORTNAME}_project
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 USE_RC_SUBR=	pen
 CONFIGURE_ARGS=	--with-daemon --with-docdir=${DOCSDIR} --without-geoip \
 		--with-ssl=${OPENSSLBASE}
@@ -21,9 +23,9 @@ LIBS+=		-L${LOCALBASE}/lib
 
 PORTDOCS=	penstats HOWTO AUTHORS README ChangeLog COPYING
 PLIST_FILES=	bin/mergelogs bin/pen bin/penctl bin/penlog \
-		bin/penlogd man/man1/mergelogs.1.gz \
-		man/man1/pen.1.gz man/man1/penctl.1.gz \
-		man/man1/penlog.1.gz man/man1/penlogd.1.gz
+		bin/penlogd share/man/man1/mergelogs.1.gz \
+		share/man/man1/pen.1.gz share/man/man1/penctl.1.gz \
+		share/man/man1/penlog.1.gz share/man/man1/penlogd.1.gz
 
 OPTIONS_DEFINE=	DEBUG DOCS KQUEUE
 OPTIONS_DEFAULT=KQUEUE