cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Update devel/doxygen to version 1.8.8 [1]

Browse Source 
- Fix graphics/partio plist problem after doxygen update [2]

PR:		194178 [1]
Submitted by:	maintainer [1]
Approved by:	mva@ [2]
This commit is contained in:
Pawel Pekala 2014-10-26 23:25:45 +00:00
parent a24f72f72e
commit 63ab8c6719
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=371529
9 changed files with 54 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
devel/doxygen/Makefile
View File

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= doxygen
PORTVERSION= 1.8.7
PORTREVISION= 1
PORTVERSION= 1.8.8
PORTEPOCH= 1
CATEGORIES= devel
MASTER_SITES= ftp://ftp.stack.nl/pub/users/dimitri/ \
@ -21,6 +20,7 @@ BUILD_DEPENDS= tmake:${PORTSDIR}/devel/tmake \
LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png
USES= bison gmake iconv perl5 python:2
ALL_TARGET= all
HAS_CONFIGURE= yes
QT_NONSTANDARD= yes # non-standard configure arguments
CONFIGURE_ARGS= --prefix ${PREFIX} --perl ${PERL} --make ${MAKE_CMD} \
@ -44,7 +44,7 @@ PDFDOCS_DESC= Install documentation in PDF format
GRAPHVIZ_RUN_DEPENDS= dot:${PORTSDIR}/graphics/graphviz
LATEX_USE= TEX=full
LATEX_USE= TEX=base,dvipsk,pdftex
QT4_USE= QT4=corelib,gui,xml,qmake_build,moc_build,rcc_build
QT4_CONFIGURE_ENV= QTDIR="${QTDIR}"
@ -107,9 +107,7 @@ pre-install:
.endif
@cd ${TMPDOCDEST} \
&& ${FIND} -s * -type f -o -type l \
| ${SED} -e 's|^|share/doc/|' >> ${PLIST} \
&& ${FIND} -d * -type d \
| ${SED} -e 's|^|@dirrm share/doc/|' >> ${PLIST}
| ${SED} -e 's|^|share/doc/|' >> ${PLIST}
.endif
do-install:

4
devel/doxygen/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (doxygen-1.8.7.src.tar.gz) = c6eac6b6e82148ae15ec5aecee4631547359f284af1ce94474d046ebca6ee3d9
SIZE (doxygen-1.8.7.src.tar.gz) = 4796875
SHA256 (doxygen-1.8.8.src.tar.gz) = 158e7834f05e0aeea5794b23c1e775ddfebafc709543e47f6fff9d81b190ade1
SIZE (doxygen-1.8.8.src.tar.gz) = 4955485

30
devel/doxygen/files/patch-Makefile.in
View File

