aboutsummaryrefslogtreecommitdiffstats
path: root/japanese
diff options
context:
space:
mode:
authormax <max@FreeBSD.org>2002-11-20 13:35:14 +0800
committermax <max@FreeBSD.org>2002-11-20 13:35:14 +0800
commitfaf026bc87acff59f7ca2817717057d46465af13 (patch)
tree58051707ea664cadf620eb191be023af29c1111f /japanese
parent6f1e2d85c326332c7bbbd7bc9a15cf475b7bd19f (diff)
downloadfreebsd-ports-gnome-faf026bc87acff59f7ca2817717057d46465af13.tar.gz
freebsd-ports-gnome-faf026bc87acff59f7ca2817717057d46465af13.tar.zst
freebsd-ports-gnome-faf026bc87acff59f7ca2817717057d46465af13.zip
Correctly handle wchar.
Submitted by: AIDA Shinra <aida-s@jcom.home.ne.jp>
Diffstat (limited to 'japanese')
-rw-r--r--japanese/Canna/Makefile1
-rw-r--r--japanese/Canna/files/patch-al34
-rw-r--r--japanese/canna-lib/Makefile1
-rw-r--r--japanese/canna-lib/files/patch-al34
-rw-r--r--japanese/canna-server/Makefile1
-rw-r--r--japanese/canna-server/files/patch-al34
6 files changed, 72 insertions, 33 deletions
diff --git a/japanese/Canna/Makefile b/japanese/Canna/Makefile
index ceb61b8d7604..53097d29c0dd 100644
--- a/japanese/Canna/Makefile
+++ b/japanese/Canna/Makefile
@@ -8,6 +8,7 @@
PORTNAME= Canna
PORTVERSION= 3.6
+PORTREVISION= 1
CATEGORIES= japanese
MASTER_SITES= http://downloads.sourceforge.jp/canna/1425/
DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g}
diff --git a/japanese/Canna/files/patch-al b/japanese/Canna/files/patch-al
index 84d0c4172999..27876dd02ac4 100644
--- a/japanese/Canna/files/patch-al
+++ b/japanese/Canna/files/patch-al
@@ -1,26 +1,38 @@
---- canna/widedef.h.OLD Sat Oct 26 11:59:11 2002
-+++ canna/widedef.h Sat Oct 26 12:04:56 2002
-@@ -35,7 +35,7 @@
+--- canna/widedef.h.orig Sat Oct 19 17:27:28 2002
++++ canna/widedef.h Tue Nov 19 08:20:30 2002
+@@ -35,7 +35,11 @@
#define WCHAR16
#endif
-#if defined(__FreeBSD__) || defined(__NetBSD__)
-+#if defined(__NetBSD__)
++#ifdef __FreeBSD__
++# include <osreldate.h>
++#endif
++
++#if (defined(__FreeBSD__) && __FreeBSD_version < 500000) || defined(__NetBSD__)
# include <machine/ansi.h>
#endif
-@@ -61,7 +61,13 @@
+@@ -61,7 +65,7 @@
#endif /* !nec_ews_svr2 */
#endif /* HAVE_WCHAR_OPERATION */
-#if defined(__FreeBSD__) || defined(__NetBSD__)
-+#if defined(__FreeBSD__)
++#if (defined(__FreeBSD__) && __FreeBSD_version < 500000) || defined(__NetBSD__)
+ # ifdef _BSD_WCHAR_T_
+ # undef _BSD_WCHAR_T_
+ # ifdef WCHAR16
+@@ -72,6 +76,13 @@
+ # include <stddef.h>
+ # define _WCHAR_T
+ # endif
++#elif defined(__FreeBSD__) && __FreeBSD_version >= 500000
+# ifdef WCHAR16
-+# warning FreeBSD does not use 16-bit wide character types
++typedef unsigned short wchar_t;
++# define _WCHAR_T_DECLARED
+# endif
+# include <stddef.h>
+# define _WCHAR_T
-+#elif defined(__NetBSD__)
- # ifdef _BSD_WCHAR_T_
- # undef _BSD_WCHAR_T_
- # ifdef WCHAR16
+ #else
+ #if !defined(WCHAR_T) && !defined(_WCHAR_T) && !defined(_WCHAR_T_) \
+ && !defined(__WCHAR_T) && !defined(_GCC_WCHAR_T) && !defined(_WCHAR_T_DEFINED)
diff --git a/japanese/canna-lib/Makefile b/japanese/canna-lib/Makefile
index ceb61b8d7604..53097d29c0dd 100644
--- a/japanese/canna-lib/Makefile
+++ b/japanese/canna-lib/Makefile
@@ -8,6 +8,7 @@
PORTNAME= Canna
PORTVERSION= 3.6
+PORTREVISION= 1
CATEGORIES= japanese
MASTER_SITES= http://downloads.sourceforge.jp/canna/1425/
DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g}
diff --git a/japanese/canna-lib/files/patch-al b/japanese/canna-lib/files/patch-al
index 84d0c4172999..27876dd02ac4 100644
--- a/japanese/canna-lib/files/patch-al
+++ b/japanese/canna-lib/files/patch-al
@@ -1,26 +1,38 @@
---- canna/widedef.h.OLD Sat Oct 26 11:59:11 2002
-+++ canna/widedef.h Sat Oct 26 12:04:56 2002
-@@ -35,7 +35,7 @@
+--- canna/widedef.h.orig Sat Oct 19 17:27:28 2002
++++ canna/widedef.h Tue Nov 19 08:20:30 2002
+@@ -35,7 +35,11 @@
#define WCHAR16
#endif
-#if defined(__FreeBSD__) || defined(__NetBSD__)
-+#if defined(__NetBSD__)
++#ifdef __FreeBSD__
++# include <osreldate.h>
++#endif
++
++#if (defined(__FreeBSD__) && __FreeBSD_version < 500000) || defined(__NetBSD__)
# include <machine/ansi.h>
#endif
-@@ -61,7 +61,13 @@
+@@ -61,7 +65,7 @@
#endif /* !nec_ews_svr2 */
#endif /* HAVE_WCHAR_OPERATION */
-#if defined(__FreeBSD__) || defined(__NetBSD__)
-+#if defined(__FreeBSD__)
++#if (defined(__FreeBSD__) && __FreeBSD_version < 500000) || defined(__NetBSD__)
+ # ifdef _BSD_WCHAR_T_
+ # undef _BSD_WCHAR_T_
+ # ifdef WCHAR16
+@@ -72,6 +76,13 @@
+ # include <stddef.h>
+ # define _WCHAR_T
+ # endif
++#elif defined(__FreeBSD__) && __FreeBSD_version >= 500000
+# ifdef WCHAR16
-+# warning FreeBSD does not use 16-bit wide character types
++typedef unsigned short wchar_t;
++# define _WCHAR_T_DECLARED
+# endif
+# include <stddef.h>
+# define _WCHAR_T
-+#elif defined(__NetBSD__)
- # ifdef _BSD_WCHAR_T_
- # undef _BSD_WCHAR_T_
- # ifdef WCHAR16
+ #else
+ #if !defined(WCHAR_T) && !defined(_WCHAR_T) && !defined(_WCHAR_T_) \
+ && !defined(__WCHAR_T) && !defined(_GCC_WCHAR_T) && !defined(_WCHAR_T_DEFINED)
diff --git a/japanese/canna-server/Makefile b/japanese/canna-server/Makefile
index ceb61b8d7604..53097d29c0dd 100644
--- a/japanese/canna-server/Makefile
+++ b/japanese/canna-server/Makefile
@@ -8,6 +8,7 @@
PORTNAME= Canna
PORTVERSION= 3.6
+PORTREVISION= 1
CATEGORIES= japanese
MASTER_SITES= http://downloads.sourceforge.jp/canna/1425/
DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g}
diff --git a/japanese/canna-server/files/patch-al b/japanese/canna-server/files/patch-al
index 84d0c4172999..27876dd02ac4 100644
--- a/japanese/canna-server/files/patch-al
+++ b/japanese/canna-server/files/patch-al
@@ -1,26 +1,38 @@
---- canna/widedef.h.OLD Sat Oct 26 11:59:11 2002
-+++ canna/widedef.h Sat Oct 26 12:04:56 2002
-@@ -35,7 +35,7 @@
+--- canna/widedef.h.orig Sat Oct 19 17:27:28 2002
++++ canna/widedef.h Tue Nov 19 08:20:30 2002
+@@ -35,7 +35,11 @@
#define WCHAR16
#endif
-#if defined(__FreeBSD__) || defined(__NetBSD__)
-+#if defined(__NetBSD__)
++#ifdef __FreeBSD__
++# include <osreldate.h>
++#endif
++
++#if (defined(__FreeBSD__) && __FreeBSD_version < 500000) || defined(__NetBSD__)
# include <machine/ansi.h>
#endif
-@@ -61,7 +61,13 @@
+@@ -61,7 +65,7 @@
#endif /* !nec_ews_svr2 */
#endif /* HAVE_WCHAR_OPERATION */
-#if defined(__FreeBSD__) || defined(__NetBSD__)
-+#if defined(__FreeBSD__)
++#if (defined(__FreeBSD__) && __FreeBSD_version < 500000) || defined(__NetBSD__)
+ # ifdef _BSD_WCHAR_T_
+ # undef _BSD_WCHAR_T_
+ # ifdef WCHAR16
+@@ -72,6 +76,13 @@
+ # include <stddef.h>
+ # define _WCHAR_T
+ # endif
++#elif defined(__FreeBSD__) && __FreeBSD_version >= 500000
+# ifdef WCHAR16
-+# warning FreeBSD does not use 16-bit wide character types
++typedef unsigned short wchar_t;
++# define _WCHAR_T_DECLARED
+# endif
+# include <stddef.h>
+# define _WCHAR_T
-+#elif defined(__NetBSD__)
- # ifdef _BSD_WCHAR_T_
- # undef _BSD_WCHAR_T_
- # ifdef WCHAR16
+ #else
+ #if !defined(WCHAR_T) && !defined(_WCHAR_T) && !defined(_WCHAR_T_) \
+ && !defined(__WCHAR_T) && !defined(_GCC_WCHAR_T) && !defined(_WCHAR_T_DEFINED)
generated by cgit (git 2.34.1) at 2024-11-18 19:28:52 +0800