svn commit: r304779 - in head/security: quantis quantis-kmod quantis/files
Alex Dupre
ale at FreeBSD.org
Mon Sep 24 14:22:29 UTC 2012
Author: ale
Date: Mon Sep 24 14:22:28 2012
New Revision: 304779
URL: http://svn.freebsd.org/changeset/ports/304779
Log:
- Update to v12.09.12 release
- Switch to OptionsNG
- Pet portlint
Added:
head/security/quantis/files/patch-QuantisExtensions_CMakeLists.txt (contents, props changed)
head/security/quantis/files/patch-QuantisExtensions_QuantisExtractor_C.c (contents, props changed)
Modified:
head/security/quantis-kmod/Makefile
head/security/quantis-kmod/distinfo
head/security/quantis/Makefile
head/security/quantis/distinfo
head/security/quantis/pkg-plist
Modified: head/security/quantis-kmod/Makefile
==============================================================================
--- head/security/quantis-kmod/Makefile Mon Sep 24 14:04:31 2012 (r304778)
+++ head/security/quantis-kmod/Makefile Mon Sep 24 14:22:28 2012 (r304779)
@@ -1,24 +1,20 @@
-# New ports collection makefile for: quantis-kmod
-# Date created: 10 May 2010
-# Whom: Alex Dupre <ale at FreeBSD.org>
-#
+# Created by: Alex Dupre <ale at FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= quantis
-DISTVERSION= v11.12.13
+DISTVERSION= v12.09.12
CATEGORIES= security kld
MASTER_SITES= http://www.idquantique.com/files/products/quantis/ \
${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= ale
-DISTNAME= ${PORTNAME}-${DISTVERSION}-src
PKGNAMESUFFIX= -kmod
+DISTNAME= ${PORTNAME}-${DISTVERSION}-src
MAINTAINER= ale at FreeBSD.org
COMMENT= Kernel driver for Quantis PCI/PCIe random number generator
-LICENSE_COMB= dual
LICENSE= BSD GPLv2
+LICENSE_COMB= dual
LICENSE_FILE= ${WRKDIR}/Quantis-${DISTVERSION}/License.txt
USE_ZIP= yes
Modified: head/security/quantis-kmod/distinfo
==============================================================================
--- head/security/quantis-kmod/distinfo Mon Sep 24 14:04:31 2012 (r304778)
+++ head/security/quantis-kmod/distinfo Mon Sep 24 14:22:28 2012 (r304779)
@@ -1,2 +1,2 @@
-SHA256 (quantis-v11.12.13-src.zip) = 1152885033434a0a768390d6dcd20c2d0d913b484f11553a6e3619e7def36277
-SIZE (quantis-v11.12.13-src.zip) = 1897920
+SHA256 (quantis-v12.09.12-src.zip) = 58201ccb36bef8d0e711a9a346a4343b68b6326672af9f3262da0b9350782b1e
+SIZE (quantis-v12.09.12-src.zip) = 4606543
Modified: head/security/quantis/Makefile
==============================================================================
--- head/security/quantis/Makefile Mon Sep 24 14:04:31 2012 (r304778)
+++ head/security/quantis/Makefile Mon Sep 24 14:22:28 2012 (r304779)
@@ -1,13 +1,8 @@
-# New ports collection makefile for: quantis
-# Date created: 10 May 2010
-# Whom: Alex Dupre <ale at FreeBSD.org>
-#
+# Created by: Alex Dupre <ale at FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= quantis
-DISTVERSION= v11.12.13
-PORTREVISION= 1
+DISTVERSION= v12.09.12
CATEGORIES= security devel java
MASTER_SITES= http://www.idquantique.com/files/products/quantis/ \
${MASTER_SITE_LOCAL}
@@ -17,17 +12,21 @@ DISTNAME= ${PORTNAME}-${DISTVERSION}-src
MAINTAINER= ale at FreeBSD.org
COMMENT= Libraries and utilities to access Quantis devices
-OPTIONS= PCI "Enable Quantis PCI support" on \
- USB "Enable Quantis USB support (FreeBSD >= 8.1)" on \
- JAVA "Enable Java support" on \
- COMPAT "Build API v1 compatibility libraries" off \
- TOOL "Build EasyQuantis application" on \
- GUI "Build QT4 GUI for EasyQuantis application" on
-
-LICENSE_COMB= dual
LICENSE= BSD GPLv2
+LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/Quantis-${DISTVERSION}/License.txt
+OPTIONS_DEFINE= PCI USB JAVA COMPAT TOOL GUI DOCS EXAMPLES
+OPTIONS_DEFAULT=PCI USB JAVA TOOL GUI
+NO_OPTIONS_SORT=yes
+
+PCI_DESC= Enable Quantis PCI support
+USB_DESC= Enable Quantis USB support (FreeBSD >= 8.1)
+JAVA_DESC= Enable Java support
+COMPAT_DESC= Build API v1 compatibility libraries
+TOOL_DESC= Build EasyQuantis application
+GUI_DESC= Build QT4 GUI for EasyQuantis application
+
USE_ZIP= yes
EXTRACT_BEFORE_ARGS= -aqo
USE_CMAKE= yes
@@ -47,17 +46,17 @@ PORTEXAMPLES= *
IGNORE= requires FreeBSD >= 7
.endif
-.if defined(WITH_PCI)
+.if ${PORT_OPTIONS:MPCI}
RUN_DEPENDS+= ${KMODDIR}/quantis.ko:${PORTSDIR}/security/quantis-kmod
.else
CMAKE_ARGS+= -DDISABLE_QUANTIS_PCI=1
.endif
-.if defined(WITHOUT_USB) || ${OSVERSION} < 801000
+.if empty(PORT_OPTIONS:MUSB) || ${OSVERSION} < 801000
CMAKE_ARGS+= -DDISABLE_QUANTIS_USB=1
.endif
-.if defined(WITH_JAVA)
+.if ${PORT_OPTIONS:MJAVA}
USE_JAVA= yes
JAVA_VERSION= 1.5+
JAVA_OS= native
@@ -65,7 +64,7 @@ JAVA_OS= native
CMAKE_ARGS+= -DDISABLE_QUANTIS_JAVA=1
.endif
-.if defined(WITH_COMPAT)
+.if ${PORT_OPTIONS:MCOMPAT}
CMAKE_ARGS+= -DENABLE_QUANTIS_COMPAT=1
PLIST_SUB+= COMPAT=""
@@ -73,11 +72,11 @@ PLIST_SUB+= COMPAT=""
PLIST_SUB+= COMPAT="@comment "
.endif
-.if defined(WITH_TOOL)
+.if ${PORT_OPTIONS:MTOOL}
BUILD_DEPENDS+= ${LOCALBASE}/lib/libboost_date_time.a:${PORTSDIR}/devel/boost-libs
CXXFLAGS+= -I${LOCALBASE}/include
-. if defined(WITH_GUI)
+. if ${PORT_OPTIONS:MGUI}
USE_QT4+= gui moc_build uic_build rcc_build qmake_build
. else
CMAKE_ARGS+= -DDISABLE_EASYQUANTIS_GUI=1
@@ -95,15 +94,15 @@ post-patch:
${WRKSRC}/CMake/CompilersFlags.cmake
post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
@${INSTALL_DATA} ${WRKSRC}/../*.txt ${DOCSDIR}
@${INSTALL_DATA} ${WRKSRC}/../User_Manual.pdf ${DOCSDIR}
.endif
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
@${MKDIR} ${EXAMPLESDIR}
@(cd ${WRKSRC}/../Samples; ${COPYTREE_SHARE} . ${EXAMPLESDIR})
-.if defined(WITH_USB) && ${OSVERSION} >= 801000
+.if ${PORT_OPTIONS:MUSB} && ${OSVERSION} >= 801000
@${MKDIR} ${EXAMPLESDIR}/devd
${INSTALL_DATA} ${FILESDIR}/quantis.conf ${EXAMPLESDIR}/devd
@${CAT} ${PKGMESSAGE}
Modified: head/security/quantis/distinfo
==============================================================================
--- head/security/quantis/distinfo Mon Sep 24 14:04:31 2012 (r304778)
+++ head/security/quantis/distinfo Mon Sep 24 14:22:28 2012 (r304779)
@@ -1,2 +1,2 @@
-SHA256 (quantis-v11.12.13-src.zip) = 1152885033434a0a768390d6dcd20c2d0d913b484f11553a6e3619e7def36277
-SIZE (quantis-v11.12.13-src.zip) = 1897920
+SHA256 (quantis-v12.09.12-src.zip) = 58201ccb36bef8d0e711a9a346a4343b68b6326672af9f3262da0b9350782b1e
+SIZE (quantis-v12.09.12-src.zip) = 4606543
Added: head/security/quantis/files/patch-QuantisExtensions_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/quantis/files/patch-QuantisExtensions_CMakeLists.txt Mon Sep 24 14:22:28 2012 (r304779)
@@ -0,0 +1,10 @@
+--- QuantisExtensions/CMakeLists.txt.orig 2012-09-24 16:08:08.000000000 +0200
++++ QuantisExtensions/CMakeLists.txt 2012-09-24 16:08:24.000000000 +0200
+@@ -58,6 +58,6 @@
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIB_DIR}
+ )
+
+-INSTALL(FILES ${Public_Headers} DESTINATION include)
++INSTALL(FILES ${Public_Headers} DESTINATION include/QuantisExtensions)
+
+
Added: head/security/quantis/files/patch-QuantisExtensions_QuantisExtractor_C.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/quantis/files/patch-QuantisExtensions_QuantisExtractor_C.c Mon Sep 24 14:22:28 2012 (r304779)
@@ -0,0 +1,15 @@
+--- QuantisExtensions/QuantisExtractor_C.c.orig 2012-09-24 15:42:36.000000000 +0200
++++ QuantisExtensions/QuantisExtractor_C.c 2012-09-24 15:42:56.000000000 +0200
+@@ -53,7 +53,11 @@
+ #include "../Quantis/Conversion.h"
+ #include <stdio.h>
+ #include <math.h>
+-#include <malloc.h>
++#ifdef HAVE_MALLOC_H
++# include <malloc.h>
++#else
++# include <stdlib.h>
++#endif
+
+
+ /* Size of the buffer used for QuantisReadXXX methods */
Modified: head/security/quantis/pkg-plist
==============================================================================
--- head/security/quantis/pkg-plist Mon Sep 24 14:04:31 2012 (r304778)
+++ head/security/quantis/pkg-plist Mon Sep 24 14:22:28 2012 (r304779)
@@ -10,20 +10,27 @@ include/Quantis/Quantis_Java.h
include/Quantis/Quantis_random_device.hpp
include/Quantis/msc_stdint.h
include/Quantis/resource.h
+include/QuantisExtensions/QuantisExtractor.h
+include/QuantisExtensions/QuantisExtractor.hpp
lib/libQuantis-NoHw.a
lib/libQuantis-NoHw.so
lib/libQuantis-NoHw.so.2
-lib/libQuantis-NoHw.so.2.9.0
+lib/libQuantis-NoHw.so.2.10.0
lib/libQuantis.a
lib/libQuantis.so
lib/libQuantis.so.2
-lib/libQuantis.so.2.9.0
+lib/libQuantis.so.2.10.0
+lib/libQuantis_Extensions.a
+lib/libQuantis_Extensions.so
+lib/libQuantis_Extensions.so.2
+lib/libQuantis_Extensions.so.2.10.0
%%COMPAT%%lib/libQuantisPci-Compat.a
%%COMPAT%%lib/libQuantisPci-Compat.so
%%COMPAT%%lib/libQuantisPci-Compat.so.2
-%%COMPAT%%lib/libQuantisPci-Compat.so.2.9.0
+%%COMPAT%%lib/libQuantisPci-Compat.so.2.10.0
%%COMPAT%%lib/libQuantisUsb-Compat.a
%%COMPAT%%lib/libQuantisUsb-Compat.so
%%COMPAT%%lib/libQuantisUsb-Compat.so.2
-%%COMPAT%%lib/libQuantisUsb-Compat.so.2.9.0
+%%COMPAT%%lib/libQuantisUsb-Compat.so.2.10.0
@dirrm include/Quantis
+ at dirrm include/QuantisExtensions
More information about the svn-ports-all
mailing list