update to 2.8.4

pilrcui (ui previewer) is broken in 2.8, but we get support for LP64.


What's new in 2.8 (Tue, 1 May 2001)
-----------------
o added new resources
- WORDLIST, GRAFITTIINPUTAREA, COLORTABLE, KEYBOARD, COUNTRYLOCALIZATION etc
- [MOST ARE SYSTEM USE ONLY], see doc/manual.html for more information
o ID generation consistancy fixes
- ie: VERSION ID 1 "1.0", VERSION 1 "1.0" and VERSION "1.0" should work
- restore's old behaviour to maintain compatibility in older sample code
o SLIDER changes
- fix warnings for sliders, no longer complain when legal :))
o error message fix
- adjust include file messing error to have line # printed :)
o DATA change
- such that the data file can be found in include directories specified
o added -LE32 flag, generate little endian 32bit compatible resources (ARM, NT)
o various bugfixes et al :P
o recursive includes (32-level deep) now supported
o added src2unix.sh script to strip ^M chars for UN*X users
o fixed strdup complaints
o updated documentation (POPUPLIST example)
o added "-R output.ro -prc" option
- resources are bundled into a prc database (instead of .bin) !yay!
- DEFAULT: cr8r: 'pRES' type: 'data' name: "PilRC resources"
- (can be installed on device)
o ability to custom specify the above using -creator -type and -name
o added srcindent.sh script to indent all source files using indent tool
o VC++ error/warning message syntax fix
o added creationDate/modificationDate chunks
o added support for non-32bit operating systems (alpha etc)

4 files changed, 188 insertions, 76 deletions

diff --git a/devel/pilrc/Makefile b/devel/pilrc/Makefile
index 851344ff87c..05ef0ea6084 100644
--- a/devel/pilrc/Makefile
+++ b/devel/pilrc/Makefile
@@ -1,23 +1,28 @@
-# $NetBSD: Makefile,v 1.4 2001/05/02 09:25:56 zuntum Exp $
+# $NetBSD: Makefile,v 1.5 2001/05/11 08:14:33 dillo Exp $
 #
 
-DISTNAME=	pilrc-2_7b
-PKGNAME=	pilrc-2.7b
+DISTNAME=	pilrc-2.8p4
+PKGNAME=	pilrc-2.8.4
 CATEGORIES=	devel
-MASTER_SITES=	http://www.ardiri.com/download/palm/pilrc/archive/
-#PATCH_SITES=	http://www.ardiri.com/download/palm/pilrc/patch/
-EXTRACT_SUFX=	.zip
+MASTER_SITES=	http://www.ardiri.com/download/palm/pilrc/patch/
+#MASTER_SITES=	http://www.ardiri.com/download/palm/pilrc/archive/
+#EXTRACT_SUFX=	.zip
 
-MAINTAINER=	dillo@giga.or.at
+#PATCH_SITES=	http://www.ardiri.com/download/palm/pilrc/patch/
+#PATCHFILES=	pilrc-2.8p0.diff pilrc-2.8p1.diff pilrc-2.8p2.diff
+#PATCHFILES+=	pilrc-2.8p3.diff
+#PATCH_DIST_STRIP+=-p1
+#
+MAINTAINER=	dillo@netbsd.org
 HOMEPAGE=	http://www.ardiri.com/index.cfm?redir=palm&cat=pilrc
 COMMENT=	generate resources for PalmOS applications from textual description
 
-# LP64 problems - pilrc.c has: Assert(sizeof(char *) == sizeof(int));
-NOT_FOR_PLATFORM= *-*-alpha *-*-sparc64
-
 .include "../../mk/bsd.prefs.mk"
 
-PILRC_USE_GTK?=	YES
+# pilrcui is broken in 2.8
+#PILRC_USE_GTK?=	YES
+PILRC_USE_GTK=	NO
+
 .if ${PILRC_USE_GTK} == YES
 DEPENDS+=	gtk+>=1.2.0:../../x11/gtk
 PLIST_SUBST+=	PILRCUI=''
@@ -26,9 +31,9 @@ CONFIGURE_ARGS+=--disable-pilrcui
 PLIST_SUBST+=	PILRCUI='@comment '
 .endif
 
-EXTRACT_CMD=	unzip -aq ${DOWNLOADED_DISTFILE}
+#EXTRACT_CMD=	unzip -aq ${DOWNLOADED_DISTFILE}
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
+WRKSRC=		${WRKDIR}/pilrc-2.8p4
 GNU_CONFIGURE=	YES
 
 DOCDIR=		${PREFIX}/share/doc/html/pilrc
