diff options
author | xtraeme <xtraeme> | 2008-04-29 13:48:06 +0000 |
---|---|---|
committer | xtraeme <xtraeme> | 2008-04-29 13:48:06 +0000 |
commit | 6f11fc779a4ee2ee94f37c4d5241ddb818324526 (patch) | |
tree | 80fa4f95fc7b19f33af7e7172d45a5b51955c044 | |
parent | 6eaf30cc2ef74c51465cd7ddd37319aaed108879 (diff) | |
download | pkgsrc-6f11fc779a4ee2ee94f37c4d5241ddb818324526.tar.gz |
Switch to 2 clause BSD license now that TNF license has dropped
clause 3 and 4.
-rw-r--r-- | sysutils/mklivecd/files/mklivecd.8 | 12 | ||||
-rwxr-xr-x | sysutils/mklivecd/files/mklivecd.sh | 14 |
2 files changed, 3 insertions, 23 deletions
diff --git a/sysutils/mklivecd/files/mklivecd.8 b/sysutils/mklivecd/files/mklivecd.8 index 16957de335f..d49d7eb9a91 100644 --- a/sysutils/mklivecd/files/mklivecd.8 +++ b/sysutils/mklivecd/files/mklivecd.8 @@ -1,13 +1,10 @@ -.\" $NetBSD: mklivecd.8,v 1.19 2008/03/27 20:54:09 xtraeme Exp $ +.\" $NetBSD: mklivecd.8,v 1.20 2008/04/29 13:48:06 xtraeme Exp $ .\" .\" mklivecd - Make your own NetBSD/x86 Live CD-ROM/DVD-ROM .\" .\" Copyright (c) 2004-2008 Juan Romero Pardines. .\" All rights reserved. .\" -.\" This code is derived from software contributed to The NetBSD Foundation -.\" by Juan Romero Pardines. -.\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: @@ -16,13 +13,6 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 3. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed by the NetBSD -.\" Foundation, Inc. and its contributors. -.\" 4. Neither the name of The NetBSD Foundation nor the names of its -.\" contributors may be used to endorse or promote products derived -.\" from this software without specific prior written permission. .\" .\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS .\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED diff --git a/sysutils/mklivecd/files/mklivecd.sh b/sysutils/mklivecd/files/mklivecd.sh index 6bb2fe8878b..25f54b661c2 100755 --- a/sysutils/mklivecd/files/mklivecd.sh +++ b/sysutils/mklivecd/files/mklivecd.sh @@ -1,13 +1,10 @@ #!/bin/sh # -# $NetBSD: mklivecd.sh,v 1.48 2008/03/27 21:08:26 xtraeme Exp $ +# $NetBSD: mklivecd.sh,v 1.49 2008/04/29 13:48:06 xtraeme Exp $ # # Copyright (c) 2004-2008 Juan Romero Pardines. # All rights reserved. # -# This code is derived from software contributed to The NetBSD Foundation -# by Juan Romero Pardines. -# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: @@ -16,13 +13,6 @@ # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. -# 3. All advertising materials mentioning features or use of this software -# must display the following acknowledgement: -# This product includes software developed by the NetBSD -# Foundation, Inc. and its contributors. -# 4. Neither the name of The NetBSD Foundation nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. # # THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS # ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED @@ -689,7 +679,7 @@ do_cdlive() cat > $ISODIR/etc/rc.d/root <<_EOF_ #!/bin/sh # -# \$NetBSD: mklivecd.sh,v 1.48 2008/03/27 21:08:26 xtraeme Exp $ +# \$NetBSD: mklivecd.sh,v 1.49 2008/04/29 13:48:06 xtraeme Exp $ # # PROVIDE: root |