Wed Apr 29 19:57:51 2020 UTC ()
Avoid complex version logic for obsolete NetBSD versions


(maya)
diff -r1.33 -r1.34 pkgsrc/databases/nss_ldap/Makefile
diff -r1.13 -r1.14 pkgsrc/net/mDNSResponder-nss/Makefile
diff -r1.18 -r1.19 pkgsrc/sysutils/easydiskpasswd/Makefile
diff -r1.16 -r1.17 pkgsrc/sysutils/i2ocfg/Makefile
cvs diff -r1.33 -r1.34 pkgsrc/databases/nss_ldap/Makefile (switch to unified diff)

--- pkgsrc/databases/nss_ldap/Makefile 2020/01/18 21:48:57 1.33
+++ pkgsrc/databases/nss_ldap/Makefile 2020/04/29 19:57:51 1.34
@@ -1,51 +1,51 @@ @@ -1,51 +1,51 @@
1# $NetBSD: Makefile,v 1.33 2020/01/18 21:48:57 jperkin Exp $ 1# $NetBSD: Makefile,v 1.34 2020/04/29 19:57:51 maya Exp $
2 2
3DISTNAME= nss_ldap-265 3DISTNAME= nss_ldap-265
4PKGREVISION= 8 4PKGREVISION= 8
5CATEGORIES= databases 5CATEGORIES= databases
6MASTER_SITES= http://www.padl.com/download/ 6MASTER_SITES= http://www.padl.com/download/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9#HOMEPAGE= http://www.padl.com/OSS/nss_ldap.html 9#HOMEPAGE= http://www.padl.com/OSS/nss_ldap.html
10COMMENT= LDAP client for nsswitch 10COMMENT= LDAP client for nsswitch
11LICENSE= gnu-lgpl-v2 11LICENSE= gnu-lgpl-v2
12 12
13# needs nsswitch 13# needs nsswitch
14ONLY_FOR_PLATFORM= NetBSD-[3-9]*-* FreeBSD-*-* 14ONLY_FOR_PLATFORM= NetBSD-*-* FreeBSD-*-*
15 15
16USE_TOOLS+= gmake 16USE_TOOLS+= gmake
17GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
18CONFIGURE_ARGS+= --enable-schema-mapping 18CONFIGURE_ARGS+= --enable-schema-mapping
19CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 19CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
20CONFIGURE_ARGS+= --with-ldap-lib=openldap 20CONFIGURE_ARGS+= --with-ldap-lib=openldap
21CONFIGURE_ARGS+= --with-ldap-dir=${BUILDLINK_PREFIX.openldap-client} 21CONFIGURE_ARGS+= --with-ldap-dir=${BUILDLINK_PREFIX.openldap-client}
22CONFIGURE_ARGS+= --with-ldap-conf-file=${PKG_SYSCONFDIR}/ldap.conf 22CONFIGURE_ARGS+= --with-ldap-conf-file=${PKG_SYSCONFDIR}/ldap.conf
23CONFIGURE_ARGS+= --with-ldap-secret-file=${PKG_SYSCONFDIR}/ldap.secret 23CONFIGURE_ARGS+= --with-ldap-secret-file=${PKG_SYSCONFDIR}/ldap.secret
24CFLAGS.FreeBSD+= -DUID_NOBODY=65534 -DGID_NOBODY=65534 # see <sys/conf.h> 24CFLAGS.FreeBSD+= -DUID_NOBODY=65534 -DGID_NOBODY=65534 # see <sys/conf.h>
25CONFIGURE_ENV+= ac_cv_header_nsswitch_h=no 25CONFIGURE_ENV+= ac_cv_header_nsswitch_h=no
26MAKE_FLAGS+= INST_UID=${BINOWN} INST_GID=${BINGRP} 26MAKE_FLAGS+= INST_UID=${BINOWN} INST_GID=${BINGRP}
27 27
28# shared with security/pam-ldap 28# shared with security/pam-ldap
29EGDIR= ${PREFIX}/share/examples/${PKGBASE} 29EGDIR= ${PREFIX}/share/examples/${PKGBASE}
30CONF_FILES= ${EGDIR}/ldap.conf ${PKG_SYSCONFDIR}/ldap.conf 30CONF_FILES= ${EGDIR}/ldap.conf ${PKG_SYSCONFDIR}/ldap.conf
31 31
32INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} sysconfdir=${EGDIR} 32INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} sysconfdir=${EGDIR}
33 33
34SUBST_CLASSES+= fix-opsys 34SUBST_CLASSES+= fix-opsys
35SUBST_STAGE.fix-opsys= pre-configure 35SUBST_STAGE.fix-opsys= pre-configure
36SUBST_MESSAGE.fix-opsys= Fixing system name. 36SUBST_MESSAGE.fix-opsys= Fixing system name.
37SUBST_FILES.fix-opsys= Makefile.in 37SUBST_FILES.fix-opsys= Makefile.in
38SUBST_SED.fix-opsys= -e 's,@OPSYS@,${OPSYS:tl},g' 38SUBST_SED.fix-opsys= -e 's,@OPSYS@,${OPSYS:tl},g'
39 39
40.include "../../mk/bsd.prefs.mk" 40.include "../../mk/bsd.prefs.mk"
41 41
42pre-build: 42pre-build:
43 ${CP} ${FILESDIR}/netbsd.c ${FILESDIR}/netbsd.h ${FILESDIR}/freebsd.c ${WRKSRC} 43 ${CP} ${FILESDIR}/netbsd.c ${FILESDIR}/netbsd.h ${FILESDIR}/freebsd.c ${WRKSRC}
44.if ${OPSYS} == "NetBSD" 44.if ${OPSYS} == "NetBSD"
45 ${LN} -fs /usr/include/nsswitch.h ${BUILDLINK_DIR}/include/nss.h 45 ${LN} -fs /usr/include/nsswitch.h ${BUILDLINK_DIR}/include/nss.h
46.endif 46.endif
47 47
48.include "options.mk" 48.include "options.mk"
49 49
50.include "../../databases/openldap-client/buildlink3.mk" 50.include "../../databases/openldap-client/buildlink3.mk"
51.include "../../mk/bsd.pkg.mk" 51.include "../../mk/bsd.pkg.mk"
cvs diff -r1.13 -r1.14 pkgsrc/net/mDNSResponder-nss/Makefile (switch to unified diff)

