CVS commit: pkgsrc/pkgtools/pkgin

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon May 25 08:42:05 UTC 2020

Modified Files:
        pkgsrc/pkgtools/pkgin: Makefile distinfo
Removed Files:
        pkgsrc/pkgtools/pkgin: MESSAGE

Log Message:
pkgin: Update to 20.5.1.

This is quite a disruptive change, but has been tested in various ways across
Darwin, Minix, and SmartOS, so I'm reasonably confident I caught most issues.

With the switch to automake the pkgsrc Makefile has been able to be simplified
a lot, and I also took the opportunity to remove the mostly useless MESSAGE
file.

## Version 20.5.1 (2020-05-25)

 * Improve make portability.

## Version 20.5.0 (2020-05-25)

 * Switch to automake and overhaul mandatory configure options.
 * Remove unused code and pointless configure tests, cleaning up includes
   and headers where appropriate.
 * New version number scheme (yy.m.x).  The previous scheme had no relevance,
   this one at least gives users some clue about how up-to-date their version
   is.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r0 pkgsrc/pkgtools/pkgin/MESSAGE
cvs rdiff -u -r1.101 -r1.102 pkgsrc/pkgtools/pkgin/Makefile
cvs rdiff -u -r1.63 -r1.64 pkgsrc/pkgtools/pkgin/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/pkgtools/pkgin/Makefile
diff -u pkgsrc/pkgtools/pkgin/Makefile:1.101 pkgsrc/pkgtools/pkgin/Makefile:1.102
--- pkgsrc/pkgtools/pkgin/Makefile:1.101        Sun May 17 12:13:46 2020
+++ pkgsrc/pkgtools/pkgin/Makefile      Mon May 25 08:42:05 2020
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.101 2020/05/17 12:13:46 rillig Exp $
+# $NetBSD: Makefile,v 1.102 2020/05/25 08:42:05 jperkin Exp $
 
-DISTNAME=              pkgin-0.16.1
+DISTNAME=              pkgin-20.5.1
 CATEGORIES=            pkgtools
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=NetBSDfr/}
 GITHUB_TAG=            v${PKGVERSION_NOREV}
@@ -15,28 +15,24 @@ CONF_FILES=         ${EGDIR}/repositories.conf.
                        ${PKG_SYSCONFDIR}/${PKGBASE}/repositories.conf
 
 OWN_DIRS+=             ${PKG_SYSCONFDIR}/${PKGBASE}
-INSTALLATION_DIRS+=    bin ${PKGMANDIR}/cat1 ${PKGMANDIR}/man1 ${EGDIR}
+OWN_DIRS+=             ${VARBASE}/db/pkgin
+
+INSTALLATION_DIRS+=    bin ${PKGMANDIR}/man1 ${EGDIR}
 
 BUILD_DEFS+=           PKGIN_REPOSITORY_URL
 BUILD_DEFS+=           VARBASE
 
-OWN_DIRS+=             ${VARBASE}/db/pkgin
-
-SUBST_CLASSES+=                path
-SUBST_STAGE.path=      pre-configure
-SUBST_MESSAGE.path=    Adjusting path.
-SUBST_FILES.path=      Makefile.in actions.c pkgin.1
-SUBST_SED.path=                -e "s|/usr/pkg/etc|${PKG_SYSCONFDIR}|g"
-SUBST_SED.path+=       -e "s|/usr/sbin|${PKG_TOOLS_BIN}|g"
-SUBST_SED.path+=       -e "s|/var|${VARBASE}|g"
-SUBST_SED.path+=       -e "s|/usr/pkg|${PREFIX}|g"
-SUBST_SED.path+=       -e "s|!=.*uname -p|=    ${MACHINE_ARCH}|g"
-SUBST_SED.path+=       -e '/^BSD_PKG_MK/a\${.newline}PKGPATH=  ${PKGPATH}${.newline}'
-SUBST_NOOP_OK.path=    yes
-
 GNU_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --disable-maintainer-mode
