summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordanfe <danfe@FreeBSD.org>2004-10-06 04:57:17 +0000
committerdanfe <danfe@FreeBSD.org>2004-10-06 04:57:17 +0000
commit0d01d076849fa416108cd8596b625840729efabb (patch)
tree6e9ac8b31416304042d050c18ea0d13b2990189d
parent28478251aee213f4aa752de4c19b75fad9337a10 (diff)
downloadFreeBSD-ports-0d01d076849fa416108cd8596b625840729efabb.zip
FreeBSD-ports-0d01d076849fa416108cd8596b625840729efabb.tar.gz
Fix the code so GCC 3.4.2 likes it better, and unbreak.
Reported by: kris Approved by: portmgr (krion), fjoe (mentor, implicit)
-rw-r--r--security/qtfw/Makefile8
-rw-r--r--security/qtfw/files/patch-fwrule.cpp9
2 files changed, 10 insertions, 7 deletions
diff --git a/security/qtfw/Makefile b/security/qtfw/Makefile
index 0e9f718..4f81be1 100644
--- a/security/qtfw/Makefile
+++ b/security/qtfw/Makefile
@@ -22,13 +22,7 @@ MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
PLIST_FILES= bin/qtfw
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 502126
-BROKEN= "Does not compile on FreeBSD >= 5.x"
-.endif
-
do-install:
@${INSTALL_PROGRAM} ${WRKSRC}/qtfw ${PREFIX}/bin
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/qtfw/files/patch-fwrule.cpp b/security/qtfw/files/patch-fwrule.cpp
index 979c53b..22e5d7d 100644
--- a/security/qtfw/files/patch-fwrule.cpp
+++ b/security/qtfw/files/patch-fwrule.cpp
@@ -8,3 +8,12 @@
#define IPPROTO_IP 0
+@@ -547,7 +547,7 @@
+ nCurrentIndex++;
+ ac++;
+ }
+- av = new (char*)[ac];
++ av = new char*[ac];
+
+ /* Now fill the av[] array */
+ for (int i =0;i < ac;i++)
OpenPOWER on IntegriCloud