1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-27 00:57:50 +00:00

- Update to 9.2.1

PR:		ports/85698
Submitted by:	Alejandro Pulver <alejandro@varnet.biz>
Approved by:	Adam Kranzel <adam@blacktabby.org> (maintainer)
This commit is contained in:
Pav Lucistnik 2005-09-09 08:59:25 +00:00
parent 6b5e94369d
commit a4cd3a36c0
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=142273
8 changed files with 1551 additions and 1012 deletions

View File

@ -6,7 +6,7 @@
#
PORTNAME= amaya
PORTVERSION= 8.5
PORTVERSION= 9.2.1
CATEGORIES= www
MASTER_SITES= http://www.w3.org/Amaya/Distribution/ \
ftp://ftp.w3.org/pub/amaya/ \
@ -18,80 +18,64 @@ MASTER_SITES= http://www.w3.org/Amaya/Distribution/ \
ftp://ftp.ntua.gr/pub/www/W3C/amaya/ \
ftp://nic.funet.fi/index/WWW/W3/amaya/ \
http://www.nic.funet.fi/index/WWW/W3/amaya/
DISTNAME= ${PORTNAME}-src-${PORTVERSION}
DISTNAME= ${PORTNAME}-fullsrc-${PORTVERSION}
EXTRACT_SUFX= .tgz
DIST_SUBDIR= amaya
MAINTAINER= adam-ports@blacktabby.org
COMMENT= The W3C's testbed web editor/browser
LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft \
jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png
WRKSRC= ${WRKDIR}/Amaya/obj
USE_GNOME= gnometarget imlib
USE_REINPLACE= yes
USE_GMAKE= yes
USE_REINPLACE= yes
USE_GNOME= gtk12 imlib
USE_ICONV= yes
GNU_CONFIGURE= yes
CONFIGURE_SCRIPT= ../configure
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LIBS="${LDFLAGS}"
CONFIGURE_ARGS= --with-gtk
CFLAGS+= -fpermissive
OPTIONS= BOOKMARKS "Enable bookmark support (experimental)" off \
OPENGL "Enable OpenGL support" off \
TEMPLATES "Enable template support (experimental)" off
CPPFLAGS= -I${LOCALBASE}/include
LDFLAGS= -L${LOCALBASE}/lib
DICT?= none
.if ${DICT} != "none"
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
.if ${DICT} == "all"
DISTFILES+= Dutch.tgz
DISTFILES+= English.tgz
DISTFILES+= French.tgz
DISTFILES+= German.tgz
DISTFILES+= Italian.tgz
DISTFILES+= Spanish.tgz
DISTFILES+= Swedish.tgz
.else
DISTFILES+= ${DICT:S/$/.tgz/g}
.endif
.endif
REALVERSION= 8.8.1
DATADIR= ${PREFIX}/Amaya-${REALVERSION}
PLIST_SUB= REALVERSION="${REALVERSION}"
.include <bsd.port.pre.mk>
.if ${ARCH} == "alpha"
BROKEN= "Does not compile on alpha"
.if defined(WITH_BOOKMARKS)
CONFIGURE_ARGS+= --enable-bookmarks
.else
CONFIGURE_ARGS+= --disable-bookmarks
.endif
.if ${X_WINDOW_SYSTEM:L} != xfree86-3 && defined(WITH_OPENGL)
.if defined(WITH_OPENGL)
LIB_DEPENDS+= gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea
USE_GL= yes
CONFIGURE_ARGS+= --with-gl
CFLAGS+= ${PTHREAD_CFLAGS}
LDFLAGS+= -lcompat ${PTHREAD_LIBS}
CONFIGURE_ENV+= LIBS="-lcompat"
PLIST_SUB+= GUI="gl"
.else
PLIST_SUB+= GUI="gtk"
.endif
pre-everything::
.if ${DICT} == "none"
@${ECHO_MSG} Several spellchecking dictionaries are available. To use
@${ECHO_MSG} one of them, define DICT to be the appropriate language.
.if defined(WITH_TEMPLATES)
CONFIGURE_ARGS+= --enable-templates
.else
CONFIGURE_ARGS+= --disable-templates
.endif
post-extract:
@${MKDIR} ${WRKSRC}
post-patch:
@${GREP} -lR "<malloc\.h>" ${WRKDIR} | ${XARGS} ${REINPLACE_CMD} -e \
's|<malloc\.h>|<stdlib.h>|g'
post-install:
${INSTALL_DATA} ${WRKSRC}/../amaya/COPYRIGHT.html ${PREFIX}/Amaya/amaya
.if ${DICT} != "none"
${INSTALL_DATA} ${WRKDIR}/*.dic ${PREFIX}/Amaya/dicopar
${MV} ${TMPPLIST} ${TMPPLIST}.new
cd ${WRKDIR} && ${LS} -1 *.dic | \
${SED} -e 's|^|Amaya/dicopar/|' > ${TMPPLIST}
${CAT} ${TMPPLIST}.new >> ${TMPPLIST}
${RM} ${TMPPLIST}.new
.endif
@${GREP} -lR "<malloc\.h>" ${WRKDIR} | \
${XARGS} ${REINPLACE_CMD} -e 's|<malloc\.h>|<stdlib.h>|g'
.include <bsd.port.post.mk>

View File

@ -1,16 +1,2 @@
MD5 (amaya/amaya-src-8.5.tgz) = 0ee123988b2e09fe60f9120df8dc9012
SIZE (amaya/amaya-src-8.5.tgz) = 9713795
MD5 (amaya/Dutch.tgz) = 3edb9cce5ce160d7270b23808c1d5981
SIZE (amaya/Dutch.tgz) = 1228989
MD5 (amaya/English.tgz) = c1f7122288329dc3cbb3871ea00eb4b4
SIZE (amaya/English.tgz) = 619699
MD5 (amaya/French.tgz) = 2412b593ec42c7aac2a341e54a7bb936
SIZE (amaya/French.tgz) = 803561
MD5 (amaya/German.tgz) = 400eeeae974a64d23de4fcdd609c30bc
SIZE (amaya/German.tgz) = 1132270
MD5 (amaya/Italian.tgz) = 05e2d25ee8af11faaaa25a33da89d504
SIZE (amaya/Italian.tgz) = 323845
MD5 (amaya/Spanish.tgz) = b504a75cd0f789a3046bf2041067b18b
SIZE (amaya/Spanish.tgz) = 525267
MD5 (amaya/Swedish.tgz) = 6536ab2e31e3f58618ba79d9fddc7f76
SIZE (amaya/Swedish.tgz) = 96316
MD5 (amaya-fullsrc-9.2.1.tgz) = 7941bbbae65619f16b41f431210b7e39
SIZE (amaya-fullsrc-9.2.1.tgz) = 23112083

View File

@ -1,13 +0,0 @@
--- ../Options.in.orig Fri Jan 30 01:06:42 2004
+++ ../Options.in Wed Mar 10 14:37:42 2004
@@ -27,8 +27,8 @@
DIFF = @DIFF@
INSTALL = @INSTALL@
-INSTALL_DATA= $(INSTALL) -m 444
-INSTALL_BIN= $(INSTALL) -m 755
+INSTALL_DATA=@INSTALL_DATA@
+INSTALL_BIN=@INSTALL_PROGRAM@
CEXTRACT_FLAGS=@CEXTRACT_FLAGS@

View File

@ -1,24 +0,0 @@
--- ../configure.orig Thu Apr 15 16:39:55 2004
+++ ../configure Sat Apr 17 19:02:52 2004
@@ -13851,9 +13851,9 @@
fi
done
- GTK_INCLUDES="${GTK_INCLUDES} `gtk-config --cflags`"
+ GTK_INCLUDES="${GTK_INCLUDES} `imlib-config --cflags-gdk`"
- GTK_LIBRARIES="`gtk-config --libs`"
+ GTK_LIBRARIES="`imlib-config --libs-gdk`"
if test "${with_gl}" != "yes" ; then
GTK_LIBRARIES="${GTK_LIBRARIES} -lgdk_imlib"
fi
@@ -14849,6 +14849,9 @@
if test "$with_dav" = "yes" ; then
dav_frag=$srcdir/davlib/Makefile.dav
+else
+
+ dav_frag=/dev/null
fi

View File

@ -0,0 +1,13 @@
--- ../../libwww/Library/src/wwwsys.h.orig Fri Aug 12 20:41:18 2005
+++ ../../libwww/Library/src/wwwsys.h Sun Aug 14 11:16:55 2005
@@ -1320,10 +1320,6 @@
#define socerrno errno
#endif
-#ifndef HAVE_STRERROR /* Otherwise use the table */
-extern char *sys_errlist[];
-extern int sys_nerr;
-#endif
/*
.

View File

@ -0,0 +1,11 @@
--- ../thotlib/internals/h/picture.h.orig Thu Jun 2 07:12:22 2005
+++ ../thotlib/internals/h/picture.h Mon Aug 15 16:39:55 2005
@@ -9,6 +9,8 @@
* Definition for picture management
*/
+#include <gdk_imlib.h>
+
#ifdef _WINGUI
#include <windows.h>
#endif /* _WINGUI */

View File

@ -0,0 +1,20 @@
--- ../thotlib/presentation/presvariables.c.orig Tue Jun 7 10:37:13 2005
+++ ../thotlib/presentation/presvariables.c Sat Aug 13 10:24:34 2005
@@ -1263,7 +1263,7 @@
/* date en anglais */
pt = &tod;
*pt = time (NULL);
- ptm = localtime (pt);
+ ptm = localtime ((const time_t *)pt);
GetCounterValue (ptm->tm_year, CntDecimal, number, &l);
CopyStringToBuffer ((unsigned char *)number, pAb->AbText, &l);
pAb->AbVolume += l;
@@ -1283,7 +1283,7 @@
/* date en francais */
pt = &tod;
*pt = time (NULL);
- ptm = localtime (pt);
+ ptm = localtime ((const time_t *)pt);
GetCounterValue (ptm->tm_mday, CntDecimal, number, &l);
CopyStringToBuffer ((unsigned char *)number, pAb->AbText, &l);
pAb->AbVolume += l;

File diff suppressed because it is too large Load Diff