Fri Aug 30 16:53:45 2013 UTC ()
Correctly fix the ctype usage. Don't overwrite our CFLAGS.
Bump revision.


(joerg)
diff -r1.11 -r1.12 pkgsrc/mail/ripmime/Makefile
diff -r1.6 -r1.7 pkgsrc/mail/ripmime/distinfo
diff -r1.5 -r1.6 pkgsrc/mail/ripmime/patches/patch-aa
diff -r1.1 -r1.2 pkgsrc/mail/ripmime/patches/patch-ab
diff -r1.1 -r1.2 pkgsrc/mail/ripmime/patches/patch-ac
diff -r0 -r1.1 pkgsrc/mail/ripmime/patches/patch-ripOLE_Makefile
cvs diff -r1.11 -r1.12 pkgsrc/mail/ripmime/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/ripmime/Makefile 2013/08/01 20:19:55 1.11
+++ pkgsrc/mail/ripmime/Makefile 2013/08/30 16:53:45 1.12
@@ -1,22 +1,28 @@ @@ -1,22 +1,28 @@
1# $NetBSD: Makefile,v 1.11 2013/08/01 20:19:55 shattered Exp $ 1# $NetBSD: Makefile,v 1.12 2013/08/30 16:53:45 joerg Exp $
2# 2#
3 3
4DISTNAME= ripmime-1.4.0.10 4DISTNAME= ripmime-1.4.0.10
 5PKGREVISION= 1
5CATEGORIES= mail 6CATEGORIES= mail
6MASTER_SITES= http://www.pldaniels.com/ripmime/ 7MASTER_SITES= http://www.pldaniels.com/ripmime/
7 8
8MAINTAINER= reed@reedmedia.net 9MAINTAINER= reed@reedmedia.net
9HOMEPAGE= http://www.pldaniels.com/ripmime/ 10HOMEPAGE= http://www.pldaniels.com/ripmime/
10COMMENT= Extract the attached files out of a MIME encoded email package 11COMMENT= Extract the attached files out of a MIME encoded email package
11 12
12MAKE_JOBS_SAFE= no 13MAKE_JOBS_SAFE= no
13MAKE_ENV+= LIBS=${BUILDLINK_LDADD.iconv} 14MAKE_ENV+= LIBS=${BUILDLINK_LDADD.iconv}
14 15
15INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 16INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
16 17
 18.include "../../mk/compiler.mk"
 19.if !empty(PKGSRC_COMPILER:Mclang)
 20CFLAGS+= -Wno-error=tautological-compare
 21.endif
 22
17do-install: 23do-install:
18 ${INSTALL_PROGRAM} ${WRKSRC}/ripmime ${DESTDIR}${PREFIX}/bin 24 ${INSTALL_PROGRAM} ${WRKSRC}/ripmime ${DESTDIR}${PREFIX}/bin
19 ${INSTALL_MAN} ${WRKSRC}/ripmime.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 25 ${INSTALL_MAN} ${WRKSRC}/ripmime.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
20 26
21.include "../../converters/libiconv/buildlink3.mk" 27.include "../../converters/libiconv/buildlink3.mk"
22.include "../../mk/bsd.pkg.mk" 28.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/mail/ripmime/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/ripmime/distinfo 2013/08/01 20:19:55 1.6
+++ pkgsrc/mail/ripmime/distinfo 2013/08/30 16:53:45 1.7
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.6 2013/08/01 20:19:55 shattered Exp $ 1$NetBSD: distinfo,v 1.7 2013/08/30 16:53:45 joerg Exp $
2 2
3SHA1 (ripmime-1.4.0.10.tar.gz) = 296f657f2f664b713751178fb589d5c64dc7b6ae 3SHA1 (ripmime-1.4.0.10.tar.gz) = 296f657f2f664b713751178fb589d5c64dc7b6ae
4RMD160 (ripmime-1.4.0.10.tar.gz) = 312f6ca37e73a5a024dd8cf07e6b969b6d7a952d 4RMD160 (ripmime-1.4.0.10.tar.gz) = 312f6ca37e73a5a024dd8cf07e6b969b6d7a952d
5Size (ripmime-1.4.0.10.tar.gz) = 174610 bytes 5Size (ripmime-1.4.0.10.tar.gz) = 174610 bytes
6SHA1 (patch-aa) = 9fc681acd369555f17027a6ea1e84566e36b18c1 6SHA1 (patch-aa) = b2e0bbabbf58307458c830cbd816685c14565546
7SHA1 (patch-ab) = 08d4cb2519f4f0dd062ca717185b597e4edd09f9 7SHA1 (patch-ab) = cde9aed0e6df4540b4e563953a77fae69944facc
8SHA1 (patch-ac) = 188092463ece3302806952fec1efc06000391e36 8SHA1 (patch-ac) = 71fe6aaaf08c2b2c79f5d554be8a37fd26cdf796
 9SHA1 (patch-ripOLE_Makefile) = 50af6c9f8ee0a93efdfe03ef6fc2bc7b5c9f03f8
