ports/60682: Fix devel/libchipcard build on 5.X systems

[Samy Al Bahra]

>Number:         60682
>Category:       ports
>Synopsis:       Fix devel/libchipcard build on 5.X systems
>Confidential:   no
>Severity:       critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Dec 29 00:30:21 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Samy Al Bahra
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
Kerneled 
>Environment:


System: FreeBSD beastie.freebsd.local 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Wed Aug 20 18:35:24 AST 2003     samy at beastie.freebsd.local:/usr/src/sys/i386/compile/KERNELED i386


>Description:


The devel/libchipcard port does not
build on 5.X systems due to subset
style array assignment it uses, now
depreciated with gcc 3.X. The following
patch fixes this.


>How-To-Repeat:


Build with gcc 3.X.


>Fix:


--- libchipcard.patch begins here ---
diff -ruN libchipcard/Makefile /home/samy/tmp/libchipcard/Makefile
--- libchipcard/Makefile	Sun Dec 21 01:17:52 2003
+++ /home/samy/tmp/libchipcard/Makefile	Mon Dec 29 10:37:47 2003
@@ -29,14 +29,8 @@
 
 MAN5=		libchipcard.conf.5 chipcardc.conf.5 chipcardd.conf.5
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=		"Does not compile on FreeBSD ${OSVERSION}"
-.endif
-
 post-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/freebsd/chipcardd.sh ${PREFIX}/etc/rc.d
 	@${SED} -e 's,%%PREFIX%%,${PREFIX},' ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -ruN libchipcard/files/patch-hbcicard.cpp /home/samy/tmp/libchipcard/files/patch-hbcicard.cpp
--- libchipcard/files/patch-hbcicard.cpp	Thu Jan  1 03:00:00 1970
+++ /home/samy/tmp/libchipcard/files/patch-hbcicard.cpp	Mon Dec 29 11:03:07 2003
@@ -0,0 +1,13 @@
+--- src/libchipcard/cards/hbcicard.cpp.orig	Mon Dec 29 10:58:25 2003
++++ src/libchipcard/cards/hbcicard.cpp	Mon Dec 29 10:59:41 2003
+@@ -401,8 +401,8 @@
+     string id;
+     string fcp;
+     CTError err;
+-    unsigned char id1[9]={{0xd2},{0x76},{0x00},{0x00},{0x25},{0x48},{0x42},{0x01},{0x00}};
+-    unsigned char id2[9]={{0xd2},{0x76},{0x00},{0x00},{0x25},{0x48},{0x42},{0x02},{0x00}};
++    unsigned char id1[9]={0xd2,0x76,0x00,0x00,0x25,0x48,0x42,0x01,0x00};
++    unsigned char id2[9]={0xd2,0x76,0x00,0x00,0x25,0x48,0x42,0x02,0x00};
+ 
+ #if DEBUGMODE>15
+     fprintf(stderr,"LIBCHIPCARD: Checking type.\n");
--- libchipcard.patch ends here ---



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