Thu Jun 5 13:36:38 2014 UTC ()
Depend on libfetch from pkgsrc.

On NetBSD 5, builtin libfetch is linked against builtin openssl, but
pkgsrc openssl is used to build pkgin, causing a link failure.

ok imil@.


(gdt)
diff -r1.46 -r1.47 pkgsrc/pkgtools/pkgin/Makefile
cvs diff -r1.46 -r1.47 pkgsrc/pkgtools/pkgin/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkgin/Makefile 2014/04/09 07:27:15 1.46
+++ pkgsrc/pkgtools/pkgin/Makefile 2014/06/05 13:36:38 1.47
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.46 2014/04/09 07:27:15 obache Exp $ 1# $NetBSD: Makefile,v 1.47 2014/06/05 13:36:38 gdt Exp $
2 2
3GHCOMMIT= 3859170568fbe4fe21b5660dbaeca8d65ac10f1b 3GHCOMMIT= 3859170568fbe4fe21b5660dbaeca8d65ac10f1b
4DISTNAME= ${GHCOMMIT} 4DISTNAME= ${GHCOMMIT}
5PKGNAME= pkgin-0.6.4 5PKGNAME= pkgin-0.6.4
6PKGREVISION= 6 6PKGREVISION= 7
7CATEGORIES= pkgtools 7CATEGORIES= pkgtools
8MASTER_SITES= https://github.com/NetBSDfr/pkgin/archive/ 8MASTER_SITES= https://github.com/NetBSDfr/pkgin/archive/
9 9
10MAINTAINER= imil@NetBSD.org 10MAINTAINER= imil@NetBSD.org
11HOMEPAGE= http://pkgin.net/ 11HOMEPAGE= http://pkgin.net/
12COMMENT= Apt / yum like tool for managing pkgsrc binary packages 12COMMENT= Apt / yum like tool for managing pkgsrc binary packages
13LICENSE= modified-bsd 13LICENSE= modified-bsd
14 14
15EGDIR= ${PREFIX}/share/examples/${PKGBASE} 15EGDIR= ${PREFIX}/share/examples/${PKGBASE}
16CONF_FILES= ${EGDIR}/repositories.conf.example \ 16CONF_FILES= ${EGDIR}/repositories.conf.example \
17 ${PKG_SYSCONFDIR}/${PKGBASE}/repositories.conf 17 ${PKG_SYSCONFDIR}/${PKGBASE}/repositories.conf
18 18
19OWN_DIRS+= ${PKG_SYSCONFDIR}/${PKGBASE} 19OWN_DIRS+= ${PKG_SYSCONFDIR}/${PKGBASE}
@@ -72,15 +72,16 @@ do-install: @@ -72,15 +72,16 @@ do-install:
72. endif 72. endif
73.endif 73.endif
74 ${INSTALL_DATA} ${WRKSRC}/repositories.conf \ 74 ${INSTALL_DATA} ${WRKSRC}/repositories.conf \
75 ${DESTDIR}${EGDIR}/repositories.conf.example 75 ${DESTDIR}${EGDIR}/repositories.conf.example
76 76
77# libfetch has no builtin.mk and is included in NetBSD>=5 77# libfetch has no builtin.mk and is included in NetBSD>=5
78.if ${OPSYS} != "NetBSD" || \ 78.if ${OPSYS} != "NetBSD" || \
79 (${OPSYS} == "NetBSD" && !empty(OS_VERSION:M[0-4].*)) 79 (${OPSYS} == "NetBSD" && !empty(OS_VERSION:M[0-4].*))
80. include "../../net/libfetch/buildlink3.mk" 80. include "../../net/libfetch/buildlink3.mk"
81.endif 81.endif
82 82
83.include "../../archivers/libarchive/buildlink3.mk" 83.include "../../archivers/libarchive/buildlink3.mk"
84.include "../../databases/sqlite3/buildlink3.mk" 84.include "../../databases/sqlite3/buildlink3.mk"
 85.include "../../net/libfetch/buildlink3.mk"
85.include "../../security/openssl/buildlink3.mk" 86.include "../../security/openssl/buildlink3.mk"
86.include "../../mk/bsd.pkg.mk" 87.include "../../mk/bsd.pkg.mk"