Split netbsd fortunes into offensive and non offensive.

Split could be considered somewhat arbitrary.

diff --git a/fortune/datfiles/Makefile b/fortune/datfiles/Makefile
index e5b0b78e13988807c032cd3318501ff6672057fa..745a62b4005693a7ee732e155e314e8fe0ddba4b 100644 (file)
--- a/fortune/datfiles/Makefile
+++ b/fortune/datfiles/Makefile
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.27 2000/02/06 11:59:29 pooka Exp $
+#      $NetBSD: Makefile,v 1.28 2000/08/17 16:48:52 abs Exp $

 #      @(#)Makefile    8.2 (Berkeley) 4/19/94
 
 .include <bsd.own.mk>                  # for INSTALL_OFFENSIVE_FORTUNES
 #      @(#)Makefile    8.2 (Berkeley) 4/19/94
 
 .include <bsd.own.mk>                  # for INSTALL_OFFENSIVE_FORTUNES


@@ -8,7 +8,7 @@ SRCFILES=       fortunes fortunes2 startrek zippy unamerican-o limerick \
 DATFILES=      fortunes.dat fortunes2.dat startrek.dat zippy.dat \
                fortunes-o fortunes-o.dat fortunes2-o fortunes2-o.dat \
                limerick.dat limerick-o.dat unamerican-o unamerican-o.dat \
 DATFILES=      fortunes.dat fortunes2.dat startrek.dat zippy.dat \
                fortunes-o fortunes-o.dat fortunes2-o fortunes2-o.dat \
                limerick.dat limerick-o.dat unamerican-o unamerican-o.dat \

-               netbsd.dat
+               netbsd.dat netbsd-o netbsd-o.dat

 
 # TO AVOID INSTALLING THE POTENTIALLY OFFENSIVE FORTUNES, RUN 'make' with
 # "INSTALL_OFFENSIVE_FORTUNES=NO", or set "INSTALL_OFFENSIVE_FORTUNES=NO"
 
 # TO AVOID INSTALLING THE POTENTIALLY OFFENSIVE FORTUNES, RUN 'make' with
 # "INSTALL_OFFENSIVE_FORTUNES=NO", or set "INSTALL_OFFENSIVE_FORTUNES=NO"


@@ -66,5 +66,10 @@ unamerican-o: unamerican-o.${TYPE}
 unamerican-o.dat: unamerican-o
        ${STRFILE} -rsx ${.ALLSRC} ${.TARGET}
 
 unamerican-o.dat: unamerican-o
        ${STRFILE} -rsx ${.ALLSRC} ${.TARGET}
 

+netbsd-o: netbsd-o.${TYPE}
+       tr [a-zA-Z] [n-za-mN-ZA-M] < ${.ALLSRC} > ${.TARGET}
+netbsd-o.dat: netbsd-o
+       ${STRFILE} -rsx ${.ALLSRC} ${.TARGET}
+

 
 .include <bsd.prog.mk>
 
 .include <bsd.prog.mk>

diff --git a/fortune/datfiles/netbsd b/fortune/datfiles/netbsd
index aab435f811c9f4ba3433873cd881271e757c7c5d..fc36985f75f13b87a801618df19598548f7cdfcc 100644 (file)
--- a/fortune/datfiles/netbsd
+++ b/fortune/datfiles/netbsd
@@ -23,14 +23,6 @@ Anagrams for NetBSD core team:
   Basement DEC rot
                -- Julian Assange
 %
   Basement DEC rot
                -- Julian Assange
 %

-Anagrams for NetBSD core team:
-  Strobe mased net
-  Strobe mased ten
-  Erect teen bonds
-  A boned cream test
-  Cremate no debts
-               -- Julian Assange
-%

 Anagrams for NetBSD-core:
   Bent Coders
   Secret Bond
 Anagrams for NetBSD-core:
   Bent Coders
   Secret Bond


@@ -69,9 +61,6 @@ NetBSD - because Unix isn't just #include <linux.h>, i386, ELF, ...!
 NetBSD - big, isn't it?
                -- Julian Assange
 %
 NetBSD - big, isn't it?
                -- Julian Assange
 %

-NetBSD - Bits for Tits.
-               -- Julian Assange
-%

 NetBSD - daemonic power
                -- R. C. Dowdeswell
 %
 NetBSD - daemonic power
                -- R. C. Dowdeswell
 %


@@ -96,12 +85,6 @@ NetBSD - Mach 3 stealthOS, undetectable by media radar.
 NetBSD - more is more.
                -- Julian Assange
 %
 NetBSD - more is more.
                -- Julian Assange
 %

