From fluffy@FreeBSD.org  Wed Dec 16 04:34:34 2009
Return-Path: <fluffy@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E4B981065670
	for <FreeBSD-gnats-submit@FreeBSD.org>; Wed, 16 Dec 2009 04:34:34 +0000 (UTC)
	(envelope-from fluffy@FreeBSD.org)
Received: from ns.ael.RU (ns.ael.ru [62.76.207.226])
	by mx1.freebsd.org (Postfix) with ESMTP id 28CD88FC13
	for <FreeBSD-gnats-submit@FreeBSD.org>; Wed, 16 Dec 2009 04:34:33 +0000 (UTC)
Received: from Fluffy.Khv.RU (dhcp-14.local.ael [192.168.100.14])
	by ns.ael.RU (8.14.3/8.14.3/Fluffy/5.3) with ESMTP id nBG4YS9v004022
	for <FreeBSD-gnats-submit@FreeBSD.org>; Wed, 16 Dec 2009 14:34:28 +1000 (VLAT)
	(envelope-from fluffy@FreeBSD.org)
Received: from Fluffy.Khv.RU (localhost [127.0.0.1])
	by Fluffy.Khv.RU (8.14.3/8.14.3/Fluffy/5.4.1) with ESMTP id nBG4YSE2081640
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 16 Dec 2009 14:34:28 +1000 (VLAT)
	(envelope-from fluffy@FreeBSD.org)
Message-Id: <1260938068.81590@Fluffy.Khv.RU>
Date: Wed, 16 Dec 2009 14:34:28 +1000
From: "Dima Panov" <fluffy@FreeBSD.org>
To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org>
Subject: chineese/gcin[-devel]: proper use of OPTIONS, unbreak with fesh qt
X-Send-Pr-Version: gtk-send-pr 0.4.9 
X-GNATS-Notify:

>Number:         141667
>Category:       ports
>Synopsis:       chineese/gcin[-devel]: proper use of OPTIONS, unbreak with fesh qt
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Dec 16 04:40:06 UTC 2009
>Closed-Date:    Mon Dec 21 17:06:20 UTC 2009
>Last-Modified:  Mon Dec 21 17:06:20 UTC 2009
>Originator:     Dima Panov
>Release:        FreeBSD 9.0-900004-CURRENT amd64
>Organization:
Fluffy.Khv.RU 
>Environment:


System: FreeBSD 9.0-900004-CURRENT #0: Mon Dec  7 14:03:42 VLAT 2009
    fluffy@Fluffy.Khv.RU:/usr/obj/usr/src/sys/Spot



>Description:


chinese/gcin[-devel]: proper use of OPTIONS, unbreak with fresh qt


>How-To-Repeat:





>Fix:


--- zh-gcin.diff begins here ---
Index: chinese/gcin/Makefile
===================================================================
RCS file: /home/ncvs/ports/chinese/gcin/Makefile,v
retrieving revision 1.100
diff -u -r1.100 Makefile
--- chinese/gcin/Makefile	28 Aug 2009 17:36:44 -0000	1.100
+++ chinese/gcin/Makefile	15 Dec 2009 10:40:35 -0000
@@ -36,11 +36,7 @@
 		gcin-message.1 gcin-setup.1 gtab-merge.1 juyin-learn.1 \
 		phoa2d.1 sim2trad.1 tsa2d32.1 tslearn.1
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-BROKEN=		does not compile
-.endif
+.include <bsd.port.options.mk>
 
 .if defined(WITH_ANTHY)
 BUILD_DEPENDS+=	${LOCALBASE}/include/anthy/anthy.h:${PORTSDIR}/japanese/anthy
@@ -53,6 +49,27 @@
 		http://edt1023.sayya.org/gcin/:boshiamy
 DISTFILES+=	${BOSHIAMY_FILE}:boshiamy
 BOSHIAMY_FILE=	noseeing-12.tar.gz
+PLIST_SUB+=	BOSHIAMY=""
+.else
+PLIST_SUB+=	BOSHIAMY="@comment "
+.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
+PLIST_SUB+=	QT_IM_MODULE=""
+.else
+PLIST_SUB+=	QT_IM_MODULE="@comment "
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 700000
+BROKEN=		does not compile
+.endif
+
+.if defined(WITH_BOSHIAMY)
 post-extract:
 	@${TAR} -C ${WRKSRC}/data/ -zxf ${DISTDIR}/${BOSHIAMY_FILE} \
 		noseeing.cin
