diff options
| author | Brooks Davis <brooks@FreeBSD.org> | 2019-11-25 23:25:52 +0000 |
|---|---|---|
| committer | Brooks Davis <brooks@FreeBSD.org> | 2019-11-25 23:25:52 +0000 |
| commit | f2ab4428432c7278a3dfc65dd19ae1a0e21e9b2f (patch) | |
| tree | 52dbe489ef07375a512911ffcd740da2bf5bfaed | |
| parent | 349193f6e0668b51b63df6aee192eed9a6930e18 (diff) | |
| download | freebsd-ports-f2ab4428432c7278a3dfc65dd19ae1a0e21e9b2f.zip | |
Fix build with src r354909 applied.
The referenced change made NO_INSTALLLIB, NO_MAN, and NO_PROFILE into
errors causing these ports that declare them and use the FreeBSD make
infrastructure as part of their build to fail.
When the offending variables occur in a BSD Makefile, NO_MAN becomes
MAN= and NO_INSTALLLIB and NO_PROFILE become MK_INSTALLLIB=no and
MK_PROFILE=no respectively. When declared in the environment they
become WITHOUT_<FOO>.
95 files changed, 388 insertions, 116 deletions
diff --git a/archivers/libcabinet/files/patch-Makefile b/archivers/libcabinet/files/patch-Makefile index eea743f53728..a4c20f207c09 100644 --- a/archivers/libcabinet/files/patch-Makefile +++ b/archivers/libcabinet/files/patch-Makefile @@ -1,7 +1,7 @@ --- Makefile.orig 2016-07-26 12:03:27 UTC +++ Makefile @@ -0,0 +1,16 @@ -+NO_PROFILE= true ++MK_PROFILE= no +CXXFLAGS+= -Wno-deprecated +LIB= cabinet +LIBDIR= ${PREFIX}/lib diff --git a/archivers/parchive/files/Makefile b/archivers/parchive/files/Makefile index 8adca2f01fd4..c1945f34a435 100644 --- a/archivers/parchive/files/Makefile +++ b/archivers/parchive/files/Makefile @@ -4,6 +4,6 @@ PREFIX?=/usr/local BINDIR= ${PREFIX}/bin PROG= parchive SRCS= backend.c checkpar.c makepar.c rwpar.c rs.c md5.c fileops.c main.c readoldpar.c interface.c ui_text.c -NO_MAN= yes +MAN= .include <bsd.prog.mk> diff --git a/archivers/zipmix/files/Makefile b/archivers/zipmix/files/Makefile index 045b71cc1c00..df7c69da5034 100644 --- a/archivers/zipmix/files/Makefile +++ b/archivers/zipmix/files/Makefile @@ -2,6 +2,6 @@ PROG= zipmix -NO_MAN= YES +MAN= .include <bsd.prog.mk> diff --git a/audio/jack_ghero/files/patch-Makefile b/audio/jack_ghero/files/patch-Makefile new file mode 100644 index 000000000000..e71c4b5e3cc9 --- /dev/null +++ b/audio/jack_ghero/files/patch-Makefile @@ -0,0 +1,11 @@ +--- Makefile.orig ++++ Makefile +@@ -38,7 +38,7 @@ + INCLUDEDIR= ${PREFIX}/include + MKLINT= no + NOGCCERROR= +-NO_PROFILE= ++MK_PROFILE= no + PTHREAD_LIBS?= -lpthread + + CFLAGS+= -I${PREFIX}/include -Wall diff --git a/audio/libg722/files/patch-Makefile b/audio/libg722/files/patch-Makefile new file mode 100644 index 000000000000..35ef132a1bbb --- /dev/null +++ b/audio/libg722/files/patch-Makefile @@ -0,0 +1,11 @@ +--- Makefile.orig ++++ Makefile +@@ -4,7 +4,7 @@ + SHLIB_MAJOR= 0 + PREFIX?= /usr/local + LIBDIR= ${PREFIX}/lib +-NO_PROFILE= YES ++MK_PROFILE= no + INCLUDEDIR= ${PREFIX}/include + MAN= + SRCS= g722_decode.c g722_encode.c diff --git a/benchmarks/raidtest/files/Makefile b/benchmarks/raidtest/files/Makefile index 17a06399787c..1be726de4500 100644 --- a/benchmarks/raidtest/files/Makefile +++ b/benchmarks/raidtest/files/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= raidtest -NO_MAN= true +MAN= WARNS?= 6 BINDIR?= ${PREFIX}/bin diff --git a/chinese/docproj/src/cjktexsty/Makefile b/chinese/docproj/src/cjktexsty/Makefile index 7d635bd0fbd3..fda9df6cd6d2 100644 --- a/chinese/docproj/src/cjktexsty/Makefile +++ b/chinese/docproj/src/cjktexsty/Makefile @@ -8,8 +8,7 @@ LOCALBASE?= ${PREFIX} BINDIR= ${PREFIX}/bin CFLAGS+= -I${LOCALBASE}/include LDADD= -L${LOCALBASE}/lib -liconv -NO_MAN= -NOMAN= +MAN= .if defined(BSD_INSTALL_PROGRAM) install: diff --git a/comms/mlan3/files/patch-Makefiles b/comms/mlan3/files/patch-Makefiles index b769b5f2cc1b..a1dae6453a5f 100644 --- a/comms/mlan3/files/patch-Makefiles +++ b/comms/mlan3/files/patch-Makefiles @@ -25,7 +25,7 @@ +CFLAGS= -I. -Wall -I${MLANCOM} +LDADD= -L${MLANLIB} -lmlan +DPADD= ${MLANLIB}/libmlan.a -+NO_MAN= 1 ++MAN= +SRCS= ${PROG}.c + +test: ${PROG} @@ -43,7 +43,7 @@ +CFLAGS= -I. -Wall -I${MLANCOM} +LDADD= -L${MLANLIB} -lmlan +DPADD= ${MLANLIB}/libmlan.a -+NO_MAN= 1 ++MAN= +SRCS= ${PROG}.c + +test: ${PROG} @@ -61,7 +61,7 @@ +CFLAGS= -I. -Wall -I${MLANCOM} +LDADD= -L${MLANLIB} -lmlan +DPADD= ${MLANLIB}/libmlan.a -+NO_MAN= 1 ++MAN= +SRCS= ${PROG}.c + +test: ${PROG} @@ -79,7 +79,7 @@ +CFLAGS= -I. -Wall -I${MLANCOM} +LDADD= -L${MLANLIB} -lmlan +DPADD= ${MLANLIB}/libmlan.a -+NO_MAN= 1 ++MAN= +SRCS= ${PROG}.c + +test: ${PROG} @@ -97,7 +97,7 @@ +CFLAGS= -I. -Wall -I${MLANCOM} +LDADD= -L${MLANLIB} -lmlan +DPADD= ${MLANLIB}/libmlan.a -+NO_MAN= 1 ++MAN= +SRCS= ${PROG}.c + +test: ${PROG} @@ -115,7 +115,7 @@ +CFLAGS= -I. -Wall -I${MLANCOM} +LDADD= -L${MLANLIB} -lmlan +DPADD= ${MLANLIB}/libmlan.a -+NO_MAN= 1 ++MAN= +SRCS= ${PROG}.c + +test: ${PROG} @@ -133,7 +133,7 @@ +CFLAGS= -I. -Wall -I${MLANCOM} +LDADD= -L${MLANLIB} -lmlan +DPADD= ${MLANLIB}/libmlan.a -+NO_MAN= 1 ++MAN= +SRCS= ${PROG}.c + +test: ${PROG} @@ -151,7 +151,7 @@ +CFLAGS= -I. -Wall -I${MLANCOM} +LDADD= -L${MLANLIB} -lmlan +DPADD= ${MLANLIB}/libmlan.a -+NO_MAN= 1 ++MAN= +SRCS= ${PROG}.c + +test: ${PROG} @@ -165,7 +165,7 @@ +CFLAGS= -I. -Wall -I ../../common +LDFLAGS= -L ../../common -L ../../lib/userial +LDADD= -lmlanser -lmlancom -+NO_MAN= true ++MAN= +SRCS= tstfind.c + +.include <bsd.prog.mk> @@ -180,7 +180,7 @@ +CFLAGS= -I. -Wall -I${MLANCOM} +LDADD= -L${MLANLIB} -lmlan +DPADD= ${MLANLIB}/libmlan.a -+NO_MAN= 1 ++MAN= +SRCS= ${PROG}.c + +test: ${PROG} @@ -198,7 +198,7 @@ +CFLAGS= -I. -Wall -I${MLANCOM} +LDADD= -L${MLANLIB} -lmlan +DPADD= ${MLANLIB}/libmlan.a -+NO_MAN= 1 ++MAN= +SRCS= ${PROG}.c + +test: ${PROG} @@ -212,7 +212,7 @@ +CFLAGS= -I. -Wall -I ../../common +LDFLAGS= -L ../../common -L ../../lib/userial +LDADD= -lmlanser -lmlancom -+NO_MAN= true ++MAN= +SRCS= tstfind.c + +.include <bsd.prog.mk> @@ -227,7 +227,7 @@ +CFLAGS= -I. -Wall -I${MLANCOM} +LDADD= -L${MLANLIB} -lmlan +DPADD= ${MLANLIB}/libmlan.a -+NO_MAN= 1 ++MAN= +SRCS= ${PROG}.c + +test: ${PROG} @@ -270,7 +270,7 @@ +MLANLNK= ${.CURDIR}/Link +LIB= mlan +CFLAGS= -I. -Wall -I${MLANCOM} -+NO_PROFILE= yes ++MK_PROFILE= no +PREFIX?= /usr/local +LIBDIR= ${PREFIX}/lib + diff --git a/converters/chmview/files/Makefile b/converters/chmview/files/Makefile index 3ccf08737d77..aa0a0df7b9a8 100644 --- a/converters/chmview/files/Makefile +++ b/converters/chmview/files/Makefile @@ -7,7 +7,7 @@ LDADD+= -L${LOCALBASE}/lib -lchm WARNS?= 6 -NO_MAN= yes +MAN= PROG= chmview diff --git a/databases/libnvpair/files/patch-Makefile b/databases/libnvpair/files/patch-Makefile new file mode 100644 index 000000000000..041838b7597e --- /dev/null +++ b/databases/libnvpair/files/patch-Makefile @@ -0,0 +1,11 @@ +--- Makefile.orig ++++ Makefile +@@ -17,7 +17,6 @@ + VERSION_DEF= ${.CURDIR}/Versions.def + SYMBOL_MAPS= ${.CURDIR}/mapfile-vers + +-NOPROFILE= yes +-NO_PROFILE= yes ++MK_PROFILE= no + + .include <bsd.lib.mk> diff --git a/devel/android-tools-adb/files/Makefile b/devel/android-tools-adb/files/Makefile index 88d30f997211..7f1435627c82 100644 --- a/devel/android-tools-adb/files/Makefile +++ b/devel/android-tools-adb/files/Makefile @@ -2,7 +2,7 @@ PROG_CXX=adb NOMAN= # DragonFly, NetBSD, OpenBSD -NO_MAN= # FreeBSD +MAN= # FreeBSD BINDIR?=/usr/bin FILESDIR?=${DOCDIR}/${PROG} diff --git a/devel/android-tools-simpleperf/files/Makefile b/devel/android-tools-simpleperf/files/Makefile index 127989901607..e813d5a1a44b 100644 --- a/devel/android-tools-simpleperf/files/Makefile +++ b/devel/android-tools-simpleperf/files/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG_CXX=simpleperf -NO_MAN= +MAN= BINDIR?=/usr/bin SRCS+= callchain.cpp diff --git a/devel/calibrator/files/patch-Makefile b/devel/calibrator/files/patch-Makefile index a5636a9c1016..661b41b157fb 100644 --- a/devel/calibrator/files/patch-Makefile +++ b/devel/calibrator/files/patch-Makefile @@ -3,7 +3,7 @@ @@ -0,0 +1,8 @@ +PROG= calibrator +SRCS= calibrator.c -+NO_MAN= defined ++MAN= + +CFLAGS+= -D_ANSI_SOURCE +LDADD+= -lm diff --git a/devel/cgilib/files/Makefile.bsd b/devel/cgilib/files/Makefile.bsd index b78aee5f0676..4373460102e7 100644 --- a/devel/cgilib/files/Makefile.bsd +++ b/devel/cgilib/files/Makefile.bsd @@ -1,6 +1,6 @@ LIB= cgi -NO_PROFILE= yes +MK_PROFILE= no SHLIB_MAJOR?= 1 SHLIB_MINOR?= 0 diff --git a/devel/configkit/files/patch-CKC_Makefile b/devel/configkit/files/patch-CKC_Makefile new file mode 100644 index 000000000000..1208971045b6 --- /dev/null +++ b/devel/configkit/files/patch-CKC_Makefile @@ -0,0 +1,11 @@ +--- CKC/Makefile.orig ++++ CKC/Makefile +@@ -4,7 +4,7 @@ + SRCS += ckc.c + SRCS += ktype.c + +-NO_MAN += 1 ++MAN= + + BINDIR += /usr/local/bin + diff --git a/devel/configkit/files/patch-Makefile b/devel/configkit/files/patch-Makefile new file mode 100644 index 000000000000..7df4655998dd --- /dev/null +++ b/devel/configkit/files/patch-Makefile @@ -0,0 +1,11 @@ +--- Makefile.orig ++++ Makefile +@@ -23,7 +23,7 @@ + BINDIR ?= /usr/local/bin + + WARNS ?= 5 +-NO_MAN= yes ++MAN= + + CLEANFILES += example.c example.h + diff --git a/devel/cvsdiff2patch/Makefile b/devel/cvsdiff2patch/Makefile index 2be11769b62d..e1d9cfa22bdc 100644 --- a/devel/cvsdiff2patch/Makefile +++ b/devel/cvsdiff2patch/Makefile @@ -10,7 +10,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Turn cvs diff output into patch input USES= tar:bzip2 uidfix -MAKE_ENV= NO_MAN=yes PLIST_FILES= bin/cvsdiff2patch diff --git a/devel/cvsdiff2patch/files/patch-Makefile b/devel/cvsdiff2patch/files/patch-Makefile new file mode 100644 index 000000000000..c166b0b2d5d0 --- /dev/null +++ b/devel/cvsdiff2patch/files/patch-Makefile @@ -0,0 +1,11 @@ +--- Makefile.orig ++++ Makefile +@@ -2,7 +2,7 @@ + # $Id: Makefile,v 1.1 2003/06/06 16:56:08 bright Exp $ + + PROG= cvsdiff2patch +-NOMAN= YES ++MAN= + PREFIX?= /usr/local + BINDIR= ${PREFIX}/bin + MANDIR= ${PREFIX}/man/man diff --git a/devel/fmake/Makefile b/devel/fmake/Makefile index 834be2a6208f..931875d4835a 100644 --- a/devel/fmake/Makefile +++ b/devel/fmake/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE # UCB third clause nullified PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz -MAKE_ARGS+= PROG=fmake NO_MAN=yes +MAKE_ARGS+= PROG=fmake MAN= do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ diff --git a/devel/jech-dht/files/Makefile.example b/devel/jech-dht/files/Makefile.example index 0e6e3920805b..45129cc712db 100644 --- a/devel/jech-dht/files/Makefile.example +++ b/devel/jech-dht/files/Makefile.example @@ -1,5 +1,5 @@ PROG= dht-example -NO_MAN= nope, too much to ask +MAN= LDADD= -L. -ldht -lcrypt -lmd BINDIR= ${STAGEDIR}${PREFIX}/bin diff --git a/devel/libgpc/files/BSDmakefile b/devel/libgpc/files/BSDmakefile index bdbe36692b60..335dd569f9f2 100644 --- a/devel/libgpc/files/BSDmakefile +++ b/devel/libgpc/files/BSDmakefile @@ -1,6 +1,5 @@ LIB= gpc -NO_PROFILE= yes -NOPROFILE= yes +MK_PROFILE= no SHLIB_MAJOR= 2 SHLIB_MINOR= 32 diff --git a/devel/libopenbsd/Makefile b/devel/libopenbsd/Makefile index fbb5026ff640..ed31ec607aeb 100644 --- a/devel/libopenbsd/Makefile +++ b/devel/libopenbsd/Makefile @@ -12,7 +12,7 @@ COMMENT= imsg and ohash routines from OpenBSD libutil LICENSE= ISCL USES= uidfix tar:xz -MAKE_ENV= SHLIB_MAJOR=0 NO_PROFILE=1 +MAKE_ENV= SHLIB_MAJOR=0 WITHOUT_PROFILE=1 MAKE_ARGS= INCLUDEDIR="${PREFIX}/include" LIBDIR="${PREFIX}/lib" \ MANDIR="${PREFIX}/man/man" USE_LDCONFIG= yes diff --git a/devel/libpasori/files/patch-lib_Makefile b/devel/libpasori/files/patch-lib_Makefile new file mode 100644 index 000000000000..f879e71f8d0d --- /dev/null +++ b/devel/libpasori/files/patch-lib_Makefile @@ -0,0 +1,11 @@ +--- lib/Makefile.orig ++++ lib/Makefile +@@ -10,7 +10,7 @@ + + LIBDIR= ${LOCALBASE}/lib + INCLUDEDIR= ${LOCALBASE}/include +-NO_PROFILE= ++MK_PROFILE= no + SHLIB_MAJOR= 1 + + CFLAGS+= -D__LIBPASORI_WITH_LIBUSB diff --git a/devel/libpasori/files/patch-lpdump_Makefile b/devel/libpasori/files/patch-lpdump_Makefile new file mode 100644 index 000000000000..f1b2bf00bc5b --- /dev/null +++ b/devel/libpasori/files/patch-lpdump_Makefile @@ -0,0 +1,11 @@ +--- lpdump/Makefile.orig ++++ lpdump/Makefile +@@ -7,7 +7,7 @@ + LDADD= -L../lib -lpasori + + BINDIR= ${LOCALBASE}/bin +-NO_MAN= ++MAN= + + CFLAGS+= -Wall -W + diff --git a/devel/libpasori/files/patch-lptest_Makefile b/devel/libpasori/files/patch-lptest_Makefile new file mode 100644 index 000000000000..817111905507 --- /dev/null +++ b/devel/libpasori/files/patch-lptest_Makefile @@ -0,0 +1,11 @@ +--- lptest/Makefile.orig ++++ lptest/Makefile +@@ -7,7 +7,7 @@ + LDADD= -L../lib -lpasori + + BINDIR= ${LOCALBASE}/bin +-NO_MAN= ++MAN= + + CFLAGS+= -Wall -W + diff --git a/devel/libphk/files/patch-test_argv_Makefile b/devel/libphk/files/patch-test_argv_Makefile new file mode 100644 index 000000000000..dc3d577904ea --- /dev/null +++ b/devel/libphk/files/patch-test_argv_Makefile @@ -0,0 +1,11 @@ +--- test/argv/Makefile.orig ++++ test/argv/Makefile +@@ -4,7 +4,7 @@ + CFLAGS += -I${.CURDIR}/../.. + LDADD += -L../.. -lphk + +-NO_MAN = sorry ++MAN = + + .include <bsd.prog.mk> + diff --git a/devel/libphk/files/patch-test_expr_Makefile b/devel/libphk/files/patch-test_expr_Makefile new file mode 100644 index 000000000000..ebe69d23d6b4 --- /dev/null +++ b/devel/libphk/files/patch-test_expr_Makefile @@ -0,0 +1,11 @@ +--- test/expr/Makefile.orig ++++ test/expr/Makefile +@@ -5,7 +5,7 @@ + LDADD += -L../.. -lphk -lm + DPADD += ../../libphk.a + +-NO_MAN = sorry ++MAN = + + .include <bsd.prog.mk> + diff --git a/devel/libshhopt/files/Makefile.lib b/devel/libshhopt/files/Makefile.lib index 8a2df02e48b3..1ffb9ddc0cd5 100644 --- a/devel/libshhopt/files/Makefile.lib +++ b/devel/libshhopt/files/Makefile.lib @@ -5,7 +5,7 @@ LIB= shhopt LIBDIR= ${PREFIX}/lib SHLIB_MAJOR= ${SHLIB_VER} SHLIB_MINOR= 1 -NO_PROFILE= yes +MK_PROFILE= no NO_OBJ= yes INCS= shhopt.h diff --git a/devel/libuutil/files/patch-Makefile b/devel/libuutil/files/patch-Makefile new file mode 100644 index 000000000000..62f7e2ccb590 --- /dev/null +++ b/devel/libuutil/files/patch-Makefile @@ -0,0 +1,12 @@ +--- Makefile.orig ++++ Makefile +@@ -21,8 +21,7 @@ + VERSION_DEF= ${.CURDIR}/Versions.def + SYMBOL_MAPS= ${.CURDIR}/mapfile-vers + +-NOPROFILE= yes +-NO_PROFILE= yes ++MK_PROFILE= no + + .PATH: ${.CURDIR}/avl + diff --git a/devel/qmake/files/Makefile.bsd b/devel/qmake/files/Makefile.bsd index 5ac9d8ae784f..5e040dcca011 100644 --- a/devel/qmake/files/Makefile.bsd +++ b/devel/qmake/files/Makefile.bsd @@ -5,7 +5,7 @@ _OBJS!= ${MAKE} -f Makefile.unix -V OBJS -V QOBJS # next to -DHAVE_CONFIG_CPP below: #_OBJS:= ${_OBJS:S/qconfig.o//} SRCS:= ${_OBJS:.o=.cpp} -NO_MAN= true # qmake.1 anyone? +MAN= .PATH: ${.CURDIR} ${.CURDIR:H}/src/tools CXXFLAGS+=-I${.CURDIR:H}/mkspecs/freebsd-g++ diff --git a/devel/replay/Makefile b/devel/replay/Makefile index bcf1093df896..8584e312b7ed 100644 --- a/devel/replay/Makefile +++ b/devel/replay/Makefile @@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Program that helps you fix a build interactively USES= tar:bzip2 uidfix -MAKE_ENV= NO_MAN=yes NO_WERROR="defined" +MAKE_ENV= WITHOUT_MAN=yes NO_WERROR="defined" PLIST_FILES= bin/replay diff --git a/devel/st/files/Makefile.main b/devel/st/files/Makefile.main index bac98362edd1..7caa532326db 100644 --- a/devel/st/files/Makefile.main +++ b/devel/st/files/Makefile.main @@ -6,7 +6,7 @@ LIBDIR= ${PREFIX}/lib SHLIB_MAJOR= 1 SHLIB_MINOR= 1 LIB= st -NO_PROFILE= yes +MK_PROFILE= no SRCS= io.c key.c sched.c stk.c sync.c event.c CFLAGS+= -DFREEBSD -DMD_HAVE_KQUEUE diff --git a/devel/trio/files/BSDmakefile b/devel/trio/files/BSDmakefile index 027604390464..db292c51717b 100644 --- a/devel/trio/files/BSDmakefile +++ b/devel/trio/files/BSDmakefile @@ -2,7 +2,7 @@ LIB= trio SHLIB_MAJOR= 2 SHLIB_MINOR= 0 -NO_PROFILE= nope +MK_PROFILE= no INCLUDEDIR= ${PREFIX}/include LIBDIR= ${PREFIX}/lib diff --git a/editors/hexpert/Makefile b/editors/hexpert/Makefile index 9f432ece7af2..da425e38aeac 100644 --- a/editors/hexpert/Makefile +++ b/editors/hexpert/Makefile @@ -10,7 +10,7 @@ MAINTAINER= peter@FreeBSD.org COMMENT= Hexpert - a simple but flexible binary file editor USES= ncurses uidfix -MAKE_ENV= NO_MAN=yes NO_OBJ=yes +MAKE_ENV= MK_MAN=no MAKE_ARGS= LDADD="-lncurses" PLIST_FILES= bin/hex diff --git a/finance/libstocks/files/Makefile.client b/finance/libstocks/files/Makefile.client index 206073fbc215..2cee8a98dcdf 100644 --- a/finance/libstocks/files/Makefile.client +++ b/finance/libstocks/files/Makefile.client @@ -1,6 +1,6 @@ PROG= libstocks_client SRCS= client.c -NO_MAN= 1 +MAN= PREFIX?=/usr/local BINDIR= ${STAGEDIR}${PREFIX}/bin diff --git a/finance/libstocks/files/Makefile.lib b/finance/libstocks/files/Makefile.lib index 0a97c014939f..0d4159691e9a 100644 --- a/finance/libstocks/files/Makefile.lib +++ b/finance/libstocks/files/Makefile.lib @@ -7,7 +7,7 @@ LIB= stocks SHLIB_MAJOR=0 SHLIB_MINOR=5 -NO_PROFILE= True # to avoid building profiled library +MK_PROFILE=no # to avoid building profiled library SRCS!= ${MAKE} -f ${.CURDIR}/Makefile.in -V libstocks_a_SOURCES INCS!= ${MAKE} -f ${.CURDIR}/Makefile.in -V include_HEADERS diff --git a/games/cre/files/Makefile b/games/cre/files/Makefile index 81cb926cda46..8ae103a15d98 100644 --- a/games/cre/files/Makefile +++ b/games/cre/files/Makefile @@ -4,7 +4,7 @@ # PROG= cre -SRCS!= ls *.[ch] -NO_MAN= yes +SRCS!= ls *.c +MAN= .include <bsd.prog.mk> diff --git a/games/libshhcards/files/Makefile.lib b/games/libshhcards/files/Makefile.lib index 5b2623438429..9da576458723 100644 --- a/games/libshhcards/files/Makefile.lib +++ b/games/libshhcards/files/Makefile.lib @@ -5,7 +5,7 @@ LIB= shhcards LIBDIR= ${PREFIX}/lib SHLIB_MAJOR= ${SHLIB_VER} SHLIB_MINOR= 0 -NO_PROFILE= yes +MK_PROFILE= no NOOBJ= yes INCS= shhcards.h diff --git a/graphics/gdchart/files/Makefile b/graphics/gdchart/files/Makefile index 02744ed839ff..78404e49d1e1 100644 --- a/graphics/gdchart/files/Makefile +++ b/graphics/gdchart/files/Makefile @@ -14,7 +14,6 @@ SRCS= array_alloc.c \ INCS= gdc.h \ gdchart.h \ gdcpie.h -NO_MAN= YES PREFIX?= /usr/local LOCALBASE?= /usr/local LIBDIR= ${PREFIX}/lib diff --git a/graphics/libfpx/files/Makefile.bsd b/graphics/libfpx/files/Makefile.bsd index 2c7828924181..7565642489e7 100644 --- a/graphics/libfpx/files/Makefile.bsd +++ b/graphics/libfpx/files/Makefile.bsd @@ -8,8 +8,7 @@ LIBDIR = ${PREFIX}/lib INCSDIR = ${PREFIX}/include INCDIR = ${INCSDIR} # for pre-bsd.incs.mk API -NO_PROFILE= Don't want it -NOPROFILE= ${NO_PROFILE} +MK_PROFILE= no HAVES= -DHAVE_WCHAR_H -DHAVE_DLFCN_H \ -DHAVE_SYS_TIME_H \ -DHAVE_SYS_PARAM_H -DHAVE_SYS_MOUNT_H diff --git a/graphics/libjxr/files/BSDmakefile.jxrgluelib b/graphics/libjxr/files/BSDmakefile.jxrgluelib index 98e4d1e6c525..aa86acc8f59d 100644 --- a/graphics/libjxr/files/BSDmakefile.jxrgluelib +++ b/graphics/libjxr/files/BSDmakefile.jxrgluelib @@ -1,6 +1,6 @@ LIB= jxrglue SHLIB_MAJOR= 1 -NO_PROFILE= nope +MK_PROFILE= no LIBDIR= ${PREFIX}/lib INCLUDEDIR= ${PREFIX}/include/jxrlib INCS= JXRGlue.h JXRMeta.h JXRTest.h diff --git a/graphics/libjxr/files/BSDmakefile.libjpegxr b/graphics/libjxr/files/BSDmakefile.libjpegxr index 5144270d631e..33088890edeb 100644 --- a/graphics/libjxr/files/BSDmakefile.libjpegxr +++ b/graphics/libjxr/files/BSDmakefile.libjpegxr @@ -1,6 +1,6 @@ LIB= jpegxr SHLIB_MAJOR= 1 -NO_PROFILE= nope +MK_PROFILE= no LIBDIR= ${PREFIX}/lib INCLUDEDIR= ${PREFIX}/include/jxrlib INCS= guiddef.h windowsmediaphoto.h wmsal.h wmspecstring.h \ diff --git a/graphics/libmng/files/Makefile.bsd b/graphics/libmng/files/Makefile.bsd index 01925bcc024e..865b974c0bd2 100644 --- a/graphics/libmng/files/Makefile.bsd +++ b/graphics/libmng/files/Makefile.bsd @@ -1,7 +1,7 @@ LIB= mng LDADD= -lm -L${LIBDIR} -lz -llcms -ljpeg -NO_PROFILE= yes +MK_PROFILE= no SHLIB_MAJOR?= 1 SHLIB_MINOR?= 0 diff --git a/graphics/pgplot/files/Makefile.clib b/graphics/pgplot/files/Makefile.clib index ae9c327c1cec..87c660cc8aef 100644 --- a/graphics/pgplot/files/Makefile.clib +++ b/graphics/pgplot/files/Makefile.clib @@ -2,7 +2,7 @@ LIB= cpgplot SHLIB_MAJOR= 5 SHLIB_MINOR= 2 -NO_PROFILE= 1 +MK_PROFILE= no CFLAGS+= -DPG_PPU diff --git a/graphics/pgplot/files/Makefile.flib b/graphics/pgplot/files/Makefile.flib index 86093d44778d..e4f50a595f9f 100644 --- a/graphics/pgplot/files/Makefile.flib +++ b/graphics/pgplot/files/Makefile.flib @@ -2,7 +2,7 @@ LIB= pgplot SHLIB_MAJOR= 5 SHLIB_MINOR= 2 -NO_PROFILE= 1 +MK_PROFILE= no CFLAGS+= -DPG_PPU -I${PREFIX}/include -I${LOCALBASE}/include LDADD= -lpng diff --git a/graphics/plasma-kmod/files/patch-Makefile b/graphics/plasma-kmod/files/patch-Makefile index d0dc6a902dfe..3628a78d5f13 100644 --- a/graphics/plasma-kmod/files/patch-Makefile +++ b/graphics/plasma-kmod/files/patch-Makefile @@ -7,6 +7,6 @@ -NOMAN= -CFLAGS+= -I${.CURDIR}/.. -I. -CWARNFLAGS= -Wall -+NO_MAN= ++MAN= .include <bsd.kmod.mk> diff --git a/graphics/s10sh/files/Makefile.bsd b/graphics/s10sh/files/Makefile.bsd index 63e972399641..1f44bf4c07d8 100644 --- a/graphics/s10sh/files/Makefile.bsd +++ b/graphics/s10sh/files/Makefile.bsd @@ -1,5 +1,5 @@ PROG = s10sh -NO_MAN = oh... +MAN = SRCS = main.c crc.c serial.c common.c bar.c diff --git a/graphics/tifmerge/files/Makefile b/graphics/tifmerge/files/Makefile index a508cf6dad6e..b96cac6cdf3a 100644 --- a/graphics/tifmerge/files/Makefile +++ b/graphics/tifmerge/files/Makefile @@ -2,7 +2,7 @@ LIB= tifmerge SHLIB_MAJOR= 1 SHLIB_MINOR= 0 -NO_PROFILE= yes +MK_PROFILE= no SRCS= tifmerge.c diff --git a/graphics/xfpovray/files/BSDmakefile b/graphics/xfpovray/files/BSDmakefile index 16b0cc63bc74..b7ad54dfd68b 100644 --- a/graphics/xfpovray/files/BSDmakefile +++ b/graphics/xfpovray/files/BSDmakefile @@ -1,5 +1,5 @@ PROG= xfpovray -NO_MAN= nope +MAN= NO_WERROR= yes BINDIR= ${PREFIX}/bin CFLAGS+=-Iflx -I${LOCALBASE}/include -DHELP_DIR='"${DOCSDIR}"' diff --git a/japanese/edyvalue/files/Makefile b/japanese/edyvalue/files/Makefile index f4fee370af0d..d12f5a7ef49c 100644 --- a/japanese/edyvalue/files/Makefile +++ b/japanese/edyvalue/files/Makefile @@ -5,7 +5,7 @@ DPADD= ${LOCALBASE}/lib/libpasori.a LDADD= -L${LOCALBASE}/lib -lpasori BINDIR= ${LOCALBASE}/bin -NO_MAN= +MAN= CFLAGS+= -I${LOCALBASE}/include CFLAGS+= -Wall -W diff --git a/japanese/kon2-16dot/files/patch-font_Makefile.FreeBSD b/japanese/kon2-16dot/files/patch-font_Makefile.FreeBSD index 33d67d6ffc34..ca7eab56e89e 100644 --- a/japanese/kon2-16dot/files/patch-font_Makefile.FreeBSD +++ b/japanese/kon2-16dot/files/patch-font_Makefile.FreeBSD @@ -1,18 +1,26 @@ ---- font/Makefile.FreeBSD.orig 1997-01-25 19:08:44.000000000 +0900 -+++ font/Makefile.FreeBSD 2014-01-31 11:01:37.000000000 +0900 -@@ -11,6 +11,7 @@ +--- font/Makefile.FreeBSD.orig 1997-01-25 10:08:44.000000000 +0000 ++++ font/Makefile.FreeBSD 2019-11-22 22:25:17.725974000 +0000 +@@ -4,13 +4,12 @@ + CFLAGS+= -I${.CURDIR}/../include + CLEANFILES= Makefile + +-NOMAN= YES +- + .if exists(${.CURDIR}/../.config) + .include "${.CURDIR}/../.config" .endif PROG= fld -+NO_MAN= yes ++MAN= .if exists(${.OBJDIR}/../lib) LIBOBJ= -L${.OBJDIR}/../lib -@@ -20,4 +21,7 @@ +@@ -19,5 +18,8 @@ + .endif LDADD= ${LIBOBJ} -lgon - ++ +install: ${PROG} + /usr/bin/install -s ${PROG} ${BINDIR} -+ + .include <bsd.prog.mk> diff --git a/japanese/kon2-16dot/files/patch-src_Makefile.FreeBSD b/japanese/kon2-16dot/files/patch-src_Makefile.FreeBSD index 951777eb3315..8452bc071322 100644 --- a/japanese/kon2-16dot/files/patch-src_Makefile.FreeBSD +++ b/japanese/kon2-16dot/files/patch-src_Makefile.FreeBSD @@ -1,5 +1,5 @@ ---- src/Makefile.FreeBSD.orig 1997-01-30 10:29:25.000000000 +0900 -+++ src/Makefile.FreeBSD 2014-01-31 10:53:18.000000000 +0900 +--- src/Makefile.FreeBSD.orig 1997-01-30 01:29:25.000000000 +0000 ++++ src/Makefile.FreeBSD 2019-11-22 22:25:55.221854000 +0000 @@ -1,12 +1,17 @@ # FreeBSD makefile for kon # Tatsumi Hosokawa <hosokawa@jp.FreeBSD.org> @@ -18,15 +18,16 @@ +.endif LIBS+= -L${.CURDIR}/display -L${.CURDIR}/../lib -ldisplay -lgon -NOMAN= YES -+MK_MAN= no ++MAN= CFLAGS+= -I${.CURDIR}/../include CLEANFILES= Makefile -@@ -28,4 +33,7 @@ +@@ -27,5 +32,8 @@ + .if exists(${.CURDIR}/../.config) .include "${.CURDIR}/../.config" .endif - ++ +install: ${PROG} + /usr/bin/install -s ${PROG} ${BINDIR} -+ + .include <bsd.prog.mk> diff --git a/japanese/suicavalue/files/Makefile b/japanese/suicavalue/files/Makefile index 57d2df62441e..000ae3a338e1 100644 --- a/japanese/suicavalue/files/Makefile +++ b/japanese/suicavalue/files/Makefile @@ -4,8 +4,8 @@ PROG= SuicaValue DPADD= ${LOCALBASE}/lib/libpasori.a LDADD= -L${LOCALBASE}/lib -lpasori -BINDIR= ${LOCALBASE}/bin -NO_MAN= +BINDIR= ${PREFIX}/bin +MAN= CFLAGS+= -I${LOCALBASE}/include CFLAGS+= -Wall -W diff --git a/java/jxgrabkey/files/Makefile.JXGrabKey b/java/jxgrabkey/files/Makefile.JXGrabKey index 06298499b5bd..5ba535d77e90 100644 --- a/java/jxgrabkey/files/Makefile.JXGrabKey +++ b/java/jxgrabkey/files/Makefile.JXGrabKey @@ -2,7 +2,7 @@ LIB_CXX= JXGrabKey SHLIB_NAME= lib${LIB_CXX}.so -NO_PROFILE= nope +MK_PROFILE= no SRCS= JXGrabKey.cpp VPATH= src diff --git a/mail/dma/Makefile b/mail/dma/Makefile index b90d22b931c0..fea3273265fe 100644 --- a/mail/dma/Makefile +++ b/mail/dma/Makefile @@ -44,7 +44,7 @@ post-patch: ${WRKSRC}/dma.8 @${REINPLACE_CMD} -e 's, /etc/dma, ${PREFIX}/etc/dma,g' \ ${WRKSRC}/dma.conf - @${REINPLACE_CMD} -e '/^MK_MAN/d' -e 's/^NOMAN/NO_MAN/' \ + @${REINPLACE_CMD} -e '/^MK_MAN/d' -e 's/^NOMAN.*/MAN=/' \ ${WRKSRC}/bsd/dma-mbox-create/Makefile post-install: diff --git a/mail/libdomainkeys/files/Makefile b/mail/libdomainkeys/files/Makefile index 6092b249a28b..46b5f7917fbf 100644 --- a/mail/libdomainkeys/files/Makefile +++ b/mail/libdomainkeys/files/Makefile @@ -9,7 +9,7 @@ INCLUDEDIR= ${PREFIX}/include CFLAGS+= -DBIND_8_COMPAT -I${OPENSSLBASE}/include LDFLAGS+= -lcrypto -L${OPENSSLBASE}/lib -NO_PROFILE= +MK_PROFILE= no dktest: dktest.c ${CC} ${CFLAGS} -I. dktest.c -o dktest libdomainkeys.a ${LDFLAGS} diff --git a/math/eispack/Makefile b/math/eispack/Makefile index 23b3d52684d0..d506e2371822 100644 --- a/math/eispack/Makefile +++ b/math/eispack/Makefile @@ -40,7 +40,7 @@ base system profiling libraries .endif PLIST_FILES+= lib/libeispack_p.a .else -MAKE_ENV+= NO_PROFILE=yes +MAKE_ENV+= WITHOUT_PROFILE=yes .endif SRCS= csroot.f epslon.f pythag.f bakvec.f balanc.f balbak.f bandr.f \ diff --git a/math/levmar/Makefile b/math/levmar/Makefile index 76e1c64937ae..a64244525a79 100644 --- a/math/levmar/Makefile +++ b/math/levmar/Makefile @@ -45,7 +45,7 @@ base system profiling libraries .endif PLIST_FILES+= lib/liblevmar_p.a .else -MAKE_ENV+= NO_PROFILE= +MAKE_ENV+= WITHOUT_PROFILE=true .endif post-extract: diff --git a/math/libmissing/Makefile b/math/libmissing/Makefile index ccce5cc97679..7d2f6a159714 100644 --- a/math/libmissing/Makefile +++ b/math/libmissing/Makefile @@ -42,7 +42,7 @@ base system profiling libraries .endif PLIST_FILES+= lib/libmissing_p.a .else -MAKE_ENV+= NO_PROFILE=yes +MAKE_ENV+= WITHOUT_PROFILE=yes .endif post-patch: diff --git a/math/lrng/Makefile b/math/lrng/Makefile index 8ce982512bf8..6fe43b181652 100644 --- a/math/lrng/Makefile +++ b/math/lrng/Makefile @@ -60,7 +60,7 @@ base system profiling libraries .endif PLIST_FILES+= lib/lib${LIB}_p.a .else -MAKE_ENV+= NO_PROFILE=yes +MAKE_ENV+= WITHOUT_PROFILE=yes .endif post-extract: diff --git a/math/randlib/Makefile b/math/randlib/Makefile index 9f27d48398b7..be53a6dc559c 100644 --- a/math/randlib/Makefile +++ b/math/randlib/Makefile @@ -13,7 +13,7 @@ COMMENT= Library of Routines for Random Number Generation USES= uidfix USE_LDCONFIG= yes -MAKE_ENV= NO_PROFILE=true +MAKE_ENV= WITHOUT_PROFILE=true WRKSRC= ${WRKDIR}/source/randlib.c/src PORTDOCS= Basegen.c.doc randlib.c.chs randlib.c.fdoc PLIST_FILES= include/randlib.h \ diff --git a/math/sfft/Makefile b/math/sfft/Makefile index 6e5576b590cd..81b14d21d2cf 100644 --- a/math/sfft/Makefile +++ b/math/sfft/Makefile @@ -71,7 +71,7 @@ base system profiling libraries .endif PLIST_FILES+= lib/libsfft_p.a .else -MAKE_ENV+= NO_PROFILE=yes +MAKE_ENV+= WITHOUT_PROFILE=yes .endif post-extract: diff --git a/math/slatec/Makefile b/math/slatec/Makefile index e56d9fd93bfb..f8e1d1aa9e6a 100644 --- a/math/slatec/Makefile +++ b/math/slatec/Makefile @@ -44,7 +44,7 @@ base system profiling libraries .endif PLIST_FILES+= lib/libslatec_p.a .else -MAKE_ENV+= NO_PROFILE= +MAKE_ENV+= WITHOUT_PROFILE=yes .endif post-extract: diff --git a/math/spblas/Makefile b/math/spblas/Makefile index 50fb10d9420d..4780b59b7224 100644 --- a/math/spblas/Makefile +++ b/math/spblas/Makefile @@ -43,7 +43,7 @@ base system profiling libraries .endif PLIST_FILES+= lib/libspblas_p.a .else -MAKE_ENV+= NO_PROFILE=yes +MAKE_ENV+= WITHOUT_PROFILE=yes .endif .if ${PORT_OPTIONS:MDOCS} diff --git a/misc/cpuid/files/Makefile.bsd b/misc/cpuid/files/Makefile.bsd index a04a65044d5b..02bd79f5e84c 100644 --- a/misc/cpuid/files/Makefile.bsd +++ b/misc/cpuid/files/Makefile.bsd @@ -1,4 +1,4 @@ PROG=cpuid -NO_MAN=yet +MAN= BINDIR=${PREFIX}/bin .include <bsd.prog.mk>" diff --git a/misc/hulgalugha/Makefile b/misc/hulgalugha/Makefile index afd7f8ca16d8..7f6dfa82b37e 100644 --- a/misc/hulgalugha/Makefile +++ b/misc/hulgalugha/Makefile @@ -10,7 +10,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Very jerky text filter USES= tar:bzip2 uidfix -MAKE_ENV= NO_MAN=yes +MAKE_ENV= WITHOUT_MAN=yes PLIST_FILES= bin/hulgalugha diff --git a/multimedia/ab25/files/patch-bin_Makefile b/multimedia/ab25/files/patch-bin_Makefile new file mode 100644 index 000000000000..48614a854533 --- /dev/null +++ b/multimedia/ab25/files/patch-bin_Makefile @@ -0,0 +1,10 @@ +--- bin/Makefile.orig ++++ bin/Makefile +@@ -10,6 +10,6 @@ + BINDIR?= ${PREFIX}/bin + CFLAGS+= -I${.CURDIR}/../src -I${PREFIX}/include/PCSC \ + -I${PREFIX}/include/ab25 +-NO_MAN= ++MAN= + + .include <bsd.prog.mk> diff --git a/multimedia/ab25/files/patch-lib_Makefile b/multimedia/ab25/files/patch-lib_Makefile new file mode 100644 index 000000000000..e3098f2764f0 --- /dev/null +++ b/multimedia/ab25/files/patch-lib_Makefile @@ -0,0 +1,9 @@ +--- lib/Makefile.orig ++++ lib/Makefile +@@ -13,6 +13,5 @@ + + PREFIX?= /usr/local + CFLAGS+= -I${.CURDIR}/../src -I${PREFIX}/include/PCSC +-NO_MAN= + + .include <bsd.lib.mk> diff --git a/multimedia/cuse4bsd-kmod/files/patch-Makefile.lib b/multimedia/cuse4bsd-kmod/files/patch-Makefile.lib new file mode 100644 index 000000000000..438966a82560 --- /dev/null +++ b/multimedia/cuse4bsd-kmod/files/patch-Makefile.lib @@ -0,0 +1,11 @@ +--- Makefile.lib.orig ++++ Makefile.lib +@@ -31,7 +31,7 @@ + MAN= cuse4bsd.3 + MKLINT= no + NOGCCERROR= +-NO_PROFILE= ++MK_PROFILE= no + PTHREAD_LIBS?= -lpthread + CFLAGS+= -D_GNU_SOURCE + .if defined(HAVE_DEBUG) diff --git a/multimedia/cx88/files/patch-client_Makefile b/multimedia/cx88/files/patch-client_Makefile new file mode 100644 index 000000000000..2d480d089619 --- /dev/null +++ b/multimedia/cx88/files/patch-client_Makefile @@ -0,0 +1,11 @@ +--- client/Makefile.orig ++++ client/Makefile +@@ -21,7 +21,7 @@ + CXXFLAGS+= -DCX88_USE_IIC + .endif + +-NO_MAN= ++MAN= + + LDADD = -L$(LIBTUNER_LIB) -ltuner_static -lezxml -lpthread -ledit + diff --git a/multimedia/libtuner/files/patch-Makefile b/multimedia/libtuner/files/patch-Makefile new file mode 100644 index 000000000000..29f2fd820e43 --- /dev/null +++ b/multimedia/libtuner/files/patch-Makefile @@ -0,0 +1,11 @@ +--- Makefile.orig ++++ Makefile +@@ -42,7 +42,7 @@ + SRCS += tuner_iic_device.h tuner_iic_device.cpp + .endif + +-NO_PROFILE= ++MK_PROFILE = no + LIB = tuner_static + SHLIB = tuner + SHLIB_MAJOR = $(LIBTUNER_MAJOR) diff --git a/net/dual-dhclient-daemon/files/patch-Makefile b/net/dual-dhclient-daemon/files/patch-Makefile new file mode 100644 index 000000000000..b60fc2aa18c0 --- /dev/null +++ b/net/dual-dhclient-daemon/files/patch-Makefile @@ -0,0 +1,10 @@ +--- Makefile.orig ++++ Makefile +@@ -1,6 +1,6 @@ + PROG = dual-dhclient + SRCS = main.c +-NO_MAN ?= yes ++MAN = + BINDIR ?= /usr/local/sbin + + .include <bsd.prog.mk> diff --git a/net/libutp/files/BSDmakefile b/net/libutp/files/BSDmakefile index ead56cbd465a..8fbb85bece76 100644 --- a/net/libutp/files/BSDmakefile +++ b/net/libutp/files/BSDmakefile @@ -1,7 +1,7 @@ LIB= utp SHLIB_MAJOR= 0 SRCS= utp.cpp utp_utils.cpp -NO_PROFILE= yes +MK_PROFILE= no CXXFLAGS+= -fno-exceptions -fno-rtti CXXFLAGS+= -I${.CURDIR} -I${.CURDIR}/utp_config_lib -DPOSIX diff --git a/net/libutp/files/BSDmakefile.utils b/net/libutp/files/BSDmakefile.utils index d250ba258e5f..5ad223344e50 100644 --- a/net/libutp/files/BSDmakefile.utils +++ b/net/libutp/files/BSDmakefile.utils @@ -1,7 +1,7 @@ # PROG_CXX defined on command-line SRCS= ${PROG_CXX}.cpp -NO_MAN= ha-ha +MAN= LDADD= -L.. -lutp CXXFLAGS+= -I.. -DPOSIX diff --git a/net/mpd5/files/patch-src-Makefile b/net/mpd5/files/patch-src-Makefile index bab99faea158..8b37480e4711 100644 --- a/net/mpd5/files/patch-src-Makefile +++ b/net/mpd5/files/patch-src-Makefile @@ -1,6 +1,6 @@ ---- src/Makefile.orig 2019-10-10 18:24:28 UTC +--- src/Makefile.orig +++ src/Makefile -@@ -9,9 +9,11 @@ +@@ -9,11 +9,12 @@ PROG?= mpd5 PREFIX?= /usr/local @@ -8,12 +8,14 @@ BINDIR?= ${PREFIX}/sbin VERSION= 5.8 -NOMAN= -+ -+MK_MAN= no - NO_MAN= +-NO_MAN= ++MAN= ++ BINOWN!= /usr/bin/id -n -u -@@ -59,9 +61,6 @@ USE_TCP_WRAP= yes + BINGRP!= /usr/bin/id -n -g + +@@ -59,9 +60,6 @@ USE_AUTH_PAM= yes USE_AUTH_SYSTEM= yes @@ -23,7 +25,7 @@ # Build without builtin web server. #NOWEB= yes -@@ -71,7 +70,7 @@ SYSLOG_FACILITY= LOG_DAEMON +@@ -71,7 +69,7 @@ # Print wide protocol names instead of short names. # Comment this line, to save about 10 KB space @@ -32,7 +34,7 @@ # Reduce some internal structures size to save more memory # This is to limit amount of active sessions -@@ -83,27 +82,27 @@ COPTS+= -DPROTO_NAME_LIST +@@ -83,27 +81,27 @@ ## filter TCP accept connections LDADD+= -lwrap DPADD+= ${LIBWRAP} @@ -64,7 +66,7 @@ .endif LDADD+= -lnetgraph -lutil -@@ -112,19 +111,12 @@ DPADD+= ${LIBNETGRAPH} +@@ -112,19 +110,12 @@ LDADD+= -L/usr/lib -lradius DPADD+= ${LIBRADIUS} @@ -88,7 +90,7 @@ -Wcast-align \ -Wchar-subscripts \ -Wformat \ -@@ -134,15 +126,14 @@ COPTS+= -Wall \ +@@ -134,15 +125,14 @@ -Wnested-externs \ -Wpointer-arith \ -Wwrite-strings \ @@ -107,7 +109,7 @@ .endif # Standard sources -@@ -154,14 +145,13 @@ STDSRCS= assert.c auth.c bund.c rep.c ccp.c cha +@@ -154,14 +144,13 @@ util.c vars.c eap.c msoft.c ippool.c .if defined ( NOWEB ) @@ -124,7 +126,7 @@ PDPATH1= contrib/libpdel/util:contrib/libpdel/structs PDPATH2= contrib/libpdel/structs/type .if defined ( NOWEB ) -@@ -199,60 +189,59 @@ PDELSRCS+= http_connection.c \ +@@ -199,60 +188,59 @@ string_fp.c \ timeout_fp.c .endif @@ -200,7 +202,7 @@ .endif .endif -@@ -261,46 +250,46 @@ COPTS+= -DUSE_NG_PRED1 +@@ -261,46 +249,46 @@ .if defined ( ECP_DES ) SRCS+= ecp_dese.c SRCS+= ecp_dese_bis.c @@ -258,7 +260,7 @@ .endif # Add in required support files and libraries -@@ -309,15 +298,12 @@ DPADD+= ${LIBCRYPTO} +@@ -309,15 +297,12 @@ .if exists ( /usr/lib/libexecinfo.so ) LDADD+= -lexecinfo diff --git a/net/ntimed/files/patch-configure b/net/ntimed/files/patch-configure new file mode 100644 index 000000000000..61d6b7ed6c0f --- /dev/null +++ b/net/ntimed/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig ++++ configure +@@ -95,7 +95,7 @@ + echo "SRCS += ${f}" + done + +- echo 'NO_MAN = not_yet' ++ echo 'MAN =' + echo 'LDADD += -lm' + echo 'WARNS ?= 6' + echo '.include <bsd.prog.mk>' diff --git a/net/sup/files/patch-lib_Makefile b/net/sup/files/patch-lib_Makefile new file mode 100644 index 000000000000..89d12b581d6b --- /dev/null +++ b/net/sup/files/patch-lib_Makefile @@ -0,0 +1,14 @@ +--- lib/Makefile.orig ++++ lib/Makefile +@@ -2,10 +2,9 @@ + + NOLINT= # defined + NOPIC= # defined +-NOPROFILE=# defined + NO_LINT= # defined + NO_PIC= # defined +-NO_PROFILE=# defined ++MK_PROFILE=no + + LIB= sup + diff --git a/net/sup/files/patch-supscan_Makefile b/net/sup/files/patch-supscan_Makefile new file mode 100644 index 000000000000..4e4720ed1ff4 --- /dev/null +++ b/net/sup/files/patch-supscan_Makefile @@ -0,0 +1,14 @@ +--- supscan/Makefile.orig ++++ supscan/Makefile +@@ -1,10 +1,8 @@ + # $NetBSD: Makefile,v 1.6 2002/09/18 13:31:56 lukem Exp $ + +-NOMAN= # defined +-NO_MAN= # defined +- + PROG= supscan + SRCS= supscan.c scan.c ++MAN= + + .PATH: ${.CURDIR}/../source + diff --git a/net/udt/files/BSDmakefile b/net/udt/files/BSDmakefile index 7625197ad218..a5e4474e74dc 100644 --- a/net/udt/files/BSDmakefile +++ b/net/udt/files/BSDmakefile @@ -1,7 +1,7 @@ LIB= udt SHLIB_MAJOR=4 SHLIB_MINOR=10 -NO_PROFILE= yes # Ports don't install profile-libraries +MK_PROFILE= no # Ports don't install profile-libraries LIBDIR= ${PREFIX}/lib INCLUDEDIR= ${PREFIX}/include INCS= udt.h diff --git a/print/epsonepl/files/Makefile b/print/epsonepl/files/Makefile index e43a6ac074d1..df291ef164ad 100644 --- a/print/epsonepl/files/Makefile +++ b/print/epsonepl/files/Makefile @@ -11,6 +11,6 @@ SRCS= ijs_server_epsonepl.c epl_compress.c epl_job_footer.c epl_job_header.c \ epl_page_footer.c epl_page_header.c epl_print_stripe.c SCRIPTS= ps2epl -NO_MAN= yes +MAN= .include <bsd.prog.mk> diff --git a/security/pam_jail/files/patch-Makefile b/security/pam_jail/files/patch-Makefile new file mode 100644 index 000000000000..77e19a707f6d --- /dev/null +++ b/security/pam_jail/files/patch-Makefile @@ -0,0 +1,13 @@ +--- Makefile.orig ++++ Makefile +@@ -4,8 +4,8 @@ + SRCS= pam_jail.c + MAN= pam_jail.8 + +-NO_INSTALLLIB= +-NO_PROFILE= ++MK_INSTALLLIB= no ++MK_PROFILE= no + WARNS?= 4 + SHLIB_NAME?= ${LIB}.so.${SHLIB_MAJOR} + LDADD+= -lpam diff --git a/security/pam_mkhomedir/Makefile b/security/pam_mkhomedir/Makefile index 6d93bdd0f68c..6908d2f07c87 100644 --- a/security/pam_mkhomedir/Makefile +++ b/security/pam_mkhomedir/Makefile @@ -21,13 +21,13 @@ PLIST_FILES+= lib/libpam_mkhomedir_p.a MAKE_ARGS+= PROFILE=yes WITH_STATIC= yes .else -MAKE_ARGS+= NO_PROFILE=yes +MAKE_ARGS+= MK_PROFILE=no .endif .if defined(WITH_STATIC) PLIST_FILES+= lib/libpam_mkhomedir.a .else -MAKE_ARGS+= NO_INSTALLLIB=yes +MAKE_ARGS+= MK_INSTALLLIB=no .endif pre-everything:: diff --git a/sysutils/bksh/Makefile b/sysutils/bksh/Makefile index 1fcd462c878c..c44130748719 100644 --- a/sysutils/bksh/Makefile +++ b/sysutils/bksh/Makefile @@ -14,6 +14,6 @@ USES= uidfix PLIST_FILES= bin/bksh post-patch: - @${REINPLACE_CMD} -e "s/NOMAN/NO_MAN/" ${WRKSRC}/local.mk + @${REINPLACE_CMD} -e "s/NOMAN.*/MAN=/" ${WRKSRC}/local.mk .include <bsd.port.mk> diff --git a/sysutils/btsixad/files/patch-test_Makefile b/sysutils/btsixad/files/patch-test_Makefile new file mode 100644 index 000000000000..b31deab9969f --- /dev/null +++ b/sysutils/btsixad/files/patch-test_Makefile @@ -0,0 +1,10 @@ +--- test/Makefile.orig ++++ test/Makefile +@@ -1,6 +1,6 @@ + PROG=test + SRCS=test.c +-NO_MAN= ++MAN= + CFLAGS+= -Wno-parentheses -Wno-switch + LDADD+= -lusbhid + install: diff --git a/sysutils/libsunacl/Makefile b/sysutils/libsunacl/Makefile index d5a350ebf113..52ea6ec38ed1 100644 --- a/sysutils/libsunacl/Makefile +++ b/sysutils/libsunacl/Makefile @@ -14,6 +14,6 @@ LICENSE= BSD2CLAUSE USES= uidfix USE_LDCONFIG= yes PLIST_FILES= include/sunacl.h lib/libsunacl.a lib/libsunacl.so.1 lib/libsunacl.so -MAKE_ENV= NO_PROFILE=yes +MAKE_ENV= WITHOUT_PROFILE=yes .include <bsd.port.mk> diff --git a/sysutils/mfid/files/patch-Makefile b/sysutils/mfid/files/patch-Makefile new file mode 100644 index 000000000000..d436b293272d --- /dev/null +++ b/sysutils/mfid/files/patch-Makefile @@ -0,0 +1,11 @@ +--- Makefile.orig ++++ Makefile +@@ -3,7 +3,6 @@ + + CFLAGS+= -g -Wall -Wunused + +-NOMAN= +-NO_MAN= ++MAN= + + .include <bsd.prog.mk> diff --git a/sysutils/pidof/Makefile b/sysutils/pidof/Makefile index 0caac78750e8..0b02c6053ff8 100644 --- a/sysutils/pidof/Makefile +++ b/sysutils/pidof/Makefile @@ -17,7 +17,7 @@ CONFLICTS= psmisc-1* PLIST_FILES= bin/pidof post-patch: - @${REINPLACE_CMD} 's/NOMAN/NO_MAN/ ; /LINKS/d' ${WRKSRC}/Makefile + @${REINPLACE_CMD} 's/NOMAN.*/MAN=/ ; /LINKS/d' ${WRKSRC}/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/pidof ${STAGEDIR}${PREFIX}/bin diff --git a/textproc/fixrtf/src/Makefile b/textproc/fixrtf/src/Makefile index 9a7948fe6513..716709eb6d3a 100644 --- a/textproc/fixrtf/src/Makefile +++ b/textproc/fixrtf/src/Makefile @@ -7,7 +7,6 @@ PREFIX?= /usr/local BINDIR= ${PREFIX}/bin CFLAGS+=-I${PREFIX}/include LDADD= -L${PREFIX}/lib -lpng -NO_MAN= -NOMAN= +MAN= .include <bsd.prog.mk> diff --git a/textproc/hhm/files/Makefile b/textproc/hhm/files/Makefile index 69145a03ccf3..ad025ffe47b5 100644 --- a/textproc/hhm/files/Makefile +++ b/textproc/hhm/files/Makefile @@ -6,6 +6,6 @@ LDADD= -L${PREFIX}/lib -llzxcomp -lm CFLAGS= -I${PREFIX}/include BINDIR= ${PREFIX}/bin -NO_MAN= # +MAN= .include <bsd.prog.mk> diff --git a/textproc/libcsv/Makefile b/textproc/libcsv/Makefile index 01f2b746ca56..0d6bff187fc9 100644 --- a/textproc/libcsv/Makefile +++ b/textproc/libcsv/Makefile @@ -23,7 +23,7 @@ PLIST_SUB= SHLIB_MAJOR="${SHLIB_MAJOR}" SHLIB_MAJOR= 3 PROFILE_PLIST_SUB= PROFILE="" -PROFILE_MAKE_ENV_OFF= NO_PROFILE=true +PROFILE_MAKE_ENV_OFF= WITHOUT_PROFILE=true PROFILE_PLIST_SUB_OFF= PROFILE="@comment " do-configure: diff --git a/textproc/wordnet/files/src.wn.Makefile b/textproc/wordnet/files/src.wn.Makefile index c8579f1cbcef..d6357c85853f 100644 --- a/textproc/wordnet/files/src.wn.Makefile +++ b/textproc/wordnet/files/src.wn.Makefile @@ -1,6 +1,5 @@ PROG= wn -NO_MAN= True # man pages installed separately -NOMAN= ${NO_MAN} +MAN= CFLAGS+= -DUNIX -DDEFAULTPATH="\"${PREFIX}/share/WordNet\"" \ -DDEFAULTBIN="\"${PREFIX}/bin\"" diff --git a/www/mathopd/files/patch-src__Makefile b/www/mathopd/files/patch-src__Makefile index c6efb648629d..91b9c60f3e2b 100644 --- a/www/mathopd/files/patch-src__Makefile +++ b/www/mathopd/files/patch-src__Makefile @@ -14,7 +14,7 @@ +SRCS= base64.c cgi.c config.c core.c dump.c imap.c log.c main.c \ + redirect.c request.c util.c stub.c sendfile.c +BINDIR?= ${PREFIX}/sbin -+NO_MAN= yes ++MAN= +LDADD= -lcrypt -# On Solaris, uncomment the following diff --git a/www/nostromo/files/patch-src-libmy-Makefile b/www/nostromo/files/patch-src-libmy-Makefile index 7037f4f107be..1ad0d3c653c0 100644 --- a/www/nostromo/files/patch-src-libmy-Makefile +++ b/www/nostromo/files/patch-src-libmy-Makefile @@ -7,7 +7,7 @@ -NOPIC= 1 -NOPROFILE= 1 +NO_PIC= 1 -+NO_PROFILE= 1 ++MK_PROFILE= no PIPE= -pipe diff --git a/x11-toolkits/itk/files/Makefile.lib b/x11-toolkits/itk/files/Makefile.lib index c3c303f162ea..0364759686d4 100644 --- a/x11-toolkits/itk/files/Makefile.lib +++ b/x11-toolkits/itk/files/Makefile.lib @@ -1,4 +1,4 @@ -NO_PROFILE= yes +MK_PROFILE= no LIB= itk ITK_LIBRARY= ${PREFIX}/lib/itk${MAJOR}.${MINOR} CFLAGS+= -I. -I./../generic \ diff --git a/x11/wmxss/files/patch-Src__Makefile b/x11/wmxss/files/patch-Src__Makefile index 3c2c94ef54f2..4729c5765697 100644 --- a/x11/wmxss/files/patch-Src__Makefile +++ b/x11/wmxss/files/patch-Src__Makefile @@ -24,7 +24,7 @@ +LDADD+= -lXpm -lX11 -lXext +LDADD+= -L${LOCALBASE}/lib -+NO_MAN= ++MAN= -.c.o: - $(CC) $(CFLAGS) -D$(shell echo `uname -s`) -c $< -o $*.o $(INCDIR) |