From owner-freebsd-ports Fri Mar 16 21: 0:56 2001 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 5744637B722 for ; Fri, 16 Mar 2001 21:00:04 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.1/8.11.1) id f2H504J40866; Fri, 16 Mar 2001 21:00:04 -0800 (PST) (envelope-from gnats) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id F365537B71A for ; Fri, 16 Mar 2001 20:59:26 -0800 (PST) (envelope-from nobody@FreeBSD.org) Received: (from nobody@localhost) by freefall.freebsd.org (8.11.1/8.11.1) id f2H4xQn40784; Fri, 16 Mar 2001 20:59:26 -0800 (PST) (envelope-from nobody) Message-Id: <200103170459.f2H4xQn40784@freefall.freebsd.org> Date: Fri, 16 Mar 2001 20:59:26 -0800 (PST) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-1.0 Subject: ports/25872: Update port: www/amaya to 4.3.1 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 25872 >Category: ports >Synopsis: Update port: www/amaya to 4.3.1 >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: Fri Mar 16 21:00:04 PST 2001 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.2-RELEASE i386 >Organization: >Environment: >Description: - Update to version 4.3.1 New file: files/patch-ac files/patch-ad >How-To-Repeat: >Fix: diff -urN /usr/ports/www/amaya/Makefile www/amaya/Makefile --- /usr/ports/www/amaya/Makefile Wed Jan 17 20:39:17 2001 +++ www/amaya/Makefile Sat Mar 17 09:24:07 2001 @@ -6,20 +6,28 @@ # PORTNAME= amaya -PORTVERSION= 4.2.1 +PORTVERSION= 4.3.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" \ + LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ARGS= --with-more-shared DICT?= none @@ -37,12 +45,6 @@ .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 +58,12 @@ ${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 -urN /usr/ports/www/amaya/distinfo www/amaya/distinfo --- /usr/ports/www/amaya/distinfo Thu Jan 4 14:19:28 2001 +++ www/amaya/distinfo Sat Mar 17 09:19:04 2001 @@ -1,4 +1,4 @@ -MD5 (amaya/amaya-src-4.2.1.tgz) = 2d8af7c6e76544bb92f22abd5c589d86 +MD5 (amaya/amaya-src-4.3.1.tgz) = 3b2e54b68cafbd57ca05f6dd19b0339b MD5 (amaya/Dutch.tgz) = 3edb9cce5ce160d7270b23808c1d5981 MD5 (amaya/English.tgz) = e06eb8accd75b3e65d7ffa552244b011 MD5 (amaya/French.tgz) = 791bc87281b27f10a987815aa7d10108 diff -urN /usr/ports/www/amaya/files/patch-ac www/amaya/files/patch-ac --- /usr/ports/www/amaya/files/patch-ac Thu Jan 1 09:00:00 1970 +++ www/amaya/files/patch-ac Sat Mar 17 08:53:41 2001 @@ -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 -urN /usr/ports/www/amaya/files/patch-ad www/amaya/files/patch-ad --- /usr/ports/www/amaya/files/patch-ad Thu Jan 1 09:00:00 1970 +++ www/amaya/files/patch-ad Sat Mar 17 02:06:46 2001 @@ -0,0 +1,11 @@ +--- ../configure.orig Wed Feb 28 19:34:16 2001 ++++ ../configure Sat Mar 17 01:03:09 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 <Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message