@ -1,6 +1,6 @@
--- Makefile.in-orig 2014-06-14 08:30:10.000000000 +0200
+++ Makefile.in 2014-06-14 08:31:21.000000000 +0200
@@ -2,25 +2,24 @@
--- Makefile.in.orig 2014-08-22 08:36:24 UTC
+++ Makefile.in
@@ -2,26 +2,25 @@
DESTDIR =
doxywizard:
@ -20,8 +20,7 @@
+ $(MAKE) -C addon/doxmlparser/examples/metrics
doxyapp:
- cd addon/doxyapp ; $(MAKE) clean
+ $(MAKE) -C addon/doxyapp
cd addon/doxyapp ; $(MAKE) clean
clean: FORCE
- - cd examples ; $(MAKE) clean
@ -29,33 +28,36 @@
- - cd qtools ; $(MAKE) clean
- - cd src ; $(MAKE) clean
- - cd libmd5 ; $(MAKE) clean
- - cd vhdlparser ; $(MAKE) clean
+ -cd examples ; $(MAKE) clean
+ -cd doc ; $(MAKE) clean
+ -cd qtools ; $(MAKE) clean
+ -cd src ; $(MAKE) clean
+ -cd vhdlparser ; $(MAKE) clean
-cd addon/doxywizard ; $(MAKE) clean
-cd addon/doxysearch ; $(MAKE) clean
-cd addon/doxyapp ; $(MAKE) clean
@@ -32,7 +31,6 @@ clean: FORCE
@@ -33,7 +32,6 @@
distclean: clean
-cd src ; $(MAKE) distclean
- -cd libmd5 ; $(MAKE) distclean
-cd vhdlparser ; $(MAKE) distclean
-cd qtools ; $(MAKE) distclean
-cd addon/doxywizard ; $(MAKE) distclean
-cd addon/doxysearch ; $(MAKE) distclean
-cd addon/doxyapp ; $(MAKE) distclean
@@ -51,9 +49,8 @@ distclean: clean
@@ -54,10 +52,9 @@
-rm -rf xml
-rm -f src/Makefile.doxygen src/Makefile.libdoxygen
-rm -f src/Makefile.libdoxycfg src/libdoxycfg.t src/libdoxygen.t
- -rm -f libmd5/Makefile.libmd5
-rm -f vhdlparser/Makefile.vhdlparser
-rm -f .makeconfig .tmakeconfig
- -rm -f src/doxygen.pro src/libdoxygen.pro qtools/qtools.pro src/libdoxycfg.pro libmd5/libmd5.pro
+ -rm -f src/doxygen.pro src/libdoxygen.pro qtools/qtools.pro src/libdoxycfg.pro
- -rm -f src/doxygen.pro src/libdoxygen.pro qtools/qtools.pro src/libdoxycfg.pro libmd5/libmd5.pro vhdlparser/vhdlparser.pro
+ -rm -f src/doxygen.pro src/libdoxygen.pro qtools/qtools.pro src/libdoxycfg.pro vhdlparser/vhdlparser.pro
-rm -rf generated_src
-rm -f addon/doxywizard/doxywizard.pro
-rm -f VERSION
@@ -88,14 +85,14 @@ install_docs:
@@ -92,14 +89,14 @@
cp -r examples $(DESTDIR)$(DOCDIR)
cp -r html $(DESTDIR)$(DOCDIR)
@ -70,8 +72,8 @@
- cd latex ; $(MAKE)
+ $(MAKE) -C latex
-DISTFILES = Doxyfile libmd5 addon tmake doc examples bin lib objects testing \
+DISTFILES = Doxyfile addon tmake doc examples bin lib objects testing \
-DISTFILES = Doxyfile vhdlparser libmd5 addon tmake doc examples bin lib objects testing \
+DISTFILES = Doxyfile vhdlparser addon tmake doc examples bin lib objects testing \
qtools src configure configure.bin Makefile.in Makefile.win_nmake.in \
Makefile.win_make.in INSTALL LANGUAGE.HOWTO LICENSE PLATFORMS \
VERSION README.md packages winbuild jquery

24
devel/doxygen/files/patch-configure
View File

