Date: Thu, 24 Jan 2002 17:49:04 +0100 (CET) From: Miguel Mendez <flynn@energyhq.homeip.net> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/34231: Upgrade www/quanta to 2.0.1 Message-ID: <200201241649.g0OGn4O69658@energyhq.homeip.net>
next in thread | raw e-mail | index | archive | help
>Number: 34231
>Category: ports
>Synopsis: Upgrade www/quanta to 2.0.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu Jan 24 08:50:00 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: Miguel Mendez
>Release: FreeBSD 4.5-RC i386
>Organization:
People who use malloc.h should be shot, Inc
>Environment:
System: FreeBSD energyhq.homeip.net 4.5-RC FreeBSD 4.5-RC #0: Mon Jan 21 21:19:45 CET 2002 root@energyhq.homeip.net:/storage2/obj/storage2/src/sys/ENERGYHQ i386
>Description:
Quanta 2.0.1 is out, this patch upgrades the port, and yes, next
time I'll think two times before doings this kind of thing :)
>How-To-Repeat:
>Fix:
--- quanta.diff begins here ---
diff -ruN quanta.old/Makefile quanta/Makefile
--- quanta.old/Makefile Wed Dec 5 16:50:07 2001
+++ quanta/Makefile Thu Jan 24 16:27:31 2002
@@ -6,11 +6,11 @@
#
PORTNAME= quanta
-PORTVERSION= 2.0p1
+PORTVERSION= 2.0.1
CATEGORIES= www kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
-DISTNAME= ${PORTNAME}-2.0-pr1
+
.if !defined(NOPORTDOCS)
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
css.tar.bz2 \
@@ -23,8 +23,6 @@
LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
-WRKSRC= ${WRKDIR}/${PORTNAME}
-
USE_KDELIBS_VER=2
USE_XPM= yes
USE_BZIP2= yes
@@ -40,7 +38,13 @@
pre-configure:
@${PERL} -pi -e "s#lqt #lqt2 #g" ${WRKSRC}/quanta/Makefile.in
+ @${PERL} -pi -e "s@automake@automake14@g" ${WRKSRC}/configure
+
+post-configure:
+ @${PERL} -pi -e "s@autoconf@autoconf213@g" ${WRKSRC}/Makefile
+ @${PERL} -pi -e "s@moc@moc2@g" ${WRKSRC}/configure
+
post-install:
.if !defined(NOPORTDOCS)
.for doc in ${DOCS}
diff -ruN quanta.old/distinfo quanta/distinfo
--- quanta.old/distinfo Sun Mar 18 08:53:02 2001
+++ quanta/distinfo Thu Jan 24 15:54:59 2002
@@ -1,4 +1,4 @@
-MD5 (quanta-2.0-pr1.tar.bz2) = dec00150b247d40162fa3941b56c3b93
+MD5 (quanta-2.0.1.tar.bz2) = c2ea4c4a01fdc751375d033ada59a1dd
MD5 (css.tar.bz2) = 9134a94af4c783c740cc0ad5806e4b51
MD5 (html.tar.bz2) = 0cc3234c4b3df88d4115340ce05e0053
MD5 (javascript.tar.bz2) = eea6e25a1c25af1f5a0c33e32e52c136
diff -ruN quanta.old/files/patch-Makefile.in quanta/files/patch-Makefile.in
--- quanta.old/files/patch-Makefile.in Thu Jan 1 01:00:00 1970
+++ quanta/files/patch-Makefile.in Thu Jan 24 16:34:44 2002
@@ -0,0 +1,24 @@
+--- Makefile.in.orig Wed Dec 5 11:04:46 2001
++++ Makefile.in Thu Jan 24 16:34:24 2002
+@@ -251,17 +251,14 @@
+ cd $(top_srcdir) && $(AUTOMAKE) --gnu ./Makefile
+ cd $(top_srcdir) && perl admin/am_edit Makefile.in
+
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
+- cd $(top_builddir) \
+- && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
++Makefile:
++ ${ECHO} ""
+
+ $(ACLOCAL_M4): configure.in acinclude.m4
+ cd $(srcdir) && $(ACLOCAL)
+
+-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- $(SHELL) ./config.status --recheck
+-$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+- cd $(srcdir) && $(AUTOCONF)
++config.status:
++ @{ECHO} config.status patched
+
+ config.h: stamp-h
+ @if test ! -f $@; then \
diff -ruN quanta.old/files/patch-quanta::plugins::php4dgb::dbgbase::DbgSite.h quanta/files/patch-quanta::plugins::php4dgb::dbgbase::DbgSite.h
--- quanta.old/files/patch-quanta::plugins::php4dgb::dbgbase::DbgSite.h Thu Jan 1 01:00:00 1970
+++ quanta/files/patch-quanta::plugins::php4dgb::dbgbase::DbgSite.h Thu Jan 24 17:02:33 2002
@@ -0,0 +1,10 @@
+--- quanta/plugins/php4dbg/dbgbase/DbgSite.h.orig Thu Jan 24 17:01:33 2002
++++ quanta/plugins/php4dbg/dbgbase/DbgSite.h Thu Jan 24 17:01:48 2002
+@@ -14,6 +14,7 @@
+ #ifndef _DBGSITE_H_
+ #define _DBGSITE_H_
+
++#include <sys/types.h>
+ #include <qobject.h>
+ #include "ListenerGlobals.h"
+ #include "RequestorBase.h"
diff -ruN quanta.old/files/patch-quanta::plugins::php4dgb::dbgbase::ListenerBase.cpp quanta/files/patch-quanta::plugins::php4dgb::dbgbase::ListenerBase.cpp
--- quanta.old/files/patch-quanta::plugins::php4dgb::dbgbase::ListenerBase.cpp Thu Jan 1 01:00:00 1970
+++ quanta/files/patch-quanta::plugins::php4dgb::dbgbase::ListenerBase.cpp Thu Jan 24 17:10:46 2002
@@ -0,0 +1,18 @@
+--- quanta/plugins/php4dbg/dbgbase/ListenerBase.cpp.orig Thu Jan 24 17:09:23 2002
++++ quanta/plugins/php4dbg/dbgbase/ListenerBase.cpp Thu Jan 24 17:09:52 2002
+@@ -11,11 +11,13 @@
+ the world-wide-web at http://dd.cron.ru/license
+ ***************************************************************************/
+
++#include <sys/types.h>
++#include <stdio.h>
++#include <assert.h>
+ #include "dbg_core.h"
+ #include "ListenerBase.h"
+ #include "ThreadBase.h"
+-#include <stdio.h>
+-#include <assert.h>
++
+
+ ListenerBase::~ListenerBase() {
+ DBGTRACE("ListenerBase::~ListenerBase\n");
diff -ruN quanta.old/files/patch-quanta::plugins::php4dgb::dbgbase::ListenerGlobals.cpp quanta/files/patch-quanta::plugins::php4dgb::dbgbase::ListenerGlobals.cpp
--- quanta.old/files/patch-quanta::plugins::php4dgb::dbgbase::ListenerGlobals.cpp Thu Jan 1 01:00:00 1970
+++ quanta/files/patch-quanta::plugins::php4dgb::dbgbase::ListenerGlobals.cpp Thu Jan 24 16:56:21 2002
@@ -0,0 +1,19 @@
+--- quanta/plugins/php4dbg/dbgbase/ListenerGlobals.cpp.orig Thu Jan 24 16:50:10 2002
++++ quanta/plugins/php4dbg/dbgbase/ListenerGlobals.cpp Thu Jan 24 16:51:58 2002
+@@ -11,6 +11,7 @@
+ the world-wide-web at http://dd.cron.ru/license
+ ***************************************************************************/
+
++#include <sys/types.h>
+ #include <stdarg.h>
+ #include <stdio.h>
+ #include "ListenerGlobals.h"
+@@ -344,7 +345,7 @@
+ ret_val = select(listen_socket + 1, &rset, NULL, NULL, &timeout);
+ if (ret_val>0) {
+ siz = sizeof(laddr);
+- ret_val = accept(listen_socket, &laddr, &siz);
++ ret_val = accept(listen_socket, &laddr,(socklen_t *) &siz);
+ }
+ if (ret_val <= 0) {
+ return (ret_val) ? (-1) : (0);
diff -ruN quanta.old/files/patch-quanta::plugins::php4dgb::dbgbase::ThreadBase.cpp quanta/files/patch-quanta::plugins::php4dgb::dbgbase::ThreadBase.cpp
--- quanta.old/files/patch-quanta::plugins::php4dgb::dbgbase::ThreadBase.cpp Thu Jan 1 01:00:00 1970
+++ quanta/files/patch-quanta::plugins::php4dgb::dbgbase::ThreadBase.cpp Thu Jan 24 16:57:21 2002
@@ -0,0 +1,10 @@
+--- quanta/plugins/php4dbg/dbgbase/ThreadBase.cpp.orig Thu Jan 24 16:52:35 2002
++++ quanta/plugins/php4dbg/dbgbase/ThreadBase.cpp Thu Jan 24 16:52:44 2002
+@@ -11,6 +11,7 @@
+ the world-wide-web at http://dd.cron.ru/license
+ ***************************************************************************/
+
++#include <sys/types.h>
+ #include "ThreadBase.h"
+ #include "ListenerGlobals.h"
+ #include "dbg_core.h"
diff -ruN quanta.old/files/patch-quanta::plugins::php4dgb::dbgbase::dbg_core.c quanta/files/patch-quanta::plugins::php4dgb::dbgbase::dbg_core.c
--- quanta.old/files/patch-quanta::plugins::php4dgb::dbgbase::dbg_core.c Thu Jan 1 01:00:00 1970
+++ quanta/files/patch-quanta::plugins::php4dgb::dbgbase::dbg_core.c Thu Jan 24 16:58:59 2002
@@ -0,0 +1,13 @@
+--- quanta/plugins/php4dbg/dbgbase/dbg_core.c.orig Thu Jan 24 16:53:35 2002
++++ quanta/plugins/php4dbg/dbgbase/dbg_core.c Thu Jan 24 16:53:42 2002
+@@ -11,9 +11,9 @@
+ the world-wide-web at http://dd.cron.ru/license
+ ***************************************************************************/
+
++#include <sys/types.h>
+ #include "dbg_core.h"
+ #include <string.h>
+-#include <malloc.h>
+ #include <stdlib.h>
+
+ #ifdef DBG_USE_STDALLOCA
diff -ruN quanta.old/files/patch-quanta::plugins::php4dgb::debugger.h quanta/files/patch-quanta::plugins::php4dgb::debugger.h
--- quanta.old/files/patch-quanta::plugins::php4dgb::debugger.h Thu Jan 1 01:00:00 1970
+++ quanta/files/patch-quanta::plugins::php4dgb::debugger.h Thu Jan 24 17:23:23 2002
@@ -0,0 +1,10 @@
+--- quanta/plugins/php4dbg/debugger.h.orig Thu Jan 24 17:22:31 2002
++++ quanta/plugins/php4dbg/debugger.h Thu Jan 24 17:22:47 2002
+@@ -6,6 +6,7 @@
+ #endif
+
+ #include <qobject.h>
++#include <sys/types.h>
+
+ class Listener;
+ class QSocketNotifier;
diff -ruN quanta.old/files/patch-quanta::plugins::php4dgb::listener.cpp quanta/files/patch-quanta::plugins::php4dgb::listener.cpp
--- quanta.old/files/patch-quanta::plugins::php4dgb::listener.cpp Thu Jan 1 01:00:00 1970
+++ quanta/files/patch-quanta::plugins::php4dgb::listener.cpp Thu Jan 24 17:28:05 2002
@@ -0,0 +1,8 @@
+--- quanta/plugins/php4dbg/listener.cpp.orig Thu Jan 24 17:27:25 2002
++++ quanta/plugins/php4dbg/listener.cpp Thu Jan 24 17:27:41 2002
+@@ -1,4 +1,4 @@
+-
++#include <sys/types.h>
+ #include "listener.h"
+
+ #include <stdarg.h>
diff -ruN quanta.old/pkg-plist quanta/pkg-plist
--- quanta.old/pkg-plist Sun Mar 18 08:53:02 2001
+++ quanta/pkg-plist Thu Jan 24 17:42:54 2002
@@ -112,6 +112,8 @@
share/apps/quanta/toolbar/bookmark.png
share/apps/quanta/toolbar/ball.png
share/apps/quanta/toolbar/back.png
+share/apps/quanta/toolbar/ftab.png
+share/apps/quanta/toolbar/ptab.png
share/apps/quanta/tags/ul.tag
share/apps/quanta/tags/tr.tag
share/apps/quanta/tags/thead.tag
@@ -1765,6 +1767,26 @@
%%PORTDOCS%%share/apps/quanta/doc/css/all-properties.html
%%PORTDOCS%%share/apps/quanta/doc/css/LICENSE
%%PORTDOCS%%share/apps/quanta/doc/css.docrc
+%%PORTDOCS%%share/apps/quanta/doc/aniquanta.gif
+%%PORTDOCS%%share/apps/quanta/doc/background.png
+%%PORTDOCS%%share/apps/quanta/doc/bgtable.png
+%%PORTDOCS%%share/apps/quanta/doc/developer.html
+%%PORTDOCS%%share/apps/quanta/doc/focus.html
+%%PORTDOCS%%share/apps/quanta/doc/intro.html
+%%PORTDOCS%%share/apps/quanta/doc/kdelogo2.png
+%%PORTDOCS%%share/apps/quanta/doc/konq.css
+%%PORTDOCS%%share/apps/quanta/doc/lines.png
+%%PORTDOCS%%share/apps/quanta/doc/lines2.png
+%%PORTDOCS%%share/apps/quanta/doc/maindoc.html
+%%PORTDOCS%%share/apps/quanta/doc/minilogo.png
+%%PORTDOCS%%share/apps/quanta/doc/more.png
+%%PORTDOCS%%share/apps/quanta/doc/qcenter2.png
+%%PORTDOCS%%share/apps/quanta/doc/quanta.css
+%%PORTDOCS%%share/apps/quanta/doc/quantahdr.png
+%%PORTDOCS%%share/apps/quanta/doc/shadow1.png
+%%PORTDOCS%%share/apps/quanta/doc/template.html
+%%PORTDOCS%%share/apps/quanta/doc/tips.html
+%%PORTDOCS%%share/apps/quanta/doc/webdev.png
%%PORTDOCS%%@dirrm share/apps/quanta/doc/php
%%PORTDOCS%%@dirrm share/apps/quanta/doc/javascript/.pics/med
%%PORTDOCS%%@dirrm share/apps/quanta/doc/javascript/.pics
@@ -1787,6 +1809,8 @@
%%PORTDOCS%%@dirrm share/apps/quanta/doc/css/classification
%%PORTDOCS%%@dirrm share/apps/quanta/doc/css/box
%%PORTDOCS%%@dirrm share/apps/quanta/doc/css
+%%PORTDOCS%%share/apps/quanta/actions.rc
+%%PORTDOCS%%share/apps/quanta/quantaui.rc
@dirrm share/locale/fr/LC_MESSAGES
@dirrm share/locale/de/LC_MESSAGES
@dirrm share/locale/da/LC_MESSAGES
--- quanta.diff ends here ---
>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?200201241649.g0OGn4O69658>