>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: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Dec 16 04:40:06 UTC 2009
>Closed-Date:
>Last-Modified:
>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 at 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:
>Unformatted: