ziggi/bsdports
1
0
Fork 0
mirror of https://github.com/beard7n/bsdports.git synced 2026-04-16 21:41:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
ziggi
2020-05-25 06:36:58 +00:00
parent 7bb103ce22
commit 7facced69f
22 changed files with 26 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Mk/Uses/python.mk
View File

@@ -241,7 +241,7 @@ _INCLUDE_USES_PYTHON_MK= yes
# What Python version and what Python interpreters are currently supported?
# When adding a version, please keep the comment in
# Mk/bsd.default-versions.mk in sync.
_PYTHON_VERSIONS= 2.7 3.6 3.7 # preferred first
_PYTHON_VERSIONS= 2.7 3.6 3.7 3.8 # preferred first
_PYTHON_PORTBRANCH= 2.7 # ${_PYTHON_VERSIONS:[1]}
_PYTHON_BASECMD= ${LOCALBASE}/bin/python
_PYTHON_RELPORTDIR= lang/python

2
Mk/bsd.default-versions.mk
View File

@@ -86,7 +86,7 @@ PGSQL_DEFAULT?= 9.5
# Possible values: 7.1, 7.2, 7.3
PHP_DEFAULT?= 7.2
# Possible values: 2.7, 3.5, 3.6, 3.7
PYTHON_DEFAULT?= 3.6
PYTHON_DEFAULT?= 3.8
# Possible values: 2.7
PYTHON2_DEFAULT?= 2.7
# Possible values: 3.5, 3.6, 3.7

2
crypto/certbot/Makefile
View File