cvs diff -r1.5 -r1.6 pkgsrc/mail/ripmime/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/mail/ripmime/patches/patch-aa 2013/08/01 20:19:55 1.5
+++ pkgsrc/mail/ripmime/patches/patch-aa 2013/08/30 16:53:45 1.6
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1$NetBSD: patch-aa,v 1.5 2013/08/01 20:19:55 shattered Exp $ 1$NetBSD: patch-aa,v 1.6 2013/08/30 16:53:45 joerg Exp $
2 2
3--- Makefile.orig 2011-12-05 08:46:23.000000000 +0000 3--- Makefile.orig 2011-12-05 08:46:23.000000000 +0000
4+++ Makefile 4+++ Makefile
5@@ -15,7 +15,7 @@ VERSION=0.1.14 5@@ -15,7 +15,7 @@ VERSION=0.1.14
6 # use our recommended settings. 6 # use our recommended settings.
7 #CFLAGS ?= -Wall -g -O2 -Werror $(CPU_OPTS) 7 #CFLAGS ?= -Wall -g -O2 -Werror $(CPU_OPTS)
8 #CFLAGS=-Wall -g -O2 -Wundef -Wshadow -Wsign-compare -I. 8 #CFLAGS=-Wall -g -O2 -Wundef -Wshadow -Wsign-compare -I.
9-CFLAGS=-Wall -g -I. -O2 -Werror 9-CFLAGS=-Wall -g -I. -O2 -Werror
10+CFLAGS?=-Wall -g -I. -O2 -Werror 10+#CFLAGS=-Wall -g -I. -O2 -Werror
11  11
12 # OLE decoding is still considered to be 'beta' mode - so it  12 # OLE decoding is still considered to be 'beta' mode - so it
13 # disabled in the stable release of ripMIME for now 13 # disabled in the stable release of ripMIME for now
14@@ -26,7 +26,7 @@ CFLAGS=-Wall -g -I. -O2 -Werror 14@@ -26,7 +26,7 @@ CFLAGS=-Wall -g -I. -O2 -Werror
15 # mailpacks@pldaniels.com 15 # mailpacks@pldaniels.com
16 # 16 #
17 COMPONENTS= -DRIPOLE 17 COMPONENTS= -DRIPOLE
18-LIBS=  18-LIBS=
19+#LIBS=  19+#LIBS=
20 #COMPONENTS=  20 #COMPONENTS=
21  21
22 # DEBUGGING Related Flags 22 # DEBUGGING Related Flags
cvs diff -r1.1 -r1.2 pkgsrc/mail/ripmime/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/mail/ripmime/patches/patch-ab 2013/07/21 10:58:49 1.1
+++ pkgsrc/mail/ripmime/patches/patch-ab 2013/08/30 16:53:45 1.2
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-ab,v 1.1 2013/07/21 10:58:49 shattered Exp $ 1$NetBSD: patch-ab,v 1.2 2013/08/30 16:53:45 joerg Exp $
2 2
3Avoid compiler warning. 3Avoid compiler warning.
4 4
5--- ripOLE/ole.c.orig 2008-10-31 16:17:32.000000000 +0000 5--- ripOLE/ole.c.orig 2008-10-31 16:17:32.000000000 +0000
6+++ ripOLE/ole.c 6+++ ripOLE/ole.c
7@@ -512,7 +512,7 @@ int OLE_print_sector( struct OLE_object  7@@ -512,7 +512,7 @@ int OLE_print_sector( struct OLE_object
8 int j; 8 int j;
9 for (j = current_byte -31; j <=current_byte; j++) 9 for (j = current_byte -31; j <=current_byte; j++)
10 { 10 {
11- if (isalnum(*(sector +j))) printf("%c",*(sector+j)); 11- if (isalnum(*(sector +j))) printf("%c",*(sector+j));
12+ if (isalnum((int)*(sector +j))) printf("%c",*(sector+j)); 12+ if (isalnum((unsigned char)*(sector +j))) printf("%c",*(sector+j));
13 else printf("."); 13 else printf(".");
14 } 14 }
15 printf("\n"); 15 printf("\n");
cvs diff -r1.1 -r1.2 pkgsrc/mail/ripmime/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/mail/ripmime/patches/patch-ac 2013/07/21 10:58:49 1.1
+++ pkgsrc/mail/ripmime/patches/patch-ac 2013/08/30 16:53:45 1.2
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-ac,v 1.1 2013/07/21 10:58:49 shattered Exp $ 1$NetBSD: patch-ac,v 1.2 2013/08/30 16:53:45 joerg Exp $
2 2
3Avoid compiler warning. 3Avoid compiler warning.
4 4
5--- ripOLE/pldstr.c.orig 2008-10-31 16:17:32.000000000 +0000 5--- ripOLE/pldstr.c.orig 2008-10-31 16:17:32.000000000 +0000
6+++ ripOLE/pldstr.c 6+++ ripOLE/pldstr.c
7@@ -237,8 +237,8 @@ int PLD_strncasecmp( char *s1, char *s2, 7@@ -237,8 +237,8 @@ int PLD_strncasecmp( char *s1, char *s2,
8  8
9 while(n > 0) 9 while(n > 0)
10 { 10 {
11- c1 = tolower(*ds1); 11- c1 = tolower(*ds1);
12- c2 = tolower(*ds2); 12- c2 = tolower(*ds2);
13+ c1 = tolower((int)*ds1); 13+ c1 = tolower((unsigned char)*ds1);
14+ c2 = tolower((int)*ds2); 14+ c2 = tolower((unsigned char)*ds2);
15  15
16 if (c1 == c2) 16 if (c1 == c2)
17 { 17 {
File Added: pkgsrc/mail/ripmime/patches/patch-ripOLE_Makefile
$NetBSD: patch-ripOLE_Makefile,v 1.1 2013/08/30 16:53:45 joerg Exp $

--- ripOLE/Makefile.orig	2013-08-30 14:11:54.000000000 +0000
+++ ripOLE/Makefile
@@ -1,6 +1,6 @@
 
 OBJS= ole.o olestream-unwrap.o bytedecoders.o logger.o pldstr.o bt-int.o
-CFLAGS=-Wall -g -O2 -I. -Werror
+#CFLAGS=-Wall -g -O2 -I. -Werror
 
 
 .c.o: