CVS commit: pkgsrc/security/botan1

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Apr  1 08:04:55 UTC 2022

Modified Files:
        pkgsrc/security/botan1: Makefile PLIST buildlink3.mk

Log Message:
botan1: pkglint fixes


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/botan1/Makefile \
    pkgsrc/security/botan1/PLIST pkgsrc/security/botan1/buildlink3.mk

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

Modified files:

Index: pkgsrc/security/botan1/Makefile
diff -u pkgsrc/security/botan1/Makefile:1.1 pkgsrc/security/botan1/Makefile:1.2
--- pkgsrc/security/botan1/Makefile:1.1 Fri Apr  1 08:00:34 2022
+++ pkgsrc/security/botan1/Makefile     Fri Apr  1 08:04:55 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2022/04/01 08:00:34 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2022/04/01 08:04:55 wiz Exp $
 
 DISTNAME=      Botan-1.10.17
 PKGNAME=       ${DISTNAME:tl}
@@ -28,16 +28,14 @@ MAKE_FLAGS+=        LIB_OPT=${CXXFLAGS:Q}
 
 .include "../../mk/bsd.prefs.mk"
 
-PLIST_VARS+=   x86 x86_64 i386
+PLIST_VARS+=   x86_64 i386
 
 .if ${MACHINE_ARCH} == "x86_64"
 CONFIGURE_ARGS+=       --cpu=amd64
 PLIST.x86_64=          yes
-PLIST.x86=             yes
 .elif ${MACHINE_ARCH} == "i386"
 CONFIGURE_ARGS+=       --cpu=i386
 PLIST.i386=            yes
-PLIST.x86=             yes
 .elif ${MACHINE_ARCH} == "powerpc"
 CONFIGURE_ARGS+=       --cpu=ppc
 .elif ${MACHINE_ARCH} == "powerpc64"
Index: pkgsrc/security/botan1/PLIST
diff -u pkgsrc/security/botan1/PLIST:1.1 pkgsrc/security/botan1/PLIST:1.2
--- pkgsrc/security/botan1/PLIST:1.1    Fri Apr  1 08:00:34 2022
+++ pkgsrc/security/botan1/PLIST        Fri Apr  1 08:04:55 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2022/04/01 08:00:34 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2022/04/01 08:04:55 wiz Exp $
 bin/botan-config-1.10
 include/botan-1.10/botan/adler32.h
 include/botan-1.10/botan/aes.h
@@ -183,8 +183,8 @@ include/botan-1.10/botan/serp_simd.h
 ${PLIST.i386}include/botan-1.10/botan/serp_x86_32.h
 include/botan-1.10/botan/serpent.h
 include/botan-1.10/botan/sha160.h
-${PLIST.i386}include/botan-1.10/botan/sha1_x86_32.h
 ${PLIST.x86_64}include/botan-1.10/botan/sha1_sse2.h
+${PLIST.i386}include/botan-1.10/botan/sha1_x86_32.h
 ${PLIST.x86_64}include/botan-1.10/botan/sha1_x86_64.h
 include/botan-1.10/botan/sha2_32.h
 include/botan-1.10/botan/sha2_64.h
Index: pkgsrc/security/botan1/buildlink3.mk
diff -u pkgsrc/security/botan1/buildlink3.mk:1.1 pkgsrc/security/botan1/buildlink3.mk:1.2
--- pkgsrc/security/botan1/buildlink3.mk:1.1    Fri Apr  1 08:00:34 2022
+++ pkgsrc/security/botan1/buildlink3.mk        Fri Apr  1 08:04:55 2022
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2022/04/01 08:00:34 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2022/04/01 08:04:55 wiz Exp $
 
 BUILDLINK_TREE+=       botan
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        botan
 BOTAN_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.botan+=  botan>=1.10.12<1.11
-BUILDLINK_PKGSRCDIR.botan?=    ../../security/botan
+BUILDLINK_PKGSRCDIR.botan?=    ../../security/botan1
 .endif # BOTAN_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -botan