@@ -33,7 +33,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}acme>=${ACME_VERSION}:python/py-acme@${PY_FL
BUILD_DEPENDS= ${RUN_DEPENDS}
# Actually 2.7,3.3+
USES= python:3.6
USES= python:3.6+
USE_PYTHON= autoplist distutils
NO_ARCH= yes

19
devel/doxygen/Makefile
View File

@@ -2,7 +2,7 @@
# $FreeBSD: head/devel/doxygen/Makefile 459474 2018-01-19 21:28:34Z antoine $
PORTNAME= doxygen
PORTVERSION= 1.8.14
PORTVERSION= 1.8.15
CATEGORIES= devel
MASTER_SITES= ftp://ftp.stack.nl/pub/users/dimitri/ \
http://ftp.stack.nl/pub/users/dimitri/
@@ -11,14 +11,25 @@ EXTRACT_SUFX= .src.tar.gz
MAINTAINER= cyberbotx@cyberbotx.com
COMMENT= Documentation system for C, C++, and other languages
LIB_DEPENDS+= libQtCore.so:xapp/libqt4
LIB_DEPENDS+= libQtGui.so:xapp/libqt4
#LIB_DEPENDS+= libQtCore.so:xapp/libqt4
#LIB_DEPENDS+= libQtGui.so:xapp/libqt4
RUN_DEPENDS= dot:graphics/graphviz
LIB_DEPENDS+= libQt5Core.so:xapp/libqt5-base
LIB_DEPENDS+= libQt5Gui.so:xapp/libqt5-base
LIB_DEPENDS+= libQt5Widgets.so:xapp/libqt5-base
LIB_DEPENDS+= libQt5Xml.so:xapp/libqt5-base
USES= cmake:outsource shebangfix # bison cmake:outsource,noninja python shebangfix
#USES= cmake shebangfix # bison cmake:outsource,noninja python shebangfix
USES= bison cmake:noninja compiler:c++11-lang iconv python shebangfix
ALL_TARGET= all
CMAKE_ARGS+= -DDOC_INSTALL_DIR:PATH=${DOCSDIR_REL}
CMAKE_ARGS+= -Dbuild_wizard:BOOLEAN=true
RUN_DEPENDS= dot:graph/graphviz
MAKE_JOBS_UNSAFE= yes
EXTRACT_AFTER_ARGS= --exclude '*/libmd5'

6
devel/doxygen/distinfo
View File

@@ -1,3 +1,3 @@
TIMESTAMP = 1516157551
SHA256 (doxygen-1.8.14.src.tar.gz) = d1757e02755ef6f56fd45f1f4398598b920381948d6fcfa58f5ca6aa56f59d4d
SIZE (doxygen-1.8.14.src.tar.gz) = 4877980
TIMESTAMP = 1590228621
SHA256 (doxygen-1.8.15.src.tar.gz) = bd9c0ec462b6a9b5b41ede97bede5458e0d7bb40d4cfa27f6f622eb33c59245d
SIZE (doxygen-1.8.15.src.tar.gz) = 5097791

10
devel/doxygen/files/patch-CMakeLists.txt
View File

@@ -1,10 +0,0 @@
--- CMakeLists.txt.orig 2015-06-16 17:42:32 UTC
+++ CMakeLists.txt
@@ -122,7 +122,6 @@ if (win_static)
endif()
-add_subdirectory(libmd5)
add_subdirectory(qtools)
add_subdirectory(vhdlparser)
add_subdirectory(src)

11
devel/doxygen/files/patch-doc-doxygen_manual.tex
View File

@@ -1,11 +0,0 @@
--- doc/doxygen_manual.tex.orig 2015-02-28 15:26:54 UTC
+++ doc/doxygen_manual.tex
@@ -13,7 +13,7 @@
% input used in their production; they are not affected by this license.
\documentclass{book}
-\usepackage[a4paper,left=2.5cm,right=2.5cm,top=2.5cm,bottom=2.5cm]{geometry}
+\usepackage[left=2.5cm,right=2.5cm,top=2.5cm,bottom=2.5cm]{geometry}
\usepackage{makeidx}
\usepackage{natbib}
\usepackage{graphicx}

11
devel/doxygen/files/patch-doc_CMakeLists.txt
View File

@@ -1,11 +0,0 @@
--- doc/CMakeLists.txt.orig 2017-10-31 19:36:00 UTC
+++ doc/CMakeLists.txt
@@ -168,7 +168,7 @@ install(FILES
"${PROJECT_BINARY_DIR}/man/doxywizard.1"
"${PROJECT_BINARY_DIR}/man/doxysearch.1"
"${PROJECT_BINARY_DIR}/man/doxyindexer.1"
- DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
+ DESTINATION man/man1
)
install(FILES

12
devel/doxygen/files/patch-md5-Doxyfile
View File

@@ -1,12 +0,0 @@
--- Doxyfile.orig 2014-08-14 17:46:42 UTC
+++ Doxyfile
@@ -261,8 +261,7 @@
MACRO_EXPANSION = YES
EXPAND_ONLY_PREDEF = YES
SEARCH_INCLUDES = YES
-INCLUDE_PATH = qtools \
- libmd5
+INCLUDE_PATH = qtools
INCLUDE_FILE_PATTERNS =
PREDEFINED =
EXPAND_AS_DEFINED =

25
devel/doxygen/files/patch-md5-definition
View File

@@ -1,25 +0,0 @@
--- src/definition.cpp.orig 2015-01-03 22:38:57 UTC
+++ src/definition.cpp
@@ -17,6 +17,7 @@
#include <ctype.h>
#include <qregexp.h>
+#include <sys/types.h>
#include "md5.h"
#include <stdio.h>
#include <stdlib.h>
@@ -537,13 +538,11 @@ void Definition::writeDocAnchorsToTagFil
bool Definition::_docsAlreadyAdded(const QCString &doc,QCString &sigList)
{
- uchar md5_sig[16];
QCString sigStr(33);
// to avoid mismatches due to differences in indenting, we first remove
// double whitespaces...
QCString docStr = doc.simplifyWhiteSpace();
- MD5Buffer((const unsigned char *)docStr.data(),docStr.length(),md5_sig);
- MD5SigToString(md5_sig,sigStr.rawData(),33);
+ MD5Data((const unsigned char *)docStr.data(),docStr.length(),sigStr.rawData());
//printf("%s:_docsAlreadyAdded doc='%s' sig='%s' docSigs='%s'\n",
// name().data(),doc.data(),sigStr.data(),sigList.data());
if (sigList.find(sigStr)==-1) // new docs, add signature to prevent re-adding it

19
devel/doxygen/files/patch-md5-dirdef
View File

@@ -1,19 +0,0 @@
--- src/dirdef.cpp.orig 2015-01-03 22:38:57 UTC
+++ src/dirdef.cpp
@@ -1,3 +1,4 @@
+#include <sys/types.h>
#include "md5.h"
#include "dirdef.h"
@@ -81,10 +82,8 @@ void DirDef::addFile(FileDef *fd)
static QCString encodeDirName(const QCString &anchor)
{
// convert to md5 hash
- uchar md5_sig[16];
QCString sigStr(33);
- MD5Buffer((const unsigned char *)anchor.data(),anchor.length(),md5_sig);
- MD5SigToString(md5_sig,sigStr.rawData(),33);
+ MD5Data((const unsigned char *)anchor.data(),anchor.length(),sigStr.rawData());
return sigStr;
// old algorithm

70
devel/doxygen/files/patch-md5-dot
View File

@@ -1,70 +0,0 @@
--- src/dot.cpp.orig 2016-05-10 19:51:52 UTC
+++ src/dot.cpp
@@ -39,6 +39,7 @@
#include "dirdef.h"
#include "vhdldocgen.h"
#include "ftextstream.h"
+#include <sys/types.h>
#include "md5.h"
#include "memberlist.h"
#include "groupdef.h"
@@ -2271,10 +2272,8 @@ void DotGfxHierarchyTable::createGraph(D
}
}
writeGraphFooter(md5stream);
- uchar md5_sig[16];
QCString sigStr(33);
- MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);
- MD5SigToString(md5_sig,sigStr.rawData(),33);
+ MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.rawData());
bool regenerate=FALSE;
if (checkAndUpdateMd5Signature(absBaseName,sigStr) ||
!checkDeliverables(absImgName,absMapName))
@@ -3039,10 +3038,8 @@ QCString computeMd5Signature(DotNode *ro
}
}
writeGraphFooter(md5stream);
- uchar md5_sig[16];
QCString sigStr(33);
- MD5Buffer((const unsigned char *)buf.data(),buf.length(),md5_sig);
- MD5SigToString(md5_sig,sigStr.rawData(),33);
+ MD5Data((const unsigned char *)buf.data(),buf.length(),sigStr.rawData());
graphStr=buf.data();
//printf("md5: %s | file: %s\n",sigStr,baseName.data());
return sigStr;
@@ -3954,10 +3951,8 @@ QCString DotDirDeps::writeGraph(FTextStr
FTextStream md5stream(&theGraph);
//m_dir->writeDepGraph(md5stream);
writeDotDirDepGraph(md5stream,m_dir,linkRelations);
- uchar md5_sig[16];
QCString sigStr(33);
- MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);
- MD5SigToString(md5_sig,sigStr.rawData(),33);
+ MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.rawData());
bool regenerate=FALSE;
if (checkAndUpdateMd5Signature(absBaseName,sigStr) ||
!checkDeliverables(graphFormat==GOF_BITMAP ? absImgName :
@@ -4099,10 +4094,8 @@ void generateGraphLegend(const char *pat
md5stream << " Node18 -> Node9 [dir=\"back\",color=\"darkorchid3\",fontsize=\"" << FONTSIZE << "\",style=\"dashed\",label=\"m_usedClass\",fontname=\"" << FONTNAME << "\"];\n";
md5stream << " Node18 [shape=\"box\",label=\"Used\",fontsize=\"" << FONTSIZE << "\",height=0.2,width=0.4,fontname=\"" << FONTNAME << "\",color=\"black\",URL=\"$classUsed" << Doxygen::htmlFileExtension << "\"];\n";
writeGraphFooter(md5stream);
- uchar md5_sig[16];
QCString sigStr(33);
- MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);
- MD5SigToString(md5_sig,sigStr.rawData(),33);
+ MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.rawData());
QCString absBaseName = (QCString)path+"/graph_legend";
QCString absDotName = absBaseName+".dot";
QCString imgExt = getDotImageExtension();
@@ -4507,10 +4500,8 @@ QCString DotGroupCollaboration::writeGra
}
writeGraphFooter(md5stream);
- uchar md5_sig[16];
QCString sigStr(33);
- MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);
- MD5SigToString(md5_sig,sigStr.rawData(),33);
+ MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.rawData());
QCString imgExt = getDotImageExtension();
QCString imgFmt = Config_getEnum(DOT_IMAGE_FORMAT);
QCString baseName = m_diskName;