@ -1,5 +1,5 @@
--- configure.orig 2014-04-20 17:17:29.000000000 +0200
+++ configure 2014-06-13 23:25:23.000000000 +0200
--- configure.orig 2014-08-22 08:43:05 UTC
+++ configure
@@ -363,25 +363,25 @@
echo " QTDIR environment variable not set!"
printf " Checking for Qt..."
@ -31,7 +31,7 @@
echo "check the Qt installation instructions!"
exit 2
fi
@@ -848,7 +848,7 @@
@@ -857,7 +857,7 @@
fi
if test "$f_wizard" = YES; then
cat >> .tmakeconfig <<EOF
@ -40,29 +40,29 @@
EOF
fi
@@ -859,7 +859,7 @@
@@ -868,7 +868,7 @@
EOF
fi
-f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in libmd5/Makefile.in addon/doxyapp/Makefile.in addon/doxysearch/Makefile.in"
+f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in addon/doxyapp/Makefile.in addon/doxysearch/Makefile.in"
-f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in libmd5/Makefile.in addon/doxyapp/Makefile.in addon/doxysearch/Makefile.in vhdlparser/Makefile.in"
+f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in addon/doxyapp/Makefile.in addon/doxysearch/Makefile.in vhdlparser/Makefile.in"
for i in $f_inmakefiles ; do
SRC=$i
@@ -883,7 +883,6 @@
@@ -892,7 +892,6 @@
# fi
echo "all: generated_src/doxygen/version.cpp $EXTRADEPS" >> $DST
echo " \$(MAKE) -C qtools" >> $DST
- echo " \$(MAKE) -C libmd5" >> $DST
echo " \$(MAKE) -C vhdlparser" >> $DST
echo " \$(MAKE) -C src" >> $DST
if test $f_wizard = YES; then
echo " \$(MAKE) MAN1DIR=\$(MAN1DIR) -C addon/doxywizard" >> $DST
@@ -921,7 +920,7 @@
@@ -932,7 +931,7 @@
cat src/libdoxycfg.t.in | sed -e "s|%%FLEX%%|$f_flex|g" -e "s|%%BISON%%|$f_bison|g" -e "s|%%PYTHON%%|$f_python|g" > src/libdoxycfg.t
cat src/libdoxygen.t.in | sed -e "s|%%FLEX%%|$f_flex|g" -e "s|%%BISON%%|$f_bison|g" -e "s|%%PYTHON%%|$f_python|g" > src/libdoxygen.t
-f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in libmd5/libmd5.pro.in addon/doxyapp/doxyapp.pro.in addon/doxysearch/doxysearch.pro.in addon/doxysearch/doxyindexer.pro.in"
+f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in addon/doxyapp/doxyapp.pro.in addon/doxysearch/doxysearch.pro.in addon/doxysearch/doxyindexer.pro.in"
-f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in libmd5/libmd5.pro.in addon/doxyapp/doxyapp.pro.in addon/doxysearch/doxysearch.pro.in addon/doxysearch/doxyindexer.pro.in vhdlparser/vhdlparser.pro.in"
+f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in addon/doxyapp/doxyapp.pro.in addon/doxysearch/doxysearch.pro.in addon/doxysearch/doxyindexer.pro.in vhdlparser/vhdlparser.pro.in"
for i in $f_inprofiles ; do
SRC=$i

8
devel/doxygen/files/patch-doc-Makefile.in
View File

@ -1,9 +1,9 @@
--- doc/Makefile.in.orig Mon Jul 8 15:59:59 2002
+++ doc/Makefile.in Tue Oct 22 23:02:24 2002
--- doc/Makefile.in.orig 2014-07-13 13:04:37 UTC
+++ doc/Makefile.in
@@ -18,12 +18,14 @@
VERSION=$(VERSION) ; \
export VERSION; \
$(DOXYGEN)/bin/doxygen
"$(DOXYGEN)/bin/doxygen"
- @rm -f ../latex/refman.tex
@cp doxygen_logo*.gif ../html
+ifdef HAVE_LATEX
@ -15,4 +15,4 @@
+endif # HAVE_LATEX
clean:
rm -rf ../html ../latex *.bak translator_report.txt
rm -rf ../html ../latex *.bak

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

@ -1,10 +1,11 @@
--- Doxyfile.orig 2014-06-14 08:11:43.000000000 +0200
+++ Doxyfile 2014-06-14 08:11:47.000000000 +0200
@@ -257,7 +257,7 @@
--- 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 \
- libmd5
+INCLUDE_PATH = qtools
INCLUDE_FILE_PATTERNS =
PREDEFINED =

18
devel/doxygen/files/patch-md5-doxygen.pro.in
View File

