Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 29 Dec 2013 17:55:08 +0100 (CET)
From:      Tijl Coosemans <tijl@FreeBSD.org>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/185269: [patch] japanese/canna-lib: remove USE_GCC=any + staging.
Message-ID:  <201312291655.rBTGt8ks039639@kalimero.tijl.coosemans.org>
Resent-Message-ID: <201312291700.rBTH004R012553@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         185269
>Category:       ports
>Synopsis:       [patch] japanese/canna-lib: remove USE_GCC=any + staging.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Dec 29 17:00:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Tijl Coosemans
>Release:        FreeBSD 11.0-CURRENT i386
>Organization:
>Environment:
>Description:
- Remove USE_GCC=any and fix build with tradcpp (post-patch).
- Staging.
>How-To-Repeat:
>Fix:

--- canna-lib.patch begins here ---
Index: japanese/canna-lib/Makefile
===================================================================
--- japanese/canna-lib/Makefile	(revision 337955)
+++ japanese/canna-lib/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	canna
 PORTVERSION=	3.7p3
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
 MASTER_SITE_SUBDIR=	canna/9565/
@@ -11,11 +11,10 @@ PKGNAMESUFFIX=	-lib
 DISTNAME=	Canna${PORTVERSION:S/.//g}
 
 MAINTAINER=	hrs@FreeBSD.org
-COMMENT=	A Kana-to-Kanji conversion system, library part
+COMMENT=	Kana-to-Kanji conversion system, library part
 
 USES=		imake:notall
 USE_BZIP2=	yes
-USE_GCC=	any
 USE_LDCONFIG=	yes
 NO_INSTALL_MANPAGES=yes
 MAKE_JOBS_UNSAFE=	yes
@@ -27,9 +26,12 @@ INSTALL_TARGET=	instsgs
 
 METAFILE=	${DATADIR_REL}/canna-lib-dic.meta
 
-NO_STAGE=	yes
+post-patch:
+	@${REINPLACE_CMD} -e 's/#else.*/#else/' \
+		${WRKSRC}/dic/phono/newjis.kpdef
+
 post-install:
 	${MTREE_CMD} -cdink uname,gname,mode,nochange \
-		-p ${DATADIR}/dic > ${PREFIX}/${METAFILE}
+		-p ${STAGEDIR}${DATADIR}/dic > ${STAGEDIR}${PREFIX}/${METAFILE}
 
 .include <bsd.port.mk>
--- canna-lib.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312291655.rBTGt8ks039639>