Date: Sat, 17 Jan 2015 18:47:26 +0100 (CET) From: Marco Beishuizen <mbeis@xs4all.nl> To: Kurt Jaeger <lists@opsec.eu> Cc: freebsd-ports@freebsd.org Subject: Re: updating alpine port to new version (as a maintainer) Message-ID: <alpine.BSF.2.11.1501171836570.2073@localhost> In-Reply-To: <20150117165844.GS44537@home.opsec.eu> References: <alpine.BSF.2.11.1501171736240.2073@localhost> <20150117165844.GS44537@home.opsec.eu>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sat, 17 Jan 2015, the wise Kurt Jaeger wrote:
Hi Kurt,
Thanks for helping. Unfortunately not all things went as planned.
> # fix distinfo, make makesum does this for mw
> make makesum
This looked fine.
> # then I check the build and stuff on my test system (10.1-amd64)
> rm -rf work && make check-plist
> [ some iterations later ]
When I do the make check-plist I get an error:
===> 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
Ignoring previously applied (or reversed) patch.
2 out of 2 hunks ignored--saving rejects to ./alpine/alpine.c.rej
=> Patch patch-alpine__alpine.c failed to apply cleanly.
=> Patch(es) patch-alpine__Makefile.am patch-alpine__Makefile.in applied
cleanly.
*** Error code 1
The contents of alpine.c.rej are:
@@ -50,7 +50,6 @@
#include "init.h"
#include "remote.h"
#include "pattern.h"
-#include "newuser.h"
#include "setup.h"
#include "adrbkcmd.h"
#include "signal.h"
@@ -767,7 +766,6 @@
pine_state->mangled_header = 1;
show_main_screen(pine_state, 0, FirstMenu, &main_keymenu, 0,
(Pos *) NULL);
- new_user_or_version(pine_state);
ClearScreen();
}
Any ideas how to go from here?
Regards,
Marco
--
Woman would be more charming if one could
fall into her arms without falling into her hands.
-- DeGourmont
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?alpine.BSF.2.11.1501171836570.2073>