head 1.12; access; symbols pkgsrc-2013Q3:1.11.0.18 pkgsrc-2013Q3-base:1.11 pkgsrc-2013Q2:1.11.0.16 pkgsrc-2013Q2-base:1.11 pkgsrc-2013Q1:1.11.0.14 pkgsrc-2013Q1-base:1.11 pkgsrc-2012Q4:1.11.0.12 pkgsrc-2012Q4-base:1.11 pkgsrc-2012Q3:1.11.0.10 pkgsrc-2012Q3-base:1.11 pkgsrc-2012Q2:1.11.0.8 pkgsrc-2012Q2-base:1.11 pkgsrc-2012Q1:1.11.0.6 pkgsrc-2012Q1-base:1.11 pkgsrc-2011Q4:1.11.0.4 pkgsrc-2011Q4-base:1.11 pkgsrc-2011Q3:1.11.0.2 pkgsrc-2011Q3-base:1.11 pkgsrc-2011Q2:1.10.0.14 pkgsrc-2011Q2-base:1.10 pkgsrc-2011Q1:1.10.0.12 pkgsrc-2011Q1-base:1.10 pkgsrc-2010Q4:1.10.0.10 pkgsrc-2010Q4-base:1.10 pkgsrc-2010Q3:1.10.0.8 pkgsrc-2010Q3-base:1.10 pkgsrc-2010Q2:1.10.0.6 pkgsrc-2010Q2-base:1.10 pkgsrc-2010Q1:1.10.0.4 pkgsrc-2010Q1-base:1.10 pkgsrc-2009Q4:1.10.0.2 pkgsrc-2009Q4-base:1.10 pkgsrc-2009Q3:1.9.0.8 pkgsrc-2009Q3-base:1.9 pkgsrc-2009Q2:1.9.0.6 pkgsrc-2009Q2-base:1.9 pkgsrc-2009Q1:1.9.0.4 pkgsrc-2009Q1-base:1.9 pkgsrc-2008Q4:1.9.0.2 pkgsrc-2008Q4-base:1.9 pkgsrc-2008Q3:1.7.0.6 pkgsrc-2008Q3-base:1.7 cube-native-xorg:1.7.0.4 cube-native-xorg-base:1.7 pkgsrc-2008Q2:1.7.0.2 pkgsrc-2008Q2-base:1.7 pkgsrc-2008Q1:1.6.0.4 pkgsrc-2008Q1-base:1.6 pkgsrc-2007Q4:1.6.0.2 pkgsrc-2007Q4-base:1.6 pkgsrc-2007Q3:1.5.0.6 pkgsrc-2007Q3-base:1.5 pkgsrc-2007Q2:1.5.0.4 pkgsrc-2007Q2-base:1.5 pkgsrc-2007Q1:1.5.0.2 pkgsrc-2007Q1-base:1.5 pkgsrc-2006Q4:1.4.0.16 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.14 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.4.0.12 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.4.0.10 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.4.0.8 pkgsrc-2005Q4-base:1.4 pkgsrc-2005Q3:1.4.0.6 pkgsrc-2005Q3-base:1.4 pkgsrc-2005Q2:1.4.0.4 pkgsrc-2005Q2-base:1.4 pkgsrc-2005Q1:1.4.0.2 pkgsrc-2005Q1-base:1.4 pkgsrc-2004Q4:1.1.0.2 pkgsrc-2004Q4-base:1.1; locks; strict; comment @# @; 1.12 date 2013.10.06.18.53.10; author darcy; state dead; branches; next 1.11; commitid ULynNKYzW3Ybug8x; 1.11 date 2011.09.16.17.21.47; author darcy; state Exp; branches; next 1.10; 1.10 date 2009.10.19.18.30.32; author joerg; state Exp; branches; next 1.9; 1.9 date 2008.12.19.12.12.53; author darcy; state Exp; branches; next 1.8; 1.8 date 2008.12.17.15.44.10; author darcy; state Exp; branches; next 1.7; 1.7 date 2008.06.06.08.28.09; author wiz; state dead; branches; next 1.6; 1.6 date 2007.11.13.17.40.28; author rillig; state Exp; branches; next 1.5; 1.5 date 2007.01.05.10.38.05; author rillig; state dead; branches; next 1.4; 1.4 date 2005.01.12.10.55.36; author darcy; state Exp; branches; next 1.3; 1.3 date 2005.01.08.15.43.55; author darcy; state Exp; branches; next 1.2; 1.2 date 2005.01.04.13.29.08; author darcy; state dead; branches; next 1.1; 1.1 date 2004.12.18.19.05.54; author minskim; state Exp; branches; next ; desc @@ 1.12 log @emove unneeded patch. @ text @$NetBSD: patch-aa,v 1.11 2011/09/16 17:21:47 darcy Exp $ --- Makefile.orig 2011-09-16 13:10:50.000000000 -0400 +++ Makefile @@@@ -48,10 +48,8 @@@@ rm -rf build install: all - chmod 644 generate.1 - cp generate.1 /${MANDIR}/man1 - chmod 755 ${BINS} - cp ${BINS} ${BINDIR} + ${BSD_INSTALL_MAN} generate.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 + ${BSD_INSTALL_PROGRAM} ${BINS} ${DESTDIR}${PREFIX}/bin python: gmake clean @ 1.11 log @Upgrade to version 2.7. Should fix the bulk build for this package. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.10 2009/10/19 18:30:32 joerg Exp $ @ 1.10 log @PKG_DESTDIR_SUPPORT=no is not a supported value. Provide actually working DESTDIR support. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- Makefile.orig 2008-11-17 22:12:39.000000000 +0100 d5 1 a5 10 @@@@ -9,7 +9,7 @@@@ VERSION_MAJOR = 2 VERSION_MINOR = 6 PACKAGE_NAME = generate-${VERSION_MAJOR}.${VERSION_MINOR} -CFLAGS = -O2 -ansi -pipe -Wall -Wshadow -Wpointer-arith \ +CFLAGS += -O2 -pipe -Wall -Wshadow -Wpointer-arith \ -Wwrite-strings -Wstrict-prototypes \ -Wformat -Wmissing-prototypes -funsigned-char \ -I/usr/local/include -L/usr/local/lib \ @@@@ -48,10 +48,8 @@@@ clean: @ 1.9 log @Remove -ansi option from Makefile to prevent build problems as suggested by Aleksey Cheusov. Bump PKGREVISION @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.8 2008/12/17 15:44:10 darcy Exp $ d3 1 a3 1 --- Makefile.orig 2008-11-17 16:12:39.000000000 -0500 d14 13 @ 1.8 log @Allow package to build under QNX. No PKGVERSION bump as no working ports were affected. @ text @d1 1 a1 1 $NetBSD$ d10 1 a10 1 +CFLAGS += -O2 -ansi -pipe -Wall -Wshadow -Wpointer-arith \ @ 1.7 log @patch-aa checksum was removed from distinfo during 2.4->2.5 update, so remove file as well. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.6 2007/11/13 17:40:28 rillig Exp $ d3 5 a7 4 --- Makefile.orig 2007-01-30 13:56:35.000000000 +0100 +++ Makefile 2007-11-13 18:37:03.000115492 +0100 @@@@ -34,7 +34,9 @@@@ endif all: ${BINS} d9 5 a13 7 generate: generate.o ${OBJS} + ${CC} -o $@@ $^ ${LDFLAGS} ${LIBS} rgenerate: rgenerate.o ${OBJS} + ${CC} -o $@@ $^ ${LDFLAGS} ${LIBS} rgenerate.o: generate.c ${CC} ${CFLAGS} -DRESTRICTED_VERSION -c generate.c -o rgenerate.o @ 1.6 log @Solaris needs some resolver libraries. @ text @d1 1 a1 1 $NetBSD$ @ 1.5 log @The patches have been applied upstream. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.4 2005/01/12 10:55:36 darcy Exp $ d3 4 a6 4 --- generate.c.orig 2005-01-04 08:15:47.000000000 -0500 +++ generate.c @@@@ -364,7 +364,7 @@@@ replace_macro(const char *src, char *dst char lenbuf[2048]; d8 4 a11 5 replace_macro(buf + 2, lenbuf, pre_param); - sprintf(dst, "%d", strlen(lenbuf)); + sprintf(dst, "%lu", (unsigned long) strlen(lenbuf)); continue; } d13 2 a14 9 @@@@ -828,7 +828,7 @@@@ get_input(FILE * in_fp, int if_flag) continue; p = pp; - sprintf(cur_line_str, "%d", xline); + sprintf(cur_line_str, "%lu", (unsigned long) xline); while (isspace((int) *p)) p++; @ 1.4 log @Cast size_t function and variable in printf and use "%lu" to prevent compiler warnings when size_t is not unsigned int. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.3 2005/01/08 15:43:55 darcy Exp $ @ 1.3 log @Patch generate.c to remove warning from bulk build on NetBSD 2.0/amd64. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1 2004/12/18 19:05:54 minskim Exp $ d10 1 a10 1 + sprintf(dst, "%u", strlen(lenbuf)); d19 1 a19 1 + sprintf(cur_line_str, "%u", xline); @ 1.2 log @Update to version 2.2. Major changes are: - Add casts to prevent compiler warnings. - Allow for more than 10 positional parameters. @ text @d3 1 a3 1 --- generate.c.orig 2004-11-09 14:16:42.000000000 -0600 d5 2 a6 3 @@@@ -337,7 +337,7 @@@@ replace_macro(const char *src, char *dst for (k = 0; k < 10; k++) param[k] = ""; d8 5 a12 6 - if (isdigit(*buf)) + if (isdigit((unsigned char)*buf)) { if (buf[1] && buf[1] != ':') fatal("Invalid macro call"); @@@@ -380,25 +380,25 @@@@ replace_macro(const char *src, char *dst d14 2 a15 50 for (ptr = calcbuf; *ptr;) { - while (isspace(*ptr)) + while (isspace((unsigned char)*ptr)) ptr++; - if (!isdigit(*ptr)) + if (!isdigit((unsigned char)*ptr)) fatal("Invalid digit"); num = strtol(ptr, &ptr, 0); - while (isspace(*ptr)) + while (isspace((unsigned char)*ptr)) ptr++; if (*ptr == '-') { ptr++; - while (isspace(*ptr)) + while (isspace((unsigned char)*ptr)) ptr++; - if (!isdigit(*ptr)) + if (!isdigit((unsigned char)*ptr)) fatal("Invalid expression"); to = strtol(ptr, &ptr, 0); @@@@ -429,7 +429,7 @@@@ replace_macro(const char *src, char *dst replace_macro(buf + 2, calcbuf, pre_param); e1 = calcbuf; - while (isspace(*e1)) + while (isspace((unsigned char)*e1)) e1++; e2 = e1; @@@@ -443,7 +443,7 @@@@ replace_macro(const char *src, char *dst if (*e2) (*e2++ = 0); - while (isspace(*e2)) + while (isspace((unsigned char)*e2)) e2++; e3 = e2; @@@@ -475,7 +475,7 @@@@ replace_macro(const char *src, char *dst { *p++ = 0; a16 35 - while (isspace(*p)) + while (isspace((unsigned char)*p)) p++; param[k++] = p; @@@@ -737,10 +737,10 @@@@ find_key(char *s) else return (-1); - if (*p && !isspace(*p)) + if (*p && !isspace((unsigned char)*p)) return (-1); - while (isspace(*p)) + while (isspace((unsigned char)*p)) p++; strcpy(s, p); @@@@ -769,13 +769,13 @@@@ make_path(char *p) static char * split_line(char *s) { - while (*s && !isspace(*s)) + while (*s && !isspace((unsigned char)*s)) s++; if (*s) *s++ = 0; - while (isspace(*s)) + while (isspace((unsigned char)*s)) s++; return (s); @@@@ -822,7 +822,7 @@@@ get_input(FILE * in_fp, int if_flag) d18 2 a19 1 sprintf(cur_line_str, "%d", xline); d21 1 a21 2 - while (isspace(*p)) + while (isspace((unsigned char)*p)) a22 20 if (!*p) @@@@ -842,7 +842,7 @@@@ get_input(FILE * in_fp, int if_flag) } /* undocumented - probably unneeded */ - if (!p[1] || isspace(p[1])) /* comment */ + if (!p[1] || isspace((unsigned char)p[1])) /* comment */ continue; if ((cmd = find_key(p)) == AT_ENDIF) @@@@ -1129,7 +1129,7 @@@@ get_input(FILE * in_fp, int if_flag) for (; *p; p = q) { - while (*p && isspace(*p)) + while (*p && isspace((unsigned char)*p)) p++; if (*p == '\'' || *p == '"') @ 1.1 log @Add (unsigned char) casts to ctype function arguments. @ text @d1 1 a1 1 $NetBSD$ @