summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorMark Linimon <linimon@FreeBSD.org>2007-11-28 05:39:16 +0000
committerMark Linimon <linimon@FreeBSD.org>2007-11-28 05:39:16 +0000
commitfb3f4193b866363f2e85e0b96ed65996ac218c2b (patch)
tree1eec9403a4065bed4305d00537550df16a811aef /devel
parentAlso cover rubygem-activesupport which is part of rails and is (diff)
Attempt to unbreak on gcc4.2.
PR: ports/117131 Subbmited by: maintainer Approved by: portmgr (self)
Notes
Notes: svn path=/head/; revision=202852
Diffstat (limited to 'devel')
-rw-r--r--devel/libchipcard/Makefile10
-rw-r--r--devel/libchipcard/files/patch-src-libchipcard-cards-hbcicard.cpp14
2 files changed, 15 insertions, 9 deletions
diff --git a/devel/libchipcard/Makefile b/devel/libchipcard/Makefile
index ff0ab5f0ed75..fd667067dc8a 100644
--- a/devel/libchipcard/Makefile
+++ b/devel/libchipcard/Makefile
@@ -40,12 +40,4 @@ post-install:
@${INSTALL_SCRIPT} ${WRKSRC}/freebsd/chipcardd.sh ${PREFIX}/etc/rc.d
@${SED} -e 's,%%PREFIX%%,${PREFIX},' ${PKGMESSAGE}
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 700042
-.if ${ARCH} == "amd64" || ${ARCH} == "sparc64"
-BROKEN= Does not compile with GCC 4.2
-.endif
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/libchipcard/files/patch-src-libchipcard-cards-hbcicard.cpp b/devel/libchipcard/files/patch-src-libchipcard-cards-hbcicard.cpp
new file mode 100644
index 000000000000..369651ce379f
--- /dev/null
+++ b/devel/libchipcard/files/patch-src-libchipcard-cards-hbcicard.cpp
@@ -0,0 +1,14 @@
+--- src/libchipcard/cards/hbcicard.cpp.orig 2007-10-12 09:54:53.000000000 +0200
++++ src/libchipcard/cards/hbcicard.cpp 2007-10-12 09:53:18.000000000 +0200
+@@ -684,8 +684,8 @@
+ case k_HBCICARD_TYPE_1:
+ return _hash2mac1(hash,mac);
+ default:
+- DBG_INFO("LIBCHIPCARD: unknown chip card type (%8x) (%d).",
+- (unsigned int)this,
++ DBG_INFO("LIBCHIPCARD: unknown chip card type (%p) (%d).",
++ this,
+ _type);
+ return false;
+ }
+