diff --git a/net/mpd5/Makefile b/net/mpd5/Makefile index 705406f0ba6a..d7e05072dd64 100644 --- a/net/mpd5/Makefile +++ b/net/mpd5/Makefile @@ -1,65 +1,67 @@ PORTNAME= mpd DISTVERSION= 5.9 PORTREVISION= 18 CATEGORIES= net MASTER_SITES= SF/${PORTNAME}/Mpd5/Mpd-${PORTVERSION} PKGNAMESUFFIX= 5 DIST_SUBDIR= mpd5 MAINTAINER= eugen@FreeBSD.org COMMENT= Multi-link PPP daemon based on netgraph(4) WWW= https://sourceforge.net/projects/mpd/ LICENSE= BSD3CLAUSE USES= cpe +MAKE_ARGS+= MANDIR=${PREFIX}/share/man/man + CPE_VENDOR= mpd_project OPTIONS_DEFINE= DOCS NG_IPACCT RADIUS OPTIONS_DEFAULT= RADIUS NG_IPACCT_DESC= Use ng_ipacct kernel module from port RADIUS_DESC= Enable RADIUS support HAS_CONFIGURE= YES CONFIGURE_WRKSRC= "${WRKSRC}/src" .include MAKE_ARGS+= OSVERSION=${OSVERSION} .if ${PORT_OPTIONS:MNG_IPACCT} BUILD_DEPENDS+= ${LOCALBASE}/include/netgraph/ng_ipacct.h:net-mgmt/ng_ipacct .if exists(${KMODDIR}/ng_ipacct.ko) RUN_DEPENDS+= ${KMODDIR}/ng_ipacct.ko:net-mgmt/ng_ipacct .else RUN_DEPENDS+= /boot/modules/ng_ipacct.ko:net-mgmt/ng_ipacct .endif .else CONFIGURE_ENV+= USE_NG_IPACCT=no MAKE_ARGS+= USE_NG_IPACCT=no .endif .if ${PORT_OPTIONS:MRADIUS} PLIST_FILES= ${DATADIR}/dictionary.mpd post-install: ${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/conf/dictionary.mpd ${STAGEDIR}${DATADIR} .else CONFIGURE_ENV+= USE_RADIUS=no MAKE_ARGS+= USE_RADIUS=no .endif USE_RC_SUBR= mpd5 CONFSUF= conf secret script DOCSDIR= ${PREFIX}/share/doc/mpd5 PORTDOCS= README mpd* PLIST_FILES+= ${CONFSUF:C|(.*)|"@sample etc/mpd5/mpd.\1.sample"|} \ sbin/mpd5 .if !defined(WITHOUT_MAN) PLIST_FILES+= share/man/man8/mpd5.8.gz .endif .include diff --git a/net/mpd5/files/patch-doc_Makefile b/net/mpd5/files/patch-doc_Makefile deleted file mode 100644 index fe713858648c..000000000000 --- a/net/mpd5/files/patch-doc_Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- doc/Makefile.orig 2020-09-06 14:33:02 UTC -+++ doc/Makefile -@@ -13,7 +13,7 @@ MPD_DOC_FILES+= mpd*.html - MPD_DOC_FILES+= mpd.ps - - MAN8= mpd5.8 --MANDIR= ${PREFIX}/man/man -+MANDIR= ${PREFIX}/share/man/man - - depend: - diff --git a/ports-mgmt/dialog4ports/Makefile b/ports-mgmt/dialog4ports/Makefile index e8167ac67393..3858acd7b3ab 100644 --- a/ports-mgmt/dialog4ports/Makefile +++ b/ports-mgmt/dialog4ports/Makefile @@ -1,58 +1,60 @@ PORTNAME= dialog4ports PORTVERSION= 0.1.6 PORTREVISION?= 2 CATEGORIES= ports-mgmt MASTER_SITES= https://files.etoilebsd.net/dialog4ports/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ http://files.etoilebsd.net/dialog4ports/:dialog \ ftp://invisible-island.net/dialog/:dialog \ http://mirror.shatow.net/freebsd/${PORTNAME}/:dialog MAINTAINER= rum1cro@yandex.ru COMMENT?= Console Interface to configure ports WWW= https://bitbucket.org/m1cro/d4p/ LICENSE= BSD2CLAUSE USES= uidfix +MAKE_ARGS+= MAN1DIR=${PREFIX}/share/man/man1 + # CCACHE has options, so may need d4p, make d4p not ccache friendly # to avoid circular dependency NO_CCACHE= yes MAKE_ENV+= __MAKE_CONF=/dev/null SRCCONF=/dev/null .if !exists(/usr/lib/libdialog.so) BROKEN= Requires libdialog in base .endif DEPRECATED= Consider using ports-mgmt/portconfig which is a dropin replacement .if !defined(D4P_SLAVE) PLIST_FILES= bin/dialog4ports share/man/man1/${PORTNAME}.1.gz .endif .include .if defined(DEBUG_FLAGS) MAKE_ARGS+= DEBUG_FLAGS="${DEBUG_FLAGS}" .endif ## This is used by 'make config' via Tools/scripts/dialog4ports.sh ## Use caution in changing .if !exists(${DIALOG4PORTS}) DIALOG4PORTS= ${WRKSRC}/dialog4ports .endif .if defined(D4P_SLAVE) DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ ${DIALOGNAME}.tgz:dialog DIALOGNAME= dialog-1.1-20120706 MAKE_ENV+= DIALOGSOURCES=${WRKDIR}/${DIALOGNAME} do-configure: @cd ${WRKDIR}/${DIALOGNAME}; ./configure .endif .include diff --git a/ports-mgmt/dialog4ports/files/patch-Makefile b/ports-mgmt/dialog4ports/files/patch-Makefile index 66827294bd3a..642df2acd2ce 100644 --- a/ports-mgmt/dialog4ports/files/patch-Makefile +++ b/ports-mgmt/dialog4ports/files/patch-Makefile @@ -1,20 +1,16 @@ --- Makefile.orig 2016-07-08 14:49:08 UTC +++ Makefile -@@ -5,10 +5,15 @@ RM?= rm +@@ -5,7 +5,12 @@ RM?= rm MAN= ${PROG}.1.gz PROG= dialog4ports CFLAGS+= -Wall -pedantic -LDADD+= -lncursesw -lm +.if exists(/usr/lib/libncursesw.so) +LDADD+= -lncursesw +.else +LDADD+= -lncurses +.endif +LDADD+= -lm PREFIX?= /usr/local BINDIR= ${PREFIX}/bin --MAN1DIR= ${PREFIX}/man/man1 -+MAN1DIR= ${PREFIX}/share/man/man1 - BSD_INSTALL_PROGRAM?= install -m 0555 - BSD_INSTALL_DATA?= install -m 0444 - + MAN1DIR= ${PREFIX}/man/man1 diff --git a/security/unix-selfauth-helper/Makefile b/security/unix-selfauth-helper/Makefile index 0205a4391eef..9273cdff3650 100644 --- a/security/unix-selfauth-helper/Makefile +++ b/security/unix-selfauth-helper/Makefile @@ -1,19 +1,21 @@ PORTNAME= unix-selfauth-helper DISTVERSION= 1.1 PORTREVISION= 1 CATEGORIES= security MASTER_SITES= ${WWW}/releases/download/v${DISTVERSION}/ MAINTAINER= zirias@FreeBSD.org COMMENT= Local self-authentication for pam_exec WWW= https://github.com/Zirias/${PORTNAME} LICENSE= BSD2CLAUSE USES= tar:xz +MAKE_ARGS+= MANDIR=${PREFIX}/share/man/man + PLIST_FILES= etc/pam.d/unix-selfauth \ libexec/unix-selfauth-helper \ share/man/man8/unix-selfauth-helper.8.gz .include diff --git a/security/unix-selfauth-helper/files/patch-Makefile b/security/unix-selfauth-helper/files/patch-Makefile deleted file mode 100644 index 3c97ad8f1a76..000000000000 --- a/security/unix-selfauth-helper/files/patch-Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.orig 2023-07-13 18:59:16 UTC -+++ Makefile -@@ -9,7 +9,7 @@ BINMODE= 4555 - DIRS+= MAN8DIR - MAN= ${PROG}.8 - MAN8= ${MAN} --MANDIR= ${PREFIX}/man/man -+MANDIR= ${PREFIX}/share/man/man - MAN8DIR= ${MANDIR}8 - - CONFS= unix-selfauth diff --git a/sysutils/lmmon/Makefile b/sysutils/lmmon/Makefile index 60467ba561e7..1e20f4f4dc43 100644 --- a/sysutils/lmmon/Makefile +++ b/sysutils/lmmon/Makefile @@ -1,26 +1,26 @@ PORTNAME= lmmon PORTVERSION= 0.65 PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= LOCAL/bf MAINTAINER= ports@FreeBSD.org COMMENT= Display information gathered from MB power management controller LICENSE= BSD2CLAUSE USES= ncurses uidfix GNU_CONFIGURE= yes -MAKE_ARGS+= LDFLAGS="${LDFLAGS} -lncurses" +MAKE_ARGS+= LDFLAGS="${LDFLAGS} -lncurses" MANDIR=${PREFIX}/share/man/man ONLY_FOR_ARCHS= i386 amd64 PLIST_FILES= bin/lmmon share/man/man8/lmmon.8.gz FIXFILES= configure configure.in lmmon.c post-patch: @${REINPLACE_CMD} -e 's,machine/smb.h,dev/smbus/smb.h,' \ ${FIXFILES:S,^,${WRKSRC}/,} .include diff --git a/sysutils/lmmon/files/patch-Makefile.in b/sysutils/lmmon/files/patch-Makefile.in deleted file mode 100644 index 6846b4ece712..000000000000 --- a/sysutils/lmmon/files/patch-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig 1999-11-02 13:33:30 UTC -+++ Makefile.in -@@ -9,7 +9,7 @@ SRCS= lmmon.c - - PREFIX= @prefix@ - BINDIR= $(PREFIX)/bin --MANDIR= $(PREFIX)/man/man -+MANDIR= $(PREFIX)/share/man/man - - PROG= lmmon - MAN8= lmmon.8 diff --git a/sysutils/pftop/Makefile b/sysutils/pftop/Makefile index db045837aed4..13f7bf3f98a5 100644 --- a/sysutils/pftop/Makefile +++ b/sysutils/pftop/Makefile @@ -1,38 +1,38 @@ PORTNAME= pftop PORTVERSION= 0.10 PORTREVISION= 1 CATEGORIES= sysutils net MAINTAINER= grembo@FreeBSD.org COMMENT= Utility for real-time display of statistics for pf WWW= https://github.com/grembo/pftop/ LICENSE= BSD2CLAUSE LIB_DEPENDS= libpfctl.so:net/libpfctl USES= localbase uidfix USE_GITHUB= yes GH_ACCOUNT= grembo OPTIONS_DEFINE= ALTQ ALTQ_DESC= ALTQ support for queue statistics .include -MAKE_ARGS= LOCALBASE="${PREFIX}" +MAKE_ARGS= LOCALBASE="${PREFIX}" MANDIR=${PREFIX}/share/man/man CFLAGS+= -DHAVE_SNPRINTF=1 -DHAVE_VSNPRINTF=1 .if ${PORT_OPTIONS:MALTQ} CFLAGS+= -DHAVE_ALTQ=1 .endif MAKE_ARGS+= CSTD=gnu89 MAKE_ENV+= __MAKE_CONF=/dev/null PLIST_FILES= sbin/pftop \ share/man/man8/pftop.8.gz .include diff --git a/sysutils/pftop/files/patch-Makefile b/sysutils/pftop/files/patch-Makefile deleted file mode 100644 index 33dccc89d8fe..000000000000 --- a/sysutils/pftop/files/patch-Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.orig 2023-11-13 12:00:08 UTC -+++ Makefile -@@ -13,7 +13,7 @@ MAN= pftop.8 - CFLAGS+= -Wall -Wno-unneeded-internal-declaration -DOS_LEVEL=${OSLEVEL} - LDADD+= -L${LOCALBASE}/lib -lcurses -lpfctl - --MANDIR=${LOCALBASE}/man/man -+MANDIR=${LOCALBASE}/share/man/man - BINDIR=${LOCALBASE}/sbin - - .y.c: