Module Name:    src
Committed By:   agc
Date:           Fri May  1 22:59:53 UTC 2009

Modified Files:
        src/distrib/sets/lists/base: mi shl.elf shl.mi
        src/distrib/sets/lists/comp: mi shl.mi
        src/distrib/sets/lists/man: mi

Log Message:
Remove openpgp files from the build (replaced by netpgp)


To generate a diff of this commit:
cvs rdiff -u -r1.806 -r1.807 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.169 -r1.170 src/distrib/sets/lists/base/shl.elf
cvs rdiff -u -r1.467 -r1.468 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.1248 -r1.1249 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.78 -r1.79 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.1134 -r1.1135 src/distrib/sets/lists/man/mi

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

Modified files:

Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.806 src/distrib/sets/lists/base/mi:1.807
--- src/distrib/sets/lists/base/mi:1.806	Mon Apr 27 14:22:40 2009
+++ src/distrib/sets/lists/base/mi	Fri May  1 22:59:51 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.806 2009/04/27 14:22:40 njoly Exp $
+# $NetBSD: mi,v 1.807 2009/05/01 22:59:51 agc Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -834,6 +834,7 @@
 ./usr/bin/msgs					base-util-bin
 ./usr/bin/nbsvtool				base-crypto-bin		crypto
 ./usr/bin/netgroup				base-nis-bin
+./usr/bin/netpgp				base-crypto-bin		crypto
 ./usr/bin/netstat				base-netutil-bin
 ./usr/bin/newaliases				base-mailwrapper-bin
 ./usr/bin/newgrp				base-util-bin
@@ -848,8 +849,7 @@
 ./usr/bin/nvi					base-obsolete		obsolete
 ./usr/bin/nview					base-obsolete		obsolete
 ./usr/bin/od					base-util-bin
-./usr/bin/openpgp				base-crypto-bin		crypto
-./usr/bin/netpgp				base-crypto-bin		crypto
+./usr/bin/openpgp				base-obsolete		obsolete
 ./usr/bin/openssl				base-crypto-bin		crypto
 ./usr/bin/page					base-util-bin
 ./usr/bin/pagesize				base-util-bin
@@ -1112,7 +1112,7 @@
 ./usr/include/nfs				base-c-usr
 ./usr/include/ntfs				base-c-usr
 ./usr/include/objc				base-objc-usr
-./usr/include/openpgpsdk			base-c-usr
+./usr/include/openpgpsdk			base-obsolete		obsolete
 ./usr/include/openssl				base-c-usr
 ./usr/include/prop				base-c-usr
 ./usr/include/protocols				base-c-usr

Index: src/distrib/sets/lists/base/shl.elf
diff -u src/distrib/sets/lists/base/shl.elf:1.169 src/distrib/sets/lists/base/shl.elf:1.170
--- src/distrib/sets/lists/base/shl.elf:1.169	Fri May  1 15:30:46 2009
+++ src/distrib/sets/lists/base/shl.elf	Fri May  1 22:59:52 2009
@@ -1,4 +1,4 @@
-# $NetBSD: shl.elf,v 1.169 2009/05/01 15:30:46 christos Exp $
+# $NetBSD: shl.elf,v 1.170 2009/05/01 22:59:52 agc Exp $
 #
 # Note:	Do not mark "old" major and major.minor shared libraries as
 #	"obsolete"; just remove the entry, as third-party applications
@@ -186,8 +186,8 @@
 ./usr/lib/libnetpgp.so.0			base-crypto-shlib	crypto
 ./usr/lib/libobjc.so				base-sys-shlib		gcc
 ./usr/lib/libobjc.so.3				base-sys-shlib		gcc
