after 0.2.2 "stable" patches applied

2 files changed, 18 insertions, 3 deletions

diff --git a/fortune/fortune/Makefile b/fortune/fortune/Makefile
index f800abb6..bc07bb50 100644
--- a/fortune/fortune/Makefile
+++ b/fortune/fortune/Makefile
@@ -1,8 +1,16 @@
 #	%W% (Berkeley) %G%
+#
+# PATCHES MAGIC                LEVEL   PATCH THAT GOT US HERE
+# --------------------         -----   ----------------------
+# CURRENT PATCH LEVEL:         1       90001 
+# --------------------         -----   ----------------------
+#
+# 29 Sep 92	Terry Lambert		Set NO_REGEX flag
+#
 
 PROG=	fortune
 MAN6=	fortune.0
-CFLAGS+=-I${.CURDIR}/../strfile
+CFLAGS+=-I${.CURDIR}/../strfile -DNO_REGEX
 DPADD=	${COMPAT}
 LDADD=	-lcompat
 
diff --git a/fortune/fortune/fortune.c b/fortune/fortune/fortune.c
index c044139d..af138220 100644
--- a/fortune/fortune/fortune.c
+++ b/fortune/fortune/fortune.c
@@ -32,6 +32,13 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * PATCHES MAGIC                LEVEL   PATCH THAT GOT US HERE
+ * --------------------         -----   ----------------------
+ * CURRENT PATCH LEVEL:         1       90001
+ * --------------------         -----   ----------------------
+ *
+ * 29 Sep 92	Terry Lambert		Fixed bogus "pat" on NO_REGEX
  */
 
 #ifndef lint
@@ -284,14 +291,14 @@ register char	**argv;
 {
 	register int	ignore_case;
 # ifndef NO_REGEX
-	register char	*pat;
+	register char	*pat = NULL;			/* 29 Sep 92*/
 # endif	/* NO_REGEX */
 	extern char *optarg;
 	extern int optind;
 	int ch;
 
 	ignore_case = FALSE;
-	pat = NULL;
+	/* pat = NULL;*/				/* 29 Sep 92*/
 
 # ifdef DEBUG
 	while ((ch = getopt(argc, argv, "aDefilm:osw")) != EOF)