diff --git a/deskutils/bigyear/Makefile b/deskutils/bigyear/Makefile index 48ea524f2fe1..958e2efa3da9 100644 --- a/deskutils/bigyear/Makefile +++ b/deskutils/bigyear/Makefile @@ -1,25 +1,25 @@ PORTNAME= bigyear PORTVERSION= 20010226 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= deskutils MASTER_SITES= https://BSDforge.com/projects/source/deskutils/bigyear/ 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 diff --git a/devel/clig/Makefile b/devel/clig/Makefile index 9eb169143e07..d5acf07dae17 100644 --- a/devel/clig/Makefile +++ b/devel/clig/Makefile @@ -1,36 +1,32 @@ PORTNAME= clig PORTVERSION= 1.9.11.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel tcl MASTER_SITES= https://BSDforge.com/projects/source/devel/clig/ MAINTAINER= portmaster@BSDforge.com COMMENT= Auto-generate an (argc, argv) processor, usage message, and manpage WWW= https://BSDforge.com/projects/devel/clig LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING-2.0 USES= shebangfix tcl tk SHEBANG_FILES= tcl/*.tcl tk_OLD_CMD= /usr/bin/wish8.0 NO_BUILD= yes MAKEFILE= makefile MAKE_ENV= NOPORTDOCS=${NOPORTDOCS} MAKE_ARGS= prefix="${PREFIX}" build_root="${STAGEDIR}" WRKSRC= ${WRKDIR}/${PORTNAME} PORTDOCS= * 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 .include 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,14 +1,14 @@ ---- 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 @@ } # doc and examples +if {$env(NOPORTDOCS) eq {}} { file copy -force CHANGES ANNOUNCE index.html README WISHLIST \ COPYING-2.0 LICENSE example \ $env(DOCDIR) +} ######################################################################## ## Local Variables: ## ## mode:tcl ## 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,9 +1,39 @@ ---- 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)" \ MnSUFFIX=$(MnSUFFIX) \ - DOCDIR=$(build_root)$(DOCDIR) VERSION=$(VERSION) + DOCDIR=$(build_root)$(DOCDIR) VERSION=$(VERSION) \ + NOPORTDOCS=${NOPORTDOCS} 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 @@ -1,71 +1,71 @@ bin/clig bin/cligUsage lib/clig/c/catArgv.c lib/clig/c/checkDoubleHigher.c lib/clig/c/checkDoubleLower.c lib/clig/c/checkFloatConversion.c lib/clig/c/checkFloatHigher.c lib/clig/c/checkFloatLower.c lib/clig/c/checkIntHigher.c lib/clig/c/checkIntLower.c lib/clig/c/checkLongHigher.c lib/clig/c/checkLongLower.c lib/clig/c/getDoubleOpt.c lib/clig/c/getDoubleOpts.c lib/clig/c/getFloatOpt.c lib/clig/c/getFloatOpts.c lib/clig/c/getIntOpt.c lib/clig/c/getIntOpts.c lib/clig/c/getLongOpt.c lib/clig/c/getLongOpts.c lib/clig/c/getStringOpt.c lib/clig/c/getStringOpts.c lib/clig/c/missingErr.c lib/clig/c/template.man lib/clig/pkgIndex.tcl lib/clig/tcl/cmdline.cli lib/clig/tcl/genCheckMandatory.tcl lib/clig/tcl/genDefault.tcl lib/clig/tcl/genDotC.tcl lib/clig/tcl/genDotH.tcl lib/clig/tcl/genGUI.tcl lib/clig/tcl/genMan.tcl lib/clig/tcl/genParse.tcl lib/clig/tcl/genShowOptionValues.tcl lib/clig/tcl/genStruct.tcl lib/clig/tcl/genUsage.tcl lib/clig/tcl/globalpg.tcl lib/clig/tcl/ober.tcl lib/clig/tcl/util.tcl lib/clig/tcllib/DeclCommandline.tcl lib/clig/tcllib/DeclDescription.tcl lib/clig/tcllib/DeclDouble.tcl lib/clig/tcllib/DeclFlag.tcl lib/clig/tcllib/DeclFloat.tcl lib/clig/tcllib/DeclInt.tcl lib/clig/tcllib/DeclLong.tcl lib/clig/tcllib/DeclName.tcl lib/clig/tcllib/DeclRest.tcl lib/clig/tcllib/DeclString.tcl lib/clig/tcllib/DeclUsage.tcl lib/clig/tcllib/DeclVersion.tcl lib/clig/tcllib/declOpt.tcl lib/clig/tcllib/oldOpts.tcl 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,39 +1,40 @@ PORTNAME= fastresolve PORTVERSION= 2.10 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= dns MASTER_SITES= https://BSDforge.com/projects/source/dns/fastresolve/ MAINTAINER= portmaster@BSDforge.com COMMENT= Programs to get DNS and domain ownership information from web logs WWW= https://BSDforge.com/projects/dns/fastresolve/ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libadns.so:dns/adns 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 LDFLAGS+= -L${BDB_LIB_DIR} CXXFLAGS+= -I${BDB_INCLUDE_DIR} OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -e 's/-ldb"/-l${BDB_LIB_CXX_NAME}"/' \ ${WRKSRC}/configure post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in AUTHORS COPYING ChangeLog INSTALL NEWS README ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor ${INSTALL_DATA} ${WRKSRC}/doc/TODO ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/timings ${STAGEDIR}${DOCSDIR} .include 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 @@ -1,30 +1,30 @@ bin/dns-terror bin/btree-dump bin/convert-dom-db bin/convert-ip-db bin/expire-ip-db bin/getdominfo 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 %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/TODO %%PORTDOCS%%%%DOCSDIR%%/timings diff --git a/dns/hesiod/Makefile b/dns/hesiod/Makefile index e9708c26f8b5..79597e749bb5 100644 --- a/dns/hesiod/Makefile +++ b/dns/hesiod/Makefile @@ -1,33 +1,34 @@ PORTNAME= hesiod PORTVERSION= 3.2.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= dns MASTER_SITES= https://BSDforge.com/projects/source/dns/hesiod/ MAINTAINER= portmaster@BSDforge.com COMMENT= Directory service built on DNS and BIND LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING OPTIONS_DEFINE= IDN 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 CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib .include .if ${PORT_OPTIONS:MIDN} LIB_DEPENDS+= libidn.so:dns/libidn .else CONFIGURE_ARGS+=--without-libidn .endif .include 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 @@ -1,24 +1,24 @@ bin/hesinfo include/hesiod.h lib/libhesiod.a 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,32 +1,32 @@ PORTNAME= vi PORTVERSION= 050325 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= editors MASTER_SITES= SF/ex-${PORTNAME}/ex-${PORTNAME}/${PORTVERSION} PKGNAMEPREFIX= 2bsd- DISTNAME= ex-${PORTVERSION} MAINTAINER= portmaster@BSDforge.com COMMENT= The original vi editor, updated to run on modern OSes WWW= https://ex-vi.sourceforge.net/ LICENSE= BSD4CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_aarch64= Fails to link: missing sbrk BROKEN_riscv64= Fails to link: missing sbrk USES= ncurses tar:bzip2 PRESERVEDIR= /var/preserve/${PKGBASE} PLIST_SUB= PRESERVEDIR="${PRESERVEDIR}" post-extract: .SILENT ${RM} -r ${WRKSRC}/libuxre ${WRKSRC}/regexp.h post-patch: .for f in Makefile ex.1 expreserve.c exrecover.c vi.1 @${REINPLACE_CMD} -e 's|/var/preserve|${PRESERVEDIR}|' ${WRKSRC}/${f} .endfor .include 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,93 +1,90 @@ ---- 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. # -INSTALL = /usr/ucb/install +INSTALL = /usr/bin/install # # Compiler and linker flags. @@ -161,9 +160,7 @@ # (wchar.h, wctype.h, btowc() etc.) which is not provided by older # compilation environments. # -REINC = -I./libuxre -DUXRE -RELIB = -L./libuxre -luxre -RETGT = uxre +REINC = -DUXRE -DREG_ANGLES=0 -DNO_BE_BACKSLASH # # VMUNIX should be correct for any modern Unix. @@ -205,13 +202,13 @@ # # You may also get terminfo access by using the ncurses library. # -#TERMLIB = ncurses +TERMLIB = ncurses # # The preferred choice for ex on Linux distributions, other systems that # provide a good termcap file, or when setting the TERMCAP environment # variable is deemed sufficient, is the included 2.11BSD termcap library. # -TERMLIB = termlib +#TERMLIB = termlib # # Since ex uses sbrk() internally, a conflict with the libc's version of @@ -240,7 +237,6 @@ -DEXPRESERVE=\"$(LIBEXECDIR)/expreserve\" CCFLAGS = $(CFLAGS) $(WARN) $(CPPFLAGS) $(FEATURES) $(CHARSET) $(OSTYPE) \ $(LARGEF) $(RECOVER) $(LANGMSG) $(REINC) $(RPMCFLAGS) -TLIB = libterm/libtermlib.a 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: - test -d $(DESTDIR)$(PREFIX) || mkdir -p $(DESTDIR)$(PREFIX) - test -d $(DESTDIR)$(MANDIR) || mkdir -p $(DESTDIR)$(MANDIR) - test -d $(DESTDIR)$(MANDIR)/man1 || mkdir -p $(DESTDIR)$(MANDIR)/man1 - rm -f $(DESTDIR)$(MANDIR)/man1/ex.1 $(DESTDIR)$(MANDIR)/man1/edit.1 \ - $(DESTDIR)$(MANDIR)/man1/vedit.1 \ - $(DESTDIR)$(MANDIR)/man1/vi.1 \ - $(DESTDIR)$(MANDIR)/man1/view.1 $(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; \ @@ -322,8 +307,7 @@ mv $(DESTDIR)$(BINDIR)/ex $(DESTDIR)$(BINDIR)/ex.old.$$$$; \ rm -f $(DESTDIR)$(BINDIR)/ex.old.$$$$; \ fi - $(INSTALL) -c $(STRIP) -m 1755 ex $(DESTDIR)$(BINDIR)/ex - test -d $(DESTDIR)$(LIBEXECDIR) || mkdir -p $(DESTDIR)$(LIBEXECDIR) + $(INSTALL) -c $(STRIP) -m 755 ex $(DESTDIR)$(BINDIR)/ex $(INSTALL) -c $(STRIP) exrecover $(DESTDIR)$(LIBEXECDIR)/exrecover $(INSTALL) -c $(STRIP) expreserve $(DESTDIR)$(LIBEXECDIR)/expreserve ln -s ex $(DESTDIR)$(BINDIR)/edit 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 @@ -1,13 +1,13 @@ bin/ex bin/edit bin/vedit 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,49 +1,50 @@ PORTNAME= autotrace PORTVERSION= 0.31.1 -PORTREVISION= 34 +PORTREVISION= 35 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/AutoTrace/${PORTVERSION} MAINTAINER= portmaster@BSDforge.com COMMENT= Convert bitmap to vector graphics WWW= https://AutoTrace.sourceforge.net/ LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi 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) INSTALL_TARGET= install-strip OPTIONS_DEFINE= IMAGEMAGICK MING PSTOEDIT OPTIONS_DEFAULT=IMAGEMAGICK MING_DESC= Enable swf interface PSTOEDIT_DESC= Convert postscript to other formats IMAGEMAGICK_USES= magick:7 IMAGEMAGICK_CONFIGURE_OFF= --without-magick MING_LIB_DEPENDS= libming.so:graphics/ming MING_CPPFLAGS= -I${LOCALBASE}/include -I${LOCALBASE}/include/ming MING_CONFIGURE_OFF= ac_cv_header_ming_h=no PSTOEDIT_LIB_DEPENDS= libpstoedit.so:graphics/pstoedit PSTOEDIT_CONFIGURE_OFF= --without-pstoedit post-patch: @${REINPLACE_CMD} -e \ 's|Magick-config|MagickWand-config|g ; \ /$$PSTOEDIT_CONFIG/s|--version|--modversion| ; \ s|$$PSTOEDIT_CONFIG $$pstoedit_args|pkg-config pstoedit| ; \ /^PSTOEDIT_CONFIG=/s|=.*$$|=pkg-config|' ${WRKSRC}/configure post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libautotrace.so .include 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 @@ -1,14 +1,14 @@ bin/autotrace bin/autotrace-config include/autotrace/autotrace.h include/autotrace/exception.h include/autotrace/input.h include/autotrace/output.h include/autotrace/types.h lib/libautotrace.a 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,34 +1,39 @@ 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} 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 USES= tcl uidfix MAKEFILE= ${FILESDIR}/Makefile.bsd MAKE_ENV= TCL_VER=${TCL_VER} MKDIR="${MKDIR}" \ TCL_SHLIB_VER=${TCL_SHLIB_VER} \ INSTALL_DATA="${INSTALL_DATA}" STAGEDIR="${STAGEDIR}" 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 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 @@ -1,33 +1,33 @@ PACKAGE = Gdtclft VERSION = 2.3 SHLIB_NAME = lib${PACKAGE}2.so SRCS = gdCmd.c LOCALBASE ?=/usr/local PREFIX ?=/usr/local TCL_VER ?=8.4 WARNS = 3 LDADD = -L${LOCALBASE}/lib -lgd -lpng -lz -lm -ltcl${TCL_SHLIB_VER} CFLAGS +=-I${LOCALBASE}/include/tcl${TCL_VER} -I${LOCALBASE}/include/gd CFLAGS +=-DNDEBUG -Wall -I. -I${LOCALBASE}/include CFLAGS +=-DVERSION=\"${VERSION}\" all: pkgIndex.tcl pkgIndex.tcl: echo 'package ifneeded $(PACKAGE) $(VERSION) [list load [file join $$dir $(SHLIB_NAME)] $(PACKAGE)]' > pkgIndex.tcl DIR = lib/tcl${TCL_VER}/gdtclft LIBDIR = ${PREFIX}/${DIR} -MANDIR = ${PREFIX}/man/man +MANDIR = ${PREFIX}/share/man/man ${STAGEDIR}${LIBDIR}: ${MKDIR} $@ beforeinstall: ${STAGEDIR}${LIBDIR} ${INSTALL_DATA} pkgIndex.tcl ${STAGEDIR}${LIBDIR} .include diff --git a/irc/ezbounce/Makefile b/irc/ezbounce/Makefile index 93e3c74a2bd8..7791f64f63af 100644 --- a/irc/ezbounce/Makefile +++ b/irc/ezbounce/Makefile @@ -1,51 +1,52 @@ 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 OPTIONS_SUB= yes SSL_USES= ssl SSL_CONFIGURE_WITH= ssl COMPRESS_BUILD_DEPENDS= ${LOCALBASE}/include/boost/function.hpp:devel/boost-libs 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 # ezbounce 1.99.15 isn't compatible with C++11 and later, which some compilers # such as GCC 6 default to. USE_CXXSTD= gnu++98 SUB_FILES= pkg-message post-patch: @${SED} -e "s:/path/to:${PREFIX}/sbin:" ${WRKSRC}/sample.conf > \ ${WRKSRC}/ezb.conf.default @${REINPLACE_CMD} -e 's|=-O2|="$$CXXFLAGS"|g' ${WRKSRC}/configure 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} ${INSTALL_DATA} ${WRKSRC}/CHANGES ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/TODO ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docs/worklog ${STAGEDIR}${DOCSDIR} .include 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,7 +1,7 @@ @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 %%PORTDOCS%%%%DOCSDIR%%/worklog diff --git a/misc/hotkeys/Makefile b/misc/hotkeys/Makefile index fe7a5b2c2193..076262b1b231 100644 --- a/misc/hotkeys/Makefile +++ b/misc/hotkeys/Makefile @@ -1,54 +1,59 @@ 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} MAINTAINER= portmaster@BSDforge.com COMMENT= Allows usage of special keys on internet/multimedia keyboards 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} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} OPTIONS_DEFINE= OSD OPTIONS_DEFAULT= OSD OSD_LIB_DEPENDS= libxosd.so:misc/xosd OSD_CONFIGURE_WITH= xosd .include .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif post-extract: @${CP} ${PATCHDIR}/error.h ${WRKSRC}/src @${CP} ${PATCHDIR}/eliteduo.def ${WRKSRC}/def @${CP} ${PATCHDIR}/logitech-ultrax.def ${WRKSRC}/def post-patch: @${REINPLACE_CMD} -e '/^install-exec-am/s/install-sysconfDATA//' \ ${WRKSRC}/src/Makefile.in post-configure: ${REINPLACE_CMD} -e 's,-lXinerama,-lXinerama `pkgconf --libs pangoxft`,g' ${WRKSRC}/src/Makefile post-install: ${INSTALL_DATA} ${WRKSRC}/src/hotkeys.conf ${STAGEDIR}${PREFIX}/etc/hotkeys.conf.sample .include 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,31 +1,31 @@ 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 %%DATADIR%%/eliteduo.def %%DATADIR%%/hp5181.def %%DATADIR%%/ibook.def %%DATADIR%%/itouch.def %%DATADIR%%/kb9930.def %%DATADIR%%/kb9963.def %%DATADIR%%/kbp8993.def %%DATADIR%%/logitech-cfo.def %%DATADIR%%/logitech-ultrax.def %%DATADIR%%/mck800.def %%DATADIR%%/msnatpro.def %%DATADIR%%/msnet.def %%DATADIR%%/msnetpro.def %%DATADIR%%/mx1998.def %%DATADIR%%/mx2500.def %%DATADIR%%/mx3000.def %%DATADIR%%/orktekusb.def %%DATADIR%%/pb5140w.def %%DATADIR%%/polypix.def %%DATADIR%%/sk2500.def %%DATADIR%%/sk2501a.def %%DATADIR%%/sk2505.def %%DATADIR%%/sk2800c.def %%DATADIR%%/sk7100.def %%DATADIR%%/sk9925.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,28 +1,29 @@ 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/ MAINTAINER= portmaster@BSDforge.com COMMENT= Packet sniffer that displays TCP information like top(1) WWW= https://BSDforge.com/projects/net-mgmt/tcptrack/ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING 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 .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) CFLAGS+= -Wno-error=unused-but-set-variable .endif .include 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,11 +1,11 @@ ---- 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; virtual bool operator==( const IPAddress & ) const = 0; - virtual bool operator!=( const IPAddress & addr ) const { return !operator!=(addr); } + virtual bool operator!=( const IPAddress & addr ) const { return !operator==(addr); } virtual char * ptr() const = 0; virtual uint32_t hash() const = 0; virtual IPAddress* Clone() 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,11 +1,11 @@ ---- 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" +#define s6_addr16 __u6_addr.__u6_addr16 + uint16_t IPv6Address::GetShort( int index ) const { assert(index >= 0); 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,10 +1,10 @@ ---- 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 #define TH_CWR 0x80 - #define TH_FLAGS (TH_FIN|TH_SYN|TH_RST|TH_ACK|TH_URG|TH_ECE|TH_CWR) u_short th_win; /* window */ u_short th_sum; /* checksum */ u_short th_urp; /* urgent pointer */ 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,10 +1,10 @@ ---- 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 #include +#include #include "headers.h" #ifdef HAVE_HASH_MAP # include diff --git a/net/pen/Makefile b/net/pen/Makefile index 672d54984831..568bb0606c40 100644 --- a/net/pen/Makefile +++ b/net/pen/Makefile @@ -1,43 +1,45 @@ PORTNAME= pen PORTVERSION= 0.34.1 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://siag.nu/pub/pen/ MAINTAINER= portmaster@BSDforge.com COMMENT= Load balancer for UDP and TCP based protocols WWW= https://siag.nu/pen/ LICENSE= GPLv2 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} CPPFLAGS+= -I${LOCALBASE}/include 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 KQUEUE_DESC= Use kqueue backend .if defined(WITH_FDSETSIZE) CONFIGURE_ARGS+= --with-fd_setsize=${WITH_FDSETSIZE} .endif KQUEUE_CONFIGURE_ON= --with-kqueue KQUEUE_CONFIGURE_OFF= --with-poll DEBUG_CONFIGURE_ENABLE= debugging post-patch: @${REINPLACE_CMD} 's/-pg//' ${WRKSRC}/configure .include