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

- update to 1.5.4

Browse Source 
- use tmake in ports (noticed by okan@)
- hack to strip a path prefix when generating md5 sum of source dir.

ok simon@, landry@
This commit is contained in:
eric 2008-01-06 10:02:59 +00:00
parent 43491badec
commit 85a125dae9
14 changed files with 137 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
devel/doxygen/Makefile
View File

@ -1,17 +1,17 @@
# $OpenBSD: Makefile,v 1.8 2007/09/16 02:52:58 merdely Exp $
# $OpenBSD: Makefile,v 1.9 2008/01/06 10:02:59 eric Exp $
COMMENT-main= source code documentation generator tool
COMMENT-gui= GUI front-end for doxygen
VERSION= 1.4.7
VERSION= 1.5.4
DISTNAME= doxygen-${VERSION}.src
PKGNAME-main= doxygen-${VERSION}p1
PKGNAME-main= doxygen-${VERSION}
FULLPKGNAME-gui=doxygen-gui-${VERSION}
CATEGORIES= devel textproc
HOMEPAGE= http://www.doxygen.org/
# GPL
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
@ -22,36 +22,46 @@ MASTER_SITES= ftp://ftp.stack.nl/pub/users/dimitri/
PSEUDO_FLAVORS= gui
FLAVOR?=
LIB_DEPENDS-main=png.>=4::graphics/png
BUILD_DEPENDS= ::devel/tmake
USE_GMAKE= Yes
MODULES= converters/libiconv
LIB_DEPENDS-main= png.>=4::graphics/png \
${LIB_DEPENDS}
WANTLIB= m c stdc++
CONFIGURE_STYLE=simple
CONFIGURE_ARGS= --prefix ${WRKINST}${LOCALBASE} \
--install /usr/bin/install \
--make /usr/bin/make
--dot ${LOCALBASE}/bin/dot
MULTI_PACKAGES= -main
.if ${FLAVOR:Mgui}
CONFIGURE_ARGS+=--with-doxywizard
CONFIGURE_ENV= QTDIR=${LOCALBASE}
MODULES= x11/qt3
MODULES+= x11/qt3
MULTI_PACKAGES+=-gui
.endif
WANTLIB-gui= ${WANTLIB} X11 Xext pthread
LIB_DEPENDS-gui=${MODQT_LIB_DEPENDS}
LIB_DEPENDS-gui=${MODQT_LIB_DEPENDS} \
${LIB_DEPENDS}
RUN_DEPENDS-gui=:doxygen-${VERSION}:${BUILD_PKGPATH}
WANTLIB-main= ${WANTLIB} z
MAKE_FLAGS+= CXX=${CXX} CC=${CC} _CFLAGS="${CXXFLAGS}" \
MAKE_FLAGS+= CXX=${CXX} CC=${CC} _CFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
WRKDIST= ${WRKDIR}/doxygen-${VERSION}
NO_REGRESS= Yes
VMEM_WARNING= Yes
pre-configure:
@perl -pi -e 's,!!LOCALBASE!!,${LOCALBASE},g' ${WRKSRC}/configure
.include <bsd.port.mk>

10
devel/doxygen/distinfo
View File

@ -1,5 +1,5 @@
MD5 (doxygen-1.4.7.src.tar.gz) = EdtjpyvTtRD9L6euSAhpeQ==
RMD160 (doxygen-1.4.7.src.tar.gz) = TeArhmzvU6f9b1TgupARGBSp13o=
SHA1 (doxygen-1.4.7.src.tar.gz) = QqM9Z2+9RxFl0C9TG/6Y9DPstDI=
SHA256 (doxygen-1.4.7.src.tar.gz) = XbDp3fb+dCcwlkGdU9ODXp8YIlgfIPXyDAV1AKXlEu0=
SIZE (doxygen-1.4.7.src.tar.gz) = 2928354
MD5 (doxygen-1.5.4.src.tar.gz) = EP/o1EXcG/fdaSkrJmkG/w==
RMD160 (doxygen-1.5.4.src.tar.gz) = Jj4ih9pPvpGkKdxT/jVpsVDHb98=
SHA1 (doxygen-1.5.4.src.tar.gz) = GoFffea0EveFLVfeyetQ98SwMmg=
SHA256 (doxygen-1.5.4.src.tar.gz) = EuaiFmuMeKmR1M7vHdkEIReyS3biDM/f38MLxKfjHfI=
SIZE (doxygen-1.5.4.src.tar.gz) = 3762535

