- Update to 1.4.3.pre5

- Add QT_IM_MODULE knob.
- Add some qt4 patch from Edward Lee.
- Add conflicts with chinese/gcin

5 files changed, 85 insertions, 10 deletions

diff --git a/chinese/gcin-devel/Makefile b/chinese/gcin-devel/Makefile
index 3b14435b3103..025274f4b765 100644
--- a/chinese/gcin-devel/Makefile
+++ b/chinese/gcin-devel/Makefile
@@ -6,17 +6,20 @@
 #
 
 PORTNAME=	gcin
-PORTVERSION=	1.4.2
+PORTVERSION=	1.4.3.pre5
 CATEGORIES=	chinese textproc gnome
-MASTER_SITES=	http://cle.linux.org.tw/gcin/download/:main \
-		http://ftp.twaren.net/local-distfiles/gcin/:main \
+MASTER_SITES=	http://www.csie.nctu.edu.tw/~cp76/gcin/download/:main \
 		LOCAL/chinsan:main
+PKGNAMESUFFIX=	-devel
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:main
 EXTRACT_ONLY=	gcin-${PORTVERSION}.tar.bz2
 
 MAINTAINER=	chinsan@FreeBSD.org
 COMMENT=	A traditional chinese input utility in X
 
+CONFLICTS=	zh-gcin-[0-9]*
+NO_LATEST_LINK=	yes
+
 USE_BZIP2=	YES
 HAS_CONFIGURE=	YES
 USE_GNOME=	gtk20
@@ -24,12 +27,16 @@ USE_GMAKE=	YES
 USE_XORG=	xtst
 INSTALLS_ICONS=	YES
 USE_LDCONFIG=	YES
-OPTIONS=	BOSHIAMY	"enable Boshiamy Input Method"	on
+
+OPTIONS=	BOSHIAMY	"enable Boshiamy Input Method" on \
+		QT_IM_MODULE	"enable QT IM module" on
 
 MAN1=		gcin.1 gcin2tab.1 gcin-gb-toggle.1 gcin-kbm-toggle.1 \
 		gcin-message.1 gcin-setup.1 gtab-merge.1 juyin-learn.1 \
 		phoa2d.1 sim2trad.1 tsa2d32.1 tslearn.1
 
+WRKSRC=		${WRKDIR}/gcin-${PORTVERSION}
+
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_BOSHIAMY)
@@ -49,15 +56,21 @@ post-extract:
 		${WRKSRC}/scripts/Makefile
 .endif
 
+.if defined(WITH_QT_IM_MODULE)
+USE_QT_VER=	4
+QT_COMPONENTS=	inputmethods qmake_build moc_build corelib gui
+LIB_DEPENDS+=	mng:${PORTSDIR}/graphics/libmng
+.endif
+
 pre-patch:
 	@${REINPLACE_CMD} -e 's,&,,; 1 s,bash,sh,; \
 		s,QT_IM_DIR=/usr,QT_IM_DIR=$$prefix,; \
 		s,mandir=$$datadir,mandir=$$prefix,; \
 		s,/usr/share,$$prefix/share,; s,libdir)\/gcin,libdir),; \
-		143,150 d; \
+		s,/usr/lib/qt4/plugins/lib,${PREFIX}/lib/qt4/plugins,; \
+		131 s,QT,QT4,; \
 		s,gcc,$$CC,; s,gcin-$$GCIN_VERSION,gcin,' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's,\/usr\/share,$$(prefix)\/share,; \
-	  	210,211 d; 215,216 d;' \
+	@${REINPLACE_CMD} -e 's,\/usr\/share,$$(prefix)\/share,;' \
 		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's,/usr/local,/usr,g' \
 		${WRKSRC}/gtk-im/Makefile ${WRKSRC}/menu/Makefile
@@ -76,6 +89,9 @@ pre-patch:
 		${WRKSRC}/IMdkit/lib/Makefile ${WRKSRC}/Makefile \
 		${WRKSRC}/qt-im/Makefile ${WRKSRC}/scripts/modify-XIM \
 		${WRKSRC}/scripts/utf8-edit
+	@${REINPLACE_CMD} -e \
+	  's,/usr/lib/qt4/include,${LOCALBASE}/include/qt4,g' \
+	  ${WRKSRC}/qt4-im/.depend
 	@${REINPLACE_CMD} -e '/make/ d' ${WRKSRC}/IMdkit/lib/Makefile
 
 .if defined(WITH_BOSHIAMY)
@@ -85,6 +101,13 @@ PLIST_SUB+=	BOSHIAMY=""
 PLIST_SUB+=	BOSHIAMY="@comment "
 .endif
 
