- Sync w/ FreeBSD ports.

- Some misc fixes such as add about three missing files, need to bump and etc.
- Reset $FreeBSD$, it was not supposed to be include in this commit as I want
  to keep it seperate, but I accidented ran the script. Ah well.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7696 df743ca5-7f9a-e211-a948-0013205c9059

9 files changed, 19 insertions, 58 deletions

diff --git a/japanese/scim-anthy/Makefile b/japanese/scim-anthy/Makefile
index 15af63937..fc4427707 100644
--- a/japanese/scim-anthy/Makefile
+++ b/japanese/scim-anthy/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	scim-anthy
-PORTVERSION=	1.2.0
+PORTVERSION=	1.2.1
 PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=scim-imengine/21166
+MASTER_SITE_SUBDIR=scim-imengine/21967
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	SCIM IMEngine module using Anthy
@@ -32,10 +32,7 @@ CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500035
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-RUN_DEPENDS+=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/stlport" \
-		LDFLAGS="-L${LOCALBASE}/lib -lstlport_gcc ${PTHREAD_LIBS}"
+IGNORE=		does not build on FreeBSD < 5.x
 .else
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/japanese/scim-anthy/distinfo b/japanese/scim-anthy/distinfo
index b7c937a8d..117f156f2 100644
--- a/japanese/scim-anthy/distinfo
+++ b/japanese/scim-anthy/distinfo
@@ -1,3 +1,3 @@
-MD5 (scim-anthy-1.2.0.tar.gz) = ce8d4ff0c8e96413d343e2d80daba3ee
-SHA256 (scim-anthy-1.2.0.tar.gz) = 786eece2d342ab8b66575c927d8741e202d3091daa1947c3bd2e14a02745d228
-SIZE (scim-anthy-1.2.0.tar.gz) = 643320
+MD5 (scim-anthy-1.2.1.tar.gz) = e66e4b85de97fa421d79893d226aeb44
+SHA256 (scim-anthy-1.2.1.tar.gz) = 4732dba156b38f9c7f2171dc16118a79bfc6f50e99dbe4efb3b24e731bbe8fe2
+SIZE (scim-anthy-1.2.1.tar.gz) = 643824
diff --git a/japanese/scim-anthy/files/patch-configure b/japanese/scim-anthy/files/patch-configure
deleted file mode 100644
index e682e4936..000000000
--- a/japanese/scim-anthy/files/patch-configure
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: configure
-diff -u configure.orig configure
---- configure.orig	Wed Dec 28 19:20:36 2005
-+++ configure	Wed Dec 28 19:23:38 2005
-@@ -465,7 +465,7 @@
- # include <unistd.h>
- #endif"
- 
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS SCIM_ANTHY_MAJOR_VERSION SCIM_ANTHY_MINOR_VERSION SCIM_ANTHY_MICRO_VERSION SCIM_ANTHY_VERSION INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os RANLIB ac_ct_RANLIB CPP EGREP ALLOCA GLIBC21 HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF LIBICONV LTLIBICONV INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB GETTEXT_PACKAGE LN_S ECHO AR ac_ct_AR CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL INSTALL_LTDL_TRUE INSTALL_LTDL_FALSE CONVENIENCE_LTDL_TRUE CONVENIENCE_LTDL_FALSE LIBADD_DL LIBTOOL_DEPS PKG_CONFIG ac_pt_PKG_CONFIG SCIM_CFLAGS SCIM_LIBS SCIM_GTKUTILS_CFLAGS SCIM_GTKUTILS_LIBS SCIM_VERSION SCIM_BUILD_SETUP_TRUE SCIM_BUILD_SETUP_FALSE SCIM_BUILD_SETUP ac_aux_dir ANTHY_LIBS ANTHY_CFLAGS GTK2_CFLAGS GTK2_LIBS SCIM_BUILD_HELPER_TRUE SCIM_BUILD_HELPER_FALSE SCIM_BUILD_HELPER SCIM_DEBUG_FLAGS SCIM_DATADIR SCIM_ICONDIR SCIM_MODULEDIR SCIM_ANTHY_DATADIR LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS SCIM_ANTHY_MAJOR_VERSION SCIM_ANTHY_MINOR_VERSION SCIM_ANTHY_MICRO_VERSION SCIM_ANTHY_VERSION INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os RANLIB ac_ct_RANLIB CPP EGREP ALLOCA GLIBC21 HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF LIBICONV LTLIBICONV INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB GETTEXT_PACKAGE LN_S ECHO AR ac_ct_AR CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL INSTALL_LTDL_TRUE INSTALL_LTDL_FALSE CONVENIENCE_LTDL_TRUE CONVENIENCE_LTDL_FALSE LIBADD_DL LIBTOOL_DEPS LIBTOOL_EXPORT_OPTIONS PKG_CONFIG ac_pt_PKG_CONFIG SCIM_CFLAGS SCIM_LIBS SCIM_GTKUTILS_CFLAGS SCIM_GTKUTILS_LIBS SCIM_VERSION SCIM_BUILD_SETUP_TRUE SCIM_BUILD_SETUP_FALSE SCIM_BUILD_SETUP ac_aux_dir ANTHY_LIBS ANTHY_CFLAGS GTK2_CFLAGS GTK2_LIBS SCIM_BUILD_HELPER_TRUE SCIM_BUILD_HELPER_FALSE SCIM_BUILD_HELPER SCIM_DEBUG_FLAGS SCIM_DATADIR SCIM_ICONDIR SCIM_MODULEDIR SCIM_ANTHY_DATADIR LIBOBJS LTLIBOBJS'
- ac_subst_files=''
- 
- # Initialize some variables set by options.
-@@ -31723,6 +31723,7 @@
- s,@CONVENIENCE_LTDL_FALSE@,$CONVENIENCE_LTDL_FALSE,;t t
- s,@LIBADD_DL@,$LIBADD_DL,;t t
- s,@LIBTOOL_DEPS@,$LIBTOOL_DEPS,;t t
-+s,@LIBTOOL_EXPORT_OPTIONS@,$LIBTOOL_EXPORT_OPTIONS,;t t
- s,@PKG_CONFIG@,$PKG_CONFIG,;t t
- s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
- s,@SCIM_CFLAGS@,$SCIM_CFLAGS,;t t
diff --git a/japanese/scim-anthy/files/patch-src::scim_anthy_key2kana.cpp b/japanese/scim-anthy/files/patch-src::scim_anthy_key2kana.cpp
deleted file mode 100644
index 5a324cd82..000000000
--- a/japanese/scim-anthy/files/patch-src::scim_anthy_key2kana.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: src/scim_anthy_key2kana.cpp
-diff -u src/scim_anthy_key2kana.cpp.orig src/scim_anthy_key2kana.cpp
---- src/scim_anthy_key2kana.cpp.orig	Tue Jul 11 11:22:08 2006
-+++ src/scim_anthy_key2kana.cpp	Mon Sep  4 01:45:58 2006
-@@ -23,6 +23,8 @@
- #include "scim_anthy_imengine.h"
- #include "scim_anthy_utils.h"
- 
-+#include <wctype.h>
-+
- using namespace scim_anthy;
- 
- Key2KanaConvertor::Key2KanaConvertor (AnthyInstance    & anthy,
diff --git a/japanese/scim-anthy/files/patch-src::scim_anthy_utils.cpp b/japanese/scim-anthy/files/patch-src::scim_anthy_utils.cpp
deleted file mode 100644
index 489d1e2bd..000000000
--- a/japanese/scim-anthy/files/patch-src::scim_anthy_utils.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: src/scim_anthy_utils.cpp
-diff -u src/scim_anthy_utils.cpp.orig src/scim_anthy_utils.cpp
---- src/scim_anthy_utils.cpp.orig	Thu Jul  7 17:24:45 2005
-+++ src/scim_anthy_utils.cpp	Thu Jul 21 16:54:04 2005
-@@ -17,6 +17,7 @@
-  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-  */
- 
-+#include <unistd.h>
- #include <sys/wait.h>
- 
- #include "scim_anthy_utils.h"
diff --git a/japanese/scim-uim/files/extra-patch-4-stable b/japanese/scim-uim/files/extra-patch-4-stable
new file mode 100644
index 000000000..13cb124a4
--- /dev/null
+++ b/japanese/scim-uim/files/extra-patch-4-stable
@@ -0,0 +1,10 @@
+--- src/scim_uim_imengine.cpp.orig	Thu Nov 11 20:27:26 2004
++++ src/scim_uim_imengine.cpp	Thu Nov 11 20:28:09 2004
+@@ -36,6 +36,7 @@
+ 
+ #include <scim.h>
+ #include "scim_uim_imengine.h"
++#include <cstdio>
+ 
+ #define scim_module_init uim_LTX_scim_module_init
+ #define scim_module_exit uim_LTX_scim_module_exit
diff --git a/japanese/uim-anthy/Makefile b/japanese/uim-anthy/Makefile
index ea7bdffa8..6120cb33c 100644
--- a/japanese/uim-anthy/Makefile
+++ b/japanese/uim-anthy/Makefile
@@ -2,7 +2,7 @@
 # Date created:        31 August 2003
 # Whom:                MANTANI Nobutaka <nobutaka@FreeBSD.org>
 #
-# $FreeBSD: ports/japanese/uim-anthy/Makefile,v 1.5 2006/09/03 14:09:22 nobutaka Exp $
+# $FreeBSD$
 #
 
 CATEGORIES=	japanese
diff --git a/japanese/uim-canna/Makefile b/japanese/uim-canna/Makefile
index 2b5e3585a..2b9906700 100644
--- a/japanese/uim-canna/Makefile
+++ b/japanese/uim-canna/Makefile
@@ -2,7 +2,7 @@
 # Date created:        31 August 2003
 # Whom:                MANTANI Nobutaka <nobutaka@FreeBSD.org>
 #
-# $FreeBSD: ports/japanese/uim-canna/Makefile,v 1.7 2006/09/03 14:09:22 nobutaka Exp $
+# $FreeBSD$
 #
 
 CATEGORIES=	japanese
diff --git a/japanese/uim-prime/Makefile b/japanese/uim-prime/Makefile
index d78a807e2..156995a6c 100644
--- a/japanese/uim-prime/Makefile
+++ b/japanese/uim-prime/Makefile
@@ -2,7 +2,7 @@
 # Date created:        31 August 2003
 # Whom:                MANTANI Nobutaka <nobutaka@FreeBSD.org>
 #
-# $FreeBSD: ports/japanese/uim-prime/Makefile,v 1.7 2006/09/03 14:09:22 nobutaka Exp $
+# $FreeBSD$
 #
 
 CATEGORIES=	japanese