Import of pkgsrc-2014Q1

This commit is contained in:
2014-11-05 12:41:07 +01:00
parent 785076ae39
commit 9a8c06dafb
19365 changed files with 828089 additions and 278039 deletions
+21 -7
View File
@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.102 2013/06/04 22:15:51 tron Exp $
# $NetBSD: Makefile,v 1.110 2014/02/19 17:43:47 jperkin Exp $
DISTNAME= doxygen-1.8.4.src
DISTNAME= doxygen-1.8.6.src
PKGNAME= ${DISTNAME:S/.src//}
PKGREVISION= 3
PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= ftp://ftp.stack.nl/pub/users/dimitri/ \
http://ftp.stack.nl/pub/users/dimitri/
@@ -14,11 +14,14 @@ LICENSE= gnu-gpl-v2
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
UNLIMIT_RESOURCES+= datasize
# doxygen upstream uses this version of flex
FLEX_REQD= 2.5.35
USE_TOOLS+= gmake gs:run perl:run bison flex
USE_LANGUAGES= c c++
HAS_CONFIGURE= yes
CONFIGURE_ARGS+= --make ${GMAKE}
CONFIGURE_ARGS+= --perl ${PERL5}
CONFIGURE_ARGS+= --python ${PYTHONBIN}
CONFIGURE_ARGS+= --install ${INSTALL}
CONFIGURE_ARGS+= --dot ${PREFIX}/bin/dot
CONFIGURE_ARGS+= --prefix ${PREFIX}
@@ -26,7 +29,11 @@ CONFIGURE_ARGS+= --docdir ${PREFIX}/share/doc/doxygen
MAKE_ENV+= PKGSRC_CFLAGS=${CFLAGS:Q}
MAKE_FLAGS+= MAN1DIR=${PKGMANDIR}/man1
# Case Insensitive fs or Sensitive
REPLACE_PERL= tmake/bin/tmake
PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.8.6
# Case Insensitive or Case Sensitive File System
PLIST_VARS+= ci cs
# pangocairo: basic ps/pdf support via PKG_BUILD_OPTIONS.graphviz
@@ -36,7 +43,6 @@ SUBST_CLASSES+= path
SUBST_STAGE.path= pre-configure
SUBST_FILES.path= doc/Makefile.in
SUBST_SED.path= -e "s|@EPSTOPDF@|${LOCALBASE}/bin/epstopdf|g"
SUBST_SED.path+= -e "s|@PYTHONBIN@|${PYTHONBIN}|g"
SUBST_CLASSES+= perlbin
SUBST_STAGE.perlbin= pre-configure
@@ -67,9 +73,17 @@ PLIST.cs= yes # case-sensitive
CONFIGURE_ARGS+= -platform freebsd-g++
.endif
.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD"
LDFLAGS+= ${BUILDLINK_LDADD.iconv}
.endif
post-patch:
touch ${WRKSRC}/src/doxytag.l
# remove unnecessary files that leak tool paths
post-install:
rm -f ${DESTDIR}${PREFIX}/share/doc/doxygen/examples/Makefile*
BUILDLINK_API_DEPENDS.graphviz+= graphviz>=2.12nb1
.include "options.mk"
@@ -77,9 +91,9 @@ BUILDLINK_API_DEPENDS.graphviz+= graphviz>=2.12nb1
.include "../../graphics/graphviz/buildlink3.mk"
.if !empty(PKG_BUILD_OPTIONS.graphviz:Mpangocairo)
PLIST.pangocairo= yes
PLIST.pangocairo= yes
.else
PLIST.nopangocairo= yes
PLIST.nopangocairo= yes
.endif
.include "../../lang/python/application.mk"
.include "../../mk/bsd.pkg.mk"
+1 -4
View File
@@ -1,10 +1,7 @@
@comment $NetBSD: PLIST,v 1.35 2013/05/21 14:43:05 wiz Exp $
@comment $NetBSD: PLIST,v 1.36 2014/01/02 18:26:36 wiz Exp $
bin/doxygen
man/man1/doxygen.1
${PLIST.latex}share/doc/doxygen/doxygen_manual.pdf
${PLIST.latex}share/doc/doxygen/examples/Makefile
${PLIST.latex}share/doc/doxygen/examples/Makefile.in
${PLIST.latex}share/doc/doxygen/examples/Makefile.win.in
${PLIST.latex}share/doc/doxygen/examples/afterdoc.cfg
${PLIST.latex}share/doc/doxygen/examples/afterdoc.h
${PLIST.latex}share/doc/doxygen/examples/afterdoc/html/afterdoc_8h_source.html
+7 -8
View File
@@ -1,12 +1,11 @@
$NetBSD: distinfo,v 1.49.2.1 2013/08/21 12:51:24 tron Exp $
$NetBSD: distinfo,v 1.52 2014/01/02 18:26:36 wiz Exp $
SHA1 (doxygen-1.8.4.src.tar.gz) = a363811b932e44d479addbadffcc8257cde60b44
RMD160 (doxygen-1.8.4.src.tar.gz) = 7087480667cb138c739fae54ca21f77e2099f4eb
Size (doxygen-1.8.4.src.tar.gz) = 6456090 bytes
SHA1 (doxygen-1.8.6.src.tar.gz) = 204f1b3695c73efac44a521609c5360241d64045
RMD160 (doxygen-1.8.6.src.tar.gz) = a3ff624168061092c39a99759d85fb02e0dbb3b4
Size (doxygen-1.8.6.src.tar.gz) = 7355610 bytes
SHA1 (patch-aa) = 74aa6e068c150d2e40c5a73723afd24d510f4538
SHA1 (patch-ab) = 1bd196c38786bb6b0b1817bb9575924ca234aee3
SHA1 (patch-ab) = d66d077fe05f26ecdb3c292d2e563e54ef7ab81a
SHA1 (patch-ac) = 87c68a2ce598c10d90d775764f4c05739eb51435
SHA1 (patch-af) = 0942cc0fdcb49e74ce018d7e790dba36b21b4d08
SHA1 (patch-af) = 2af16b257b49c7917aff5f919da43e20bedec376
SHA1 (patch-ah) = db6f117bf1faa3a1ed0b2ca9af81fc4f8d0913f9
SHA1 (patch-aj) = 1f4822364eb9aeb82084d30b0bc75af504da63f1
SHA1 (patch-tmake_lib_macosx-c++_tmake.conf) = f6f7414bf8e1c26264211c72991d8dc4222cc738
SHA1 (patch-aj) = d771e76cfc659442b2d41d5e3364b3c3189b42c8
+2 -1
View File
@@ -1,4 +1,4 @@
# $NetBSD: options.mk,v 1.7 2012/08/29 00:33:56 dsainty Exp $
# $NetBSD: options.mk,v 1.8 2013/11/20 04:50:47 dsainty Exp $
#
PKG_OPTIONS_VAR= PKG_OPTIONS.doxygen
PKG_SUPPORTED_OPTIONS= latex
@@ -28,6 +28,7 @@ DEPENDS+= tex-rsfs-[0-9]*:../../fonts/tex-rsfs
#
# Styles used by Doxygen output.
#
DEPENDS+= tex-amsfonts-[0-9]*:../../fonts/tex-amsfonts
DEPENDS+= tex-colortbl-[0-9]*:../../print/tex-colortbl
DEPENDS+= tex-fancyhdr-[0-9]*:../../print/tex-fancyhdr
DEPENDS+= tex-float-[0-9]*:../../print/tex-float
+17 -17
View File
@@ -1,32 +1,32 @@
$NetBSD: patch-ab,v 1.13 2013/01/06 01:00:59 wiz Exp $
$NetBSD: patch-ab,v 1.14 2014/01/02 18:26:36 wiz Exp $
Convert $(INSTTOOL) to pkgsrc style Variables
--- Makefile.in.orig 2012-12-25 12:17:27.000000000 +0000
--- Makefile.in.orig 2013-10-21 18:09:13.000000000 +0000
+++ Makefile.in
@@ -56,19 +56,19 @@ DATE=$(shell date "+%B %Y")
@@ -81,19 +81,19 @@ DATE=$(shell date "+%B %Y")
MAN1DIR = man/man1
install: doxywizard_install doxysearch_install
- $(INSTTOOL) -d $(DESTDIR)/$(INSTALL)/bin
- $(INSTTOOL) -m 755 bin/doxygen $(DESTDIR)/$(INSTALL)/bin
- $(INSTTOOL) -d $(DESTDIR)/$(INSTALL)/$(MAN1DIR)
+ $(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)/$(INSTALL)/bin
+ $(BSD_INSTALL_PROGRAM) bin/doxygen $(DESTDIR)/$(INSTALL)/bin
+ $(BSD_INSTALL_MAN_DIR) $(DESTDIR)/$(INSTALL)/$(MAN1DIR)
- $(INSTTOOL) -d $(DESTDIR)$(INSTALL)/bin
- $(INSTTOOL) -m 755 bin/doxygen $(DESTDIR)$(INSTALL)/bin
- $(INSTTOOL) -d $(DESTDIR)$(INSTALL)/$(MAN1DIR)
+ $(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(INSTALL)/bin
+ $(BSD_INSTALL_PROGRAM) bin/doxygen $(DESTDIR)$(INSTALL)/bin
+ $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(INSTALL)/$(MAN1DIR)
cat doc/doxygen.1 | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > doxygen.1
- $(INSTTOOL) -m 644 doxygen.1 $(DESTDIR)/$(INSTALL)/$(MAN1DIR)/doxygen.1
+ $(BSD_INSTALL_MAN) doxygen.1 $(DESTDIR)/$(INSTALL)/$(MAN1DIR)/doxygen.1
- $(INSTTOOL) -m 644 doxygen.1 $(DESTDIR)$(INSTALL)/$(MAN1DIR)/doxygen.1
+ $(BSD_INSTALL_MAN) doxygen.1 $(DESTDIR)$(INSTALL)/$(MAN1DIR)/doxygen.1
rm doxygen.1
install_docs:
- $(INSTTOOL) -d $(DESTDIR)/$(DOCDIR)
+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)/$(DOCDIR)
- $(INSTTOOL) -d $(DESTDIR)$(DOCDIR)
+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(DOCDIR)
$(MAKE) -C examples
$(MAKE) -C doc
$(MAKE) -C latex
- $(INSTTOOL) -m 644 latex/doxygen_manual.pdf $(DESTDIR)/$(DOCDIR)
+ $(BSD_INSTALL_DATA) latex/doxygen_manual.pdf $(DESTDIR)/$(DOCDIR)
cp -r examples $(DESTDIR)/$(DOCDIR)
cp -r html $(DESTDIR)/$(DOCDIR)
- $(INSTTOOL) -m 644 latex/doxygen_manual.pdf $(DESTDIR)$(DOCDIR)
+ $(BSD_INSTALL_DATA) latex/doxygen_manual.pdf $(DESTDIR)$(DOCDIR)
cp -r examples $(DESTDIR)$(DOCDIR)
cp -r html $(DESTDIR)$(DOCDIR)
+3 -11
View File
@@ -1,8 +1,8 @@
$NetBSD: patch-af,v 1.4 2009/09/27 01:30:38 minskim Exp $
$NetBSD: patch-af,v 1.6 2014/01/02 18:26:36 wiz Exp $
--- doc/Makefile.in.orig 2008-12-06 13:16:23.000000000 +0000
--- doc/Makefile.in.orig 2013-10-07 19:20:02.000000000 +0000
+++ doc/Makefile.in
@@ -23,7 +23,7 @@ all: language FORCE
@@ -23,7 +23,7 @@ all: language config.doc FORCE
@cp Makefile.latex ../latex/Makefile
@sed -e "s/\$$VERSION/$(VERSION)/g" doxygen_manual.tex >../latex/doxygen_manual.tex
@sed -e "s/\$$VERSION/$(VERSION)/g" doxygen.sty >../latex/doxygen.sty
@@ -11,11 +11,3 @@ $NetBSD: patch-af,v 1.4 2009/09/27 01:30:38 minskim Exp $
clean:
rm -rf ../html ../latex *.bak
@@ -31,6 +31,6 @@ clean:
language: language.doc
language.doc: $(wildcard ../src/translator*.h) maintainers.txt language.tpl translator.py
- python translator.py
+ @PYTHONBIN@ translator.py
FORCE:
+3 -3
View File
@@ -1,8 +1,8 @@
$NetBSD: patch-aj,v 1.3 2013/05/21 14:43:05 wiz Exp $
$NetBSD: patch-aj,v 1.4 2013/09/02 16:38:56 wiz Exp $
make build honor LDFLAGS
--- src/doxygen.pro.in.orig 2013-03-24 14:12:01.000000000 +0000
--- src/doxygen.pro.in.orig 2013-07-28 13:28:16.000000000 +0000
+++ src/doxygen.pro.in
@@ -19,6 +19,7 @@ CONFIG = console warn_on $extraopt
HEADERS = doxygen.h
@@ -10,5 +10,5 @@ make build honor LDFLAGS
unix:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 -lpthread %%SQLITE3_LIBS%% %%LIBCLANG_LIBS%%
+unix:TMAKE_LFLAGS += $(LDFLAGS)
win32:INCLUDEPATH += .
win32-mingw:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 -lpthread %%SQLITE3_LIBS%% %%LIBCLANG_LIBS%%
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
@@ -1,14 +0,0 @@
$NetBSD: patch-tmake_lib_macosx-c++_tmake.conf,v 1.1.2.2 2013/08/21 12:51:24 tron Exp $
Drop an option that is unsupported by the default compiler in Mac OS 10.8.
--- tmake/lib/macosx-c++/tmake.conf.orig 2013-08-20 17:30:43.000000000 +0000
+++ tmake/lib/macosx-c++/tmake.conf
@@ -9,7 +9,7 @@ CONFIG = qt warn_on release
TMAKE_CC = cc
TMAKE_CFLAGS = -pipe
-TMAKE_CFLAGS_WARN_ON = -Wall -W -Wno-deprecated-declarations -Wno-invalid-source-encoding
+TMAKE_CFLAGS_WARN_ON = -Wall -W -Wno-deprecated-declarations
TMAKE_CFLAGS_WARN_OFF =
TMAKE_CFLAGS_RELEASE = -O2
TMAKE_CFLAGS_DEBUG = -g -fstack-protector