+CONFIGURE_ARGS+=       --with-dbdir=${VARBASE}/db/pkgin
+CONFIGURE_ARGS+=       --with-machine-arch=${MACHINE_ARCH}
+CONFIGURE_ARGS+=       --with-pkg-install=${PKG_TOOLS_BIN}
+CONFIGURE_ARGS+=       --with-libarchive=${BUILDLINK_PREFIX.libarchive}
+CONFIGURE_ARGS+=       --with-libfetch=${BUILDLINK_PREFIX.libfetch}
+CONFIGURE_ARGS+=       --with-openssl=${BUILDLINK_PREFIX.openssl}
+CONFIGURE_ARGS+=       --with-sqlite3=${BUILDLINK_PREFIX.sqlite3}
+
 USE_FEATURES=          nbcompat
-USE_TOOLS+=            nroff
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -48,8 +44,6 @@ SUBST_SED.osrel=      -e "s|@OSREL@|${OS_VERS
 
 CFLAGS.SunOS+=         -D_FILE_OFFSET_BITS=64
 
-MAKE_ENV+=             MACHINE_ARCH=${MACHINE_ARCH}
-
 DEPENDS+=              pkg_install>=20130901:../../pkgtools/pkg_install
 
 # those have official repositories
@@ -62,19 +56,7 @@ pre-install:
                ${WRKSRC}/repositories.conf
 .endif
 
-do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/pkgin ${DESTDIR}${PREFIX}/bin
-       ${INSTALL_MAN} ${WRKSRC}/pkgin.1                                \
-               ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-.if !empty(MANINSTALL:Mcatinstall)
-.  if defined(CATMAN_SECTION_SUFFIX) && !empty(CATMAN_SECTION_SUFFIX:M[Yy][Ee][Ss])
-       ${INSTALL_MAN} ${WRKSRC}/pkgin.cat1                             \
-               ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1/pkgin.1
-.  else
-       ${INSTALL_MAN} ${WRKSRC}/pkgin.cat1                             \
-               ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1/pkgin.0
-.  endif
-.endif
+post-install:
        ${INSTALL_DATA} ${WRKSRC}/repositories.conf                     \
                ${DESTDIR}${EGDIR}/repositories.conf.example
        ${INSTALL_DATA} ${WRKSRC}/preferred.conf                        \

Index: pkgsrc/pkgtools/pkgin/distinfo
diff -u pkgsrc/pkgtools/pkgin/distinfo:1.63 pkgsrc/pkgtools/pkgin/distinfo:1.64
--- pkgsrc/pkgtools/pkgin/distinfo:1.63 Wed Apr 29 15:09:20 2020
+++ pkgsrc/pkgtools/pkgin/distinfo      Mon May 25 08:42:05 2020
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.63 2020/04/29 15:09:20 jperkin Exp $
+$NetBSD: distinfo,v 1.64 2020/05/25 08:42:05 jperkin Exp $
 
-SHA1 (pkgin-0.16.1.tar.gz) = 24c844acbef8a79be8a550e1fe4c02c5eac09919
-RMD160 (pkgin-0.16.1.tar.gz) = b7189b152c43f79bafb8c73ffdec58f565bd213a
-SHA512 (pkgin-0.16.1.tar.gz) = f718e3b202297bd5ff08b24e34bd0d1715d4ce04ffb3150e0a18b5ff8ec13ad16d66ffd51f059251478e3860f484a5223b28c4e0e3c00a53750578b143204ee2
-Size (pkgin-0.16.1.tar.gz) = 198757 bytes
+SHA1 (pkgin-20.5.1.tar.gz) = ed931b3d0dd4f9477562839ed20695e2de85f032
+RMD160 (pkgin-20.5.1.tar.gz) = 913d34a996ab82edc02b339e16a7ed03e21c60e2
+SHA512 (pkgin-20.5.1.tar.gz) = ebd2807b45c0c771d44bca0ab10cf778316e657c19581f6360155032f80f5e6c71381e8c1551a9384941340d5e753365923ca578fbeb8319d9a0070df032e366
+Size (pkgin-20.5.1.tar.gz) = 229123 bytes