Date: Fri, 20 Dec 2019 23:24:40 +0000 (UTC) From: Brooks Davis <brooks@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r520531 - in head: comms/birda/files comms/hcidump/files databases/oracle8-client/files devel/libpasori/files devel/libxalloc/files graphics/squish/files japanese/ming mail/faces/files ... Message-ID: <201912202324.xBKNOeI7070007@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brooks Date: Fri Dec 20 23:24:40 2019 New Revision: 520531 URL: https://svnweb.freebsd.org/changeset/ports/520531 Log: Additional builds with 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>. Also GC NO_MANCOMPRESSED which doesn't do anything. In the case of devel/libpasori, this change accomplished the same thing as the change in r518434, but more directly (fix the Makefiles rather than patching them after they are installed). Deleted: head/devel/libpasori/files/patch-lib_Makefile head/devel/libpasori/files/patch-lpdump_Makefile head/devel/libpasori/files/patch-lptest_Makefile Modified: head/comms/birda/files/patch-lib-Makefile head/comms/hcidump/files/patch-parser-Makefile head/databases/oracle8-client/files/patch-freebsd-Makefile head/devel/libpasori/files/Makefile.lib.usb20 head/devel/libpasori/files/Makefile.lpdump head/devel/libpasori/files/Makefile.lptest head/devel/libxalloc/files/Makefile.lib head/graphics/squish/files/BSDmakefile head/japanese/ming/Makefile head/mail/faces/files/Makefile.compface head/mail/libdkim/files/Makefile head/math/linpack/files/Makefile.lib head/security/fbopenssl/files/BSDMakefile head/security/ipv6toolkit/files/BSDMakefile.in head/security/ipv6toolkit/files/Makefile.in head/security/openssh-askpass/files/Makefile.in head/sysutils/pefs-kmod/Makefile head/x11/gpctool/files/BSDmakefile Modified: head/comms/birda/files/patch-lib-Makefile ============================================================================== --- head/comms/birda/files/patch-lib-Makefile Fri Dec 20 22:56:37 2019 (r520530) +++ head/comms/birda/files/patch-lib-Makefile Fri Dec 20 23:24:40 2019 (r520531) @@ -1,9 +1,16 @@ ---- lib/Makefile.orig 2005-11-14 12:12:28 UTC +--- lib/Makefile.orig +++ lib/Makefile -@@ -9,4 +9,6 @@ NOPROFILE= yes - NOPIC= yes - MKLINKLIB= no +@@ -5,8 +5,10 @@ + iasclt.c commsrv.c commclt.c obexsrv.c obexclt.c options.c \ + actisys.c girbil.c litelink.c jeteye.c sendobex.c redlink.c -+install: +-NOPROFILE= yes +-NOPIC= yes +-MKLINKLIB= no ++MK_PROFILE= no ++NO_PIC= yes ++MK_LINKLIB= no + ++install: + .include <bsd.lib.mk> Modified: head/comms/hcidump/files/patch-parser-Makefile ============================================================================== --- head/comms/hcidump/files/patch-parser-Makefile Fri Dec 20 22:56:37 2019 (r520530) +++ head/comms/hcidump/files/patch-parser-Makefile Fri Dec 20 23:24:40 2019 (r520531) @@ -1,6 +1,6 @@ ---- parser/Makefile.orig Fri Mar 12 23:16:59 2004 -+++ parser/Makefile Fri Dec 10 21:07:28 2004 -@@ -7,8 +7,8 @@ +--- parser/Makefile.orig ++++ parser/Makefile +@@ -7,10 +7,10 @@ MAN= SRCS= bnep.c cmtp.c hidp.c l2cap.c rfcomm.c hci.c parser.c sdp.c WARNS?= 2 @@ -9,5 +9,8 @@ +NO_WERROR= yes +CFLAGS?= -O2 - NOPROFILE= 1 +-NOPROFILE= 1 ++MK_PROFILE= no + + .include <bsd.lib.mk> Modified: head/databases/oracle8-client/files/patch-freebsd-Makefile ============================================================================== --- head/databases/oracle8-client/files/patch-freebsd-Makefile Fri Dec 20 22:56:37 2019 (r520530) +++ head/databases/oracle8-client/files/patch-freebsd-Makefile Fri Dec 20 23:24:40 2019 (r520531) @@ -1,10 +1,16 @@ ---- freebsd/Makefile.orig 2007-11-15 10:50:25.000000000 +0600 -+++ freebsd/Makefile 2007-11-15 10:50:10.000000000 +0600 -@@ -5,6 +5,7 @@ +--- freebsd/Makefile.orig ++++ freebsd/Makefile +@@ -4,11 +4,8 @@ + NO_PIC= yes NO_OBJ= yes - NO_PROFILE= yes +-NO_PROFILE= yes +- +-NOPIC= yes +-NOOBJ= yes +-NOPROFILE= yes ++MK_PROFILE= no +NO_WERROR= yes - NOPIC= yes - NOOBJ= yes + LIBDIR= ${ORACLE_HOME}/lib + Modified: head/devel/libpasori/files/Makefile.lib.usb20 ============================================================================== --- head/devel/libpasori/files/Makefile.lib.usb20 Fri Dec 20 22:56:37 2019 (r520530) +++ head/devel/libpasori/files/Makefile.lib.usb20 Fri Dec 20 23:24:40 2019 (r520531) @@ -10,7 +10,7 @@ INCS= libpasori.h libpasori_com.h libpasori_command.h LIBDIR= ${LOCALBASE}/lib INCLUDEDIR= ${LOCALBASE}/include -NO_PROFILE= +MK_PROFILE= no SHLIB_MAJOR= 1 CFLAGS+= -D__LIBPASORI_WITH_LIBUSB Modified: head/devel/libpasori/files/Makefile.lpdump ============================================================================== --- head/devel/libpasori/files/Makefile.lpdump Fri Dec 20 22:56:37 2019 (r520530) +++ head/devel/libpasori/files/Makefile.lpdump Fri Dec 20 23:24:40 2019 (r520531) @@ -7,7 +7,7 @@ DPADD= libpasori.a LDADD= -L../lib -lpasori BINDIR= ${LOCALBASE}/bin -NO_MAN= +MAN= CFLAGS+= -Wall -W Modified: head/devel/libpasori/files/Makefile.lptest ============================================================================== --- head/devel/libpasori/files/Makefile.lptest Fri Dec 20 22:56:37 2019 (r520530) +++ head/devel/libpasori/files/Makefile.lptest Fri Dec 20 23:24:40 2019 (r520531) @@ -7,7 +7,7 @@ DPADD= libpasori.a LDADD= -L../lib -lpasori BINDIR= ${LOCALBASE}/bin -NO_MAN= +MAN= CFLAGS+= -Wall -W Modified: head/devel/libxalloc/files/Makefile.lib ============================================================================== --- head/devel/libxalloc/files/Makefile.lib Fri Dec 20 22:56:37 2019 (r520530) +++ head/devel/libxalloc/files/Makefile.lib Fri Dec 20 23:24:40 2019 (r520531) @@ -5,8 +5,8 @@ LIB= xalloc LIBDIR= ${PREFIX}/lib SHLIB_MAJOR= ${SHLIB_VER} SHLIB_MINOR= 0 -NOPROFILE= yes -NOOBJ= yes +MK_PROFILE= no +NO_OBJ= yes INCS= xalloc.h INCSDIR=${PREFIX}/include Modified: head/graphics/squish/files/BSDmakefile ============================================================================== --- head/graphics/squish/files/BSDmakefile Fri Dec 20 22:56:37 2019 (r520530) +++ head/graphics/squish/files/BSDmakefile Fri Dec 20 23:24:40 2019 (r520531) @@ -1,7 +1,7 @@ LIB= squish SHLIB_MAJOR= 1 SRCS!= echo *.cpp -NO_PROFILE= yes +MK_PROFILE= no CXXFLAGS+= -include limits.h -I${.CURDIR} Modified: head/japanese/ming/Makefile ============================================================================== --- head/japanese/ming/Makefile Fri Dec 20 22:56:37 2019 (r520530) +++ head/japanese/ming/Makefile Fri Dec 20 23:24:40 2019 (r520531) @@ -19,7 +19,6 @@ LIB_DEPENDS= libpng.so:graphics/png \ CONFLICTS= ming-* WRKSRC= ${WRKDIR}/jaming-${PORTVERSION}/src -MAKE_ARGS= NO_PROFILE=true USE_LDCONFIG= yes USES= bison uidfix MAKE_ENV= WITHOUT_PROFILE=yes __MAKE_CONF=/dev/null SRCCONF=/dev/null Modified: head/mail/faces/files/Makefile.compface ============================================================================== --- head/mail/faces/files/Makefile.compface Fri Dec 20 22:56:37 2019 (r520530) +++ head/mail/faces/files/Makefile.compface Fri Dec 20 23:24:40 2019 (r520531) @@ -35,7 +35,7 @@ LIBNAME = lib$(NAME).a SHLIB_MAJOR = 1 LIB = $(NAME) SOLIB = lib$(NAME).so.$(SHLIB_MAJOR) -NOPROFILE = '' +MK_PROFILE = no LIBRARY = $(LIBDIR) MAN1DIR = $(MANDIR)/man1 MAN3DIR = $(MANDIR)/man3 Modified: head/mail/libdkim/files/Makefile ============================================================================== --- head/mail/libdkim/files/Makefile Fri Dec 20 22:56:37 2019 (r520530) +++ head/mail/libdkim/files/Makefile Fri Dec 20 23:24:40 2019 (r520531) @@ -11,6 +11,6 @@ INCLUDEDIR= ${PREFIX}/include CXXFLAGS+= -DOPENSSL_FIPS -I${OPENSSLINC} LDFLAGS+= -lcrypto -L${OPENSSLLIB} -NO_PROFILE= +MK_PROFILE= no .include <bsd.lib.mk> Modified: head/math/linpack/files/Makefile.lib ============================================================================== --- head/math/linpack/files/Makefile.lib Fri Dec 20 22:56:37 2019 (r520530) +++ head/math/linpack/files/Makefile.lib Fri Dec 20 23:24:40 2019 (r520531) @@ -2,7 +2,7 @@ # LINPACK sources LIBDIR= ${PREFIX}/lib -NOPROFILE= no +MK_PROFILE= no SHLIB_MAJOR= 3 LIB=linpack Modified: head/security/fbopenssl/files/BSDMakefile ============================================================================== --- head/security/fbopenssl/files/BSDMakefile Fri Dec 20 22:56:37 2019 (r520530) +++ head/security/fbopenssl/files/BSDMakefile Fri Dec 20 23:24:40 2019 (r520531) @@ -9,7 +9,8 @@ LIB= fbopenssl LIBDIR= ${PREFIX}/lib SHLIBDIR= ${PREFIX}/lib SHLIB_MAJOR= 0 -NO_MAN= +MAN= +MK_PROFILE= no CFLAGS+=-ansi -I${OPENSSLINC} LDADD= -Wl,-R${OPENSSLLIB} -L${OPENSSLLIB} -lcrypto Modified: head/security/ipv6toolkit/files/BSDMakefile.in ============================================================================== --- head/security/ipv6toolkit/files/BSDMakefile.in Fri Dec 20 22:56:37 2019 (r520530) +++ head/security/ipv6toolkit/files/BSDMakefile.in Fri Dec 20 23:24:40 2019 (r520531) @@ -19,7 +19,6 @@ PREFIX?= /usr/local BINDIR?= ${PREFIX}/bin MANDIR?= ${PREFIX}/man/man MAN= blackhole6.1 script6.1 ipv6toolkit.conf.5 ipv6toolkit.7 -NO_MANCOMPRESS= data/ipv6toolkit.conf: echo "# SI6 Networks' IPv6 Toolkit Configuration File" > ${.TARGET} Modified: head/security/ipv6toolkit/files/Makefile.in ============================================================================== --- head/security/ipv6toolkit/files/Makefile.in Fri Dec 20 22:56:37 2019 (r520530) +++ head/security/ipv6toolkit/files/Makefile.in Fri Dec 20 23:24:40 2019 (r520531) @@ -8,7 +8,6 @@ BINDIR?= ${PREFIX}/bin BINDIR?= ${PREFIX}/sbin .endif MANDIR?= ${PREFIX}/man/man -NO_MANCOMPRESS= .PATH: ${.CURDIR}/../tools ${.CURDIR}/../manuals Modified: head/security/openssh-askpass/files/Makefile.in ============================================================================== --- head/security/openssh-askpass/files/Makefile.in Fri Dec 20 22:56:37 2019 (r520530) +++ head/security/openssh-askpass/files/Makefile.in Fri Dec 20 23:24:40 2019 (r520531) @@ -4,7 +4,6 @@ PREFIX?= /usr/local LOCALBASE?= /usr/local BINDIR?= ${PREFIX}/bin MANDIR?= ${PREFIX}/man/man -NO_MANCOMPRESS= CLASS= SshAskpass FILES= ${CLASS} Modified: head/sysutils/pefs-kmod/Makefile ============================================================================== --- head/sysutils/pefs-kmod/Makefile Fri Dec 20 22:56:37 2019 (r520530) +++ head/sysutils/pefs-kmod/Makefile Fri Dec 20 23:24:40 2019 (r520531) @@ -20,8 +20,7 @@ ONLY_FOR_ARCHS_REASON= untested on any other arch USES= kmod uidfix MAKE_JOBS_UNSAFE=yes -MAKE_ENV= BINDIR="${PREFIX}/sbin" MANDIR="${MANPREFIX}/man/man" \ - NO_MANCOMPRESS= +MAKE_ENV= BINDIR="${PREFIX}/sbin" MANDIR="${MANPREFIX}/man/man" OPTIONS_DEFINE= AESNI OPTIONS_DEFAULT= Modified: head/x11/gpctool/files/BSDmakefile ============================================================================== --- head/x11/gpctool/files/BSDmakefile Fri Dec 20 22:56:37 2019 (r520530) +++ head/x11/gpctool/files/BSDmakefile Fri Dec 20 23:24:40 2019 (r520531) @@ -1,6 +1,5 @@ PROG= gpctool -NO_MAN= Ha-ha! -NOMAN= ${NO_MAN} +MAN= SRCS= gpctool.c main.c callbacks.c graphics.c psdump.c
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912202324.xBKNOeI7070007>