-./usr/lib/libopenpgpsdk.so			base-crypto-shlib	crypto
-./usr/lib/libopenpgpsdk.so.0			base-crypto-shlib	crypto
+./usr/lib/libopenpgpsdk.so			base-obsolete		obsolete
+./usr/lib/libopenpgpsdk.so.0			base-obsolete		obsolete
 ./usr/lib/libossaudio.so			base-sys-shlib
 ./usr/lib/libossaudio.so.1			base-sys-shlib
 ./usr/lib/libp2k.so				base-puffs-shlib

Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.467 src/distrib/sets/lists/base/shl.mi:1.468
--- src/distrib/sets/lists/base/shl.mi:1.467	Fri May  1 21:45:45 2009
+++ src/distrib/sets/lists/base/shl.mi	Fri May  1 22:59:52 2009
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.467 2009/05/01 21:45:45 perry Exp $
+# $NetBSD: shl.mi,v 1.468 2009/05/01 22:59:52 agc Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -100,7 +100,7 @@
 ./usr/lib/libnetpgp.so.0.9			base-crypto-shlib	crypto
 ./usr/lib/libobjc.so.2.0			base-sys-shlib		gcc=3
 ./usr/lib/libobjc.so.3.0			base-sys-shlib		gcc=4
-./usr/lib/libopenpgpsdk.so.0.9			base-crypto-shlib	crypto
+./usr/lib/libopenpgpsdk.so.0.9			base-obsolete		obsolete
 ./usr/lib/libossaudio.so.1.0			base-sys-shlib
 ./usr/lib/libp2k.so.1.0				base-puffs-shlib
 ./usr/lib/libpam.so.2.0				base-sys-shlib		pam

Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1248 src/distrib/sets/lists/comp/mi:1.1249
--- src/distrib/sets/lists/comp/mi:1.1248	Fri May  1 21:49:59 2009
+++ src/distrib/sets/lists/comp/mi	Fri May  1 22:59:52 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.1248 2009/05/01 21:49:59 perry Exp $
+#	$NetBSD: mi,v 1.1249 2009/05/01 22:59:52 agc Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -1664,36 +1664,36 @@
 ./usr/include/objc/sarray.h			comp-c-include
 ./usr/include/objc/thr.h			comp-c-include
 ./usr/include/objc/typedstream.h		comp-c-include
