From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jan 21 07:40:00 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 78D4A84A for ; Mon, 21 Jan 2013 07:40:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 5D355FD2 for ; Mon, 21 Jan 2013 07:40:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r0L7e0em012022 for ; Mon, 21 Jan 2013 07:40:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r0L7e0gS012021; Mon, 21 Jan 2013 07:40:00 GMT (envelope-from gnats) Resent-Date: Mon, 21 Jan 2013 07:40:00 GMT Resent-Message-Id: <201301210740.r0L7e0gS012021@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Matthias Andree Received: from apollo.emma.line.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by hub.freebsd.org (Postfix) with ESMTP id 4995542C; Mon, 21 Jan 2013 07:33:02 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from mandree by apollo.emma.line.org with local (Exim 4.80.1 (FreeBSD)) (envelope-from ) id 1TxBrq-000OtK-0g; Mon, 21 Jan 2013 08:32:30 +0100 Message-Id: Date: Mon, 21 Jan 2013 08:32:30 +0100 From: Matthias Andree To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/175466: [PATCH] graphics/gd: fix build after -CURRENT removal of bsd.compat.mk, portlint fixes Cc: dinoex@FreeBSD.org X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jan 2013 07:40:00 -0000 >Number: 175466 >Category: ports >Synopsis: [PATCH] graphics/gd: fix build after -CURRENT removal of bsd.compat.mk, portlint fixes >Confidential: no >Severity: critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Jan 21 07:40:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Matthias Andree >Release: FreeBSD 9.1-RELEASE amd64 >Organization: >Environment: System: FreeBSD apollo.emma.line.org 9.1-RELEASE FreeBSD 9.1-RELEASE #2 r244869: Sun Dec 30 22:05:16 CET >Description: Dirk, in 10-CURRENT, bsd.compat.mk got removed (1), rendering NOPROFILE=true ineffective, it needs to be NO_PROFILE=true, else the build fails due to inconsistencies around the libgd_p.a file: (Posted on #bsdports, from http://nopaste.info/4a5e078d34.html) -------------------------------------------------------------- ===> Installing for gd-2.0.35_8,1 ===> Generating temporary packing list ===> Checking if graphics/gd already installed mkdir -p /usr/local/include /usr/bin/make LIB=gd LIBDIR=/usr/local/lib NOPROFILE=true SHLIB_MAJOR=4 SHLIB_MINOR=0 -f /usr/share/mk/bsd.lib.mk install install -C -o root -g wheel -m 444 libgd.a /usr/local/lib install -C -o root -g wheel -m 444 libgd_p.a /usr/local/lib install: libgd_p.a: No such file or directory *** [_libinstall] Error code 71 Stop in /tmpfs/ports/usr/ports/graphics/gd/work/gd-2.0.35. *** [install] Error code 1 Stop in /tmpfs/ports/usr/ports/graphics/gd/work/gd-2.0.35. *** [do-install] Error code 1 -------------------------------------------------------------- Older versions would warn during "make install" like this: /usr/bin/make LIB=gd LIBDIR=/usr/local/lib NOPROFILE=true SHLIB_MAJOR=4 SHLIB_MINOR=0 -f /usr/share/mk/bsd.lib.mk install "/usr/share/mk/bsd.compat.mk", line 35: warning: NOPROFILE is deprecated in favour of NO_PROFILE While at it, update header and fix other portlint complaints (ABI versions from shared libraries). The patch below was tested on 7.4, 8.1, 9.0 amd64 Tinderboxen, and on 9.1-RELEASE with "port test". Port maintainer (dinoex@FreeBSD.org) is cc'd. (1) http://svnweb.freebsd.org/base/head/share/mk/bsd.compat.mk?view=log&pathrev=245268 Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports) >How-To-Repeat: >Fix: --- gd-2.0.35_8,1.patch begins here --- diff -ruN --exclude=CVS /usr/ports/graphics/gd/Makefile ./Makefile --- /usr/ports/graphics/gd/Makefile 2012-11-17 06:58:06.000000000 +0100 +++ ./Makefile 2013-01-21 08:22:28.000000000 +0100 @@ -1,9 +1,5 @@ -# New ports collection makefile for: gd -# Date created: 27 Mar 1998 -# Whom: jeff@cetlink.net -# -# $FreeBSD: ports/graphics/gd/Makefile,v 1.105 2012/11/17 05:58:06 svnexp Exp $ -# +# Created by: jeff@cetlink.net +# $FreeBSD$ PORTNAME= gd PORTVERSION= 2.0.35 @@ -18,9 +14,9 @@ MAINTAINER?= dinoex@FreeBSD.org COMMENT?= A graphics library for fast creation of images -LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \ png15:${PORTSDIR}/graphics/png \ - freetype.9:${PORTSDIR}/print/freetype2 + freetype:${PORTSDIR}/print/freetype2 CONFLICTS= bazaar-1.* @@ -43,7 +39,7 @@ .include .if ${PORT_OPTIONS:MFONTCONFIG} -LIB_DEPENDS+= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig +LIB_DEPENDS+= fontconfig:${PORTSDIR}/x11-fonts/fontconfig CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_LIBFONTCONFIG -DHAVE_PTHREAD ${PTHREAD_CFLAGS} LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib -lfontconfig LDFLAGS2+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib @@ -101,7 +97,7 @@ ${INSTALL_DATA} ${WRKSRC}/gdfx.h ${WRKSRC}/gdhelpers.h \ ${PREFIX}/include/ ${INSTALL_SCRIPT} ${WRKDIR}/gdlib-config ${PREFIX}/bin/ -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/index.html ${DOCSDIR} .endif diff -ruN --exclude=CVS /usr/ports/graphics/gd/files/Makefile.bsd ./files/Makefile.bsd --- /usr/ports/graphics/gd/files/Makefile.bsd 2007-02-22 21:33:06.000000000 +0100 +++ ./files/Makefile.bsd 2013-01-21 08:20:47.000000000 +0100 @@ -40,7 +40,7 @@ install: mkdir -p ${PREFIX}/include - ${MAKE} LIB=${LIB} LIBDIR=${PREFIX}/lib NOPROFILE=true \ + ${MAKE} LIB=${LIB} LIBDIR=${PREFIX}/lib NOPROFILE=true NO_PROFILE=true \ SHLIB_MAJOR=${SHLIB_MAJOR} SHLIB_MINOR=${SHLIB_MINOR} \ -f ${MAKEDIR}/bsd.lib.mk install cd ${.CURDIR} && ${BSD_INSTALL_DATA} ${INCS} ${PREFIX}/include diff -ruN --exclude=CVS /usr/ports/graphics/gd/files/configure ./files/configure --- /usr/ports/graphics/gd/files/configure 2012-11-17 06:58:06.000000000 +0100 +++ ./files/configure 2012-10-08 23:20:45.000000000 +0200 @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: ports/graphics/gd/files/configure,v 1.2 2012/11/17 05:58:06 svnexp Exp $ +# $FreeBSD: /tmp/pcvs/ports/graphics/gd/files/configure,v 1.1 2004-01-14 06:14:42 dinoex Exp $ # The GD_FONTS environment variable can be set to specify the gzipped # tar-ball containing the fonts in bdf format and the bdf file names. --- gd-2.0.35_8,1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: