[pkgsrc/trunk]: pkgsrc/comms/estic Fixed invalid C++ code and some pkglint wa...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ae18d227b987
branches:  trunk
changeset: 537347:ae18d227b987
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Jan 06 18:39:38 2008 +0000

description:
Fixed invalid C++ code and some pkglint warnings.

diffstat:

 comms/estic/Makefile         |  15 ++++++---------
 comms/estic/distinfo         |   4 +++-
 comms/estic/patches/patch-az |  15 +++++++++++++++
 comms/estic/patches/patch-ba |  29 +++++++++++++++++++++++++++++
 4 files changed, 53 insertions(+), 10 deletions(-)

diffs (106 lines):

diff -r 0db09fba7d93 -r ae18d227b987 comms/estic/Makefile
--- a/comms/estic/Makefile      Sun Jan 06 18:37:21 2008 +0000
+++ b/comms/estic/Makefile      Sun Jan 06 18:39:38 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2007/01/30 20:04:15 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2008/01/06 18:39:38 rillig Exp $
 
 DISTNAME=      estic-1.61
 PKGREVISION=   1
@@ -24,24 +24,21 @@
 WRKSRC=                ${WRKDIR}/${PKGNAME_NOREV:C/-.*//}
 
 USE_LANGUAGES= c c++
+USE_TOOLS+=    patch unzip
 
 BUILD_TARGET=  depend all
 ESTICPATCH=    ${DISTNAME}-patch-from-1.60${EXTRACT_SUFX}
-LIB_TARGET=    depend lib
-LIBSRC=                ${WRKDIR}/spunk
 MAKE_FILE=     make/freebsd-x.mak
 
 INSTALLATION_DIRS=     bin
 
 post-extract:
-       ${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC} && \
-       ${LOCALBASE}/bin/unzip -p ${DISTDIR}/${ESTICPATCH} | \
-               ${PATCH} -p0 ${PATCH_DIST_ARGS}
+       cd ${WRKSRC} && \
+       unzip -p ${DISTDIR}/${ESTICPATCH} \
+       | ${PATCH} -p0 ${PATCH_DIST_ARGS}
 
 pre-build:
-       ${_PKG_SILENT}${_PKG_DEBUG}cd ${LIBSRC} && \
-       ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKE_FILE} \
-         ${LIB_TARGET}
+       cd ${WRKDIR}/spunk && ${BUILD_MAKE_CMD} depend lib
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/xestic ${PREFIX}/bin
diff -r 0db09fba7d93 -r ae18d227b987 comms/estic/distinfo
--- a/comms/estic/distinfo      Sun Jan 06 18:37:21 2008 +0000
+++ b/comms/estic/distinfo      Sun Jan 06 18:39:38 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2006/09/08 07:35:50 joerg Exp $
+$NetBSD: distinfo,v 1.10 2008/01/06 18:39:38 rillig Exp $
 
 SHA1 (estic-1.60-sources.zip) = ce66a6d52faaf6adba492bb3f74e49eab608d0c3
 RMD160 (estic-1.60-sources.zip) = be071c72ab881c815dc9a0847f2b09914bdeb2ed
@@ -31,3 +31,5 @@
 SHA1 (patch-aw) = ed428001d0ffc2428a67182a22fa54a726ca103a
 SHA1 (patch-ax) = 18f16c755f05d5899d13be239544366a1393d7d3
 SHA1 (patch-ay) = 25ec057efcb071f83ab53ca7d7d2af22e9a2c93f
+SHA1 (patch-az) = 661710c038aa502216c7cf5c7374515a43518a7f
+SHA1 (patch-ba) = cced4632684abfe71b115ec0cc65bbd77a7d2770
diff -r 0db09fba7d93 -r ae18d227b987 comms/estic/patches/patch-az
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/comms/estic/patches/patch-az      Sun Jan 06 18:39:38 2008 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-az,v 1.1 2008/01/06 18:39:38 rillig Exp $
+
+See mk/help/c++.help.
+
+--- ../spunk/itemwin.h.orig    1996-11-07 18:06:48.000000000 +0000
++++ ../spunk/itemwin.h 2008-01-06 18:52:26.000000000 +0000
+@@ -55,6 +55,8 @@ const u16 ifNoSub               = 0x0010
+ /*****************************************************************************/
+ 
+ 
++class ResEditApp;
++class ItemWindow;
+ 
+ class WindowItem : public Streamable {
+ 
diff -r 0db09fba7d93 -r ae18d227b987 comms/estic/patches/patch-ba
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/comms/estic/patches/patch-ba      Sun Jan 06 18:39:38 2008 +0000
@@ -0,0 +1,29 @@
+$NetBSD: patch-ba,v 1.1 2008/01/06 18:39:39 rillig Exp $
+
+See mk/help/c++.help.
+
+--- ../spunk/str.h.orig        1996-12-18 13:18:50.000000000 +0000
++++ ../spunk/str.h     2008-01-06 19:26:53.000000000 +0000
+@@ -91,6 +91,13 @@ extern const class String EmptyString;
+ // Note: This string class may not work with strings greater than INT_MAX or
+ //       0xFFFF, whichever is less
+ 
++String ShowControls (const String& S, unsigned Style = ccDefault);
++String HideControls (const String& S);
++int Match (const char* Source, const char* Pattern);
++int Match (const String& Source, const String& Pattern);
++int Match (const String& Source, const char* Pattern);
++int Match (const char* Source, const String& Pattern);
++String FormatStr (const char* S, ...);
+ 
+ class String : public Streamable {
+ 
+@@ -303,7 +310,7 @@ public:
+     // representation by the character itself, e.g. replace "\n" by the
+     // character with code 13.
+ 
+-    friend String ShowControls (const String& S, unsigned Style = ccDefault);
++    friend String ShowControls (const String& S, unsigned Style);
+     // Recode the given string and replace every control character by it's
+     // visible representation, e.g. "\n" instead of the character with code
+     // code 13.