From owner-svn-ports-head@freebsd.org Sat Nov 18 00:51:35 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A2F8ADE70CC; Sat, 18 Nov 2017 00:51:35 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7CEDD7C27E; Sat, 18 Nov 2017 00:51:35 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAI0pYCO016799; Sat, 18 Nov 2017 00:51:34 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAI0pYGk016796; Sat, 18 Nov 2017 00:51:34 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201711180051.vAI0pYGk016796@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Sat, 18 Nov 2017 00:51:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r454404 - in head: . graphics/netpbm graphics/netpbm/files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head: . graphics/netpbm graphics/netpbm/files X-SVN-Commit-Revision: 454404 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Nov 2017 00:51:35 -0000 Author: tobik Date: Sat Nov 18 00:51:34 2017 New Revision: 454404 URL: https://svnweb.freebsd.org/changeset/ports/454404 Log: graphics/netpbm: Fix build with older netpbm versions installed The build currently fails when older netpbm version are still installed in the build environment e.g. when upgrading from 10.35.98 to 10.80.00 the build fails with ppmtompeg.o: In function `main': ppmtompeg.c:(.text+0x9a5): undefined reference to `pm_strfree' ppmtompeg.o: In function `getUserFrameFile': ppmtompeg.c:(.text+0xcb1): undefined reference to `pm_asprintf' ppmtompeg.c:(.text+0xcfb): undefined reference to `pm_strfree' ppmtompeg.c:(.text+0xd04): undefined reference to `pm_strfree' - Use explicit paths when linking with libnetpbm - Remove UPDATING entry that previously recommended deinstalling netpbm first when using portmaster/portupgrade PR: 223724 Modified: head/UPDATING head/graphics/netpbm/Makefile head/graphics/netpbm/files/config.mk Modified: head/UPDATING ============================================================================== --- head/UPDATING Sat Nov 18 00:11:23 2017 (r454403) +++ head/UPDATING Sat Nov 18 00:51:34 2017 (r454404) @@ -149,18 +149,6 @@ you update your ports collection, before attempting an The HPN option is currently disabled by default, and does not build, in the package. This follows what happened in base as well. - 20171006: - AFFECTS: users of graphics/netpbm - AUTHOR: tobik@FreeBSD.org - - If you use portmaster/portupgrade/make to build your ports, please - uninstall the old netpbm version first before attempting to update to - netpbm 10.80.00: - - pkg delete -f netpbm - - It is recommended that you rebuild all dependent ports as well. - 20171004: AFFECTS: users of security/krb5-appl AUTHOR: cy@FreeBSD.org Modified: head/graphics/netpbm/Makefile ============================================================================== --- head/graphics/netpbm/Makefile Sat Nov 18 00:11:23 2017 (r454403) +++ head/graphics/netpbm/Makefile Sat Nov 18 00:51:34 2017 (r454404) @@ -87,7 +87,9 @@ post-patch: .endfor post-patch-STATIC-on: - @${REINPLACE_CMD} 's|$$(LD)|$$(LD) -static|g' ${WRKSRC}/common.mk + @${REINPLACE_CMD} -e 's|$$(LD)|$$(LD) -static|g' \ + -e 's@$$(NETPBMLIBFNAME)@libnetpbm.a@' \ + ${WRKSRC}/common.mk # Disable building svgtopam by default. It is the only program that # requires libxml2 and it is not useful in this day and age according Modified: head/graphics/netpbm/files/config.mk ============================================================================== --- head/graphics/netpbm/files/config.mk Sat Nov 18 00:11:23 2017 (r454403) +++ head/graphics/netpbm/files/config.mk Sat Nov 18 00:51:34 2017 (r454404) @@ -13,6 +13,7 @@ JBIGHDR_DIR = $(LOCALBASE)/include JBIGLIB = -L$(LOCALBASE)/lib -ljbig JPEGHDR_DIR = $(LOCALBASE)/include JPEGLIB = -L$(LOCALBASE)/lib -ljpeg +LINKER_CAN_DO_EXPLICIT_LIBRARY = Y LINKERISCOMPILER = Y NETPBMLIBSUFFIX = so NETPBMLIBTYPE = unixshared