-NetBSD - more ports than a Norwegian crack whore.
-               -- Julian Assange
-%
-NetBSD - Multiple Architectures lead to Multiple Orgasms.
-               -- Julian Assange
-%

 NetBSD:  No Windows or Gates, but lots of doors, portals and tunnels.
                -- Greywolf
 %
 NetBSD:  No Windows or Gates, but lots of doors, portals and tunnels.
                -- Greywolf
 %


@@ -150,9 +133,6 @@ NetBSD - the power to suave.
 NetBSD - the power to swerve (penguins, worse than cane toads).
                -- Julian Assange
 %
 NetBSD - the power to swerve (penguins, worse than cane toads).
                -- Julian Assange
 %

-NetBSD - the semen in the money shot.
-               -- Julian Assange
-%

 NetBSD:  The Source is out there.
                -- Greywolf
 %
 NetBSD:  The Source is out there.
                -- Greywolf
 %


@@ -162,15 +142,9 @@ NetBSD - we have nothing to declare but our benchmarks.
 NetBSD - we put the Net in NetBSD.
                -- Julian Assange
 %
 NetBSD - we put the Net in NetBSD.
                -- Julian Assange
 %

-NetBSD - We put the OS in OrgaSm.
-               -- Julian Assange
-%

 NetBSD - We're not in canvas anymore, toto
                -- Julian Assange
 %
 NetBSD - We're not in canvas anymore, toto
                -- Julian Assange
 %

-NetBSD - we're on a mission from Hell.
-               -- Julian Assange
-%

 NetBSD - where do you want to go Tuesday?
                -- Julian Assange
 %
 NetBSD - where do you want to go Tuesday?
                -- Julian Assange
 %


@@ -188,9 +162,6 @@ NetBSD: An Operating System For Everyone
 NetBSD: Are you old enough to run it?
                -- Tom Harvey
 %
 NetBSD: Are you old enough to run it?
                -- Tom Harvey
 %

-NetBSD: better for your uptime than Viagra.
-               -- Daniel Carosone
-%

 NetBSD: Beyond Windows
                -- Johan Ihren
 %
 NetBSD: Beyond Windows
                -- Johan Ihren
 %


@@ -262,12 +233,12 @@ NetBSD is PAR -- Powerful, Advanced, Reliable.  Is your OS up to PAR?
 NetBSD is the bomb.  (ok, bad idea)
                -- Andrew Gillham
 %
 NetBSD is the bomb.  (ok, bad idea)
                -- Andrew Gillham
 %

-NetBSD: It keeps on going...and going...and going...
-               -- Tom Harvey
-%

 NetBSD: It spanks the knickers off those other operating systems
                -- Brian D Chase
 %
 NetBSD: It spanks the knickers off those other operating systems
                -- Brian D Chase
 %

+NetBSD: It keeps on going...and going...and going...
+               -- Tom Harvey
+%

 NetBSD: it'll be there when you're ready for it
                -- Greg Lehey
 %
 NetBSD: it'll be there when you're ready for it
                -- Greg Lehey
 %


@@ -285,13 +256,6 @@ NetBSD: lets get it right
 NetBSD: Linux without the hype.
                -- Hubert Feyrer
 %
 NetBSD: Linux without the hype.
                -- Hubert Feyrer
 %

-NetBSD logo: Kiss-painted (w/tongue) Beastie stabbing a pitchfork
-       through a bloodied and obviously-in-horrible-pain Tux.
-               -- Mason Loring Bliss
-%
-NetBSD long theme: "Eat a queer fetus for Jesus, and run NetBSD!"
-               -- Mason Loring Bliss
-%

 NetBSD: making all computer hardware a commodity.
                -- Erik E. Fair
 %
 NetBSD: making all computer hardware a commodity.
                -- Erik E. Fair
 %


@@ -307,9 +271,6 @@ NetBSD: Microsoft ask you where you want to go, NetBSD gets you there
 NetBSD, More Nines.
                -- Andrew Gillham
 %
 NetBSD, More Nines.
                -- Andrew Gillham
 %

-NetBSD: More Ports That A Cheap Whore
-               -- Andrew Gillham
-%

 NetBSD: Multi-platform OS
 %
 NetBSD: My Computer Runs!
 NetBSD: Multi-platform OS
 %
 NetBSD: My Computer Runs!


