Date: Fri, 25 Feb 2000 02:47:22 -0500 (EST) From: Will Andrews <andrews@technologist.com> To: FreeBSD-gnats-submit@FreeBSD.ORG Subject: ports/16977: upgrade port: devel/doxygen: 0.4 -> 1.1.0 Message-ID: <20000225074722.C2ABB1976@shadow.blackdawn.com>
next in thread | raw e-mail | index | archive | help
>Number: 16977
>Category: ports
>Synopsis: upgrade port: devel/doxygen: 0.4 -> 1.1.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Feb 24 23:50:01 PST 2000
>Closed-Date:
>Last-Modified:
>Originator: Will Andrews
>Release: FreeBSD 3.4-STABLE i386
>Organization:
none
>Environment:
FreeBSD shadow.blackdawn.com 3.4-STABLE FreeBSD 3.4-STABLE #0: Sun Jan 23 13:41:02 EST 2000 root@shadow.blackdawn.com:/usr/src/sys/compile/SHADOW i386
FreeBSD argon.blackdawn.com 4.0-CURRENT FreeBSD 4.0-CURRENT #0: Sat Feb 12 13:20:47 EST 2000 root@argon.blackdawn.com:/usr/src/sys/compile/KRYPTON i386
>Description:
Fix doxygen! FIX! FIX! !@#*$!@#*$!@$
Changes:
1) Respect C{C,XX}, C{XX}FLAGS. Finally.
2) Upgrade from 0.4 to 1.1.0. Big jump!
3) Clean up the Makefile, in general.
4) Shut up the perl substitutions.
5) All patches save one removed. And the one that's
left now patches a different file. I hope that's
OK, but if not, just change it to patch-af or something.
This should now compile cleanly in -STABLE and -CURRENT. I will be
submitting additional PRs to fix/upgrade additional Qt/KDE ports that
still don't respect CC/CXX or C{XX}FLAGS.
>How-To-Repeat:
Use the patches below to fix the current port.
>Fix:
Index: Makefile
===================================================================
RCS file: /extra/cvsroot/ports/devel/doxygen/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile 2000/02/21 23:43:38 1.3
+++ Makefile 2000/02/25 06:55:27
@@ -1,38 +1,33 @@
# New ports collection makefile for: doxygen
-# Version required: 0.4
+# Version required: 1.1.0
# Date created: 20 March 1998
# Whom: Joep Grooten <joep@di.nl>
#
# $FreeBSD: ports/devel/doxygen/Makefile,v 1.3 2000/02/21 23:43:38 cpiazza Exp $
#
-DISTNAME= doxygen-0.4.src
-PKGNAME= doxygen-0.4
+DISTNAME= doxygen-${VERSION}.src
+PKGNAME= doxygen-${VERSION}
CATEGORIES= devel
MASTER_SITES= http://www.stack.nl/~dimitri/doxygen/dl/
MAINTAINER= joep@di.nl
-WRKSRC= ${WRKDIR}/doxygen-0.4
-
+WRKSRC= ${WRKDIR}/${PKGNAME}
+VERSION= 1.1.0
USE_QT= yes
USE_PERL5= yes
-MAKE_ARGS= freebsd-g++
-MAKE_ENV+= CC="${CC}" CXX="${CXX}"
+MAKE_ENV+= QTDIR="${X11BASE}" PCFLAGS="${CFLAGS}" PCXXFLAGS="${CXXFLAGS}"
+HAS_CONFIGURE= yes
+USE_GMAKE= yes
+CONFIGURE_ARGS+=--prefix ${PREFIX} --perl ${PERL5} --make ${GMAKE}
+CONFIGURE_ENV+= QTDIR=${X11BASE}
pre-configure:
- ${PERL} -pi -e "s:gcc:${CC}:g" ${WRKSRC}/tmake/lib/freebsd-g++/tmake.conf
- ${PERL} -pi -e "s:g\+\+:\${CXX}:g" ${WRKSRC}/tmake/lib/freebsd-g++/tmake.conf
-
-do-configure:
- cd ${WRKSRC}/src; \
- ${MAKE} tmake \
- TMAKE=../tmake/bin/tmake \
- TMAKEPATH=../tmake/lib/freebsd-g++ \
- PERL=${PERL}
-
-do-build:
- @(cd ${WRKSRC}/src; ${MAKE})
+ @${PERL} -pi -e "s:gcc:${CC}:g" ${WRKSRC}/tmake/lib/freebsd-g++/tmake.conf
+ @${PERL} -pi -e "s:g\+\+:\${CXX}:g" ${WRKSRC}/tmake/lib/freebsd-g++/tmake.conf
+ @${PERL} -pi -e "s:%%CFLAGS%%:${CFLAGS}:g" ${WRKSRC}/tmake/lib/freebsd-g++/tmake.conf
+ @${PERL} -pi -e "s:%%CXXFLAGS%%:${CXXFLAGS}:g" ${WRKSRC}/tmake/lib/freebsd-g++/tmake.conf
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/bin/doxygen ${PREFIX}/bin
Index: files/md5
===================================================================
RCS file: /extra/cvsroot/ports/devel/doxygen/files/md5,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 md5
--- files/md5 1999/06/10 00:27:41 1.1.1.1
+++ files/md5 2000/02/25 06:14:03
@@ -1 +1 @@
-MD5 (doxygen-0.4.src.tar.gz) = 6cee71d1331ba6f3019e3ee184663a6f
+MD5 (doxygen-1.1.0.src.tar.gz) = 721c198ae814917c273da18f291ded31
Index: patches/patch-aa
===================================================================
RCS file: /extra/cvsroot/ports/devel/doxygen/patches/patch-aa,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-aa
--- patches/patch-aa 1999/06/10 00:27:40 1.1.1.1
+++ patches/patch-aa 2000/02/25 06:45:56
@@ -1,16 +1,33 @@
---- Makefile.orig Sun Mar 28 20:02:05 1999
-+++ Makefile Sat Mar 20 16:36:52 1999
-@@ -1,6 +1,6 @@
- MAKE = make # name of the make tool to use
- TAR = tar # name of the GNU tar tool
--PERL = perl # name of the perl interpreter (version 5.0 or higher)
-+PERL = $(PERL5) # name of the perl interpreter (version 5.0 or higher)
- TMAKE = ../tmake/bin/tmake
+--- tmake/lib/freebsd-g++/tmake.conf Wed Jul 28 11:21:38 1999
++++ tmake/lib/freebsd-g++/tmake.conf.new Fri Feb 25 01:45:54 2000
+@@ -8,16 +8,16 @@
+ CONFIG = qt warn_on release
- # for BSD-make
-@@ -242,3 +242,5 @@
- src Makefile Makefile.windows INSTALL make.bat
+ TMAKE_CC = gcc
+-TMAKE_CFLAGS = -pipe
+-TMAKE_CFLAGS_WARN_ON = -Wall -W
++TMAKE_CFLAGS = %%CFLAGS%%
++TMAKE_CFLAGS_WARN_ON =
+ TMAKE_CFLAGS_WARN_OFF =
+-TMAKE_CFLAGS_RELEASE = -O2
+-TMAKE_CFLAGS_DEBUG = -g
++TMAKE_CFLAGS_RELEASE =
++TMAKE_CFLAGS_DEBUG =
+ TMAKE_CFLAGS_SHLIB = -fPIC
+ TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses
- FORCE:
-+
-+all:
+ TMAKE_CXX = g++
+-TMAKE_CXXFLAGS = $$TMAKE_CFLAGS
++TMAKE_CXXFLAGS = %%CXXFLAGS%%
+ TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON
+ TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF
+ TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE
+@@ -29,7 +29,7 @@
+ TMAKE_LIBDIR =
+ TMAKE_INCDIR_X11 = /usr/X11R6/include
+ TMAKE_LIBDIR_X11 = /usr/X11R6/lib
+-TMAKE_INCDIR_QT = $(QTDIR)/include
++TMAKE_INCDIR_QT = $(QTDIR)/include/X11/qt
+ TMAKE_LIBDIR_QT = $(QTDIR)/lib
+ TMAKE_INCDIR_OPENGL = /usr/X11R6/include
+ TMAKE_LIBDIR_OPENGL = /usr/X11R6/lib
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20000225074722.C2ABB1976>