8
devel/doxygen/patches/patch-Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.2 2005/07/26 05:45:08 alek Exp $
--- Makefile.in.orig Wed May 18 20:41:27 2005
+++ Makefile.in Mon Jul 25 21:51:46 2005
@@ -44,7 +44,7 @@ distclean: clean
$OpenBSD: patch-Makefile_in,v 1.3 2008/01/06 10:02:59 eric Exp $
--- Makefile.in.orig Mon Dec 17 20:57:30 2007
+++ Makefile.in Mon Dec 17 20:57:44 2007
@@ -45,7 +45,7 @@ distclean: clean
-rm -f addon/doxywizard/moc/moc_*
-rm -f addon/doxywizard/config.cpp

12
devel/doxygen/patches/patch-addon_doxywizard_doxywizard_pro_in
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-addon_doxywizard_doxywizard_pro_in,v 1.1.1.1 2005/07/17 08:30:06 alek Exp $
--- addon/doxywizard/doxywizard.pro.in.orig Mon Jan 3 20:20:58 2005
+++ addon/doxywizard/doxywizard.pro.in Fri May 6 21:02:14 2005
@@ -41,13 +41,13 @@ SOURCES = doxywizard.cpp \
config.cpp
$OpenBSD: patch-addon_doxywizard_doxywizard_pro_in,v 1.2 2008/01/06 10:02:59 eric Exp $
--- addon/doxywizard/doxywizard.pro.in.orig Sat Sep 1 21:20:16 2007
+++ addon/doxywizard/doxywizard.pro.in Mon Dec 24 20:32:07 2007
@@ -46,13 +46,13 @@ SOURCES = doxywizard.cpp \
portable.cpp
# where to put the objects
-OBJECTS_DIR = obj
@ -13,7 +13,7 @@ $OpenBSD: patch-addon_doxywizard_doxywizard_pro_in,v 1.1.1.1 2005/07/17 08:30:06
# extra C++ compiler options
-INCLUDEPATH += ../../src
+INCLUDEPATH += ../../src $(LOCALBASE)/lib/qt3/include
+TMAKE_LIBS += -pthread
+TMAKE_LIBS += -pthread -liconv
win32:TMAKE_CXXFLAGS += -DQT_DLL
win32:INCLUDEPATH += .
macosx-c++:LIBS+=-framework CoreFoundation -framework ApplicationServices

37
devel/doxygen/patches/patch-configure
View File