23
devel/doxygen/files/patch-md5-memberdef
View File

@@ -1,23 +0,0 @@
--- src/memberdef.cpp.orig 2015-01-03 22:38:57 UTC
+++ src/memberdef.cpp
@@ -17,6 +17,7 @@
#include <qglobal.h>
#include <qregexp.h>
#include <assert.h>
+#include <sys/types.h>
#include "md5.h"
#include "memberdef.h"
#include "membername.h"
@@ -3326,11 +3327,9 @@ void MemberDef::setAnchor()
}
// convert to md5 hash
- uchar md5_sig[16];
QCString sigStr(33);
- MD5Buffer((const unsigned char *)memAnchor.data(),memAnchor.length(),md5_sig);
//printf("memAnchor=%s\n",memAnchor.data());
- MD5SigToString(md5_sig,sigStr.rawData(),33);
+ MD5Data((const unsigned char *)memAnchor.data(),memAnchor.length(),sigStr.rawData());
m_impl->anc = "a"+sigStr;
}

24
devel/doxygen/files/patch-md5-membergroup
View File

@@ -1,24 +0,0 @@
--- src/membergroup.cpp.orig 2015-01-03 22:38:57 UTC
+++ src/membergroup.cpp
@@ -28,6 +28,7 @@
#include "docparser.h"
#include "marshal.h"
#include "entry.h"
+#include <sys/types.h>
#include "md5.h"
//static QCString idToName(int id)
@@ -307,12 +308,10 @@ void MemberGroup::setInGroup(bool b)
QCString MemberGroup::anchor() const
{
- uchar md5_sig[16];
QCString sigStr(33);
QCString locHeader = grpHeader;
if (locHeader.isEmpty()) locHeader="[NOHEADER]";
- MD5Buffer((const unsigned char *)locHeader.data(),locHeader.length(),md5_sig);
- MD5SigToString(md5_sig,sigStr.rawData(),33);
+ MD5Data((const unsigned char *)locHeader.data(),locHeader.length(),sigStr.rawData());
return "amgrp"+sigStr;
}

48
devel/doxygen/files/patch-md5-util
View File

@@ -1,48 +0,0 @@
--- src/util.cpp.orig 2015-01-03 22:45:44 UTC
+++ src/util.cpp
@@ -19,6 +19,7 @@
#include <errno.h>
#include <math.h>
+#include <sys/types.h>
#include "md5.h"
#include <qregexp.h>
@@ -5335,16 +5336,16 @@ QCString convertNameToFile(const char *n
if (resultLen>=128) // prevent names that cannot be created!
{
// third algorithm based on MD5 hash
- uchar md5_sig[16];
QCString sigStr(33);
- MD5Buffer((const unsigned char *)result.data(),resultLen,md5_sig);
- MD5SigToString(md5_sig,sigStr.rawData(),33);
+ MD5Data((const unsigned char *)result.data(),resultLen,sigStr.rawData());
result=result.left(128-32)+sigStr;
}
}
if (createSubdirs)
{
+#if MAP_ALGO==ALGO_COUNT || MAP_ALGO==ALGO_CRC16
int l1Dir=0,l2Dir=0;
+#endif
#if MAP_ALGO==ALGO_COUNT
// old algorithm, has the problem that after regeneration the
@@ -5375,12 +5376,13 @@ QCString convertNameToFile(const char *n
l2Dir = (dirNum>>4)&0xff;
#elif MAP_ALGO==ALGO_MD5
// third algorithm based on MD5 hash
- uchar md5_sig[16];
- MD5Buffer((const unsigned char *)result.data(),result.length(),md5_sig);
- l1Dir = md5_sig[14]&0xf;
- l2Dir = md5_sig[15];
+ char md5[33];
+ MD5Data((const unsigned char *)result.data(),result.length(),md5);
+ result.prepend(QCString().sprintf("d%c/d%c%c/",md5[29],md5[30],md5[31]));
#endif
+#if MAP_ALGO==ALGO_COUNT || MAP_ALGO==ALGO_CRC16
result.prepend(QCString().sprintf("d%x/d%02x/",l1Dir,l2Dir));
+#endif
}
//printf("*** convertNameToFile(%s)->%s\n",name,result.data());
return result;

8
devel/doxygen/files/patch-qtools_CMakeLists.txt
View File

@@ -1,8 +0,0 @@
--- qtools/CMakeLists.txt.orig 2015-05-31 19:01:12 UTC
+++ qtools/CMakeLists.txt
@@ -1,4 +1,4 @@
-include_directories(.)
+include_directories(BEFORE .)
list(APPEND qtools_src
qbuffer.cpp

21
devel/doxygen/files/patch-src_CMakeLists.txt
View File

@@ -1,21 +0,0 @@
--- src/CMakeLists.txt.orig 2015-05-31 19:01:12 UTC
+++ src/CMakeLists.txt
@@ -1,8 +1,7 @@
# vim:ts=4:sw=4:expandtab:autoindent:
-include_directories(
+include_directories(BEFORE
${CMAKE_SOURCE_DIR}/qtools
- ${CMAKE_SOURCE_DIR}/libmd5
${CMAKE_SOURCE_DIR}/vhdlparser/
${CMAKE_SOURCE_DIR}/src
${CLANG_INCLUDEDIR}
@@ -229,7 +228,7 @@ target_link_libraries(doxygen
_doxygen
doxycfg
qtools
- md5
+ md
vhdlparser
${SQLITE3_LIBRARIES}
${ICONV_LIBRARIES}

11
devel/doxygen/files/patch-vhdlparser_CMakeLists.txt
View File

@@ -1,11 +0,0 @@
--- vhdlparser/CMakeLists.txt.orig 2016-05-10 19:51:52 UTC
+++ vhdlparser/CMakeLists.txt
@@ -6,7 +6,7 @@ add_custom_command(
)
set_source_files_properties(${GENERATED_SRC}/configvalues.h PROPERTIES GENERATED 1)
-include_directories(${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/qtools ${GENERATED_SRC})
+include_directories(BEFORE ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/qtools ${GENERATED_SRC})
add_library(vhdlparser STATIC
${GENERATED_SRC}/configvalues.h
CharStream.cc

17
devel/doxygen/files/patch-x-CMakeLists.txt
View File

@@ -1,17 +0,0 @@
--- ./CMakeLists.txt.orig 2017-10-31 21:36:00.000000000 +0200
+++ ./CMakeLists.txt 2018-02-12 15:43:14.026990000 +0200
@@ -14,12 +14,12 @@
cmake_minimum_required(VERSION 2.8.12)
project(doxygen)
-option(build_wizard "Build the GUI frontend for doxygen." OFF)
+option(build_wizard "Build the GUI frontend for doxygen." ON)
option(build_app "Example showing how to embed doxygen in an application." OFF)
option(build_parse "Parses source code and dumps the dependencies between the code elements." OFF)
option(build_xmlparser "Example showing how to parse doxygen's XML output." OFF)
option(build_search "Build external search tools (doxysearch and doxyindexer)" OFF)
-option(build_doc "Build user manual" OFF)
+option(build_doc "Build user manual" ON)
option(use_sqlite3 "Add support for sqlite3 output [experimental]." OFF)
option(use_libclang "Add support for libclang parsing." OFF)
option(win_static "Link with /MT in stead of /MD on windows" OFF)

2
print/libt1lib/pkg-plist
View File

@@ -3,6 +3,6 @@ include/t1lib.h
lib/libt1.a
lib/libt1.la
lib/libt1.so
lib/libt1.so.4
lib/libt1.so.5
share/t1lib/t1lib.config
@dir share/t1lib

4
print/texlive-texmf/Makefile
View File

@@ -50,7 +50,7 @@ _FILES+= pedigree-perl/pedigree.pl
do-build:
cd ${WRKDIR} && tar xzvpf ${LATEX_DISTFILE}
cd ${WRKDIR}/latex-base-20150101.2 && \
cd ${WRKDIR}/texlive-texmf-20150523 && \
${SETENV} TEXMF=. ${LOCALBASE}/bin/tex -ini unpack.ins
# ${RM} README *.log *.aux *.pdf *.dtx *.ins *.txt *.ist *.fdd *.err
@@ -62,7 +62,7 @@ do-install:
--no-same-permission --no-same-owner \
-f ${TEXMF_DISTFILE}
${MKDIR} ${STAGEDIR}${PREFIX}/share/texmf/tex/latex/base
cd ${WRKDIR}/latex-base-20150101.2 && ${PAX} -rw . \
cd ${WRKDIR}/texlive-texmf-20150523 && ${PAX} -rw . \
${STAGEDIR}${PREFIX}/share/texmf/tex/latex/base
post-install:

2
print/texlive/Makefile
View File

@@ -261,5 +261,7 @@ post-install:
cd ${STAGEDIR}${PREFIX}/bin && ${LN} -sf xetex xelatex
cd ${STAGEDIR}${PREFIX}/bin && ${LN} -sf xetex xelollipop
#gsed -i -e 's,"PRIu64"," PRIu64 ",' work/texlive-20150521-source/texk/web2c/pdftoepdf.cc
.include <bsd.port.mk>
#EOF