From owner-freebsd-ports@FreeBSD.ORG Sat Jan 17 20:18:39 2015 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5A8D1945 for ; Sat, 17 Jan 2015 20:18:39 +0000 (UTC) Received: from mail-we0-x236.google.com (mail-we0-x236.google.com [IPv6:2a00:1450:400c:c03::236]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E065632F for ; Sat, 17 Jan 2015 20:18:38 +0000 (UTC) Received: by mail-we0-f182.google.com with SMTP id l61so136728wev.13 for ; Sat, 17 Jan 2015 12:18:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=I+Bw8mbv1VBRDtJDRSeY9yYlwL/fnOfYh62Q//UKBOM=; b=NFBAUW1vd3FJe4tHg8MOPiUOstZ3P7MrpSPQ1JivIZRkbgQQLtEGPMeiBKaS7TD9cN FsPBakVzHQ7ZT4F9I1RAiNVNTHtoVHkeL78U/uvYDBjbmP3aOUcr93r204vnMsuv6Htf U5ZVhMacNW3HF+vVHmK3WD5NOC5OUtHTzSRgN8fM3rh3eCi/wNbdszcxsHBQD9W4STd1 PqfTjwx8hDEJDHDJHT0bv/rRxJW2MRYgkoMzQoGrwi2NxXRQLdMJaeNrWQLTT0kUo1uB 6Z3KAagGduHCwK+nkbLyKXGUEmVGIORSSGsLKgiIzVNi5HU+igmyEExxs1JKggVKJMHx OpVg== MIME-Version: 1.0 X-Received: by 10.180.80.163 with SMTP id s3mr18594011wix.59.1421525917479; Sat, 17 Jan 2015 12:18:37 -0800 (PST) Received: by 10.27.131.166 with HTTP; Sat, 17 Jan 2015 12:18:37 -0800 (PST) In-Reply-To: References: <20150117165844.GS44537@home.opsec.eu> <20150117182525.GU44537@home.opsec.eu> Date: Sat, 17 Jan 2015 14:18:37 -0600 Message-ID: Subject: Re: updating alpine port to new version (as a maintainer) From: Scot Hetzel To: Marco Beishuizen Content-Type: text/plain; charset=ISO-8859-1 Cc: Kurt Jaeger , FreeBSD Ports X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Jan 2015 20:18:39 -0000 On Sat, Jan 17, 2015 at 1:48 PM, Marco Beishuizen wrote: > On Sat, 17 Jan 2015, the wise Kurt Jaeger wrote: > >> I normally proceed by moving all non-applying patches into a seperate >> directory and try if the build works: >> >> cd ~/myp/mail/alpine mkdir OLD mv files/patch-alpine__alpine.c OLD/ >> >> # and retry rm -rf work && make check-plist >> >> If the patch is required (but different), one has to dig into the code and >> find out what needs to change for the code to build. > > > After removing 5 patches the make check-plist now hangs at: > > ===> License APACHE20 accepted by the user > ===> Found saved configuration for alpine-2.11_2 > ===> alpine-2.20 depends on file: /usr/local/sbin/pkg - found > ===> Fetching all distfiles required by alpine-2.20 for building > ===> Extracting for alpine-2.20 > => SHA256 Checksum OK for alpine-2.20/alpine-2.20.tar.xz. > => SHA256 Checksum OK for alpine-2.20/maildir.patch.gz. > ===> Patching for alpine-2.20 > ===> Applying distribution patches for alpine-2.20 > ===> Applying FreeBSD patches for alpine-2.20 > cp: /home/marco/tmp/alpine/work/alpine-2.20/doc/tech-notes.txt: No such file > or directory > *** Error code 1 > > The file tech-notes.txt is not in /doc/, but in /doc/tech-notes/. Where can > I change this? > On line 41 of the current ports Makefile, it shows tech-notes.txt: 41 PORTDOCSdoc= brochure.txt tech-notes.txt Then on lines 163-164 in the post-install stage it tries to install them: 163 .for f in ${PORTDOCSdoc} 164 ${INSTALL_MAN} ${WRKSRC}/doc/$f ${STAGEDIR}${DOCSDIR} 165 .endfor Change the PORTDOCSdoc variable to: PORTDOCSdoc= brochure.txt tech-notes/tech-notes.txt This should install the tech-notes.txt file into the ${DOCSDIR}. The other option is to remove tech-notes.txt from PORTDOCSdoc and added it to PORTDOCShtml. Then update the pkg-plist for the new location. -- DISCLAIMER: No electrons were maimed while sending this message. Only slightly bruised.