Date: 30 Jan 1999 19:36:59 -0000 From: Tom Hukins <tom@eborcom.com> To: FreeBSD-gnats-submit@FreeBSD.ORG Subject: ports/9808: Upgrade Port: chimera2 Message-ID: <19990130193659.1187.qmail@eborcom.com>
next in thread | raw e-mail | index | archive | help
>Number: 9808 >Category: ports >Synopsis: Upgrade Port: chimera2 >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: Sat Jan 30 11:50:00 PST 1999 >Closed-Date: >Last-Modified: >Originator: Tom Hukins >Release: FreeBSD 2.2.8-STABLE i386 >Organization: eBORcOM >Environment: >Description: I have fixed up the chimera2 port so it compiles if png and jpeg are installed, but not under /usr/local. I have also upgraded the port from version 2a11 to 2a15, added some more MASTER_SITES and moved the manual page from pkg/PLIST to MANx in the Makefile. Files added: scripts/configure Files removed: patches/patch-ab patches/patch-ac >How-To-Repeat: >Fix: diff -ruN chimera2.old/Makefile chimera2/Makefile --- chimera2.old/Makefile Sat Jan 23 16:44:28 1999 +++ chimera2/Makefile Sat Jan 30 13:36:51 1999 @@ -1,25 +1,24 @@ # New ports collection makefile for: chimera -# Version required: 2.0a11 +# Version required: 2.0a15 # Date created: 24 Nov 1997 # Whom: Bruce Gingery <bgingery@gtcs.com> # # $Id: Makefile,v 1.20 1999/01/23 07:05:20 vanilla Exp $ # -DISTNAME= chimera-2.0a11 +DISTNAME= chimera-2.0a15 CATEGORIES= www -MASTER_SITES= ftp://ftp.cs.unlv.edu/pub/chimera-alpha/ +MASTER_SITES= ftp://ftp.cs.unlv.edu/pub/chimera-alpha/ \ + ftp://ftp.netlab.is.tsukuba.ac.jp/pub/network/WWW/chimera/ \ + ftp://ftp.uni-koeln.de/net/inet/WWW/ MAINTAINER= bgingery@gtcs.com LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.3:${PORTSDIR}/graphics/png +MAN1= chimera.1 +MANCOMPRESSED= yes USE_IMAKE= yes - -post-patch: - ${MV} ${WRKSRC}/Common.tmpl.dist ${WRKSRC}/Common.tmpl - ${CP} ${FILESDIR}/protopng.h ${WRKSRC}/image/ - ln -s ${WRKSRC}/chimera ${WRKSRC}/main .include <bsd.port.mk> diff -ruN chimera2.old/files/md5 chimera2/files/md5 --- chimera2.old/files/md5 Wed Nov 26 23:27:46 1997 +++ chimera2/files/md5 Thu Jan 21 20:15:32 1999 @@ -1 +1 @@ -MD5 (chimera-2.0a11.tar.gz) = c422accc01edcf2be5dfcea6df42f0cc +MD5 (chimera-2.0a15.tar.gz) = 4d8cdc46179e6fb5351ee411ea346442 diff -ruN chimera2.old/patches/patch-ab chimera2/patches/patch-ab --- chimera2.old/patches/patch-ab Wed Nov 26 23:27:46 1997 +++ chimera2/patches/patch-ab Thu Jan 1 01:00:00 1970 @@ -1,15 +0,0 @@ -*** common/mime.c.orig Sat Apr 19 19:23:48 1997 ---- common/mime.c Thu Aug 7 01:30:44 1997 -*************** -*** 22,27 **** ---- 22,31 ---- - #include <stdlib.h> - #endif - -+ #ifdef HAVE_STRING_H -+ #include <string.h> -+ #endif -+ - #include "common.h" - #include "mime.h" - diff -ruN chimera2.old/patches/patch-ac chimera2/patches/patch-ac --- chimera2.old/patches/patch-ac Wed Nov 26 07:53:34 1997 +++ chimera2/patches/patch-ac Thu Jan 1 01:00:00 1970 @@ -1,12 +0,0 @@ -*** image/image.c.orig Fri Mar 7 22:52:04 1997 ---- image/image.c Thu Aug 7 01:56:59 1997 -*************** -*** 33,38 **** ---- 33,39 ---- - #include "image_endian.h" - #include "imagep.h" - #include "image_format.h" -+ #include "protopng.h" - - #include "WWW.h" - diff -ruN chimera2.old/pkg/PLIST chimera2/pkg/PLIST --- chimera2.old/pkg/PLIST Wed Nov 26 23:27:47 1997 +++ chimera2/pkg/PLIST Sat Jan 30 13:09:49 1999 @@ -1,2 +1 @@ bin/chimera -man/man1/chimera.1.gz diff -ruN chimera2.old/scripts/configure chimera2/scripts/configure --- chimera2.old/scripts/configure Thu Jan 1 01:00:00 1970 +++ chimera2/scripts/configure Sat Jan 30 13:12:08 1999 @@ -0,0 +1,12 @@ +#!/bin/sh + +jpegdir=`ldconfig -r | grep -wF -e "-ljpeg.9" | sed -e 's#^.*=> ##' | \ + sed -e 's#/lib/libjpeg\..*$##'` +pngdir=`ldconfig -r | grep -wF -e "-lpng.2" | sed -e 's#^.*=> ##' | \ + sed -e 's#/lib/libpng\..*$##'` + +sed -e 's#^CHIMERA_PREFIX = /usr/local$#CHIMERA_PREFIX = ${PREFIX}#' < ${WRKSRC}/Common.tmpl.dist > ${WRKSRC}/Common.tmpl.a +sed -e "s#^JPEGDIR = /usr/local#JPEGDIR = $jpegdir#" < ${WRKSRC}/Common.tmpl.a > ${WRKSRC}/Common.tmpl.b +sed -e "s#^PNGDIR = /usr/local#PNGDIR = $pngdir#" < ${WRKSRC}/Common.tmpl.b > ${WRKSRC}/Common.tmpl + +ln -s ${WRKSRC}/chimera ${WRKSRC}/main >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?19990130193659.1187.qmail>