-./usr/include/openpgpsdk/accumulate.h		comp-c-include		crypto
-./usr/include/openpgpsdk/armour.h		comp-c-include		crypto
-./usr/include/openpgpsdk/callback.h		comp-c-include		crypto
-./usr/include/openpgpsdk/compress.h		comp-c-include		crypto
-./usr/include/openpgpsdk/configure.h		comp-c-include		crypto
-./usr/include/openpgpsdk/create.h		comp-c-include		crypto
-./usr/include/openpgpsdk/crypto.h		comp-c-include		crypto
-./usr/include/openpgpsdk/defs.h			comp-c-include		crypto
-./usr/include/openpgpsdk/errors.h		comp-c-include		crypto
-./usr/include/openpgpsdk/final.h		comp-c-include		crypto
-./usr/include/openpgpsdk/hash.h			comp-c-include		crypto
-./usr/include/openpgpsdk/keyring.h		comp-c-include		crypto
-./usr/include/openpgpsdk/lists.h		comp-c-include		crypto
-./usr/include/openpgpsdk/memory.h		comp-c-include		crypto
-./usr/include/openpgpsdk/openpgpsdk.h		comp-c-include		crypto
-./usr/include/openpgpsdk/packet-parse.h		comp-c-include		crypto
-./usr/include/openpgpsdk/packet-show-cast.h	comp-c-include		crypto
-./usr/include/openpgpsdk/packet-show.h		comp-c-include		crypto
-./usr/include/openpgpsdk/packet.h		comp-c-include		crypto
-./usr/include/openpgpsdk/random.h		comp-c-include		crypto
-./usr/include/openpgpsdk/readerwriter.h		comp-c-include		crypto
-./usr/include/openpgpsdk/signature.h		comp-c-include		crypto
-./usr/include/openpgpsdk/std_print.h		comp-c-include		crypto
-./usr/include/openpgpsdk/streamwriter.h		comp-c-include		crypto
-./usr/include/openpgpsdk/types.h		comp-c-include		crypto
-./usr/include/openpgpsdk/util.h			comp-c-include		crypto
-./usr/include/openpgpsdk/validate.h		comp-c-include		crypto
-./usr/include/openpgpsdk/version.h		comp-c-include		crypto
-./usr/include/openpgpsdk/writer.h		comp-c-include		crypto
-./usr/include/openpgpsdk/writer_armoured.h	comp-c-include		crypto
+./usr/include/openpgpsdk/accumulate.h		comp-c-obsolete		obsolete
+./usr/include/openpgpsdk/armour.h		comp-c-obsolete		obsolete
+./usr/include/openpgpsdk/callback.h		comp-c-obsolete		obsolete
+./usr/include/openpgpsdk/compress.h		comp-c-obsolete		obsolete
+./usr/include/openpgpsdk/configure.h		comp-c-obsolete		obsolete
+./usr/include/openpgpsdk/create.h		comp-c-obsolete		obsolete
+./usr/include/openpgpsdk/crypto.h		comp-c-obsolete		obsolete
+./usr/include/openpgpsdk/defs.h			comp-c-obsolete		obsolete
+./usr/include/openpgpsdk/errors.h		comp-c-obsolete		obsolete
+./usr/include/openpgpsdk/final.h		comp-c-obsolete		obsolete
+./usr/include/openpgpsdk/hash.h			comp-c-obsolete		obsolete
+./usr/include/openpgpsdk/keyring.h		comp-c-obsolete		obsolete
+./usr/include/openpgpsdk/lists.h		comp-c-obsolete		obsolete
+./usr/include/openpgpsdk/memory.h		comp-c-obsolete		obsolete
+./usr/include/openpgpsdk/openpgpsdk.h		comp-c-obsolete		obsolete
+./usr/include/openpgpsdk/packet-parse.h		comp-c-obsolete		obsolete
+./usr/include/openpgpsdk/packet-show-cast.h	comp-c-obsolete		obsolete
+./usr/include/openpgpsdk/packet-show.h		comp-c-obsolete		obsolete
+./usr/include/openpgpsdk/packet.h		comp-c-obsolete		obsolete
+./usr/include/openpgpsdk/random.h		comp-c-obsolete		obsolete
+./usr/include/openpgpsdk/readerwriter.h		comp-c-obsolete		obsolete
+./usr/include/openpgpsdk/signature.h		comp-c-obsolete		obsolete
+./usr/include/openpgpsdk/std_print.h		comp-c-obsolete		obsolete
+./usr/include/openpgpsdk/streamwriter.h		comp-c-obsolete		obsolete
+./usr/include/openpgpsdk/types.h		comp-c-obsolete		obsolete
+./usr/include/openpgpsdk/util.h			comp-c-obsolete		obsolete
+./usr/include/openpgpsdk/validate.h		comp-c-obsolete		obsolete
+./usr/include/openpgpsdk/version.h		comp-c-obsolete		obsolete
+./usr/include/openpgpsdk/writer.h		comp-c-obsolete		obsolete
+./usr/include/openpgpsdk/writer_armoured.h	comp-c-obsolete		obsolete
 ./usr/include/openssl/aes.h			comp-c-include		crypto
 ./usr/include/openssl/asn1.h			comp-c-include		crypto
 ./usr/include/openssl/asn1_mac.h		comp-c-include		crypto
@@ -2455,9 +2455,8 @@
 ./usr/lib/libobjc_g.a				-unknown-		debuglib
 ./usr/lib/libobjc_p.a				comp-objc-proflib	profile
 ./usr/lib/libopcodes_g.a			-unknown-		debuglib
-./usr/lib/libopenpgpsdk.a			comp-c-lib		crypto
-./usr/lib/libopenpgpsdk_g.a			-unknown-		debuglib
-./usr/lib/libopenpgpsdk_p.a			comp-c-proflib		profile,crypto
+./usr/lib/libopenpgpsdk.a			comp-obsolete		obsolete
+./usr/lib/libopenpgpsdk_g.a			comp-obsolete		obsolete
 ./usr/lib/libossaudio.a				comp-c-lib
 ./usr/lib/libossaudio_g.a			-unknown-		debuglib
 ./usr/lib/libossaudio_p.a			comp-c-proflib		profile
