6 files changed, 73 insertions, 19 deletions
diff --git a/www/amaya/Makefile b/www/amaya/Makefile
index 80cec5d5f06..df969c5a22f 100644
--- a/www/amaya/Makefile
+++ b/www/amaya/Makefile
@@ -7,19 +7,28 @@
 
 PORTNAME=	amaya
 PORTVERSION=	4.3.1
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.w3.org/Amaya/Distribution/ \
 		ftp://ftp.w3.org/pub/amaya/
 DISTNAME=	${PORTNAME}-src-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
+
+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
+		png.4:${PORTSDIR}/graphics/png
+
+DIST_SUBDIR=	amaya
+WRKSRC=		${WRKDIR}/Amaya/obj
 
 USE_MOTIF=	yes
-USE_XLIB=	yes
 USE_GMAKE=	yes
-DIST_SUBDIR=	amaya
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+GNU_CONFIGURE=	yes
+CONFIGURE_SCRIPT=	../configure
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--with-more-shared
 
 DICT?=		none
 
@@ -37,12 +46,6 @@ DISTFILES+=	${DICT:S/$/.tgz/g}
 .endif
 .endif
 
-WRKSRC=		${WRKDIR}/Amaya/obj
-
-GNU_CONFIGURE=	yes
-CONFIGURE_SCRIPT=	../configure
-CONFIGURE_ARGS=	--with-amaya
-
 pre-fetch:
 .if ${DICT} == "none"
 	@${ECHO_MSG} Several spellchecking dictionaries are available.  To use
@@ -56,16 +59,12 @@ post-configure:
 	${CP} ${WRKSRC}/Options.orig ${WRKSRC}/Options
 
 post-install:
-.for file in amaya print
-	strip ${PREFIX}/Amaya/applis/bin/${file}
-.endfor
-	${INSTALL_DATA} ${WRKSRC}/../amaya/COPYRIGHT.html\
-	${PREFIX}/Amaya/amaya/
+	${INSTALL_DATA} ${WRKSRC}/../amaya/COPYRIGHT.html ${PREFIX}/Amaya/amaya
 .if ${DICT} != "none"
-	${INSTALL_DATA} ${WRKDIR}/*.dic ${PREFIX}/Amaya/dicopar/
+	${INSTALL_DATA} ${WRKDIR}/*.dic ${PREFIX}/Amaya/dicopar
 	${MV} ${TMPPLIST} ${TMPPLIST}.new
-	cd ${WRKDIR} && ls -1 *.dic | perl -pi -e 's|^|Amaya/dicopar/|'\
-	> ${TMPPLIST}
+	cd ${WRKDIR} && ls -1 *.dic | \
+		${PERL} -pi -e 's|^|Amaya/dicopar/|' > ${TMPPLIST}
 	${CAT} ${TMPPLIST}.new >> ${TMPPLIST}
 	${RM} ${TMPPLIST}.new
 .endif
diff --git a/www/amaya/files/patch-ac b/www/amaya/files/patch-ac
new file mode 100644
index 00000000000..583c0cf0fb4
--- /dev/null
+++ b/www/amaya/files/patch-ac
@@ -0,0 +1,11 @@
+--- ../Makefile.in.orig	Wed Feb 28 19:34:16 2001
++++ ../Makefile.in	Tue Mar 20 01:40:14 2001
+@@ -187,7 +187,7 @@
+ 	  if [ ! -f Makefile -o ! -f wwwconf.h ] ; then \
+ 	  	$$libwwwdir/configure \
+ 			--disable-shared \
+-			--with-zlib="$$localdir/libz.a"; \
++			--with-zlib; \
+ 		$(ECHO) "libwww is configured" ; \
+ 	  fi)
+ 
diff --git a/www/amaya/files/patch-ad b/www/amaya/files/patch-ad
new file mode 100644
index 00000000000..d7e71bdc424
--- /dev/null
+++ b/www/amaya/files/patch-ad
@@ -0,0 +1,22 @@
+--- ../Options.in.orig	Fri Sep 15 23:24:26 2000
++++ ../Options.in	Sat Mar 17 08:53:21 2001
+@@ -9,7 +9,7 @@
+ SHELL	= /bin/sh
+ 
+ CC	= @CC@
+-CFLAGS	= @CFLAGS@
++CFLAGS	= @CFLAGS@ @CPPFLAGS@
+ CPP     = @CPP@
+ LD	= @CC@
+ LDFLAGS	= @LDFLAGS@
+@@ -24,8 +24,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@
+ 
diff --git a/www/amaya/files/patch-ae b/www/amaya/files/patch-ae
new file mode 100644
index 00000000000..32111aa9a63
--- /dev/null
+++ b/www/amaya/files/patch-ae
@@ -0,0 +1,11 @@
+--- ../configure.orig	Wed Feb 28 19:34:16 2001
++++ ../configure	Mon Mar 19 22:16:50 2001
+@@ -1651,7 +1651,7 @@
+   :
+ fi
+ 
+-if test "$with_graphic-libs" = "no" ; then
++if test "$with_more_shared" = "yes" ; then
+     echo $ac_n "checking for libjpeg version = 6b""... $ac_c" 1>&6
+ echo "configure:1657: checking for libjpeg version = 6b" >&5
+     cat > conftest.$ac_ext <<EOF
diff --git a/www/amaya/files/patch-af b/www/amaya/files/patch-af
new file mode 100644
index 00000000000..921d246b79b
--- /dev/null
+++ b/www/amaya/files/patch-af
@@ -0,0 +1,11 @@
+--- ../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/pkg-plist b/www/amaya/pkg-plist
index 379ae13b214..efa49c739da 100644
--- a/www/amaya/pkg-plist
+++ b/www/amaya/pkg-plist
@@ -184,8 +184,8 @@ Amaya/doc/Icons/table.gif
 Amaya/doc/Icons/target.gif
 Amaya/doc/Icons/ui.gif
 Amaya/doc/Icons/up.gif
-Amaya/doc/Icons/warning.gif
 Amaya/doc/Icons/w3c-amaya.gif
+Amaya/doc/Icons/warning.gif
 Amaya/doc/amaya/Access.html
 Amaya/doc/amaya/Access.html.fr
 Amaya/doc/amaya/Annotations.html