--- pkgsrc/net/mDNSResponder-nss/Makefile 2017/09/03 08:53:12 1.13
+++ pkgsrc/net/mDNSResponder-nss/Makefile 2020/04/29 19:57:51 1.14
@@ -1,40 +1,39 @@ @@ -1,40 +1,39 @@
1# $NetBSD: Makefile,v 1.13 2017/09/03 08:53:12 wiz Exp $ 1# $NetBSD: Makefile,v 1.14 2020/04/29 19:57:51 maya Exp $
2 2
3DISTNAME= mDNSResponder-258.14 3DISTNAME= mDNSResponder-258.14
4PKGNAME= mDNSResponder-nss-258.14 4PKGNAME= mDNSResponder-nss-258.14
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= net 6CATEGORIES= net
7MASTER_SITES= http://www.opensource.apple.com/tarballs/mDNSResponder/ 7MASTER_SITES= http://www.opensource.apple.com/tarballs/mDNSResponder/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://developer.apple.com/bonjour/ 10HOMEPAGE= https://developer.apple.com/bonjour/
11COMMENT= Apple's mDNS responder - NetBSD nsswitch module 11COMMENT= Apple's mDNS responder - NetBSD nsswitch module
12LICENSE= modified-bsd 12LICENSE= modified-bsd
13 13
14# needs nsswitch 14ONLY_FOR_PLATFORM= NetBSD-*-*
15ONLY_FOR_PLATFORM= NetBSD-[3-9]*-* 
16 15
17INSTALLATION_DIRS= lib share/examples/nss_mdns ${PKGMANDIR}/man5 16INSTALLATION_DIRS= lib share/examples/nss_mdns ${PKGMANDIR}/man5
18 17
19BUILD_DEFS+= PKG_SYSCONFBASE 18BUILD_DEFS+= PKG_SYSCONFBASE
20CONF_FILES= ${PREFIX}/share/examples/nss_mdns/nss_mdns.conf \ 19CONF_FILES= ${PREFIX}/share/examples/nss_mdns/nss_mdns.conf \
21 ${PKG_SYSCONFDIR}/nss_mdns.conf 20 ${PKG_SYSCONFDIR}/nss_mdns.conf
22 21
23post-extract: 22post-extract:
24 ${CP} ${FILESDIR}/netbsd.c ${FILESDIR}/netbsd.h ${WRKSRC}/mDNSPosix 23 ${CP} ${FILESDIR}/netbsd.c ${FILESDIR}/netbsd.h ${WRKSRC}/mDNSPosix
25 24
26do-build: 25do-build:
27 (cd ${WRKSRC}/mDNSPosix && ${CC} -c -fPIC -I. -I${LOCALBASE}/include \ 26 (cd ${WRKSRC}/mDNSPosix && ${CC} -c -fPIC -I. -I${LOCALBASE}/include \
28 -DPKG_SYSCONFBASE=\"${PKG_SYSCONFBASE}\" nss_mdns.c netbsd.c) 27 -DPKG_SYSCONFBASE=\"${PKG_SYSCONFBASE}\" nss_mdns.c netbsd.c)
29 (cd ${WRKSRC}/mDNSPosix && ${LD} -shared *.o -o nss_mdns.so.0 \ 28 (cd ${WRKSRC}/mDNSPosix && ${LD} -shared *.o -o nss_mdns.so.0 \
30 -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -ldns_sd) 29 -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -ldns_sd)
31 30
32do-install: 31do-install:
33 ${INSTALL_LIB} ${WRKSRC}/mDNSPosix/nss_mdns.so.0 ${DESTDIR}${PREFIX}/lib 32 ${INSTALL_LIB} ${WRKSRC}/mDNSPosix/nss_mdns.so.0 ${DESTDIR}${PREFIX}/lib
34 ${INSTALL_DATA} ${WRKSRC}/mDNSPosix/nss_mdns.conf \ 33 ${INSTALL_DATA} ${WRKSRC}/mDNSPosix/nss_mdns.conf \
35 ${DESTDIR}${PREFIX}/share/examples/nss_mdns 34 ${DESTDIR}${PREFIX}/share/examples/nss_mdns
36 ${INSTALL_MAN} ${WRKSRC}/mDNSPosix/nss_mdns.conf.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5 35 ${INSTALL_MAN} ${WRKSRC}/mDNSPosix/nss_mdns.conf.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
37 36
38.include "../../net/mDNSResponder/buildlink3.mk" 37.include "../../net/mDNSResponder/buildlink3.mk"
39.include "../../mk/pthread.buildlink3.mk" 38.include "../../mk/pthread.buildlink3.mk"
40.include "../../mk/bsd.pkg.mk" 39.include "../../mk/bsd.pkg.mk"
cvs diff -r1.18 -r1.19 pkgsrc/sysutils/easydiskpasswd/Makefile (switch to unified diff)

--- pkgsrc/sysutils/easydiskpasswd/Makefile 2019/11/04 21:28:45 1.18
+++ pkgsrc/sysutils/easydiskpasswd/Makefile 2020/04/29 19:57:51 1.19
@@ -1,28 +1,28 @@ @@ -1,28 +1,28 @@
1# $NetBSD: Makefile,v 1.18 2019/11/04 21:28:45 rillig Exp $ 1# $NetBSD: Makefile,v 1.19 2020/04/29 19:57:51 maya Exp $
2 2
3DISTNAME= easydiskpasswd-1.0 3DISTNAME= easydiskpasswd-1.0
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= sysutils 5CATEGORIES= sysutils
6DISTFILES= # empty 6DISTFILES= # empty
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9COMMENT= Tool to unlock a password protected USB "EasyDisk" 9COMMENT= Tool to unlock a password protected USB "EasyDisk"
10 10
11WRKSRC= ${WRKDIR} 11WRKSRC= ${WRKDIR}
12MAKE_ENV+= BINOWN=${BINOWN} BINGRP=${BINGRP} 12MAKE_ENV+= BINOWN=${BINOWN} BINGRP=${BINGRP}
13 13
14INSTALLATION_DIRS= bin 14INSTALLATION_DIRS= bin
15 15
16# we depend on SCIOCCOMMAND, a header defining sense codes 16# we depend on SCIOCCOMMAND, a header defining sense codes
17# and the "make" infrastructure 17# and the "make" infrastructure
18ONLY_FOR_PLATFORM= NetBSD-[3-9]*-* 18ONLY_FOR_PLATFORM= NetBSD-*-*
19 19
20.include "../../mk/compiler.mk" 20.include "../../mk/compiler.mk"
21.if !empty(PKGSRC_COMPILER:Mclang) 21.if !empty(PKGSRC_COMPILER:Mclang)
22BUILDLINK_TRANSFORM+= rm:-Wno-traditional 22BUILDLINK_TRANSFORM+= rm:-Wno-traditional
23.endif 23.endif
24 24
25do-extract: 25do-extract:
26 ${CP} ${FILESDIR}/easydiskpasswd.c ${FILESDIR}/Makefile ${WRKSRC} 26 ${CP} ${FILESDIR}/easydiskpasswd.c ${FILESDIR}/Makefile ${WRKSRC}
27 27
28.include "../../mk/bsd.pkg.mk" 28.include "../../mk/bsd.pkg.mk"
cvs diff -r1.16 -r1.17 pkgsrc/sysutils/i2ocfg/Makefile (switch to unified diff)

--- pkgsrc/sysutils/i2ocfg/Makefile 2017/08/16 20:45:45 1.16
+++ pkgsrc/sysutils/i2ocfg/Makefile 2020/04/29 19:57:51 1.17
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1# $NetBSD: Makefile,v 1.16 2017/08/16 20:45:45 wiz Exp $ 1# $NetBSD: Makefile,v 1.17 2020/04/29 19:57:51 maya Exp $
2 2
3DISTNAME= i2ocfg-1.1 3DISTNAME= i2ocfg-1.1
4CATEGORIES= sysutils 4CATEGORIES= sysutils
5MASTER_SITES= http://www.hairylemon.org/~ad/software/download/i2ocfg/ 5MASTER_SITES= http://www.hairylemon.org/~ad/software/download/i2ocfg/
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8#HOMEPAGE= http://www.hairylemon.org/~ad/software/i2ocfg/ 8#HOMEPAGE= http://www.hairylemon.org/~ad/software/i2ocfg/
9COMMENT= I2O configuration dialog gateway 9COMMENT= I2O configuration dialog gateway
10 10
11ONLY_FOR_PLATFORM= NetBSD-1.5[J-Z]-* NetBSD-1.6*-* NetBSD-[2-9]*-* 11ONLY_FOR_PLATFORM= NetBSD-*-*
12 12
13USE_BSD_MAKEFILE= YES 13USE_BSD_MAKEFILE= YES
14USE_TOOLS+= groff nroff 14USE_TOOLS+= groff nroff
15INSTALL_MAKE_FLAGS= MANDIR=${PREFIX}/${PKGMANDIR} 15INSTALL_MAKE_FLAGS= MANDIR=${PREFIX}/${PKGMANDIR}
16 16
17INSTALLATION_DIRS= libexec/cgi-bin ${PKGMANDIR}/cat8 ${PKGMANDIR}/man8 17INSTALLATION_DIRS= libexec/cgi-bin ${PKGMANDIR}/cat8 ${PKGMANDIR}/man8
18 18
19MANCOMPRESSED_IF_MANZ= YES 19MANCOMPRESSED_IF_MANZ= YES
20 20
21.include "../../mk/bsd.pkg.mk" 21.include "../../mk/bsd.pkg.mk"