@@ -64,12 +81,6 @@
 		${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
-
 post-patch:
 	@${REINPLACE_CMD} -e 's,&,,; 1 s,bash,sh,; \
 		s,QT_IM_DIR=/usr,QT_IM_DIR=$$prefix,; \
@@ -101,17 +112,6 @@
 	@${REINPLACE_CMD} '/install.*DOC_DIR/d' ${WRKSRC}/Makefile
 .endif
 
-.if defined(WITH_BOSHIAMY)
-PLIST_SUB+=	BOSHIAMY=""
-.else
-PLIST_SUB+=	BOSHIAMY="@comment "
-.endif
-
-.if defined(WITH_QT_IM_MODULE)
-PLIST_SUB+=	QT_IM_MODULE=""
-.else
-PLIST_SUB+=	QT_IM_MODULE="@comment "
-.endif
 
 post-build:
 .if !defined(DEBUG_FLAGS)
Index: chinese/gcin-devel/Makefile
===================================================================
RCS file: /home/ncvs/ports/chinese/gcin-devel/Makefile,v
retrieving revision 1.105
diff -u -r1.105 Makefile
--- chinese/gcin-devel/Makefile	30 Sep 2009 17:56:55 -0000	1.105
+++ chinese/gcin-devel/Makefile	15 Dec 2009 10:41:34 -0000
@@ -43,11 +43,7 @@
 
 WRKSRC=		${WRKDIR}/gcin-${PORTVERSION}
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-BROKEN=		does not build
-.endif
+.include <bsd.port.options.mk>
 
 .if defined(WITH_ANTHY)
 BUILD_DEPENDS+=	${LOCALBASE}/include/anthy/anthy.h:${PORTSDIR}/japanese/anthy
@@ -59,6 +55,27 @@
 		http://edt1023.sayya.org/gcin/:boshiamy
 DISTFILES+=	${BOSHIAMY_FILE}:boshiamy
 BOSHIAMY_FILE=	noseeing-12.tar.gz
+PLIST_SUB+=	BOSHIAMY=""
+.else
+PLIST_SUB+=	BOSHIAMY="@comment "
+.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
+PLIST_SUB+=	QT_IM_MODULE=""
+.else
+PLIST_SUB+=	QT_IM_MODULE="@comment "
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 700000
+BROKEN=		does not build
+.endif
+
+.if defined(WITH_BOSHIAMY)
 post-extract:
 	@${TAR} -C ${WRKSRC}/data/ -zxf ${DISTDIR}/${BOSHIAMY_FILE} \
 		noseeing.cin
@@ -70,12 +87,6 @@
 		${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
-
 post-patch:
 	@${REINPLACE_CMD} -e 's,&,,; 1 s,bash,sh,; \
 		s,QT_IM_DIR=/usr,QT_IM_DIR=$$prefix,; \
@@ -108,18 +119,6 @@
 		${WRKSRC}/scripts/utf8-edit
 	@${REINPLACE_CMD} -e '/make/ d' ${WRKSRC}/IMdkit/lib/Makefile
 
-.if defined(WITH_BOSHIAMY)
-PLIST_SUB+=	BOSHIAMY=""
-.else
-PLIST_SUB+=	BOSHIAMY="@comment "
-.endif
-
-.if defined(WITH_QT_IM_MODULE)
-PLIST_SUB+=	QT_IM_MODULE=""
-.else
-PLIST_SUB+=	QT_IM_MODULE="@comment "
-.endif
-
 post-build:
 .if !defined(DEBUG_FLAGS)
 	@${FIND} ${WRKSRC} -name "*.so*" | ${XARGS} strip
--- zh-gcin.diff ends here ---



>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: fluffy 
State-Changed-When: Mon Dec 21 17:06:19 UTC 2009 
State-Changed-Why:  
Committed, slightly different version, by makc@ 

http://www.freebsd.org/cgi/query-pr.cgi?pr=141667 
>Unformatted:
