Index: head/net/kitinerary/Makefile =================================================================== --- head/net/kitinerary/Makefile (revision 535492) +++ head/net/kitinerary/Makefile (revision 535493) @@ -1,28 +1,29 @@ # $FreeBSD$ PORTNAME= kitinerary DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= net kde kde-applications MAINTAINER= kde@FreeBSD.org COMMENT= Data Model and Extraction System for Travel Reservation information LICENSE= LGPL21 LIB_DEPENDS= libpoppler.so:graphics/poppler \ - libzxing.so:textproc/zxing-cpp + libZXingCore.so:textproc/zxing-cpp USES= compiler:c++11-lang cmake gettext gnome kde:5 pkgconfig qt:5 tar:xz USE_GNOME= libxml2 USE_KDE= coreaddons ecm i18n # Pim components USE_KDE+= calendarcore contacts kpkpass mime USE_QT= core declarative gui network \ buildtools_build qmake_build USE_LDCONFIG= yes DESCR= ${.CURDIR:H:H}/deskutils/kdepim/pkg-descr OPTIONS_DEFINE= DOCS .include Index: head/textproc/zxing-cpp/files/patch-core_src_zxing_oned_OneDReader.cpp =================================================================== --- head/textproc/zxing-cpp/files/patch-core_src_zxing_oned_OneDReader.cpp (revision 535492) +++ head/textproc/zxing-cpp/files/patch-core_src_zxing_oned_OneDReader.cpp (nonexistent) @@ -1,10 +0,0 @@ ---- core/src/zxing/oned/OneDReader.cpp.orig 2018-03-20 15:08:49 UTC -+++ core/src/zxing/oned/OneDReader.cpp -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - #include - #include - #include Property changes on: head/textproc/zxing-cpp/files/patch-core_src_zxing_oned_OneDReader.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/textproc/zxing-cpp/Makefile =================================================================== --- head/textproc/zxing-cpp/Makefile (revision 535492) +++ head/textproc/zxing-cpp/Makefile (revision 535493) @@ -1,35 +1,22 @@ # Created by: Yuri Victorovich # $FreeBSD$ PORTNAME= zxing-cpp -DISTVERSION= 0.20190320 -PORTREVISION= 4 +DISTVERSIONPREFIX= v +DISTVERSION= 1.0.8 CATEGORIES= textproc -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/ -PATCHFILES= 9e5dfa57f3b998bc3049bfa893b20e81dea656df.patch:-p1 - -MAINTAINER= yuri@FreeBSD.org +MAINTAINER= kde@FreeBSD.org COMMENT= ZXing C++ Library for QR code recognition LICENSE= APACHE20 -LICENSE_FILE= ${WRKSRC}/COPYING +LICENSE_FILE= ${WRKSRC}/LICENSE USES= cmake compiler:c++11-lang iconv USE_GITHUB= yes -GH_ACCOUNT= glassechidna -GH_TAGNAME= e0e40dd +GH_ACCOUNT= nu-book USE_LDCONFIG= yes CMAKE_ON= BUILD_SHARED_LIBS - -OPTIONS_DEFINE= OPENCV # only one .cpp module in the project depends on OpenCV -OPTIONS_SUB= yes - -OPENCV_LIB_DEPENDS= libopencv_core.so:graphics/opencv-core \ - libopencv_photo.so:graphics/opencv - -post-patch-OPENCV-off: - @${REINPLACE_CMD} 's|find_package(OpenCV)|#&|' ${WRKSRC}/CMakeLists.txt .include Index: head/textproc/zxing-cpp/distinfo =================================================================== --- head/textproc/zxing-cpp/distinfo (revision 535492) +++ head/textproc/zxing-cpp/distinfo (revision 535493) @@ -1,5 +1,3 @@ -TIMESTAMP = 1571103733 -SHA256 (glassechidna-zxing-cpp-0.20190320-e0e40dd_GH0.tar.gz) = 699ed1e08812631d40730bd96a7e314d1ad8adf28f45770d8ae8e57a536ba33b -SIZE (glassechidna-zxing-cpp-0.20190320-e0e40dd_GH0.tar.gz) = 312377 -SHA256 (9e5dfa57f3b998bc3049bfa893b20e81dea656df.patch) = a9afdcaed3ac3026eb471e371431d23b9353a58807c7b5c863f33253f31f128b -SIZE (9e5dfa57f3b998bc3049bfa893b20e81dea656df.patch) = 1251 +TIMESTAMP = 1589647728 +SHA256 (nu-book-zxing-cpp-v1.0.8_GH0.tar.gz) = 9154b5456904e47bd4c38462d57e4b7897bfb20cb2bc2e8c958453e40e73c8b2 +SIZE (nu-book-zxing-cpp-v1.0.8_GH0.tar.gz) = 128506816 Index: head/textproc/zxing-cpp/pkg-plist =================================================================== --- head/textproc/zxing-cpp/pkg-plist (revision 535492) +++ head/textproc/zxing-cpp/pkg-plist (revision 535493) @@ -1,108 +1,166 @@ -bin/zxing -include/zxing/BarcodeFormat.h -include/zxing/Binarizer.h -include/zxing/BinaryBitmap.h -include/zxing/ChecksumException.h -include/zxing/DecodeHints.h -include/zxing/Exception.h -include/zxing/FormatException.h -include/zxing/IllegalStateException.h -include/zxing/InvertedLuminanceSource.h -include/zxing/LuminanceSource.h -%%OPENCV%%include/zxing/MatSource.h -include/zxing/MultiFormatReader.h -include/zxing/NotFoundException.h -include/zxing/Reader.h -include/zxing/ReaderException.h -include/zxing/Result.h -include/zxing/ResultPoint.h -include/zxing/ResultPointCallback.h -include/zxing/ZXing.h -include/zxing/aztec/AztecDetectorResult.h -include/zxing/aztec/AztecReader.h -include/zxing/aztec/decoder/Decoder.h -include/zxing/aztec/detector/Detector.h -include/zxing/common/Array.h -include/zxing/common/BitArray.h -include/zxing/common/BitMatrix.h -include/zxing/common/BitSource.h -include/zxing/common/CharacterSetECI.h -include/zxing/common/Counted.h -include/zxing/common/DecoderResult.h -include/zxing/common/DetectorResult.h -include/zxing/common/GlobalHistogramBinarizer.h -include/zxing/common/GreyscaleLuminanceSource.h -include/zxing/common/GreyscaleRotatedLuminanceSource.h -include/zxing/common/GridSampler.h -include/zxing/common/HybridBinarizer.h -include/zxing/common/IllegalArgumentException.h -include/zxing/common/PerspectiveTransform.h -include/zxing/common/Point.h -include/zxing/common/Str.h -include/zxing/common/StringUtils.h -include/zxing/common/detector/JavaMath.h -include/zxing/common/detector/MathUtils.h -include/zxing/common/detector/MonochromeRectangleDetector.h -include/zxing/common/detector/WhiteRectangleDetector.h -include/zxing/common/reedsolomon/GenericGF.h -include/zxing/common/reedsolomon/GenericGFPoly.h -include/zxing/common/reedsolomon/ReedSolomonDecoder.h -include/zxing/common/reedsolomon/ReedSolomonException.h -include/zxing/datamatrix/DataMatrixReader.h -include/zxing/datamatrix/Version.h -include/zxing/datamatrix/decoder/BitMatrixParser.h -include/zxing/datamatrix/decoder/DataBlock.h -include/zxing/datamatrix/decoder/DecodedBitStreamParser.h -include/zxing/datamatrix/decoder/Decoder.h -include/zxing/datamatrix/detector/CornerPoint.h -include/zxing/datamatrix/detector/Detector.h -include/zxing/datamatrix/detector/DetectorException.h -include/zxing/multi/ByQuadrantReader.h -include/zxing/multi/GenericMultipleBarcodeReader.h -include/zxing/multi/MultipleBarcodeReader.h -include/zxing/multi/qrcode/QRCodeMultiReader.h -include/zxing/multi/qrcode/detector/MultiDetector.h -include/zxing/multi/qrcode/detector/MultiFinderPatternFinder.h -include/zxing/oned/CodaBarReader.h -include/zxing/oned/Code128Reader.h -include/zxing/oned/Code39Reader.h -include/zxing/oned/Code93Reader.h -include/zxing/oned/EAN13Reader.h -include/zxing/oned/EAN8Reader.h -include/zxing/oned/ITFReader.h -include/zxing/oned/MultiFormatOneDReader.h -include/zxing/oned/MultiFormatUPCEANReader.h -include/zxing/oned/OneDReader.h -include/zxing/oned/OneDResultPoint.h -include/zxing/oned/UPCAReader.h -include/zxing/oned/UPCEANReader.h -include/zxing/oned/UPCEReader.h -include/zxing/pdf417/PDF417Reader.h -include/zxing/pdf417/decoder/BitMatrixParser.h -include/zxing/pdf417/decoder/DecodedBitStreamParser.h -include/zxing/pdf417/decoder/Decoder.h -include/zxing/pdf417/decoder/ec/ErrorCorrection.h -include/zxing/pdf417/decoder/ec/ModulusGF.h -include/zxing/pdf417/decoder/ec/ModulusPoly.h -include/zxing/pdf417/detector/Detector.h -include/zxing/pdf417/detector/LinesSampler.h -include/zxing/qrcode/ErrorCorrectionLevel.h -include/zxing/qrcode/FormatInformation.h -include/zxing/qrcode/QRCodeReader.h -include/zxing/qrcode/Version.h -include/zxing/qrcode/decoder/BitMatrixParser.h -include/zxing/qrcode/decoder/DataBlock.h -include/zxing/qrcode/decoder/DataMask.h -include/zxing/qrcode/decoder/DecodedBitStreamParser.h -include/zxing/qrcode/decoder/Decoder.h -include/zxing/qrcode/decoder/Mode.h -include/zxing/qrcode/detector/AlignmentPattern.h -include/zxing/qrcode/detector/AlignmentPatternFinder.h -include/zxing/qrcode/detector/Detector.h -include/zxing/qrcode/detector/FinderPattern.h -include/zxing/qrcode/detector/FinderPatternFinder.h -include/zxing/qrcode/detector/FinderPatternInfo.h -lib/libzxing.so -lib/zxing/cmake/zxing-config.cmake -lib/zxing/cmake/zxing-targets-%%CMAKE_BUILD_TYPE%%.cmake -lib/zxing/cmake/zxing-targets.cmake +include/ZXing/BarcodeFormat.h +include/ZXing/BinaryBitmap.h +include/ZXing/BitArray.h +include/ZXing/BitHacks.h +include/ZXing/BitMatrix.h +include/ZXing/BitSource.h +include/ZXing/ByteArray.h +include/ZXing/ByteMatrix.h +include/ZXing/CharacterSet.h +include/ZXing/CharacterSetECI.h +include/ZXing/CustomData.h +include/ZXing/DecodeHints.h +include/ZXing/DecodeStatus.h +include/ZXing/DecoderResult.h +include/ZXing/DetectorResult.h +include/ZXing/GenericGF.h +include/ZXing/GenericGFPoly.h +include/ZXing/GenericLuminanceSource.h +include/ZXing/GlobalHistogramBinarizer.h +include/ZXing/GridSampler.h +include/ZXing/HybridBinarizer.h +include/ZXing/LuminanceSource.h +include/ZXing/MultiFormatReader.h +include/ZXing/MultiFormatWriter.h +include/ZXing/PerspectiveTransform.h +include/ZXing/ReadBarcode.h +include/ZXing/Reader.h +include/ZXing/ReedSolomonDecoder.h +include/ZXing/ReedSolomonEncoder.h +include/ZXing/Result.h +include/ZXing/ResultMetadata.h +include/ZXing/ResultPoint.h +include/ZXing/TextDecoder.h +include/ZXing/TextEncoder.h +include/ZXing/TextUtfEncoding.h +include/ZXing/WhiteRectDetector.h +include/ZXing/ZXBigInteger.h +include/ZXing/ZXConfig.h +include/ZXing/ZXContainerAlgorithms.h +include/ZXing/ZXFilesystem.h +include/ZXing/ZXNullable.h +include/ZXing/ZXNumeric.h +include/ZXing/ZXStrConvWorkaround.h +include/ZXing/ZXTestSupport.h +include/ZXing/ZXVersion.h +include/ZXing/aztec/AZDecoder.h +include/ZXing/aztec/AZDetector.h +include/ZXing/aztec/AZDetectorResult.h +include/ZXing/aztec/AZEncoder.h +include/ZXing/aztec/AZEncodingState.h +include/ZXing/aztec/AZHighLevelEncoder.h +include/ZXing/aztec/AZReader.h +include/ZXing/aztec/AZToken.h +include/ZXing/aztec/AZWriter.h +include/ZXing/datamatrix/DMBitMatrixParser.h +include/ZXing/datamatrix/DMDataBlock.h +include/ZXing/datamatrix/DMDecoder.h +include/ZXing/datamatrix/DMDefaultPlacement.h +include/ZXing/datamatrix/DMDetector.h +include/ZXing/datamatrix/DMECB.h +include/ZXing/datamatrix/DMECEncoder.h +include/ZXing/datamatrix/DMEncoderContext.h +include/ZXing/datamatrix/DMHighLevelEncoder.h +include/ZXing/datamatrix/DMReader.h +include/ZXing/datamatrix/DMSymbolInfo.h +include/ZXing/datamatrix/DMSymbolShape.h +include/ZXing/datamatrix/DMVersion.h +include/ZXing/datamatrix/DMWriter.h +include/ZXing/maxicode/MCBitMatrixParser.h +include/ZXing/maxicode/MCDecoder.h +include/ZXing/maxicode/MCReader.h +include/ZXing/oned/ODCodabarReader.h +include/ZXing/oned/ODCodabarWriter.h +include/ZXing/oned/ODCode128Patterns.h +include/ZXing/oned/ODCode128Reader.h +include/ZXing/oned/ODCode128Writer.h +include/ZXing/oned/ODCode39Reader.h +include/ZXing/oned/ODCode39Writer.h +include/ZXing/oned/ODCode93Reader.h +include/ZXing/oned/ODCode93Writer.h +include/ZXing/oned/ODEAN13Reader.h +include/ZXing/oned/ODEAN13Writer.h +include/ZXing/oned/ODEAN8Reader.h +include/ZXing/oned/ODEAN8Writer.h +include/ZXing/oned/ODEANManufacturerOrgSupport.h +include/ZXing/oned/ODITFReader.h +include/ZXing/oned/ODITFWriter.h +include/ZXing/oned/ODMultiUPCEANReader.h +include/ZXing/oned/ODRSS14Reader.h +include/ZXing/oned/ODRSSExpandedReader.h +include/ZXing/oned/ODReader.h +include/ZXing/oned/ODRowReader.h +include/ZXing/oned/ODUPCAReader.h +include/ZXing/oned/ODUPCAWriter.h +include/ZXing/oned/ODUPCEANCommon.h +include/ZXing/oned/ODUPCEANExtensionSupport.h +include/ZXing/oned/ODUPCEANReader.h +include/ZXing/oned/ODUPCEReader.h +include/ZXing/oned/ODUPCEWriter.h +include/ZXing/oned/ODWriterHelper.h +include/ZXing/oned/rss/ODRSSDataCharacter.h +include/ZXing/oned/rss/ODRSSExpandedBinaryDecoder.h +include/ZXing/oned/rss/ODRSSExpandedPair.h +include/ZXing/oned/rss/ODRSSExpandedRow.h +include/ZXing/oned/rss/ODRSSFieldParser.h +include/ZXing/oned/rss/ODRSSFinderPattern.h +include/ZXing/oned/rss/ODRSSGenericAppIdDecoder.h +include/ZXing/oned/rss/ODRSSPair.h +include/ZXing/oned/rss/ODRSSReaderHelper.h +include/ZXing/pdf417/PDFBarcodeMetadata.h +include/ZXing/pdf417/PDFBarcodeValue.h +include/ZXing/pdf417/PDFBoundingBox.h +include/ZXing/pdf417/PDFCodeword.h +include/ZXing/pdf417/PDFCodewordDecoder.h +include/ZXing/pdf417/PDFCompaction.h +include/ZXing/pdf417/PDFDecodedBitStreamParser.h +include/ZXing/pdf417/PDFDecoderResultExtra.h +include/ZXing/pdf417/PDFDetectionResult.h +include/ZXing/pdf417/PDFDetectionResultColumn.h +include/ZXing/pdf417/PDFDetector.h +include/ZXing/pdf417/PDFEncoder.h +include/ZXing/pdf417/PDFHighLevelEncoder.h +include/ZXing/pdf417/PDFModulusGF.h +include/ZXing/pdf417/PDFModulusPoly.h +include/ZXing/pdf417/PDFReader.h +include/ZXing/pdf417/PDFScanningDecoder.h +include/ZXing/pdf417/PDFWriter.h +include/ZXing/qrcode/QRAlignmentPattern.h +include/ZXing/qrcode/QRAlignmentPatternFinder.h +include/ZXing/qrcode/QRBitMatrixParser.h +include/ZXing/qrcode/QRCodecMode.h +include/ZXing/qrcode/QRDataBlock.h +include/ZXing/qrcode/QRDataMask.h +include/ZXing/qrcode/QRDecoder.h +include/ZXing/qrcode/QRDecoderMetadata.h +include/ZXing/qrcode/QRDetector.h +include/ZXing/qrcode/QRECB.h +include/ZXing/qrcode/QREncodeResult.h +include/ZXing/qrcode/QREncoder.h +include/ZXing/qrcode/QRErrorCorrectionLevel.h +include/ZXing/qrcode/QRFinderPattern.h +include/ZXing/qrcode/QRFinderPatternFinder.h +include/ZXing/qrcode/QRFinderPatternInfo.h +include/ZXing/qrcode/QRFormatInformation.h +include/ZXing/qrcode/QRMaskUtil.h +include/ZXing/qrcode/QRMatrixUtil.h +include/ZXing/qrcode/QRReader.h +include/ZXing/qrcode/QRVersion.h +include/ZXing/qrcode/QRWriter.h +include/ZXing/textcodec/Big5MapTable.h +include/ZXing/textcodec/Big5TextDecoder.h +include/ZXing/textcodec/Big5TextEncoder.h +include/ZXing/textcodec/GBTextDecoder.h +include/ZXing/textcodec/GBTextEncoder.h +include/ZXing/textcodec/JPTextDecoder.h +include/ZXing/textcodec/JPTextEncoder.h +include/ZXing/textcodec/KRHangulMapping.h +include/ZXing/textcodec/KRTextDecoder.h +include/ZXing/textcodec/KRTextEncoder.h +lib/cmake/ZXing/ZXingConfig.cmake +lib/cmake/ZXing/ZXingTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/ZXing/ZXingTargets.cmake +lib/libZXingCore.so +lib/libZXingCore.so.1 +lib/libZXingCore.so.1.0.7 +libdata/pkgconfig/zxing.pc