head	1.3;
access;
symbols
	pkgsrc-2013Q2:1.3.0.54
	pkgsrc-2013Q2-base:1.3
	pkgsrc-2012Q4:1.3.0.52
	pkgsrc-2012Q4-base:1.3
	pkgsrc-2011Q4:1.3.0.50
	pkgsrc-2011Q4-base:1.3
	pkgsrc-2011Q2:1.3.0.48
	pkgsrc-2011Q2-base:1.3
	pkgsrc-2009Q4:1.3.0.46
	pkgsrc-2009Q4-base:1.3
	pkgsrc-2008Q4:1.3.0.44
	pkgsrc-2008Q4-base:1.3
	pkgsrc-2008Q3:1.3.0.42
	pkgsrc-2008Q3-base:1.3
	cube-native-xorg:1.3.0.40
	cube-native-xorg-base:1.3
	pkgsrc-2008Q2:1.3.0.38
	pkgsrc-2008Q2-base:1.3
	pkgsrc-2008Q1:1.3.0.36
	pkgsrc-2008Q1-base:1.3
	pkgsrc-2007Q4:1.3.0.34
	pkgsrc-2007Q4-base:1.3
	pkgsrc-2007Q3:1.3.0.32
	pkgsrc-2007Q3-base:1.3
	pkgsrc-2007Q2:1.3.0.30
	pkgsrc-2007Q2-base:1.3
	pkgsrc-2007Q1:1.3.0.28
	pkgsrc-2007Q1-base:1.3
	pkgsrc-2006Q4:1.3.0.26
	pkgsrc-2006Q4-base:1.3
	pkgsrc-2006Q3:1.3.0.24
	pkgsrc-2006Q3-base:1.3
	pkgsrc-2006Q2:1.3.0.22
	pkgsrc-2006Q2-base:1.3
	pkgsrc-2006Q1:1.3.0.20
	pkgsrc-2006Q1-base:1.3
	pkgsrc-2005Q4:1.3.0.18
	pkgsrc-2005Q4-base:1.3
	pkgsrc-2005Q3:1.3.0.16
	pkgsrc-2005Q3-base:1.3
	pkgsrc-2005Q2:1.3.0.14
	pkgsrc-2005Q2-base:1.3
	pkgsrc-2005Q1:1.3.0.12
	pkgsrc-2005Q1-base:1.3
	pkgsrc-2004Q4:1.3.0.10
	pkgsrc-2004Q4-base:1.3
	pkgsrc-2004Q3:1.3.0.8
	pkgsrc-2004Q3-base:1.3
	pkgsrc-2004Q2:1.3.0.6
	pkgsrc-2004Q2-base:1.3
	pkgsrc-2004Q1:1.3.0.4
	pkgsrc-2004Q1-base:1.3
	pkgsrc-2003Q4:1.3.0.2
	pkgsrc-2003Q4-base:1.3
	buildlink2-base:1.3
	netbsd-1-3-PATCH003:1.2;
locks; strict;
comment	@# @;


1.3
date	99.01.10.23.52.21;	author tron;	state dead;
branches;
next	1.2;

1.2
date	98.08.07.10.40.52;	author agc;	state Exp;
branches;
next	1.1;

1.1
date	98.07.15.19.52.58;	author tron;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Major cleanup of "netpbm" package based on patches supply by
John F. Woods in PR pkg/6763 and Rob Windsor in PR pkg/6779.
@
text
@$NetBSD: patch-bz,v 1.2 1998/08/07 10:40:52 agc Exp $

--- ./ppm/xpmtoppm.c.orig	Mon Jan 31 02:42:05 1994
+++ ./ppm/xpmtoppm.c	Fri Aug 18 05:30:36 1995
@@@@ -30,9 +30,8 @@@@
 
 #include "ppm.h"
 
-static void ReadXPMFile ARGS((FILE *stream, int *widthP, int *heightP,
-    int *ncolorsP, int *chars_per_pixelP, pixel **colorsP, int **dataP));
-static void getline ARGS((char *line, int size, FILE *stream));
+void ReadXPMFile();
+static void getline();
 
 /* number of xpmColorKeys */
 #define NKEYS 5
@@@@ -46,7 +45,27 @@@@
  "c",					/* key #5: color visual */
 };
 
-int
+#ifdef NEED_STRSTR
+/* for systems which do not provide it */
+static char *
+strstr(s1, s2)
+    char *s1, *s2;
+{
+    int ls2 = strlen(s2);
+
+    if (ls2 == 0)
+	return (s1);
+    while (strlen(s1) >= ls2) {
+	if (strncmp(s1, s2, ls2) == 0)
+	    return (s1);
+	s1++;
+    }
+    return (0);
+}
+
+#endif
+
+void
 main(argc, argv)
     int argc;
     char *argv[];
@@@@ -89,7 +108,6 @@@@
 
 #define MAX_LINE 2048
 
-static
 void
 ReadXPMFile(stream, widthP, heightP, ncolorsP,
 	    chars_per_pixelP, colorsP, dataP)
@


1.2
log
@Add NetBSD RCS Ids.
@
text
@d1 1
a1 1
$NetBSD$
@


1.1
log
@Add well known fixes for "netpbm-1mar1994" supplied by John F. Woods
in PR pkg/5723.
@
text
@d1 2
@