+.if defined(WITH_QT_IM_MODULE)
+post-patch:
+PLIST_SUB+=	QT_IM_MODULE=""
+.else
+PLIST_SUB+=	QT_IM_MODULE="@comment "
+.endif
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff --git a/chinese/gcin-devel/distinfo b/chinese/gcin-devel/distinfo
index 04ff52f390ea..edf353f32064 100644
--- a/chinese/gcin-devel/distinfo
+++ b/chinese/gcin-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (gcin-1.4.2.tar.bz2) = 86367f1408bcf0a0428e4130003d2174
-SHA256 (gcin-1.4.2.tar.bz2) = 6a34749c95fa98734a191db6362dd99ec2490d926f81d1de118787262e18568a
-SIZE (gcin-1.4.2.tar.bz2) = 2435375
+MD5 (gcin-1.4.3.pre5.tar.bz2) = dbbb6d3cf4ab37ebf01265b12b6cf0ca
+SHA256 (gcin-1.4.3.pre5.tar.bz2) = 86def627b30c2de34cec8d3a1905a8de49b462bf186230d7f9688374cf852f46
+SIZE (gcin-1.4.3.pre5.tar.bz2) = 2465228
 MD5 (noseeing-11.tar.gz) = 8248e921a542a9d4530e81ea9676cbca
 SHA256 (noseeing-11.tar.gz) = f9e3ef4a924f321fd0e29e356754399c9e7af42cd91d6f6e4fc71a77c1b734c6
 SIZE (noseeing-11.tar.gz) = 387536
diff --git a/chinese/gcin-devel/files/patch-Makefile b/chinese/gcin-devel/files/patch-Makefile
new file mode 100644
index 000000000000..b26acbd0ca64
--- /dev/null
+++ b/chinese/gcin-devel/files/patch-Makefile
@@ -0,0 +1,11 @@
+--- Makefile.orig	2008-08-11 13:21:31.000000000 +0800
++++ Makefile	2008-08-11 13:24:33.000000000 +0800
+@@ -197,6 +197,8 @@
+ 	install $(GCIN_SO) $(gcinlibdir)
+ 
+ install:
++	@echo "*** TEST ***"
++	cat config.mak
+ 	install -d $(datadir)/icons
+ 	install gcin.png $(datadir)/icons
+ 	$(MAKE) -C icons install
diff --git a/chinese/gcin-devel/files/patch-qt4-im-Makefile b/chinese/gcin-devel/files/patch-qt4-im-Makefile
new file mode 100644
index 000000000000..6a43ad6aa61f
--- /dev/null
+++ b/chinese/gcin-devel/files/patch-qt4-im-Makefile
@@ -0,0 +1,40 @@
+--- qt4-im/Makefile.orig	2008-08-04 23:55:57.000000000 +0800
++++ qt4-im/Makefile	2008-08-11 16:42:23.000000000 +0800
+@@ -1,29 +1,29 @@
+ include ../config.mak
+ QT=qt4
+-QTIM=$(QT)/plugins/lib/inputmethods
+-IMMODULES=$(libdir)/$(QTIM)
++QTIM=$(QT)/plugins/inputmethods
++IMMODULES=/usr/local/lib/$(QTIM)
+ ifeq ($(LIB), lib64)
+ 	IMMODULES_LOCAL=/usr/lib/qt4/plugins/lib64/inputmethods
+ else
+-	IMMODULES_LOCAL=/usr/lib/$(QTIM)
++	IMMODULES_LOCAL=$(IMMODULES)
+ endif
+-QTINC=/usr/lib/$(QT)/include
++QTINC=/usr/local/include/$(QT)
+ 
+-INCS=-I../im-client -I$(QTINC) -I/usr/include/X11 -I$(QTINC)/QtGui -I$(QTINC)/QtCore
++INCS=-I../im-client -I$(QTINC) -I/usr/local/include -I$(QTINC)/QtGui -I$(QTINC)/QtCore
+ CXXFLAGS=$(OPTFLAGS) $(INCS) -Wall -D_REENTRANT -fPIC  -DQT4 -DQT_SHARED \
+ -DQT_IMMODULE -DPIC
+ OBJS= moc_gcin-qt.o gcin-qt.o im-gcin-qt.o gcin-imcontext-qt.o
+ .SUFFIXES:	.c .cpp .a .so .E .h
+-LDFLAGS=-L/usr/lib/$(QT)/$(LIB) -L/usr/X11R6/$(LIB) -L../im-client -lQtGui -lQtCore -lmng -ljpeg -lpng -lz \
++LDFLAGS=-L/usr/local/lib/$(QT) -L/usr/local/lib -L../im-client -lQtGui -lQtCore -lmng -ljpeg -lpng -lz \
+ -lXrender -lXrandr  -lXft -lfontconfig -lgcin-im-client \
+--lXext -lX11 -lm -lSM -lICE -ldl -lpthread
++-lXext -lX11 -lm -lSM -lICE -lpthread
+ all:    im-gcin.so
+ 
+ .cpp.E:
+ 	$(CXX) -E $(CFLAGS) $(INCS) $< > $@
+ 
+ moc_gcin-qt.cpp:	gcin-qt.h
+-	/usr/lib/$(QT)/bin/moc $< -o moc_gcin-qt.cpp
++	/usr/local/bin/moc-qt4 $< -o moc_gcin-qt.cpp
+ 
+ im-gcin.so: $(OBJS)
+ 	export LD_RUN_PATH=$(gcinlibdir) ;\
diff --git a/chinese/gcin-devel/pkg-plist b/chinese/gcin-devel/pkg-plist
index 3713fb5b23fa..1b0692a24311 100644
--- a/chinese/gcin-devel/pkg-plist
+++ b/chinese/gcin-devel/pkg-plist
@@ -17,6 +17,7 @@ bin/tsd2a32
 bin/tslearn
 include/gcin-im-client.h
 lib/gtk-2.0/immodules/im-gcin.so
+%%QT_IM_MODULE%%lib/qt4/plugins/inputmethods/im-gcin.so
 lib/gcin1.so
 lib/gcin2.so
 lib/libgcin-im-client.so