ports/67411: [ maintainer ] emulators/pearpc: FreeBSD 4.x build fix
Roman Bogorodskiy
bogorodskiy at inbox.ru
Mon May 31 06:40:26 UTC 2004
>Number: 67411
>Category: ports
>Synopsis: [ maintainer ] emulators/pearpc: FreeBSD 4.x build fix
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun May 30 23:40:25 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator: Roman Bogorodskiy
>Release: FreeBSD 5.2.1-RELEASE-p6 i386
>Organization:
>Environment:
System: FreeBSD lame.novel.ru 5.2.1-RELEASE-p6 FreeBSD 5.2.1-RELEASE-p6 #2: Tue May 25 13:20:35 MSD 2004 root at lame.novel.ru:/usr/obj/usr/src/sys/NOV i386
>Description:
Ken Stailey (kestailey at comcast.net) pointed out that pearpc doesn't
work on STABLE (then I've recieved errlog from Bento also) and helped
to fix this trouble. I have no FreeBSD 4.x so I can't test it myself
(it still works ok on FreeBSD 5.x thougth), and I didn't receive any
comments from Ken about this update. It'd be tested on FreeBSD 4.x...
>How-To-Repeat:
>Fix:
diff -ruN /home/novel/pearpc/Makefile pearpc/Makefile
--- /home/novel/pearpc/Makefile Tue May 25 19:43:14 2004
+++ pearpc/Makefile Mon May 31 09:37:10 2004
@@ -2,11 +2,12 @@
# Date created: 22 May 2004
# Whom: Roman Bogorodskiy
#
-# $FreeBSD: ports/emulators/pearpc/Makefile,v 1.3 2004/05/25 15:43:14 pav Exp $
+# $FreeBSD: ports/emulators/pearpc/Makefile,v 1.2 2004/05/24 23:41:57 pav Exp $
#
PORTNAME= pearpc
PORTVERSION= 0.1.2
+PORTREVISION= 1
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -14,6 +15,7 @@
MAINTAINER= bogorodskiy at inbox.ru
COMMENT= PowerPC emulator
+USE_GCC= 3.3
USE_XLIB= yes
USE_REINPLACE= yes
GNU_CONFIGURE= yes
@@ -47,6 +49,10 @@
CONFIGURE_ARGS+= --enable-cpu=generic
.endif
+.if ${OSVERSION} < 500000
+CFLAGS+= -DFREEBSD_MB_SUPPORT
+.endif
+
pre-everything::
.if !defined(WITH_OPTIMIZED_CFLAGS)
@${ECHO_MSG} ""
@@ -57,6 +63,10 @@
post-configure:
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/Makefile
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/src/Makefile
+.if ${OSVERSION} < 500000
+ @${CP} ${FILESDIR}/wcrtomb.c ${FILESDIR}/mbrtowc.c \
+ ${WRKSRC}/
+.endif
post-install:
@${MKDIR} ${DATADIR}
diff -ruN /home/novel/pearpc/files/mbrtowc.c pearpc/files/mbrtowc.c
--- /home/novel/pearpc/files/mbrtowc.c Thu Jan 1 03:00:00 1970
+++ pearpc/files/mbrtowc.c Mon May 31 09:38:45 2004
@@ -0,0 +1,79 @@
+/*-
+ * Copyright (c) 2002, 2003 Tim J. Robbins.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: ports/security/putty/files/mbrtowc.c,v 1.1 2004/02/13 17:45:38 dinoex Exp $");
+
+#include <errno.h>
+#include <rune.h>
+#include <stdlib.h>
+#include <wchar.h>
+
+/*
+ * Emulate the ISO C mbrtowc() function in terms of the deprecated
+ * 4.4BSD sgetrune() function.
+ */
+size_t
+mbrtowc(wchar_t * __restrict pwc, const char * __restrict s,
+ size_t n, mbstate_t * __restrict ps __unused)
+{
+ const char *e;
+ rune_t r;
+
+ if (s == NULL) {
+ pwc = NULL;
+ s = "";
+ n = 1;
+ }
+
+ if ((r = sgetrune(s, n, &e)) == _INVALID_RUNE) {
+ /*
+ * The design of sgetrune() doesn't give us any way to tell
+ * between incomplete and invalid multibyte sequences.
+ */
+
+ if (n >= (size_t)MB_CUR_MAX) {
+ /*
+ * If we have been supplied with at least MB_CUR_MAX
+ * bytes and still cannot find a valid character, the
+ * data must be invalid.
+ */
+ errno = EILSEQ;
+ return ((size_t)-1);
+ }
+
+ /*
+ * .. otherwise, it's an incomplete character or an invalid
+ * character we cannot detect yet.
+ */
+ return ((size_t)-2);
+ }
+
+ if (pwc != NULL)
+ *pwc = (wchar_t)r;
+
+ return (r != 0 ? (size_t)(e - s) : 0);
+}
diff -ruN /home/novel/pearpc/files/patch-src::io::prom::fs::hfsplus::unicode.c pearpc/files/patch-src::io::prom::fs::hfsplus::unicode.c
--- /home/novel/pearpc/files/patch-src::io::prom::fs::hfsplus::unicode.c Thu Jan 1 03:00:00 1970
+++ pearpc/files/patch-src::io::prom::fs::hfsplus::unicode.c Mon May 31 10:19:44 2004
@@ -0,0 +1,19 @@
+--- src/io/prom/fs/hfsplus/unicode.c.DIST Thu May 6 10:45:32 2004
++++ src/io/prom/fs/hfsplus/unicode.c Tue May 25 10:06:24 2004
+@@ -28,6 +28,16 @@
+
+ #include "unicode.h"
+
++#ifdef FREEBSD_MB_SUPPORT
++size_t mbrtowc __P((wchar_t * __restrict, const char * __restrict, size_t,
++ mbstate_t * __restrict));
++size_t wcrtomb __P((char * __restrict, wchar_t, mbstate_t * __restrict));
++
++#include "mbrtowc.c"
++#include "wcrtomb.c"
++#endif /* FREEBSD_MB_SUPPORT */
++
++
+ /* convert the asci string astr into a unicode string given by ustr.
+ *
+ * ToDo: Think about better error handling ?
diff -ruN /home/novel/pearpc/files/wcrtomb.c pearpc/files/wcrtomb.c
--- /home/novel/pearpc/files/wcrtomb.c Thu Jan 1 03:00:00 1970
+++ pearpc/files/wcrtomb.c Mon May 31 09:38:40 2004
@@ -0,0 +1,57 @@
+/*-
+ * Copyright (c) 2002, 2003 Tim J. Robbins.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: ports/security/putty/files/wcrtomb.c,v 1.1 2004/02/13 17:45:39 dinoex Exp $");
+
+#include <errno.h>
+#include <limits.h>
+#include <rune.h>
+#include <stdlib.h>
+#include <wchar.h>
+
+/*
+ * Emulate the ISO C wcrtomb() function in terms of the deprecated
+ * 4.4BSD sputrune() function.
+ */
+size_t
+wcrtomb(char * __restrict s, wchar_t wc,
+ mbstate_t * __restrict ps __unused)
+{
+ char *e;
+ char buf[MB_LEN_MAX];
+
+ if (s == NULL) {
+ s = buf;
+ wc = L'\0';
+ }
+ sputrune(wc, s, MB_CUR_MAX, &e);
+ if (e == NULL) {
+ errno = EILSEQ;
+ return ((size_t)-1);
+ }
+ return ((size_t)(e - s));
+}
diff -ruN /home/novel/pearpc/pkg-message pearpc/pkg-message
--- /home/novel/pearpc/pkg-message Thu Jan 1 03:00:00 1970
+++ pearpc/pkg-message Sat May 22 15:09:50 2004
@@ -0,0 +1,3 @@
+
+Sample config file can be found at /usr/local/etc/ppccfg.example
+
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list