From 79ca4208ae8ae38b4061ba66121a7819c3e74cbb Mon Sep 17 00:00:00 2001 From: Christian Weisgerber Date: Fri, 14 Feb 2003 23:07:21 +0000 Subject: Update to 7.2. PR: 48180 Submitted by: Ports Fury via maintainer --- www/amaya/Makefile | 5 +++-- www/amaya/distinfo | 2 +- www/amaya/files/patch-ac | 11 ----------- www/amaya/files/patch-af | 11 ----------- www/amaya/files/patch-configure | 17 +++++++++-------- www/amaya/pkg-comment | 1 - www/amaya/pkg-plist | 5 +---- 7 files changed, 14 insertions(+), 38 deletions(-) delete mode 100644 www/amaya/files/patch-ac delete mode 100644 www/amaya/files/patch-af delete mode 100644 www/amaya/pkg-comment (limited to 'www/amaya') diff --git a/www/amaya/Makefile b/www/amaya/Makefile index 6304cf43ba75..9a58e6a22492 100644 --- a/www/amaya/Makefile +++ b/www/amaya/Makefile @@ -6,7 +6,7 @@ # PORTNAME= amaya -PORTVERSION= 7.1 +PORTVERSION= 7.2 CATEGORIES= www MASTER_SITES= http://www.w3.org/Amaya/Distribution/ \ ftp://ftp.w3.org/pub/amaya/ @@ -15,6 +15,7 @@ DISTFILES= ${DISTNAME}.tgz DIST_SUBDIR= amaya MAINTAINER= adam-ports@blacktabby.org +COMMENT= The W3C's testbed web editor/browser WRKSRC= ${WRKDIR}/Amaya/obj @@ -58,7 +59,7 @@ post-install: .if ${DICT} != "none" ${INSTALL_DATA} ${WRKDIR}/*.dic ${PREFIX}/Amaya/dicopar ${MV} ${TMPPLIST} ${TMPPLIST}.new - cd ${WRKDIR} && ls -1 *.dic | \ + cd ${WRKDIR} && ${LS} -1 *.dic | \ ${SED} -e 's|^|Amaya/dicopar/|' > ${TMPPLIST} ${CAT} ${TMPPLIST}.new >> ${TMPPLIST} ${RM} ${TMPPLIST}.new diff --git a/www/amaya/distinfo b/www/amaya/distinfo index 63a412eaa2f3..dece307f84fd 100644 --- a/www/amaya/distinfo +++ b/www/amaya/distinfo @@ -1,4 +1,4 @@ -MD5 (amaya/amaya-src-7.1.tgz) = 2c16488ff36e4324b51e297af86ce41c +MD5 (amaya/amaya-src-7.2.tgz) = 12c286a3c691c4ca0e620ebd8b2371b2 MD5 (amaya/Dutch.tgz) = 3edb9cce5ce160d7270b23808c1d5981 MD5 (amaya/English.tgz) = c1f7122288329dc3cbb3871ea00eb4b4 MD5 (amaya/French.tgz) = 1d3705478bdcb4b5aca827c4492f2a90 diff --git a/www/amaya/files/patch-ac b/www/amaya/files/patch-ac deleted file mode 100644 index ca5d6d67b940..000000000000 --- a/www/amaya/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ ---- ../Makefile.in.orig Sat Jul 6 00:49:48 2002 -+++ ../Makefile.in Wed Jul 24 04:09:32 2002 -@@ -186,7 +186,7 @@ - $$libwwwdir/configure \ - --disable-shared \ - @WITHDAV@ \ -- --with-zlib="$$localdir/libz.a"; \ -+ --with-zlib; \ - $(ECHO) "libwww is configured" ; \ - fi) - diff --git a/www/amaya/files/patch-af b/www/amaya/files/patch-af deleted file mode 100644 index 921d246b79b3..000000000000 --- a/www/amaya/files/patch-af +++ /dev/null @@ -1,11 +0,0 @@ ---- ../amaya/Makefile.libwww.orig Fri Sep 15 23:24:40 2000 -+++ ../amaya/Makefile.libwww Mon Mar 19 22:20:31 2001 -@@ -50,7 +50,7 @@ - -I$(THOTDIR)../libwww/modules/expat/xmltok - - # this dependency calls the ../Makefile rule that compiles libwww --AMAYA_LIBWWW_SRC= ../libz.a amaya_comp_libwww -+AMAYA_LIBWWW_SRC= amaya_comp_libwww - - amaya_comp_libwww : force - @(cd .. ; $(MAKE) libwww) diff --git a/www/amaya/files/patch-configure b/www/amaya/files/patch-configure index a66f8459da5e..095d0ad13175 100644 --- a/www/amaya/files/patch-configure +++ b/www/amaya/files/patch-configure @@ -1,22 +1,23 @@ ---- ../configure.orig Tue Dec 3 23:09:18 2002 -+++ ../configure Mon Dec 9 06:49:51 2002 -@@ -6198,9 +6198,9 @@ +--- ../configure.orig Mon Feb 3 23:43:57 2003 ++++ ../configure Wed Feb 5 01:18:24 2003 +@@ -6238,9 +6238,9 @@ fi done -GTK_INCLUDES="`gtk-config --cflags`" +GTK_INCLUDES="`imlib-config --cflags-gdk`" --GTK_LIBRARIES="`gtk-config --libs` -lgdk_imlib" +-GTK_LIBRARIES="`gtk-config --libs`" +GTK_LIBRARIES="`imlib-config --libs-gdk`" - - GTK_OPTIONS="-D_GTK -D_SVGANIM -D_SVGLIB" - no_motif=yes -@@ -6937,6 +6937,8 @@ + if test "${with_gl}" != "yes" ; then + GTK_LIBRARIES="${GTK_LIBRARIES} -lgdk_imlib" + fi +@@ -7019,6 +7019,9 @@ if test "$with_dav" = "yes" ; then dav_frag=$srcdir/davlib/Makefile.dav +else ++ + dav_frag=/dev/null fi diff --git a/www/amaya/pkg-comment b/www/amaya/pkg-comment deleted file mode 100644 index abd6664fd0e5..000000000000 --- a/www/amaya/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -The W3C's testbed web editor/browser diff --git a/www/amaya/pkg-plist b/www/amaya/pkg-plist index 4c92d6184c75..fb8b7062ac4a 100644 --- a/www/amaya/pkg-plist +++ b/www/amaya/pkg-plist @@ -46,6 +46,7 @@ Amaya/amaya/TextFileT.TRA Amaya/amaya/TextFileUSL.PRS Amaya/amaya/Timeline.STR Amaya/amaya/Timeline.conf +Amaya/amaya/Timeline.en Amaya/amaya/TimelineP.PRS Amaya/amaya/TimelineT.TRA Amaya/amaya/TimelineTX.TRA @@ -735,7 +736,6 @@ Amaya/doc/images/align-de.png Amaya/doc/images/alternateview-de.jpg Amaya/doc/images/alternateview.jpg Amaya/doc/images/amaya.gif -Amaya/doc/images/annot.gif Amaya/doc/images/annot.png Amaya/doc/images/annotationicon-de.png Amaya/doc/images/annotationicon-es.png @@ -747,7 +747,6 @@ Amaya/doc/images/annotationsmenu.png Amaya/doc/images/annotationwindow-de.png Amaya/doc/images/annotationwindow-es.png Amaya/doc/images/annotationwindow.png -Amaya/doc/images/annotorp.gif Amaya/doc/images/annotorp.png Amaya/doc/images/background-de.png Amaya/doc/images/browser_preferences-de.png @@ -826,8 +825,6 @@ Amaya/doc/images/threads.png Amaya/doc/images/tocview-de.jpg Amaya/doc/images/tocview.jpg Amaya/doc/images/up.gif -Amaya/doc/images/vh40.gif -Amaya/doc/images/w3c-amaya.gif Amaya/doc/images/w3c_home Amaya/fonts/Families.list Amaya/fonts/fonts.dir -- cgit v1.2.3