@ -1,13 +1,13 @@
$OpenBSD: patch-configure,v 1.2 2005/07/26 05:45:08 alek Exp $
--- configure.orig Sun Jul 10 16:54:15 2005
+++ configure Mon Jul 25 21:52:27 2005
$OpenBSD: patch-configure,v 1.3 2008/01/06 10:02:59 eric Exp $
--- configure.orig Fri Oct 26 16:27:08 2007
+++ configure Sat Jan 5 22:21:36 2008
@@ -1,4 +1,4 @@
-#!/bin/sh
+#! /bin/sh
#
# $Id: patch-configure,v 1.2 2005/07/26 05:45:08 alek Exp $
# $Id: patch-configure,v 1.3 2008/01/06 10:02:59 eric Exp $
#
@@ -241,7 +241,7 @@ if test "$f_wizard" = YES; then
@@ -259,7 +259,7 @@ if test "$f_wizard" = YES; then
echo " QTDIR environment variable not set!"
echo -n " Checking for Qt..."
for d in /usr/{lib,share,qt}/{qt-3,qt3,qt,qt*,3}; do
@ -16,7 +16,7 @@ $OpenBSD: patch-configure,v 1.2 2005/07/26 05:45:08 alek Exp $
QTDIR=$d
fi
done
@@ -264,10 +264,6 @@ if test "$f_wizard" = YES; then
@@ -285,10 +285,6 @@ if test "$f_wizard" = YES; then
echo "QTDIR is set to $QTDIR, but include directory $QTDIR/include does not exist!"
exit 2
fi
@ -25,9 +25,20 @@ $OpenBSD: patch-configure,v 1.2 2005/07/26 05:45:08 alek Exp $
- exit 2
- fi
echo " headers $QTDIR/include,"
echo " libraries $QTDIR/lib"
if test -n "`ls $QTDIR/lib/* | grep qt-mt`"; then
@@ -456,7 +452,7 @@ EOF
echo " libraries $QTDIR/$LIBDIR"
if test -n "`ls $QTDIR/$LIBDIR/* | grep qt-mt`"; then
@@ -436,9 +432,7 @@ configPWD=`pwd`
cat > .makeconfig <<EOF
DOXYGEN = $configPWD
-TMAKEPATH = $configPWD/tmake/lib/$f_platform
-ENV = env TMAKEPATH=\$(TMAKEPATH)
-TMAKE = $configPWD/tmake/bin/tmake
+TMAKE = /usr/local/bin/tmake
MAKE = $f_make
PERL = $f_perl
RM = rm -f
@@ -518,7 +512,7 @@ EOF
fi
if test "$f_wizard" = YES; then
cat >> .tmakeconfig <<EOF
@ -36,7 +47,7 @@ $OpenBSD: patch-configure,v 1.2 2005/07/26 05:45:08 alek Exp $
EOF
fi
@@ -482,17 +478,16 @@ EOF
@@ -544,20 +538,19 @@ EOF
if test $i = Makefile.in; then
echo "" >> $DST
echo "all: src/version.cpp " >> $DST
@ -49,7 +60,11 @@ $OpenBSD: patch-configure,v 1.2 2005/07/26 05:45:08 alek Exp $
+ echo " (cd src && \$(MAKE))" >> $DST
if test $f_wizard = YES; then
- echo " \$(MAKE) -C addon/doxywizard" >> $DST
+ echo " (cd addon/doxywizard && rm -rf obj && \$(MAKE))" >> $DST
+ echo " (cd addon/doxywizard && \$(MAKE))" >> $DST
fi
if test $f_app = YES; then
- echo " \$(MAKE) -C addon/doxyapp" >> $DST
+ echo " (cd addon/doxyapp && \$(MAKE))" >> $DST
fi
echo "" >> $DST
echo "doxywizard_install:" >> $DST

6
devel/doxygen/patches/patch-examples_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-examples_Makefile_in,v 1.2 2005/10/09 21:42:04 bernd Exp $
$OpenBSD: patch-examples_Makefile_in,v 1.3 2008/01/06 10:02:59 eric Exp $
--- examples/Makefile.in.orig Mon Jul 25 10:28:13 2005
+++ examples/Makefile.in Wed Oct 5 14:15:32 2005
@@ -106,7 +106,5 @@ docstring/html/index.html: docstring.py
+++ examples/Makefile.in Wed Dec 19 20:34:17 2007
@@ -106,7 +106,5 @@ docstring/html/index.html: docstring.py docstring.cfg
$(DOXYGEN)/bin/doxygen docstring.cfg
diagrams/html/index.html: diagrams_a.h diagrams_b.h diagrams_c.h diagrams_d.h diagrams_e.h diagrams.cfg

8
devel/doxygen/patches/patch-qtools_qtools_pro_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-qtools_qtools_pro_in,v 1.1.1.1 2005/07/17 08:30:06 alek Exp $
--- qtools/qtools.pro.in.orig Sun May 1 23:27:26 2005
+++ qtools/qtools.pro.in Sun May 1 23:27:34 2005
@@ -76,7 +76,7 @@ win32:SOURCES += qfile_win32.cpp \
$OpenBSD: patch-qtools_qtools_pro_in,v 1.2 2008/01/06 10:02:59 eric Exp $
--- qtools/qtools.pro.in.orig Mon Sep 4 22:53:41 2006
+++ qtools/qtools.pro.in Wed Dec 19 20:34:17 2007
@@ -78,7 +78,7 @@ win32:SOURCES += qfile_win32.cpp \
qfileinfo_win32.cpp
INCLUDEPATH = .

22
devel/doxygen/patches/patch-src_dirdef_cpp Normal file
View File

