Split limericks into "normal" and "offensive" ones.

Fixes PR 6202 by Matthias Grutzeck <grut@teco.edu>.

4 files changed, 53 insertions, 71 deletions

diff --git a/fortune/datfiles/Makefile b/fortune/datfiles/Makefile
index f4626c12..a429b4c7 100644
--- a/fortune/datfiles/Makefile
+++ b/fortune/datfiles/Makefile
@@ -1,12 +1,12 @@
-#	$NetBSD: Makefile,v 1.23 1999/08/04 22:45:09 thorpej Exp $
+#	$NetBSD: Makefile,v 1.24 1999/09/12 10:15:46 hwr Exp $
 #	@(#)Makefile	8.2 (Berkeley) 4/19/94
 
 .include <bsd.own.mk>			# for INSTALL_OFFENSIVE_FORTUNES
 
-SRCFILES=	fortunes fortunes2 startrek zippy unamerican
+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 limerick.dat unamerican unamerican.dat
+		limerick.dat limerick-o.dat unamerican-o unamerican-o.dat 
 
 # TO AVOID INSTALLING THE POTENTIALLY OFFENSIVE FORTUNES, RUN 'make' with
 # "INSTALL_OFFENSIVE_FORTUNES=NO", or set "INSTALL_OFFENSIVE_FORTUNES=NO"
@@ -33,12 +33,13 @@ all: ${DATFILES}
 
 # Normal fortunes: build directly from data files.
 
-fortunes.dat fortunes2.dat startrek.dat zippy.dat:
+fortunes.dat fortunes2.dat startrek.dat zippy.dat limerick.dat:
 	${STRFILE} -rs ${.CURDIR}/${.TARGET:R} ${.TARGET}
 fortunes.dat:	fortunes
 fortunes2.dat:	fortunes2
 startrek.dat:	startrek
 zippy.dat:	zippy
+limerick.dat:	limerick
 
 # Obscene fortunes: we have to build source and data files
 
@@ -52,14 +53,14 @@ fortunes2-o: fortunes2-o.${TYPE}
 fortunes2-o.dat: fortunes2-o
 	${STRFILE} -rsx ${.ALLSRC} ${.TARGET}
 
-limerick: limerick.${TYPE}
+limerick-o: limerick-o.${TYPE}
 	tr [a-zA-Z] [n-za-mN-ZA-M] < ${.ALLSRC} > ${.TARGET}
-limerick.dat: limerick
+limerick-o.dat: limerick-o
 	${STRFILE} -rsx ${.ALLSRC} ${.TARGET}
 
-unamerican: unamerican.${TYPE}
+unamerican-o: unamerican-o.${TYPE}
 	tr [a-zA-Z] [n-za-mN-ZA-M] < ${.ALLSRC} > ${.TARGET}
-unamerican.dat: unamerican
+unamerican-o.dat: unamerican-o
 	${STRFILE} -rsx ${.ALLSRC} ${.TARGET}
 
 
diff --git a/fortune/datfiles/limerick b/fortune/datfiles/limerick
new file mode 100644
index 00000000..0dccb1ff
--- /dev/null
+++ b/fortune/datfiles/limerick
@@ -0,0 +1,44 @@
+A computer called Illiac4
+Had a rather tough bug in its core.
+	It chewed up its cards
+	And spewed yards and yards
+Of illegible tape on the floor.
+%
+A computer, to print out a fact,
+Will divide, multiply, and subtract.
+	But this output can be
+	No more than debris,
+If the input was short of exact.
+		-- Gigo
+%
+A dreary young bank clerk named Fennis
+Wished to foster an aura of menace;
+	To make people afraid
+	He wore gloves of grey suede
+And white footgear intended for tennis.
+		-- Edward Gorey
+%
+A hacker who screwed a mag tape
+Was caught and convicted of rape.
+	To jail he did go,
+	From which, to his woe
+He couldn't get out with ESC.
+%
+A linguist thought it a farce
+That memory space was so sparse.
+	One day they increased it.
+	Said he as he seized it:
+"At last! Enough core for the parse".
+%
+A progressive professor named Winners
+Held classes each evening for sinners.
+	They were graded and spaced
+	So the vile and debased
+Would not be held back by beginners.
+%
+A very intelligent turtle
+Found programming UNIX a hurdle
+	The system, you see,
+	Ran as slow as did he,
+And that's not saying much for the turtle.
+%
diff --git a/fortune/datfiles/limerick.fake b/fortune/datfiles/limerick-o.fake
index 3b3f5a3d..3b3f5a3d 100644
--- a/fortune/datfiles/limerick.fake
+++ b/fortune/datfiles/limerick-o.fake
diff --git a/fortune/datfiles/limerick.real b/fortune/datfiles/limerick-o.real
index f7521b03..1798d23c 100644
--- a/fortune/datfiles/limerick.real
+++ b/fortune/datfiles/limerick-o.real
@@ -7,24 +7,12 @@ And the worst of it was that it did!
 A bather whose clothing was strewed
 By breezes that left her quite nude,
 	Saw a man come along