@@ -336,9 +297,6 @@ NetBSD: Network Your World.
 NetBSD: Networking Space
                -- Andrew Gillham
 %
 NetBSD: Networking Space
                -- Andrew Gillham
 %

-NetBSD: No Sh;t!
-               -- Andrew Gillham
-%

 NetBSD, No Worries!
                -- Andrew Gillham
 %
 NetBSD, No Worries!
                -- Andrew Gillham
 %


@@ -404,9 +362,6 @@ NetBSD: Stable and strong!
 NetBSD: Stop, Drop, and Load
                -- Andrew Gillham
 %
 NetBSD: Stop, Drop, and Load
                -- Andrew Gillham
 %

-NetBSD, stupid.
-               -- Julian Assange
-%

 NetBSD, Tap The Power
                -- Andrew Gillham
 %
 NetBSD, Tap The Power
                -- Andrew Gillham
 %


@@ -462,9 +417,6 @@ NetBSD: Two guys with a vax
 NetBSD: u_long uptime;
                -- Herb Peyerl
 %
 NetBSD: u_long uptime;
                -- Herb Peyerl
 %

-NetBSD: Unix With Balls.
-               -- Andrew Gillham
-%

 NetBSD: unshackling hardware designers and users from the bondage
         of WinTel.
                -- Erik E. Fair
 NetBSD: unshackling hardware designers and users from the bondage
         of WinTel.
                -- Erik E. Fair


@@ -518,9 +470,6 @@ NetBSD: Write Once, Run Everywhere. Java optional.
 NetBSD: You can't handle it.
                -- Paul Newhouse
 %
 NetBSD: You can't handle it.
                -- Paul Newhouse
 %

-Never mind the bollocks, here's NetBSD.
-               -- Julian Assange
-%

 Of course it runs NetBSD.
 %
 Portable.  Supportable.  NetBSD.
 Of course it runs NetBSD.
 %
 Portable.  Supportable.  NetBSD.


@@ -555,3 +504,9 @@ NetBSD: Empowering the VAX generation.
 NetBSD: A pmap for every occasion.
                -- David Brownlee
 %
 NetBSD: A pmap for every occasion.
                -- David Brownlee
 %

+NetBSD: No hype required.
+               -- David Brownlee
+%
+NetBSD: My other computer also runs NetBSD.
+               -- David Brownlee
+%

diff --git a/fortune/datfiles/netbsd-o.fake b/fortune/datfiles/netbsd-o.fake
new file mode 100644 (file)
index 0000000..3b3f5a3
--- /dev/null
+++ b/fortune/datfiles/netbsd-o.fake
@@ -0,0 +1,2 @@
+There are no potentially offensive fortunes installed on this
+system.  For further details, contact your system administrator.

diff --git a/fortune/datfiles/netbsd-o.real b/fortune/datfiles/netbsd-o.real
new file mode 100644 (file)
index 0000000..4c67b96
--- /dev/null
+++ b/fortune/datfiles/netbsd-o.real
@@ -0,0 +1,51 @@
+Never mind the bollocks, here's NetBSD.
+               -- Julian Assange
+%
+NetBSD: Unix With Balls.
+               -- Andrew Gillham
+%
+NetBSD, stupid.
+               -- Julian Assange
+%
+NetBSD: No Sh;t!
+               -- Andrew Gillham
+%
+NetBSD: More Ports That A Cheap Whore
+               -- Andrew Gillham
+%
+NetBSD long theme: "Eat a queer fetus for Jesus, and run NetBSD!"
+               -- Mason Loring Bliss
+%
+NetBSD logo: Kiss-painted (w/tongue) Beastie stabbing a pitchfork
+       through a bloodied and obviously-in-horrible-pain Tux.
+               -- Mason Loring Bliss
+%
+NetBSD: better for your uptime than Viagra.
+               -- Daniel Carosone
+%
+NetBSD - we're on a mission from Hell.
+               -- Julian Assange
+%
+NetBSD - We put the OS in OrgaSm.
+               -- Julian Assange
+%
+NetBSD - the semen in the money shot.
+               -- Julian Assange
+%
+NetBSD - Multiple Architectures lead to Multiple Orgasms.
+               -- Julian Assange
+%
+NetBSD - more ports than a Norwegian crack whore.
+               -- Julian Assange
+%
+NetBSD - Bits for Tits.
+               -- Julian Assange
+%
+Anagrams for NetBSD core team:
+  Strobe mased net
+  Strobe mased ten
+  Erect teen bonds
+  A boned cream test
+  Cremate no debts
+               -- Julian Assange
+%