@ -0,0 +1,22 @@
$OpenBSD: patch-src_dirdef_cpp,v 1.1 2008/01/06 10:02:59 eric Exp $
--- src/dirdef.cpp.orig Sun Jan 28 13:28:50 2007
+++ src/dirdef.cpp Sat Dec 29 01:27:05 2007
@@ -71,11 +71,16 @@ void DirDef::addFile(FileDef *fd)
static QCString encodeDirName(const QCString &anchor)
{
QCString result;
-
+ char *name, *prefix;
// convert to md5 hash
uchar md5_sig[16];
QCString sigStr(33);
- MD5Buffer((const unsigned char *)anchor.data(),anchor.length(),md5_sig);
+ name = (char*)anchor.data();
+ prefix = getenv("DOXYGEN_ENCODE_PATH_STRIP");
+ if(prefix != NULL)
+ if (strstr(name, prefix) == name)
+ name += strlen(prefix);
+ MD5Buffer((const unsigned char*)name,strlen(name),md5_sig);
MD5SigToString(md5_sig,sigStr.data(),33);
return sigStr;

18
devel/doxygen/patches/patch-src_doxygen_pro_in
View File

@ -1,18 +1,18 @@
$OpenBSD: patch-src_doxygen_pro_in,v 1.1.1.1 2005/07/17 08:30:06 alek Exp $
--- src/doxygen.pro.in.orig Mon Jan 3 20:17:55 2005
+++ src/doxygen.pro.in Sun May 1 23:57:39 2005
$OpenBSD: patch-src_doxygen_pro_in,v 1.2 2008/01/06 10:02:59 eric Exp $
--- src/doxygen.pro.in.orig Tue Jun 5 21:54:19 2007
+++ src/doxygen.pro.in Wed Dec 19 22:04:12 2007
@@ -18,7 +18,7 @@ TEMPLATE = app.t
CONFIG = console warn_on $extraopts
HEADERS = doxygen.h
SOURCES = main.cpp
-unix:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lpng -lmd5
+unix:LIBS += -L../lib -L$(LOCALBASE)/lib -ldoxygen -ldoxycfg -lqtools -lpng -lmd5 -lz
-unix:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lpng -lmd5
+unix:LIBS += -L../lib -L$(LOCALBASE)/lib -ldoxygen -ldoxycfg -lqtools -lpng -lmd5 -liconv -lz
win32:INCLUDEPATH += .
win32-mingw:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lpng -lmd5
win32-msvc:LIBS += qtools.lib png.lib md5.lib doxygen.lib doxycfg.lib shell32.lib
@@ -28,6 +28,7 @@ win32-borland:TMAKE_LFLAGS += -L..\lib -
win32-mingw:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lpng -lmd5
win32-msvc:LIBS += qtools.lib png.lib md5.lib doxygen.lib doxycfg.lib shell32.lib iconv.lib
@@ -28,6 +28,7 @@ win32-borland:TMAKE_LFLAGS += -L..\lib -L$(BCB)\lib\ps
win32:TMAKE_CXXFLAGS += -DQT_NODLL
win32-g++:LIBS = -L../lib -ldoxygen -ldoxycfg -lqtools -lpng -lmd5
win32-g++:LIBS = -L../lib -ldoxygen -ldoxycfg -lqtools -lpng -lmd5 -liconv
win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
+TMAKE_CXXFLAGS += $(_CFLAGS)
INCLUDEPATH += ../qtools ../libpng ../libmd5 .

8
devel/doxygen/patches/patch-src_doxytag_pro_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_doxytag_pro_in,v 1.1.1.1 2005/07/17 08:30:06 alek Exp $
--- src/doxytag.pro.in.orig Sun May 1 23:39:49 2005
+++ src/doxytag.pro.in Sun May 1 23:40:04 2005
@@ -26,6 +26,7 @@ win32-msvc:TMAKE_LFLAGS += /LIBPATH:.
$OpenBSD: patch-src_doxytag_pro_in,v 1.2 2008/01/06 10:02:59 eric Exp $
--- src/doxytag.pro.in.orig Tue Feb 20 19:27:35 2007
+++ src/doxytag.pro.in Wed Dec 19 20:34:17 2007
@@ -26,6 +26,7 @@ win32-msvc:TMAKE_LFLAGS += /LIBPATH:..\lib
win32-borland:LIBS += qtools.lib shell32.lib
win32-borland:TMAKE_LFLAGS += -L..\lib -L$(BCB)\lib\psdk
win32:TMAKE_CXXFLAGS += -DQT_NODLL

12
devel/doxygen/patches/patch-src_fortranscanner_l Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_fortranscanner_l,v 1.1 2008/01/06 10:02:59 eric Exp $
--- src/fortranscanner.l.orig Wed Dec 19 21:53:40 2007
+++ src/fortranscanner.l Wed Dec 19 21:55:52 2007
@@ -1132,7 +1132,7 @@ static Argument *addFortranParameter(const QCString &t
{
//cout<<"addFortranParameter(): "<<name<<" DOCS:"<<(docs.isNull()?QString("null"):docs)<<endl;
Argument *ret = 0;
- if (current_root->argList==0) return FALSE;
+ if (current_root->argList==0) return NULL;
ArgumentListIterator ali(*current_root->argList);
Argument *a;
for (ali.toFirst();(a=ali.current());++ali)

10
devel/doxygen/patches/patch-src_libdoxycfg_pro_in
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-src_libdoxycfg_pro_in,v 1.1.1.1 2005/07/17 08:30:06 alek Exp $
--- src/libdoxycfg.pro.in.orig Sun May 1 23:39:04 2005
+++ src/libdoxycfg.pro.in Sun May 1 23:39:22 2005
@@ -20,6 +20,7 @@ HEADERS = config.h
SOURCES = config.cpp
$OpenBSD: patch-src_libdoxycfg_pro_in,v 1.2 2008/01/06 10:02:59 eric Exp $
--- src/libdoxycfg.pro.in.orig Tue Feb 20 19:27:36 2007
+++ src/libdoxycfg.pro.in Wed Dec 19 20:34:17 2007
@@ -20,6 +20,7 @@ HEADERS = config.h portable.h
SOURCES = config.cpp portable.cpp
win32:TMAKE_CXXFLAGS += -DQT_NODLL
win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
+TMAKE_CXXFLAGS += $(_CFLAGS)

10
devel/doxygen/patches/patch-src_libdoxygen_pro_in
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-src_libdoxygen_pro_in,v 1.3 2005/10/09 21:42:04 bernd Exp $
--- src/libdoxygen.pro.in.orig Mon Aug 8 20:17:10 2005
+++ src/libdoxygen.pro.in Wed Oct 5 14:15:32 2005
@@ -198,8 +198,8 @@ SOURCES = ce_lex.cpp \
win32:TMAKE_CXXFLAGS += -DQT_NODLL
$OpenBSD: patch-src_libdoxygen_pro_in,v 1.4 2008/01/06 10:02:59 eric Exp $
--- src/libdoxygen.pro.in.orig Wed Dec 19 20:39:12 2007
+++ src/libdoxygen.pro.in Wed Dec 19 20:40:02 2007
@@ -214,8 +214,8 @@ win32:TMAKE_CXXFLAGS += -DQT_NODLL
win32-msvc:TMAKE_CXXFLAGS += -Zm200
win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
linux-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
+TMAKE_CXXFLAGS += $(_CFLAGS)
INCLUDEPATH += ../qtools
-INCLUDEPATH += ../libpng

14
devel/doxygen/pkg/DESCR-main
View File

@ -19,10 +19,22 @@ generated automatically.
To take full advantage of doxygen's features the following additional
ports should be installed:
- print/teTeX for generating LaTeX, Postscript, and PDF output.
- print/texlive for generating LaTeX, Postscript, and PDF output.
- math/graphviz for the include dependency graphs, the graphical
inheritance graphs, and the collaboration graphs.
- print/ghostscript
Flavors:
* gui -- build Qt frontend
Note:
When generating certain filenames (for example directory listing with
the html backend), doxygen uses an md5 sum of the source path. This
is a problem for the ports framework, as the sources location can vary
(/usr/obj/ports/..., usr/ports/.../w-..., /usr/ports/mystuff/.../w-...).
This port has been modified so that when running doxygen, the
DOXYGEN_ENCODE_PATH_STRIP environment variable can be set to a prefix
to be stripped from a path before its md5 sum is calculated. Ports
using doxygen should use "DOXYGEN_ENCODE_PATH_STRIP=${WRKSRC}".