[pkgsrc/trunk]: pkgsrc/graphics/compface Update to 1.5.2:

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b193c39ddcca
branches:  trunk
changeset: 526374:b193c39ddcca
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Mar 08 19:23:04 2007 +0000

description:
Update to 1.5.2:

2005-08-04  Ben Wing

        Version 1.5.2: Fixed CRLF endings in sources.  Moved configure.in to
        configure.ac and rewrote obsolete constructions.  Redid installation
        in `make install' so it actually worked, including on Cygwin
        (needs the EXEEXT variable from `configure').

diffstat:

 graphics/compface/Makefile         |  17 ++++++++---------
 graphics/compface/distinfo         |  11 ++++-------
 graphics/compface/patches/patch-aa |  12 ------------
 graphics/compface/patches/patch-ab |  22 ----------------------
 graphics/compface/patches/patch-ac |  22 ----------------------
 5 files changed, 12 insertions(+), 72 deletions(-)

diffs (124 lines):

diff -r 878e327f6d1c -r b193c39ddcca graphics/compface/Makefile
--- a/graphics/compface/Makefile        Thu Mar 08 19:11:47 2007 +0000
+++ b/graphics/compface/Makefile        Thu Mar 08 19:23:04 2007 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2006/04/22 09:22:09 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2007/03/08 19:23:04 wiz Exp $
 
-DISTNAME=      compface-1.5.1
-PKGREVISION=   1
+DISTNAME=      compface-1.5.2
 CATEGORIES=    graphics
-MASTER_SITES=  http://freshmeat.net/redir/compface/1439/url_tgz/
+MASTER_SITES=  http://ftp.xemacs.org/pub/xemacs/aux/
 
 MAINTAINER=    oishi%ims.ac.jp@localhost
 HOMEPAGE=      http://freshmeat.net/projects/compface/
@@ -11,17 +10,17 @@
 
 CONFLICTS=     faces-[0-9]*
 
-USE_TOOLS+=            autoconf gmake
+USE_TOOLS+=            gmake
 GNU_CONFIGURE=         yes
+CONFIGURE_ENV+=                INSTALL_PROGRAM=${BSD_INSTALL_PROGRAM:Q}
+CONFIGURE_ENV+=                INSTALL_SCRIPT=${BSD_INSTALL_SCRIPT:Q}
+CONFIGURE_ENV+=                INSTALL_DATA=${BSD_INSTALL_DATA:Q}
 
 SUBST_CLASSES+=                perlpath
 SUBST_MESSAGE.perlpath=        Configuring Perl path.
 SUBST_STAGE.perlpath=  pre-configure
 SUBST_FILES.perlpath=  xbm2xface.pl
-SUBST_SED.perlpath=    -e 's|
||' -e 's|/usr/bin|${PREFIX}/bin|g'
-
-pre-configure:
-       cd ${WRKSRC}; autoconf
+SUBST_SED.perlpath+=   -e 's|/usr/bin/perl|${PERL5}|g'
 
 post-install:
        ${INSTALL_SCRIPT} ${WRKSRC}/xbm2xface.pl ${PREFIX}/bin
diff -r 878e327f6d1c -r b193c39ddcca graphics/compface/distinfo
--- a/graphics/compface/distinfo        Thu Mar 08 19:11:47 2007 +0000
+++ b/graphics/compface/distinfo        Thu Mar 08 19:23:04 2007 +0000
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.6 2005/02/24 08:45:04 agc Exp $
+$NetBSD: distinfo,v 1.7 2007/03/08 19:23:04 wiz Exp $
 
-SHA1 (compface-1.5.1.tar.gz) = d97f3dd098da94e6869a8a82c225a902fe297b2b
-RMD160 (compface-1.5.1.tar.gz) = 97eedb887cca3f1bce5f087b142dbf794b128c38
-Size (compface-1.5.1.tar.gz) = 30565 bytes
-SHA1 (patch-aa) = 43d8996c8c8f8f72e78a81ae469832224c95c067
-SHA1 (patch-ab) = 17e9948122b39ce284ca64a3aa6b83f67b6f93df
-SHA1 (patch-ac) = ef118806906f8f945e9f4df50c27208d682ce341
+SHA1 (compface-1.5.2.tar.gz) = 72dad8774b3301a1562bdbd5b3c5536ebf86a03d
+RMD160 (compface-1.5.2.tar.gz) = 17174e8c263ae3984dd74fa7e93f8835773cd742
+Size (compface-1.5.2.tar.gz) = 46970 bytes
diff -r 878e327f6d1c -r b193c39ddcca graphics/compface/patches/patch-aa
--- a/graphics/compface/patches/patch-aa        Thu Mar 08 19:11:47 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2005/01/10 13:40:02 adam Exp $
-
---- compface.h.orig    2005-01-10 14:12:29.000000000 +0000
-+++ compface.h
-@@ -17,6 +17,7 @@
- #define COMPFACE_H
- 
- #include <setjmp.h>
-+#include <errno.h>
- 
- /* For all function declarations, if ANSI then use a prototype. */
- 
diff -r 878e327f6d1c -r b193c39ddcca graphics/compface/patches/patch-ab
--- a/graphics/compface/patches/patch-ab        Thu Mar 08 19:11:47 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2005/01/12 23:22:30 kristerw Exp $
-
---- cmain.c.orig       Thu Jan 13 00:14:12 2005
-+++ cmain.c    Thu Jan 13 00:15:41 2005
-@@ -49,13 +49,13 @@
- #define ERR (strerrorwrap(errno))
- #endif
- 
--#define INITERR(s) {(void)strcpy(fbuf, cmdname); (void)strcat(fbuf, ": ");\
-+#define INITERR(s) {(void)strcpy(fbuf, cmdname); (void)strcat(fbuf, ": ");\
-                                       (void)strcat(fbuf, (s));}
- #define ADDERR(s) (void)strcat(fbuf, (s));
--#define ERROR {(void)strcat(fbuf, "\n");\
-+#define ERROR {(void)strcat(fbuf, "\n");\
-                               (void)write(2, fbuf, strlen(fbuf)); exit(1);}
--#define INITWARN(s) {(void)strcpy(fbuf, cmdname);\
--                                      (void)strcat(fbuf, ": (warning) ");\
-+#define INITWARN(s) {(void)strcpy(fbuf, cmdname);\
-+                                      (void)strcat(fbuf, ": (warning) ");\
-                                       (void)strcat(fbuf, (s));}
- #define ADDWARN(s) (void)strcat(fbuf, (s));
- #define WARN {(void)strcat(fbuf, "\n"); (void)write(2, fbuf, strlen(fbuf));}
diff -r 878e327f6d1c -r b193c39ddcca graphics/compface/patches/patch-ac
--- a/graphics/compface/patches/patch-ac        Thu Mar 08 19:11:47 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2005/01/12 23:22:30 kristerw Exp $
-
---- uncmain.c.orig     Thu Jan 13 00:16:05 2005
-+++ uncmain.c  Thu Jan 13 00:16:54 2005
-@@ -45,13 +45,13 @@
- #define ERR (strerrorwrap(errno))
- #endif
- 
--#define INITERR(s) {(void)strcpy(fbuf, cmdname); (void)strcat(fbuf, ": ");\
-+#define INITERR(s) {(void)strcpy(fbuf, cmdname); (void)strcat(fbuf, ": ");\
-                                       (void)strcat(fbuf, (s));}
- #define ADDERR(s) (void)strcat(fbuf, (s));
--#define ERROR {(void)strcat(fbuf, "\n");\
-+#define ERROR {(void)strcat(fbuf, "\n");\
-                               (void)write(2, fbuf, strlen(fbuf)); exit(1);}
--#define INITWARN(s) {(void)strcpy(fbuf, cmdname);\
--                                      (void)strcat(fbuf, ": (warning) ");\
-+#define INITWARN(s) {(void)strcpy(fbuf, cmdname);\
-+                                      (void)strcat(fbuf, ": (warning) ");\
-                                       (void)strcat(fbuf, (s));}
- #define ADDWARN(s) (void)strcat(fbuf, (s));
- #define WARN {(void)strcat(fbuf, "\n"); (void)write(2, fbuf, strlen(fbuf));}