From 378ad5bd496bf9459316a15beb2ff088a111bd85 Mon Sep 17 00:00:00 2001
From: bad <bad>
Date: Mon, 14 Jan 2008 20:39:34 +0000
Subject: Makefile: Fix editing oversight in previous in. Noticed by Brian de
 Alwis patch-ag: #ifdef __sun__ is enough, as per PR pkg/37522. Bump
 PKGREVISION.

---
 lang/squeak/Makefile         |  7 ++++---
 lang/squeak/distinfo         |  4 ++--
 lang/squeak/patches/patch-ag | 14 +++-----------
 3 files changed, 9 insertions(+), 16 deletions(-)

(limited to 'lang/squeak')

diff --git a/lang/squeak/Makefile b/lang/squeak/Makefile
index 8d5e2910d5d..103e83e3109 100644
--- a/lang/squeak/Makefile
+++ b/lang/squeak/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.34 2008/01/12 23:30:38 bad Exp $
+# $NetBSD: Makefile,v 1.35 2008/01/14 20:39:34 bad Exp $
 #
 
 DISTNAME=	Squeak-3.9-8
 PKGNAME=	squeak-3.9.8
+PKGREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	http://ftp.squeak.org/3.9/unix-linux/
 DISTFILES=	Squeak-3.9-8.src.tar.gz
@@ -45,8 +46,8 @@ pre-configure:
 	${MKDIR} ${CONFIGURE_DIRS}
 
 post-install:
-	${INSTALL_DATA} ${WRKDIR}/${SQUEAK_CHANGES}.gz ${DESTDIR}${PREFIX}/lib/squeak/
-	${INSTALL_DATA} ${WRKDIR}/${SQUEAK_IMAGE}.gz ${DESTDIR}${PREFIX}/lib/squeak/
+	${INSTALL_DATA} ${WRKDIR}/${SQUEAK_CHANGES} ${DESTDIR}${PREFIX}/lib/squeak/
+	${INSTALL_DATA} ${WRKDIR}/${SQUEAK_IMAGE} ${DESTDIR}${PREFIX}/lib/squeak/
 	${INSTALL_DATA} ${WRKDIR}/${SQUEAK_SOURCES} ${DESTDIR}${PREFIX}/lib/squeak/
 	cd ${DESTDIR}${PREFIX}/lib/squeak						\
 	    && ${LN} -s ${SQUEAK_CHANGES:C/.*\///} squeak.changes.gz	\
diff --git a/lang/squeak/distinfo b/lang/squeak/distinfo
index b2280633c46..3897ae553f5 100644
--- a/lang/squeak/distinfo
+++ b/lang/squeak/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2008/01/12 23:30:38 bad Exp $
+$NetBSD: distinfo,v 1.12 2008/01/14 20:39:35 bad Exp $
 
 SHA1 (squeak/Squeak-3.9-8.src.tar.gz) = 9d8b88de09b07a6603cea7447cd3cdfe6c23d463
 RMD160 (squeak/Squeak-3.9-8.src.tar.gz) = d97bc098a3a948edc59c522e8a8baeda97fd9de9
@@ -12,7 +12,7 @@ SHA1 (patch-ac) = 38eb12424792eba344c4963132012aa90c70dd8d
 SHA1 (patch-ad) = 9acec5fd3cd8677cf3c01aa971a1b882401ed59b
 SHA1 (patch-ae) = 54e06ce67bbe71280e846dfbb81e7ebd6becd3f7
 SHA1 (patch-af) = 41561264023700df277d81f528c9dad42a11e31f
-SHA1 (patch-ag) = a84c1ce978f473fde2b96298bb65c500252da479
+SHA1 (patch-ag) = b0c63611d88c94d05485e0e113879d197268d739
 SHA1 (patch-ah) = b366ba8454e1bc5f182c51f6b39d7621498ee063
 SHA1 (patch-ai) = 8ca9289dea3484205b65759f2aa052d57d6af2ee
 SHA1 (patch-aj) = 18d81c878ee88bf334e3700d46d66dfa458618d0
diff --git a/lang/squeak/patches/patch-ag b/lang/squeak/patches/patch-ag
index 18217a498b2..43e4378c233 100644
--- a/lang/squeak/patches/patch-ag
+++ b/lang/squeak/patches/patch-ag
@@ -1,16 +1,8 @@
-$NetBSD: patch-ag,v 1.3 2008/01/12 23:30:38 bad Exp $
+$NetBSD: patch-ag,v 1.4 2008/01/14 20:39:35 bad Exp $
 
---- platforms/unix/vm/sqUnixCharConv.c.orig	2007-12-06 18:28:07.000000000 -0600
+--- platforms/unix/vm/sqUnixCharConv.c.orig	2006-10-11 06:09:43.000000000 +0200
 +++ platforms/unix/vm/sqUnixCharConv.c
-@@ -151,14 +151,18 @@ int convertChars(char *from, int fromLen
- 
- typedef char ichar_t;
- 
--#ifdef __sun__
-+#if defined(__sun__) && !defined(__NetBSD__)	/* is __NetBSD__ necc with __sun__? */
- void *sqTextEncoding=	(void *)"mac";		/* xxxFIXME -> "ISO-8859-15" */ 
- void *uxPathEncoding=	(void *)"iso5";
- void *uxTextEncoding=	(void *)"iso5";
+@@ -158,7 +158,11 @@ void *uxTextEncoding=	(void *)"iso5";
  void *uxXWinEncoding=	(void *)"iso5";
  void *uxUTF8Encoding=	(void *)"UTF-8";
  #else
-- 
cgit v1.2.3