Skip to content

Commit

Permalink
*: Move manpages to share/man
Browse files Browse the repository at this point in the history
PR:		277322
  • Loading branch information
Chris Hutchinson authored and arrowd committed Feb 27, 2024
1 parent d7ec719 commit f755375
Show file tree
Hide file tree
Showing 26 changed files with 141 additions and 101 deletions.
8 changes: 4 additions & 4 deletions 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/
Expand All @@ -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>
6 changes: 1 addition & 5 deletions 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/

Expand All @@ -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

Expand Down
4 changes: 2 additions & 2 deletions 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 @@
}

Expand Down
34 changes: 32 additions & 2 deletions 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)" \
Expand Down
28 changes: 14 additions & 14 deletions devel/clig/pkg-plist
Expand Up @@ -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
3 changes: 2 additions & 1 deletion 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/

Expand All @@ -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

Expand Down
20 changes: 10 additions & 10 deletions dns/fastresolve/pkg-plist
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion 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/

Expand All @@ -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

Expand Down
34 changes: 17 additions & 17 deletions dns/hesiod/pkg-plist
Expand Up @@ -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
2 changes: 1 addition & 1 deletion 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-
Expand Down
17 changes: 7 additions & 10 deletions 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.
Expand Down Expand Up @@ -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:
Expand All @@ -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; \
Expand Down
10 changes: 5 additions & 5 deletions editors/2bsd-vi/pkg-plist
Expand Up @@ -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%%
3 changes: 2 additions & 1 deletion 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}

Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion graphics/autotrace/pkg-plist
Expand Up @@ -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
11 changes: 8 additions & 3 deletions 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}
Expand All @@ -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

Expand All @@ -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>
2 changes: 1 addition & 1 deletion graphics/gdtclft/files/Makefile.bsd
Expand Up @@ -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} $@
Expand Down
9 changes: 5 additions & 4 deletions irc/ezbounce/Makefile
@@ -1,15 +1,15 @@
PORTNAME= ezbounce
PORTVERSION= 1.99.15
PORTREVISION= 26
PORTREVISION= 27
CATEGORIES= irc
MASTER_SITES= https://BSDforge.com/projects/source/irc/ezbounce/

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
Expand All @@ -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

Expand All @@ -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}
Expand Down

0 comments on commit f755375

Please sign in to comment.