ports/139633: unbreak textproc/sdcv on amd64

[Vladimir Kushnir]

>Number:         139633
>Category:       ports
>Synopsis:       unbreak textproc/sdcv on amd64
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Oct 15 07:40:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Vladimir Kushnir
>Release:        FreeBSD 9.0-CURRENT amd64
>Organization:
BITP
>Environment:
FreeBSD kushnir1.kiev.ua 9.0-CURRENT FreeBSD 9.0-CURRENT #2: Mon Oct  5 14:12:23 EEST 2009     root at kushnir1.kiev.ua:/usr/obj/usr/src/sys/KUSHNIR  amd64

>Description:
Console dictionary utility textproc/sdcv is marked as unbuildable on 64-bit platforms. The only source uf breakage - comparison of guint32 and sizeof() in function std::min() (src/lib/lib.cpp, line 516). Suggested fix unbreaks build. Tested under amd64 but seems to be valid for any 64-bit arch.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

*** /usr/ports/textproc/sdcv/Makefile	2009-08-31 13:31:17.000000000 +0300
--- Makefile	2009-10-15 10:12:43.000000000 +0300
***************
*** 35,44 ****
  
  .include <bsd.port.pre.mk>
  
- .if ${ARCH} == "amd64" || ${ARCH} == "ia64" || ${ARCH} == "sparc64"
- BROKEN=		Doesn't build on 64-bit platforms
- .endif
- 
  post-patch:
  	@${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|g' \
  		${WRKSRC}/doc/sdcv.1
--- 35,40 ----
***************
*** 47,52 ****
--- 43,52 ----
  	@${REINPLACE_CMD} -e 's, getopt.h,,g' ${WRKSRC}/src/Makefile.in
  	@${REINPLACE_CMD} -e '146 s|()|(int, char * const [], const char *)|g' \
  		${WRKSRC}/src/getopt.h
+ .if ${ARCH} == "amd64" || ${ARCH} == "ia64" || ${ARCH} == "sparc64"
+ 	@${REINPLACE_CMD} -e '516 s|sizeof|(guint32)sizeof|g' \
+ 		${WRKSRC}/src/lib/lib.cpp
+ .endif
  	@${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|g' \
  		${WRKSRC}/src/sdcv.cpp
  	@${REINPLACE_CMD} -e 's, at mandir@/uk, at mandir@,' \


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