@ -1,20 +1,20 @@
--- src/doxygen.pro.in-orig 2014-06-11 20:16:21.000000000 +0200
+++ src/doxygen.pro.in 2014-06-11 20:16:59.000000000 +0200
--- src/doxygen.pro.in.orig 2014-08-14 17:46:42 UTC
+++ src/doxygen.pro.in
@@ -18,7 +18,7 @@
CONFIG = console warn_on $extraopts
HEADERS = doxygen.h
SOURCES = main.cpp
-unix:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 -lpthread %%SQLITE3_LIBS%% %%LIBCLANG_LIBS%%
+unix:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd -lpthread %%SQLITE3_LIBS%% %%LIBCLANG_LIBS%%
-unix:LIBS += -L../lib -ldoxygen -lvhdlparser -ldoxycfg -lqtools -lmd5 -lpthread %%SQLITE3_LIBS%% %%LIBCLANG_LIBS%%
+unix:LIBS += -L../lib -ldoxygen -lvhdlparser -ldoxycfg -lqtools -lmd -lpthread %%SQLITE3_LIBS%% %%LIBCLANG_LIBS%%
win32:INCLUDEPATH += .
win32-mingw:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 -lpthread -llibiconv -lole32 %%SQLITE3_LIBS%% %%LIBCLANG_LIBS%%
win32-msvc:LIBS += qtools.lib md5.lib doxygen.lib doxycfg.lib shell32.lib iconv.lib
win32-mingw:LIBS += -L../lib -ldoxygen -ldoxycfg -lvhdlparser -lqtools -lmd5 -lpthread -llibiconv -lole32 %%SQLITE3_LIBS%% %%LIBCLANG_LIBS%%
win32-msvc:LIBS += qtools.lib md5.lib doxygen.lib doxycfg.lib vhdlparser.lib shell32.lib iconv.lib
@@ -29,7 +29,7 @@
win32-g++:LIBS = -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 -liconv -lpthread %%SQLITE3_LIBS%% %%LIBCLANG_LIBS%% -Wl,--as-needed -lole32
win32-g++:LIBS = -L../lib -ldoxygen -ldoxycfg -lvhdlparser -lqtools -lmd5 -liconv -lpthread %%SQLITE3_LIBS%% %%LIBCLANG_LIBS%% -Wl,--as-needed -lole32
win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
DEPENDPATH += ../generated_src/doxygen
-INCLUDEPATH += ../qtools ../libmd5 .
+INCLUDEPATH += ../qtools .
-INCLUDEPATH += ../qtools ../libmd5 . ../vhdlparser
+INCLUDEPATH += ../qtools . ../vhdlparser
DESTDIR = ../bin
TARGET = doxygen
unix:TARGETDEPS = ../lib/libdoxygen.a ../lib/libdoxycfg.a

2
graphics/partio/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= partio
PORTVERSION= 1.1.0.20140128
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= graphics math
MAINTAINER= mva@FreeBSD.org

2
graphics/partio/pkg-plist
View File

@ -21,7 +21,6 @@ lib/libpartio.a
%%PORTDOCS%%%%DOCSDIR%%/classPartio_1_1ParticleAttribute-members.html
%%PORTDOCS%%%%DOCSDIR%%/classPartio_1_1ParticleAttribute.html
%%PORTDOCS%%%%DOCSDIR%%/classPartio_1_1ParticleIterator-members.html
%%PORTDOCS%%%%DOCSDIR%%/classPartio_1_1ParticleIterator.html
%%PORTDOCS%%%%DOCSDIR%%/classPartio_1_1ParticlesData-members.html
%%PORTDOCS%%%%DOCSDIR%%/classPartio_1_1ParticlesData.html
%%PORTDOCS%%%%DOCSDIR%%/classPartio_1_1ParticlesData.png
@ -84,6 +83,7 @@ lib/libpartio.a
%%PORTDOCS%%%%DOCSDIR%%/open.png
%%PORTDOCS%%%%DOCSDIR%%/pages.html
%%PORTDOCS%%%%DOCSDIR%%/pytut.html
%%PORTDOCS%%%%DOCSDIR%%/singletonPartio_1_1ParticleIterator.html
%%PORTDOCS%%%%DOCSDIR%%/structPartio_1_1Data-members.html
%%PORTDOCS%%%%DOCSDIR%%/structPartio_1_1Data.html
%%PORTDOCS%%%%DOCSDIR%%/structPartio_1_1ETYPE__TO__TYPE-members.html