-	And, unless I am wrong,
-You expected this line to be lewd.
-%
-A bather whose clothing was strewed
-By breezes that left her quite nude,
-	Saw a man come along
 	And, unless I'm quite wrong,
 You expected this line to be lewd.
 %
 A beat schizophrenic said, "Me?
 I am not I, I'm a tree."
 	But another, more sane,
-	Shouted, "I'm a great dane "
-And covered his pants leg with pee.
-%
-A beat schizophrenic said, "Me?
-I am not I, I'm a tree."
-	But another, more sane,
 	Shouted, "I'm a Great Dane!"
 And covered his pants leg with pee.
 %
@@ -171,19 +159,6 @@ Remarked as she swallowed my semen :
 	 I must watch every calorie,
 So I get `ahead' eating you he-men!"
 %
-A computer called Illiac4
-Had a rather tough bug in its core.
-	It chewed up its cards
-	And spewed yards and yards
-Of illegible tape on the floor.
-%
-A computer, to print out a fact,
-Will divide, multiply, and subtract.
-	But this output can be
-	No more than debris,
-If the input was short of exact.
-		-- Gigo
-%
 A contortionist hailing from Lynch
 Used to rent out his tool by the inch.
 	A foot cost a quid --
@@ -298,20 +273,6 @@ Whose overworked sex is all callous,
 	On uncircumcised Ray,
 Through exuberance, tightness, and malice.
 %
-A dreary young bank clerk named Fennis
-Wished to foster an aura of menace;
-	To make people afraid
-	He wore gloves of grey suede
-And white footgear intended for tennis.
-		-- Edward Gorey
-%
-A dreary young bank clerk named Fennis
-Wished to foster an aura of menace.
-	To make people afraid
-	He wore gloves of grey suede
-And white footgear intended for tennis.
-		-- Edward Gorey, "Amphigorey"
-%
 A dulcet-voiced callgirl named Shedd,
 Who's cultured, well-spoken, well-bred,
 	Had achieved some reknown
@@ -483,12 +444,6 @@ Holds a CS professor in slavery.
 	He deflowers young owls,
 That he keeps in an underground aviary.
 %
-A hacker who screwed a mag tape
-Was caught and convicted of rape.
-	To jail he did go,
-	From which, to his woe
-He couldn't get out with ESC.
-%
 A hacker-turned-pervert named Fisk
 Made love to the drive of his disk.
 	The thing circumsized him,
@@ -692,12 +647,6 @@ Into space that is quite economical.
 	So seldom are clean,
 And the clean ones so seldom are comical.
 %
-A linguist thought it a farce
-That memory space was so sparse.
-	One day they increased it.
-	Said he as he seized it:
-"At last! Enough core for the parse".
-%
 A lonely young lad of Eton
 Used always to sleep with the heat on,
 	Till he ran into a lass
@@ -994,12 +943,6 @@ Said, I'm the match for any machine.
 Just acres of in-line routine.
 		-- W.J. Wilson
 %
-A progressive professor named Winners
-Held classes each evening for sinners.
-	They were graded and spaced
-	So the vile and debased
-Would not be held back by beginners.
-%
 A rapist who reeked of cheap booze
 Attempted to ravish Miss Hughes.
 	She cried, "I suppose
@@ -1241,12 +1184,6 @@ Caused a disk drive to go on the fritz.
 	With bats' fecal matter.
 Now it's seek time is really the pits.
 %
-A very intelligent turtle
-Found programming UNIX a hurdle
-	The system, you see,
-	Ran as slow as did he,
-And that's not saying much for the turtle.
-%
 A very odd pair are the Pitts:
 His balls are as large as her tits,
 	Her tits are as large