Bug 70326 - [maintainer update] make textproc/scim available on 4.x
Summary: [maintainer update] make textproc/scim available on 4.x
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: freebsd-ports-bugs (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2004-08-11 22:30 UTC by Jie Gao
Modified: 2004-08-12 08:17 UTC (History)
0 users

See Also:


Attachments
patch-textproc-scim (6.80 KB, text/plain)
2004-08-11 22:30 UTC, Jie Gao
no flags Details
patch-textproc-skim (1.55 KB, text/plain)
2004-08-11 22:30 UTC, Jie Gao
no flags Details
patch-korean-scim-tables (1.03 KB, text/plain)
2004-08-11 22:30 UTC, Jie Gao
no flags Details
file.diff (1.09 KB, patch)
2004-08-11 22:30 UTC, Jie Gao
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Jie Gao 2004-08-11 22:30:27 UTC
	
The textproc/scim port and related ones were marked as broken on 4.x because
C99 compliant wctype functions are not available. However, such functions are
only used in a single executable's sources. So on 4.x, I made a hack to drop
that executable and other parts will compile after extra patches.

That dropped executable on 4.x is only used for making input method tables. So
the scim-tables ports are still not available for 4.x but others will work.

The functionality on 5.x remains unchanged.

Also add SF.net master sites to the ports (except the ones that already have
SF.net master sites).

Fix: Apply the following patches to the ports directories.

Index: chinese/scim-chinese/Makefile
===================================================================
RCS file: /home/grads/gaoj/repository/ports/chinese/scim-chinese/Makefile,v
retrieving revision 1.1
retrieving revision 1.3
diff -u -r1.1 -r1.3
--- chinese/scim-chinese/Makefile	6 Aug 2004 00:24:32 -0000	1.1
+++ chinese/scim-chinese/Makefile	11 Aug 2004 20:18:49 -0000	1.3
@@ -7,9 +7,11 @@
 
 PORTNAME=	scim-chinese
 PORTVERSION=	0.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	chinese
-MASTER_SITES=	http://freedesktop.org/~suzhe/scim-chinese/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+		http://freedesktop.org/~suzhe/scim-chinese/
+MASTER_SITE_SUBDIR=scim
 
 MAINTAINER=	gaoj@cpsc.ucalgary.ca
 COMMENT=	SCIM Chinese Smart Pinyin input method
@@ -22,15 +24,27 @@
 USE_ICONV=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL_VER=	15
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
-		LDFLAGS="-L${LOCALBASE}/lib -lintl" \
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+
+CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
+.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 -lintl ${PTHREAD_LIBS}"
+EXTRA_PATCHES=	${FILESDIR}/extra-patch-4-stable
+.else
+CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
+		LDFLAGS="-L${LOCALBASE}/lib -lintl"
+.endif
+
 post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO}
 	@${ECHO} To display this message again, type \`make post-install\'
 	@${ECHO}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: chinese/scim-chinese/files/extra-patch-4-stable
===================================================================
RCS file: chinese/scim-chinese/files/extra-patch-4-stable
diff -N chinese/scim-chinese/files/extra-patch-4-stable
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ chinese/scim-chinese/files/extra-patch-4-stable	6 Aug 2004 00:48:28 -0000	1.1
@@ -0,0 +1,10 @@
+--- src/scim_special_table.cpp.orig	Wed Aug  4 20:10:57 2004
++++ src/scim_special_table.cpp	Wed Aug  4 20:11:13 2004
+@@ -23,6 +23,7 @@
+ #include <time.h>
+ #include <scim.h>
+ #include "scim_special_table.h"
++#include <cstdio>
+ 
+ static inline String
+ _trim_blank (const String &str)
--- patch-chinese-scim-chinese ends here ---

Index: chinese/scim-tables/Makefile
===================================================================
RCS file: /home/grads/gaoj/repository/ports/chinese/scim-tables/Makefile,v
retrieving revision 1.1
retrieving revision 1.3
diff -u -r1.1 -r1.3
--- chinese/scim-tables/Makefile	6 Aug 2004 00:24:33 -0000	1.1
+++ chinese/scim-tables/Makefile	11 Aug 2004 20:57:51 -0000	1.3
@@ -8,7 +8,9 @@
 PORTNAME=	scim-tables
 PORTVERSION=	0.4.0
 CATEGORIES=	chinese
-MASTER_SITES=	http://freedesktop.org/~suzhe/sources/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+		http://freedesktop.org/~suzhe/sources/
+MASTER_SITE_SUBDIR=scim
 
 MAINTAINER=	gaoj@cpsc.ucalgary.ca
 COMMENT=	SCIM table based Chinese input methods
@@ -20,10 +22,16 @@
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500035
+BROKEN=		scim-make-table is not available for 4.x
+.endif
+
 post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO}
 	@${ECHO} To display this message again, type \`make post-install\'
 	@${ECHO}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- patch-chinese-scim-tables ends here ---
How-To-Repeat: 	
N/A
Comment 1 Vanilla I. Shu freebsd_committer freebsd_triage 2004-08-12 08:16:16 UTC
State Changed
From-To: open->closed

Committed, thanks. 

BTW, there are no any input methods or tables on 4.X? 
if that's true, why should I need to run scim?