Stuart Henderson @ 2018-04-19T23:04:02 +0200:
Thanks, Stuart,
> On 2018/04/18 18:10, LÉVAI Dániel wrote:
> > Hi!
> >
> > Update to kc, that breaks compatibility with <2.4 kc databases.
> > Please check how I handled it here, I tried to mimic postgresql's way
> > with @ask-update.
[...]
> Since you're upstream would you mind uploading a tar.gz as a
> "release asset" and switching to that please? There's a drag-and-drop
> or file selection box on the releases page (or there are some gists
> floating around if you want to automate it).
>
> That way we aren't at risk of broken auto-generated distfiles
> when github update their software stack.
>
> Ports-wise that involves traditional DISTNAME and MASTER_SITES lines
> instead of GH_*.
I uploaded a new archive (repackaged Github's release tar.gz as tar.bz2)
and I point to that from the Makefile. Is this what you had in mind?
[...]
> > +FLAVORS = scrypt
> > +FLAVOR ?=
> > +
> > +.if ${FLAVOR:Mscrypt}
> > +LIB_DEPENDS += security/libscrypt
> > +MAKE_ENV += HAVE_LIBSCRYPT=yes
> > +.endif
> > +
>
> It's only a small dep, is there a real advantage to making it optional?
There's no real reason for the FLAVOR other than I didn't want to impose
this on everyone. But you're right, it's a small dep., if it's okay, I
just removed the flavor.
Attached the amended diff (also removed the patch because I've
incorporated it in the new release while there).
Daniel
Index: Makefile
===================================================================
RCS file: /cvs/ports/security/kc/Makefile,v
retrieving revision 1.14
diff -u -p -p -u -r1.14 Makefile
--- Makefile 29 Dec 2015 19:49:41 -0000 1.14
+++ Makefile 20 Apr 2018 08:52:07 -0000
@@ -2,29 +2,33 @@
COMMENT = console based password storing application
-GH_ACCOUNT = levaidaniel
-GH_PROJECT = kc
-GH_TAGNAME = 2.3.2
-REVISION = 1
+V = 2.4.2
+DISTNAME = kc-$V
+EXTRACT_SUFX = .tar.bz2
+MASTER_SITES = https://github.com/levaidaniel/kc/releases/download/${V}/
CATEGORIES = security
-HOMEPAGE = http://github.com/levaidaniel/${GH_PROJECT}
+HOMEPAGE = http://github.com/levaidaniel/kc/
MAINTAINER = LEVAI Daniel <[email protected]>
# BSD
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB += c crypto edit ncursesw pcre pthread xml2
+WANTLIB += c crypto edit ncursesw pcre pthread xml2 scrypt
LIB_DEPENDS = textproc/libxml \
- devel/pcre
+ devel/pcre \
+ security/libscrypt
+
+MAKE_ENV += HAVE_PCRE=yes OS_OPENBSD=yes HAVE_LIBSCRYPT=yes
-MAKE_ENV += HAVE_PCRE=yes
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/kc
${INSTALL} ${WRKBUILD}/pwsafe_to_kc.pl ${PREFIX}/share/kc/
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/kc
+ ${INSTALL} ${WRKBUILD}/Changelog ${PREFIX}/share/doc/kc/
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/security/kc/distinfo,v
retrieving revision 1.5
diff -u -p -p -u -r1.5 distinfo
--- distinfo 24 Dec 2013 12:56:19 -0000 1.5
+++ distinfo 20 Apr 2018 08:52:07 -0000
@@ -1,2 +1,2 @@
-SHA256 (kc-2.3.2.tar.gz) = 1Ap74wB55M/EI+GqK127Dm8LNInx0OCQzWZyi8Mo/Ng=
-SIZE (kc-2.3.2.tar.gz) = 44779
+SHA256 (kc-2.4.2.tar.bz2) = PpFoQR8OHwOQE8OwsSXolGt7D+fpLRVvBpyMu0ovimE=
+SIZE (kc-2.4.2.tar.bz2) = 65011
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/security/kc/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -p -u -r1.3 PLIST
--- pkg/PLIST 21 Mar 2013 09:48:45 -0000 1.3
+++ pkg/PLIST 20 Apr 2018 08:52:07 -0000
@@ -1,6 +1,9 @@
@comment $OpenBSD: PLIST,v 1.3 2013/03/21 09:48:45 jasper Exp $
+@ask-update kc-<2.4 Make sure all your existing kc databases are safely
*dumped* ('dump' command) then read the Changelog in ${PREFIX}/share/doc/kc
after installation
@bin bin/kc
@man man/man1/kc.1
+share/doc/kc/
+share/doc/kc/Changelog
share/doc/pkg-readmes/${FULLPKGNAME}
share/kc/
share/kc/pwsafe_to_kc.pl
--
LÉVAI Dániel
PGP key ID = 0x83B63A8F
Key fingerprint = DBEC C66B A47A DFA2 792D 650C C69B BE4C 83B6 3A8F
