From owner-freebsd-ports-bugs@FreeBSD.ORG Wed May 5 19:50:09 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0A71616A4CE for ; Wed, 5 May 2004 19:50:09 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 28DD843D3F for ; Wed, 5 May 2004 19:50:08 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i462o8FW039184 for ; Wed, 5 May 2004 19:50:08 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i462o8X7039183; Wed, 5 May 2004 19:50:08 -0700 (PDT) (envelope-from gnats) Resent-Date: Wed, 5 May 2004 19:50:08 -0700 (PDT) Resent-Message-Id: <200405060250.i462o8X7039183@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Daniel Roethlisberger Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 97EC416A4CE for ; Wed, 5 May 2004 19:41:47 -0700 (PDT) Received: from dragon.roe.ch (line-zh-102-185.adsl.econophone.ch [212.53.102.185]) by mx1.FreeBSD.org (Postfix) with ESMTP id C344C43D1F for ; Wed, 5 May 2004 19:41:45 -0700 (PDT) (envelope-from roe@dragon.roe.ch) Received: from cuendillar.roe ([192.168.1.5]) by dragon.roe.ch with ESMTP (TLSv1:DES-CBC3-SHA:168) id 1BLYpP-0007oo-00 ; Thu, 06 May 2004 04:41:39 +0200 Received: from cuendillar.roe (localhost [127.0.0.1]) by cuendillar.roe (8.12.10/8.12.10) with ESMTP id i462fUBE012853; Thu, 6 May 2004 04:41:30 +0200 (CEST) (envelope-from roe@cuendillar.roe) Received: (from roe@localhost) by cuendillar.roe (8.12.10/8.12.10/Submit) id i462fTNX012852; Thu, 6 May 2004 04:41:29 +0200 (CEST) (envelope-from roe) Message-Id: <200405060241.i462fTNX012852@cuendillar.roe> Date: Thu, 6 May 2004 04:41:29 +0200 (CEST) From: Daniel Roethlisberger To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: Daniel Roethlisberger Subject: ports/66308: [maintainer update] graphics/metapixel to 0.9 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Daniel Roethlisberger List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 May 2004 02:50:09 -0000 >Number: 66308 >Category: ports >Synopsis: [maintainer update] graphics/metapixel to 0.9 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed May 05 19:50:07 PDT 2004 >Closed-Date: >Last-Modified: >Originator: Daniel Roethlisberger >Release: FreeBSD 5.2.1-RELEASE-p5 i386 >Organization: >Environment: System: FreeBSD cuendillar.roe 5.2.1-RELEASE-p5 FreeBSD 5.2.1-RELEASE-p5 #2: Fri Apr 23 09:23:21 CEST 2004 root@cuendillar.roe:/usr/obj/usr/src/sys/IBMTPA20P i386 >Description: [DELETE] obsolete file: files/patch-sizesort Update to metapixel-0.9 Original package changes: - fixed global search mode to work with non-square images - new image zoom code to replace libzoom >How-To-Repeat: >Fix: --- metapixel-0.8-0.9.diff begins here --- diff -ruN metapixel.orig/Makefile metapixel/Makefile --- metapixel.orig/Makefile Thu May 6 01:36:10 2004 +++ metapixel/Makefile Thu May 6 04:08:33 2004 @@ -5,7 +5,7 @@ # $FreeBSD: ports/graphics/metapixel/Makefile,v 1.9 2004/02/12 13:16:10 krion Exp $ PORTNAME= metapixel -PORTVERSION= 0.8 +PORTVERSION= 0.9 CATEGORIES= graphics MASTER_SITES= http://www.complang.tuwien.ac.at/~schani/metapixel/ \ http://dragon.roe.ch/mirrors/distfiles/metapixel/ @@ -24,16 +24,16 @@ post-patch: @${RM} ${WRKSRC}/getopt.h - @${REINPLACE_CMD} -e 's,values.h,limits.h,' ${WRKSRC}/libzoom/simple.h - @${REINPLACE_CMD} -e 's,MINSHORT,SHRT_MIN,; \ - s,MAXSHORT,SHRT_MAX,' ${WRKSRC}/libzoom/zoom.c @${MV} ${WRKSRC}/sizesort ${WRKSRC}/metapixel-sizesort + @${REINPLACE_CMD} -e 's/imagesize/metapixel-imagesize/' \ + ${WRKSRC}/metapixel-sizesort do-install: ${INSTALL_PROGRAM} ${WRKSRC}/metapixel ${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/metapixel-prepare ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/metapixel-convert ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/metapixel-imagesize ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/metapixel-prepare ${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/metapixel-sizesort ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/metapixel-zoom ${PREFIX}/bin .include diff -ruN metapixel.orig/distinfo metapixel/distinfo --- metapixel.orig/distinfo Thu May 6 01:36:10 2004 +++ metapixel/distinfo Thu May 6 03:31:33 2004 @@ -1,2 +1,2 @@ -MD5 (metapixel-0.8.tar.gz) = 882185b83a0e9c1e035a9eb8928dae9c -SIZE (metapixel-0.8.tar.gz) = 62754 +MD5 (metapixel-0.9.tar.gz) = ad7fed7bcb43826cd2689f1da15585c5 +SIZE (metapixel-0.9.tar.gz) = 46348 diff -ruN metapixel.orig/files/patch-Makefile metapixel/files/patch-Makefile --- metapixel.orig/files/patch-Makefile Thu May 6 01:36:10 2004 +++ metapixel/files/patch-Makefile Thu May 6 04:13:19 2004 @@ -1,37 +1,42 @@ ---- Makefile.orig Thu Jan 15 20:56:02 2004 -+++ Makefile Wed Feb 11 17:44:32 2004 -@@ -1,33 +1,30 @@ +--- Makefile.orig Tue May 4 23:57:09 2004 ++++ Makefile Thu May 6 04:12:47 2004 +@@ -1,39 +1,36 @@ -PREFIX = /usr/local -INSTALL = install - BINDIR = $(PREFIX)/bin - VERSION = 0.8 + VERSION = 0.9 #DEBUG = -g --OPTIMIZE = -O3 -+#OPTIMIZE = -O3 +-OPTIMIZE = -O2 ++#OPTIMIZE = -O2 #PROFILE = -pg --LDOPTS = -L/sw/lib -L/usr/X11R6/lib $(PROFILE) $(DEBUG) --CCOPTS = -I/sw/include -I/usr/X11R6/include -I/usr/X11R6/include/X11 -I. -Wall $(OPTIMIZE) $(DEBUG) $(PROFILE) -DMETAPIXEL_VERSION=\"$(VERSION)\" +-MACOS_LDOPTS = -L/sw/lib +-MACOS_CCOPTS = -I/sw/include ++#MACOS_LDOPTS = -L/sw/lib ++#MACOS_CCOPTS = -I/sw/include + +-LDOPTS = $(MACOS_LDOPTS) -L/usr/X11R6/lib $(PROFILE) $(DEBUG) +-CCOPTS = $(MACOS_CCOPTS) -I/usr/X11R6/include -I/usr/X11R6/include/X11 -I. -Wall $(OPTIMIZE) $(DEBUG) $(PROFILE) -DMETAPIXEL_VERSION=\"$(VERSION)\" -CC = gcc +LDOPTS = ${LDFLAGS} $(PROFILE) $(DEBUG) +CCOPTS = ${CFLAGS} ${CPPFLAGS} -Wall $(DEBUG) $(PROFILE) -DMETAPIXEL_VERSION=\"$(VERSION)\" +#CC = gcc #LIBFFM = -lffm --OBJS = metapixel.o vector.o rwpng.o rwjpeg.o readimage.o writeimage.o lispreader.o getopt.o getopt1.o +-OBJS = metapixel.o vector.o zoom.o rwpng.o rwjpeg.o readimage.o writeimage.o lispreader.o getopt.o getopt1.o -CONVERT_OBJS = convert.o lispreader.o getopt.o getopt1.o -+OBJS = metapixel.o vector.o rwpng.o rwjpeg.o readimage.o writeimage.o lispreader.o ++OBJS = metapixel.o vector.o zoom.o rwpng.o rwjpeg.o readimage.o writeimage.o lispreader.o +CONVERT_OBJS = convert.o lispreader.o IMAGESIZE_OBJS = imagesize.o rwpng.o rwjpeg.o readimage.o -all : metapixel convert imagesize -+all : metapixel metapixel-convert metapixel-imagesize ++all : metapixel metapixel-convert metapixel-imagesize metapixel-zoom - metapixel : $(OBJS) libzoom/libzoom.a - $(CC) $(LDOPTS) -o metapixel $(OBJS) libzoom/libzoom.a -lpng -ljpeg $(LIBFFM) -lm -lz + metapixel : $(OBJS) + $(CC) $(LDOPTS) -o metapixel $(OBJS) -lpng -ljpeg $(LIBFFM) -lm -lz -convert : $(CONVERT_OBJS) - $(CC) $(LDOPTS) -o convert $(CONVERT_OBJS) @@ -39,9 +44,14 @@ + $(CC) $(LDOPTS) -o metapixel-convert $(CONVERT_OBJS) -imagesize : $(IMAGESIZE_OBJS) -- $(CC) $(LDOPTS) -o imagesize $(IMAGESIZE_OBJS) libzoom/libzoom.a -lpng -ljpeg -lm -lz +- $(CC) $(LDOPTS) -o imagesize $(IMAGESIZE_OBJS) -lpng -ljpeg -lm -lz +metapixel-imagesize : $(IMAGESIZE_OBJS) -+ $(CC) $(LDOPTS) -o metapixel-imagesize $(IMAGESIZE_OBJS) libzoom/libzoom.a -lpng -ljpeg -lm -lz ++ $(CC) $(LDOPTS) -o metapixel-imagesize $(IMAGESIZE_OBJS) -lpng -ljpeg -lm -lz + +-zoom : zoom.c rwjpeg.c rwpng.c readimage.c writeimage.c +- $(CC) -o zoom $(OPTIMIZE) $(PROFILE) $(MACOS_CCOPTS) -DTEST_ZOOM zoom.c rwjpeg.c rwpng.c readimage.c writeimage.c $(MACOS_LDOPTS) -lpng -ljpeg -lm -lz ++metapixel-zoom : zoom.c rwjpeg.c rwpng.c readimage.c writeimage.c ++ $(CC) $(CCOPTS) $(LDFLAGS) -o metapixel-zoom -DTEST_ZOOM zoom.c rwjpeg.c rwpng.c readimage.c writeimage.c -lpng -ljpeg -lm -lz %.o : %.c $(CC) $(CCOPTS) -c $< diff -ruN metapixel.orig/files/patch-sizesort metapixel/files/patch-sizesort --- metapixel.orig/files/patch-sizesort Thu May 6 01:36:10 2004 +++ metapixel/files/patch-sizesort Thu Jan 1 01:00:00 1970 @@ -1,11 +0,0 @@ ---- sizesort.orig Thu Jan 15 20:56:03 2004 -+++ sizesort Wed Feb 11 17:44:32 2004 -@@ -31,7 +31,7 @@ - - foreach my $filename (glob("$srcdir/*")) { - if (-f $filename && -r $filename) { -- my ($w, $h) = split /\s+/, `imagesize $filename`; -+ my ($w, $h) = split /\s+/, `metapixel-imagesize $filename`; - print "$filename $w $h\n"; - my $dir = sprintf "$destdir/%dx%d", $w, $h; - `mkdir $dir` if (!-d $dir); diff -ruN metapixel.orig/pkg-plist metapixel/pkg-plist --- metapixel.orig/pkg-plist Thu May 6 01:36:10 2004 +++ metapixel/pkg-plist Thu May 6 04:07:49 2004 @@ -1,5 +1,6 @@ bin/metapixel -bin/metapixel-prepare bin/metapixel-convert bin/metapixel-imagesize +bin/metapixel-prepare bin/metapixel-sizesort +bin/metapixel-zoom --- metapixel-0.8-0.9.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: