From itetcu@people.tecnik93.com  Tue Nov 29 23:56:38 2005
Return-Path: <itetcu@people.tecnik93.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 557F416A41F
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 29 Nov 2005 23:56:38 +0000 (GMT)
	(envelope-from itetcu@people.tecnik93.com)
Received: from smtp.rdsnet.ro (smtp.rdsnet.ro [62.231.74.130])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0980C43E16
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 29 Nov 2005 23:54:12 +0000 (GMT)
	(envelope-from itetcu@people.tecnik93.com)
Received: (qmail 29465 invoked by uid 89); 29 Nov 2005 23:53:56 -0000
Received: from unknown (HELO it.buh.tecnik93.com) (81.196.204.98)
  by 0 with SMTP; 29 Nov 2005 23:53:56 -0000
Received: from it.buh.tecnik93.com (localhost [127.0.0.1])
	by it.buh.tecnik93.com (Postfix) with ESMTP id EBCBCBA5D
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 30 Nov 2005 01:53:50 +0200 (EET)
Message-Id: <1133308430.0@it.buh.tecnik93.com>
Date: Wed, 30 Nov 2005 01:53:50 +0200
From: "Ion-Mihai "IOnut" Tetcu" <itetcu@people.tecnik93.com>
To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@freebsd.org>
Subject: [MAINTAINER] editors/rospell: fix build on 4.x
X-Send-Pr-Version: gtk-send-pr 0.4.6 
X-GNATS-Notify:

>Number:         89740
>Category:       ports
>Synopsis:       [MAINTAINER] editors/rospell: fix build on 4.x
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    edwin
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Nov 30 00:00:22 GMT 2005
>Closed-Date:    Wed Nov 30 00:53:39 GMT 2005
>Last-Modified:  Wed Nov 30 00:53:39 GMT 2005
>Originator:     Ion-Mihai "IOnut" Tetcu
>Release:        FreeBSD 6.0-STABLE i386
>Organization:
Tecnik'93 
>Environment:


System: FreeBSD 6.0-STABLE #4: Wed Nov 16 15:38:12 EET 2005


>Description:


4.x make doesn't know what BSDmakefile is so tekk it what to use.

Remove HAS_CONFIGURE= yes because we don't use distributed ./configure


>How-To-Repeat:





>Fix:


--- Makefile.diff begins here ---
--- rospell/Makefile.orig	Wed Nov 30 01:37:06 2005
+++ rospell/Makefile	Wed Nov 30 01:49:05 2005
@@ -20,20 +20,19 @@
 MAKE_ENV+=	PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS}
 CONFIGURE_ENV=	QTDIR=${X11BASE} LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
 
-HAS_CONFIGURE=	yes
+MAKEFILE=	BSDmakefile
 
 MAN1=	rospell.1
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500000
-IGNORE=		doesn't compile properly on 4.x systems
-.endif
+do-configure:
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} -f ${MAKEFILE} dictfiles.h
 
 do-build:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE}
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} -f ${MAKEFILE} ${ALL_TARGET}
 
 do-install:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} install
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} -f ${MAKEFILE} ${INSTALL_TARGET}
 
 .include <bsd.port.post.mk>
--- Makefile.diff ends here ---



>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->edwin 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed Nov 30 00:13:09 GMT 2005 
Responsible-Changed-Why:  
Abort current build and retry with patch supplied. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=89740 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Wed Nov 30 00:16:27 GMT 2005 
State-Changed-Why:  
===>  Building for rospell-2005.03.b1 
---> Compiling ...  
In file included from src/rospell/spell.h:21, 
from src/rospell/main.cpp:29: 
src/rospell/utf8.h:72: syntax error before `!' 
src/rospell/utf8.h:82: extraneous `char' ignored 
src/rospell/utf8.h: In function `class UTF8 * strtoascii(char *)': 
src/rospell/utf8.h:88: no method `UTF8::chartoascii' 
src/rospell/utf8.h:93: return to `UTF8 *' from `char *' 

<jilles> Mavvie, hmm, a <ctype.h> macro collision :) 
<jilles> try #define _DONT_USE_CTYPE_INLINE_ before all #includes 

Tried his solution in main.cpp, but it didn't work. 


http://www.freebsd.org/cgi/query-pr.cgi?pr=89740 

From: Ion-Mihai Tetcu <itetcu@people.tecnik93.com>
To: Edwin Groothuis <edwin@FreeBSD.org>
Cc: edwin@FreeBSD.org
Subject: Re: ports/89740: [MAINTAINER] editors/rospell: fix build on 4.x
Date: Wed, 30 Nov 2005 02:42:12 +0200

 --MP_1Dx2TT1FW1SILnPlixNvXtg
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
 On Wed, 30 Nov 2005 00:25:11 GMT
 Edwin Groothuis <edwin@FreeBSD.org> wrote:
 
 > Synopsis: [MAINTAINER] editors/rospell: fix build on 4.x
 > 
 > State-Changed-From-To: open->feedback
 > State-Changed-By: edwin
 > State-Changed-When: Wed Nov 30 00:16:27 GMT 2005
 > State-Changed-Why: 
 > ===>  Building for rospell-2005.03.b1
 > ---> Compiling ... 
 > In file included from src/rospell/spell.h:21,
 >                  from src/rospell/main.cpp:29:
 > src/rospell/utf8.h:72: syntax error before `!'
 > src/rospell/utf8.h:82: extraneous `char' ignored
 > src/rospell/utf8.h: In function `class UTF8 * strtoascii(char *)':
 > src/rospell/utf8.h:88: no method `UTF8::chartoascii'
 > src/rospell/utf8.h:93: return to `UTF8 *' from `char *'
 > 
 > <jilles> Mavvie, hmm, a <ctype.h> macro collision :)
 > <jilles> try #define _DONT_USE_CTYPE_INLINE_ before all #includes
 > 
 > Tried his solution in main.cpp, but it didn't work.
 
 Grrr I'm tired of this, I've already ping-pong'ed with the author a few
 times for his UTF* ... thought I got it all OK now :(
 
 Suspend/close the PR (let it broken on 4.x); if you want put in the
 modifications from the PR, except the BROKEN part (let's do "configure"
 in do-configure:).
 
 Eventually I'll try to work on it _if_ I have time (which I
 doubt); 4.x isn't recommended anyway for desktops.
 
 
 
 -- 
 IOnut - Unregistered ;) FreeBSD "user"
   "Intellectual Property" is   nowhere near as valuable   as "Intellect"
 
 BOFH excuse #214:
 Fluorescent lights are generating negative ions. If turning them off
 doesn't work, take them out and put tin foil on the ends.
 
 
 
 --MP_1Dx2TT1FW1SILnPlixNvXtg
 Content-Type: application/octet-stream; name=Makefile.diff
 Content-Transfer-Encoding: base64
 Content-Disposition: attachment; filename=Makefile.diff
 
 LS0tIHJvc3BlbGwvTWFrZWZpbGUub3JpZwlXZWQgTm92IDMwIDAxOjM3OjA2IDIwMDUKKysrIHJv
 c3BlbGwvTWFrZWZpbGUJV2VkIE5vdiAzMCAwMTo0OTowNSAyMDA1CkBAIC0yMCwyMCArMjAsMTkg
 QEAKIE1BS0VfRU5WKz0JUFRIUkVBRF9DRkxBR1M9JHtQVEhSRUFEX0NGTEFHU30gUFRIUkVBRF9M
 SUJTPSR7UFRIUkVBRF9MSUJTfQogQ09ORklHVVJFX0VOVj0JUVRESVI9JHtYMTFCQVNFfSBMREZM
 QUdTPSIke0xERkxBR1N9ICR7UFRIUkVBRF9MSUJTfSIKIAotSEFTX0NPTkZJR1VSRT0JeWVzCitN
 QUtFRklMRT0JQlNEbWFrZWZpbGUKIAogTUFOMT0Jcm9zcGVsbC4xCiAKIC5pbmNsdWRlIDxic2Qu
 cG9ydC5wcmUubWs+CiAKLmlmICR7T1NWRVJTSU9OfSA8IDUwMDAwMApJR05PUkU9CQlkb2Vzbid0
 IGNvbXBpbGUgcHJvcGVybHkgb24gNC54IHN5c3RlbXMKLmVuZGlmCgorZG8tY29uZmlndXJlOgor
 CUBjZCAke1dSS1NSQ30gJiYgJHtTRVRFTlZ9ICR7TUFLRV9FTlZ9ICR7TUFLRX0gLWYgJHtNQUtF
 RklMRX0gZGljdGZpbGVzLmgKIAogZG8tYnVpbGQ6Ci0JQGNkICR7V1JLU1JDfSAmJiAke1NFVEVO
 Vn0gJHtNQUtFX0VOVn0gJHtNQUtFfQorCUBjZCAke1dSS1NSQ30gJiYgJHtTRVRFTlZ9ICR7TUFL
 RV9FTlZ9ICR7TUFLRX0gLWYgJHtNQUtFRklMRX0gJHtBTExfVEFSR0VUfQogCiBkby1pbnN0YWxs
 OgotCUBjZCAke1dSS1NSQ30gJiYgJHtTRVRFTlZ9ICR7TUFLRV9FTlZ9ICR7TUFLRX0gaW5zdGFs
 bAorCUBjZCAke1dSS1NSQ30gJiYgJHtTRVRFTlZ9ICR7TUFLRV9FTlZ9ICR7TUFLRX0gLWYgJHtN
 QUtFRklMRX0gJHtJTlNUQUxMX1RBUkdFVH0KIAogLmluY2x1ZGUgPGJzZC5wb3J0LnBvc3QubWs+
 Cg==
 
 --MP_1Dx2TT1FW1SILnPlixNvXtg--
 
State-Changed-From-To: feedback->closed 
State-Changed-By: edwin 
State-Changed-When: Wed Nov 30 00:53:33 GMT 2005 
State-Changed-Why:  
Committed, thanks! 

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