diff --git a/devel/pilrc/distinfo b/devel/pilrc/distinfo
index 170ae012173..04c28e556ec 100644
--- a/devel/pilrc/distinfo
+++ b/devel/pilrc/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/04/25 17:39:16 wiz Exp $
+$NetBSD: distinfo,v 1.2 2001/05/11 08:14:33 dillo Exp $
 
-SHA1 (pilrc-2_7b.zip) = cc40803940f1749e387fdc4acb221168252e461e
-Size (pilrc-2_7b.zip) = 192381 bytes
-SHA1 (patch-aa) = e8ed545addaa333ea755efef6388a452f06f4c12
-SHA1 (patch-ab) = 8a494bd68f1b7d758b1618c7a5776f4363af660e
+SHA1 (pilrc-2.8p4.tar.gz) = fdd6cd2501f482e0f09165ee73ab832ad500845f
+Size (pilrc-2.8p4.tar.gz) = 192632 bytes
+SHA1 (patch-ab) = 54d94c0c999fc7775570fa0907ca574807dc0709
diff --git a/devel/pilrc/patches/patch-aa b/devel/pilrc/patches/patch-aa
deleted file mode 100644
index b4d0e39c17c..00000000000
--- a/devel/pilrc/patches/patch-aa
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/04/25 17:39:16 wiz Exp $
-
---- configure.in.orig	Thu Feb  8 08:50:24 2001
-+++ configure.in	Thu Mar 22 12:11:10 2001
-@@ -34,13 +34,24 @@
- AC_PROG_CC
- AC_PROG_RANLIB
- 
--AM_PATH_GTK(1.2.0,
--[
--AM_CONDITIONAL(PILRCUI, true)
--],
--[
--AM_CONDITIONAL(PILRCUI, false)
--])
-+AC_ARG_ENABLE(pilrcui,
-+  [  --enable-pilrcui        build pilrcui (needs gtk; default: enabled)])
-+
-+AC_MSG_CHECKING([whether pilrcui should be built])
-+if test -z "$enable_pilrcui" -o "$enable_pilrcui" = yes
-+then
-+    AC_MSG_RESULT([yes])
-+    AM_PATH_GTK(1.2.0,
-+    [
-+    AM_CONDITIONAL(PILRCUI, true)
-+    ],
-+    [
-+    AM_CONDITIONAL(PILRCUI, false)
-+    ])
-+else
-+    AC_MSG_RESULT([no])
-+    AM_CONDITIONAL(PILRCUI, false)
-+fi
- 
- # Check for warnings flag if gcc was detected.
- if test "x$ac_cv_prog_gcc" = "xyes"; then
diff --git a/devel/pilrc/patches/patch-ab b/devel/pilrc/patches/patch-ab
index df46e381aed..222057766f2 100644
--- a/devel/pilrc/patches/patch-ab
+++ b/devel/pilrc/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/04/25 17:39:16 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2001/05/11 08:14:34 dillo Exp $
 
---- configure.orig	Thu Mar 22 15:09:11 2001
-+++ configure	Thu Mar 22 15:09:18 2001
+--- configure.orig	Wed May  9 11:27:23 2001
++++ configure
 @@ -12,6 +12,8 @@
  ac_default_prefix=/usr/local
  # Any additions from configure.in:
@@ -11,24 +11,6 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/04/25 17:39:16 wiz Exp $
    --with-gtk-prefix=PFX   Prefix where GTK is installed (optional)"
  ac_help="$ac_help
    --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)"
-@@ -558,7 +560,7 @@
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # ./install, which can be erroneously created by make from ./install.sh.
- echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
--echo "configure:562: checking for a BSD compatible install" >&5
-+echo "configure:564: checking for a BSD compatible install" >&5
- if test -z "$INSTALL"; then
- if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -611,7 +613,7 @@
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
- 
- echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
--echo "configure:615: checking whether build environment is sane" >&5
-+echo "configure:617: checking whether build environment is sane" >&5
- # Just in case
- sleep 1
- echo timestamp > conftestfile
 @@ -1033,7 +1035,19 @@
  fi
  
@@ -50,7 +32,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/04/25 17:39:16 wiz Exp $
  if test "${with_gtk_prefix+set}" = set; then
    withval="$with_gtk_prefix"
    gtk_config_prefix="$withval"
-@@ -1315,12 +1329,24 @@
+@@ -1315,17 +1329,186 @@
    PILRCUI_TRUE='#'
    PILRCUI_FALSE=
  fi
@@ -76,3 +58,165 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/04/25 17:39:16 wiz Exp $
  
  # Check for warnings flag if gcc was detected.
  if test "x$ac_cv_prog_gcc" = "xyes"; then
+   CFLAGS="$CFLAGS -Wall"
+ fi
++
++echo $ac_n "checking size of short""... $ac_c" 1>&6
++echo "configure:1358: checking size of short" >&5
++if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  if test "$cross_compiling" = yes; then
++    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
++else
++  cat > conftest.$ac_ext <<EOF
++#line 1366 "configure"
++#include "confdefs.h"
++#include <stdio.h>
++main()
++{
++  FILE *f=fopen("conftestval", "w");
++  if (!f) exit(1);
++  fprintf(f, "%d\n", sizeof(short));
++  exit(0);
++}
++EOF
++if { (eval echo configure:1377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++then
++  ac_cv_sizeof_short=`cat conftestval`
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -fr conftest*
++  ac_cv_sizeof_short=0
++fi
++rm -fr conftest*
++fi
++
++fi
++echo "$ac_t""$ac_cv_sizeof_short" 1>&6
++cat >> confdefs.h <<EOF
++#define SIZEOF_SHORT $ac_cv_sizeof_short
++EOF
++
++
++echo $ac_n "checking size of int""... $ac_c" 1>&6
++echo "configure:1397: checking size of int" >&5
++if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  if test "$cross_compiling" = yes; then
++    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
++else
++  cat > conftest.$ac_ext <<EOF
++#line 1405 "configure"
++#include "confdefs.h"
++#include <stdio.h>
++main()
++{
++  FILE *f=fopen("conftestval", "w");
++  if (!f) exit(1);
++  fprintf(f, "%d\n", sizeof(int));
++  exit(0);
++}
++EOF
++if { (eval echo configure:1416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++then
++  ac_cv_sizeof_int=`cat conftestval`
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -fr conftest*
++  ac_cv_sizeof_int=0
++fi
++rm -fr conftest*
++fi
++
++fi
++echo "$ac_t""$ac_cv_sizeof_int" 1>&6
++cat >> confdefs.h <<EOF
++#define SIZEOF_INT $ac_cv_sizeof_int
++EOF
++
++
++echo $ac_n "checking size of long""... $ac_c" 1>&6
++echo "configure:1436: checking size of long" >&5
++if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  if test "$cross_compiling" = yes; then
++    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
++else
++  cat > conftest.$ac_ext <<EOF
++#line 1444 "configure"
++#include "confdefs.h"
++#include <stdio.h>
++main()
++{
++  FILE *f=fopen("conftestval", "w");
++  if (!f) exit(1);
++  fprintf(f, "%d\n", sizeof(long));
++  exit(0);
++}
++EOF
++if { (eval echo configure:1455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++then
++  ac_cv_sizeof_long=`cat conftestval`
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -fr conftest*
++  ac_cv_sizeof_long=0
++fi
++rm -fr conftest*
++fi
++
++fi
++echo "$ac_t""$ac_cv_sizeof_long" 1>&6
++cat >> confdefs.h <<EOF
++#define SIZEOF_LONG $ac_cv_sizeof_long
++EOF
++
++
++echo $ac_n "checking size of char *""... $ac_c" 1>&6
++echo "configure:1475: checking size of char *" >&5
++if eval "test \"`echo '$''{'ac_cv_sizeof_char_p'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  if test "$cross_compiling" = yes; then
++    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
++else
++  cat > conftest.$ac_ext <<EOF
++#line 1483 "configure"
++#include "confdefs.h"
++#include <stdio.h>
++main()
++{
++  FILE *f=fopen("conftestval", "w");
++  if (!f) exit(1);
++  fprintf(f, "%d\n", sizeof(char *));
++  exit(0);
++}
++EOF
++if { (eval echo configure:1494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++then
++  ac_cv_sizeof_char_p=`cat conftestval`
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -fr conftest*
++  ac_cv_sizeof_char_p=0
++fi
++rm -fr conftest*
++fi
++
++fi
++echo "$ac_t""$ac_cv_sizeof_char_p" 1>&6
++cat >> confdefs.h <<EOF
++#define SIZEOF_CHAR_P $ac_cv_sizeof_char_p
++EOF
++
++
+ 
+ cat >> confdefs.h <<\EOF
+ #define UNIX 1