@@ -2988,7 +2987,7 @@
 ./usr/libdata/debug/usr/bin/nvi.debug		comp-obsolete		obsolete
 ./usr/libdata/debug/usr/bin/objcopy.debug	comp-util-debug		bfd,debug
 ./usr/libdata/debug/usr/bin/objdump.debug	comp-util-debug		bfd,debug
-./usr/libdata/debug/usr/bin/openpgp.debug	comp-crypto-debug	crypto,debug
+./usr/libdata/debug/usr/bin/openpgp.debug	comp-obsolete		obsolete
 ./usr/libdata/debug/usr/bin/openssl.debug	comp-crypto-debug	crypto,debug
 ./usr/libdata/debug/usr/bin/passwd.debug	comp-util-debug		debug
 ./usr/libdata/debug/usr/bin/paste.debug		comp-util-debug		debug
@@ -3562,7 +3561,7 @@
 ./usr/libdata/lint/llib-lmilter.ln		comp-obsolete		obsolete
 ./usr/libdata/lint/llib-lnetpgp.ln		comp-c-lintlib		lint,crypto
 ./usr/libdata/lint/llib-lntp.ln			comp-obsolete		obsolete
-./usr/libdata/lint/llib-lopenpgpsdk.ln		comp-c-lintlib		lint,crypto
+./usr/libdata/lint/llib-lopenpgpsdk.ln		comp-obsolete		obsolete
 ./usr/libdata/lint/llib-lossaudio.ln		comp-c-lintlib		lint
 ./usr/libdata/lint/llib-lp2k.ln			comp-puffs-lintlib	lint
 ./usr/libdata/lint/llib-lpam.ln			comp-c-lintlib		lint,pam
@@ -6816,7 +6815,7 @@
 ./usr/share/man/cat3/openpam_restore_cred.0	comp-c-catman		.cat,pam
 ./usr/share/man/cat3/openpam_set_option.0	comp-c-catman		.cat,pam
 ./usr/share/man/cat3/openpam_ttyconv.0		comp-c-catman		.cat,pam
-./usr/share/man/cat3/openpgpsdk.0		comp-c-catman		crypto,.cat
+./usr/share/man/cat3/openpgpsdk.0		comp-c-obsolete		obsolete
 ./usr/share/man/cat3/openpty.0			comp-c-catman		.cat
 ./usr/share/man/cat3/openssl_bio.0		comp-c-catman		crypto,.cat
 ./usr/share/man/cat3/openssl_blowfish.0		comp-c-catman		crypto,.cat
@@ -12151,7 +12150,7 @@
 ./usr/share/man/html3/openpam_restore_cred.html	comp-c-htmlman		html,pam
 ./usr/share/man/html3/openpam_set_option.html	comp-c-htmlman		html,pam
 ./usr/share/man/html3/openpam_ttyconv.html	comp-c-htmlman		html,pam
-./usr/share/man/html3/openpgpsdk.html		comp-c-htmlman		crypto,html
+./usr/share/man/html3/openpgpsdk.html		comp-obsolete		obsolete
 ./usr/share/man/html3/openpty.html		comp-c-htmlman		html
 ./usr/share/man/html3/openssl_bio.html		comp-c-htmlman		crypto,html
 ./usr/share/man/html3/openssl_blowfish.html	comp-c-htmlman		crypto,html
@@ -17481,7 +17480,7 @@
 ./usr/share/man/man3/openpam_restore_cred.3	comp-c-man		.man,pam
 ./usr/share/man/man3/openpam_set_option.3	comp-c-man		.man,pam
 ./usr/share/man/man3/openpam_ttyconv.3		comp-c-man		.man,pam
-./usr/share/man/man3/openpgpsdk.3		comp-c-man		crypto,.man
+./usr/share/man/man3/openpgpsdk.3		comp-obsolete		obsolete
 ./usr/share/man/man3/openpty.3			comp-c-man		.man
 ./usr/share/man/man3/openssl_bio.3		comp-c-man		crypto,.man
 ./usr/share/man/man3/openssl_blowfish.3		comp-c-man		crypto,.man

Index: src/distrib/sets/lists/comp/shl.mi
diff -u src/distrib/sets/lists/comp/shl.mi:1.78 src/distrib/sets/lists/comp/shl.mi:1.79
--- src/distrib/sets/lists/comp/shl.mi:1.78	Sat Apr 25 05:54:50 2009
+++ src/distrib/sets/lists/comp/shl.mi	Fri May  1 22:59:52 2009
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.78 2009/04/25 05:54:50 agc Exp $
+# $NetBSD: shl.mi,v 1.79 2009/05/01 22:59:52 agc Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -63,7 +63,7 @@
 ./usr/lib/libobjc_pic.a				comp-objc-piclib
 ./usr/lib/libopcodes.so.3			comp-c-shlib		bfd
 ./usr/lib/libopcodes.so.3.0			comp-c-shlib		bfd
-./usr/lib/libopenpgpsdk_pic.a			comp-c-piclib		crypto
+./usr/lib/libopenpgpsdk_pic.a			comp-obsolete		obsolete
 ./usr/lib/libossaudio_pic.a			comp-c-piclib
 ./usr/lib/libp2k_pic.a				comp-puffs-piclib
 ./usr/lib/libpam_pic.a				comp-c-piclib		pam

Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1134 src/distrib/sets/lists/man/mi:1.1135
--- src/distrib/sets/lists/man/mi:1.1134	Sat Apr 25 05:54:51 2009
+++ src/distrib/sets/lists/man/mi	Fri May  1 22:59:53 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1134 2009/04/25 05:54:51 agc Exp $
+# $NetBSD: mi,v 1.1135 2009/05/01 22:59:53 agc Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -315,7 +315,7 @@
 ./usr/share/man/cat1/nview.0			man-obsolete		obsolete
 ./usr/share/man/cat1/od.0			man-util-catman		.cat
 ./usr/share/man/cat1/omshell.0			man-dhcpd-catman	.cat
-./usr/share/man/cat1/openpgp.0			man-crypto-catman	crypto,.cat
+./usr/share/man/cat1/openpgp.0			man-obsolete		obsolete
 ./usr/share/man/cat1/openssl.0			man-crypto-catman	crypto,.cat
 ./usr/share/man/cat1/openssl_CA.pl.0		man-crypto-catman	crypto,.cat
 ./usr/share/man/cat1/openssl_asn1parse.0	man-crypto-catman	crypto,.cat
@@ -2975,7 +2975,7 @@
 ./usr/share/man/html1/nview.html		man-obsolete		obsolete
 ./usr/share/man/html1/od.html			man-util-htmlman	html
 ./usr/share/man/html1/omshell.html		man-dhcpd-htmlman	html
-./usr/share/man/html1/openpgp.html		man-crypto-htmlman	crypto,html
+./usr/share/man/html1/openpgp.html		man-obsolete		obsolete
 ./usr/share/man/html1/openssl.html		man-crypto-htmlman	crypto,html
 ./usr/share/man/html1/openssl_CA.pl.html	man-crypto-htmlman	crypto,html
 ./usr/share/man/html1/openssl_asn1parse.html	man-crypto-htmlman	crypto,html
@@ -5283,7 +5283,7 @@
 ./usr/share/man/man1/nview.1			man-obsolete		obsolete
 ./usr/share/man/man1/od.1			man-util-man		.man
 ./usr/share/man/man1/omshell.1			man-dhcpd-man		.man
-./usr/share/man/man1/openpgp.1			man-crypto-man		crypto,.man
+./usr/share/man/man1/openpgp.1			man-obsolete		obsolete
 ./usr/share/man/man1/openssl.1			man-crypto-man		crypto,.man
 ./usr/share/man/man1/openssl_CA.pl.1		man-crypto-man		crypto,.man
 ./usr/share/man/man1/openssl_asn1parse.1	man-crypto-man		crypto,.man

Reply via email to