From roe@dragon.roe.ch Sun Dec 17 23:50:06 2006 Return-Path: Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 299E716A417 for ; Sun, 17 Dec 2006 23:50:06 +0000 (UTC) (envelope-from roe@dragon.roe.ch) Received: from calvin.roe.ch (calvin.roe.ch [213.144.141.26]) by mx1.FreeBSD.org (Postfix) with ESMTP id DBA6D43CAD for ; Sun, 17 Dec 2006 23:50:04 +0000 (GMT) (envelope-from roe@dragon.roe.ch) Received: from d212-53-102-185.cust.tele2.ch ([212.53.102.185] helo=dragon.roe.ch) by calvin.roe.ch (envelope-from ) with ESMTPS (TLSv1:AES256-SHA:256) id 1Gw5lL-000CJE-L7 for FreeBSD-gnats-submit@freebsd.org; Mon, 18 Dec 2006 00:49:48 +0100 Received: from adsl-130-143.dsl.init7.net ([213.144.130.143] helo=aphrodite.roe) by dragon.roe.ch (envelope-from ) with ESMTP (TLSv1:AES256-SHA:256) id 1Gw5lX-0001CG-00 ; Mon, 18 Dec 2006 00:49:59 +0100 Received: from aphrodite.roe (aphrodite [127.0.0.1]) by aphrodite.roe (8.13.6/8.13.6) with ESMTP id kBI016Qk005203; Mon, 18 Dec 2006 01:01:06 +0100 (CET) (envelope-from roe@aphrodite.roe) Received: (from roe@localhost) by aphrodite.roe (8.13.6/8.13.6/Submit) id kBI015wP005202; Mon, 18 Dec 2006 01:01:05 +0100 (CET) (envelope-from roe) Message-Id: <200612180001.kBI015wP005202@aphrodite.roe> Date: Mon, 18 Dec 2006 01:01:05 +0100 (CET) From: Daniel Roethlisberger Reply-To: Daniel Roethlisberger To: FreeBSD-gnats-submit@freebsd.org Cc: daniel@roe.ch Subject: [maintainer] Update graphics/metapixel to 1.0.2 and fix MASTER_SITES X-Send-Pr-Version: 3.113 X-GNATS-Notify: >Number: 106846 >Category: ports >Synopsis: [maintainer] Update graphics/metapixel to 1.0.2 and fix MASTER_SITES >Confidential: no >Severity: non-critical >Priority: medium >Responsible: jmelo >State: closed >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Dec 17 23:50:15 GMT 2006 >Closed-Date: Mon Dec 18 05:47:00 GMT 2006 >Last-Modified: Mon Dec 18 05:50:22 GMT 2006 >Originator: Daniel Roethlisberger >Release: FreeBSD 6.1-RELEASE-p10 i386 >Organization: >Environment: System: FreeBSD aphrodite.roe 6.1-RELEASE-p10 FreeBSD 6.1-RELEASE-p10 #9: Sat Oct 21 15:21:13 CEST 2006 root@aphrodite.roe:/usr/obj/usr/src/sys/APHRODITE i386 >Description: Update metapixel to 1.0.2 and fix MASTER_SITES. Most notable changes are GIF reading and JPEG writing support. >How-To-Repeat: >Fix: --- metapixel-1.0.1-1.0.2.diff begins here --- diff -ruN metapixel.orig/Makefile metapixel/Makefile --- metapixel.orig/Makefile Sun Apr 2 16:31:47 2006 +++ metapixel/Makefile Mon Dec 18 00:45:04 2006 @@ -5,16 +5,17 @@ # $FreeBSD: ports/graphics/metapixel/Makefile,v 1.13 2006/04/02 14:31:47 pav Exp $ PORTNAME= metapixel -PORTVERSION= 1.0.1 +PORTVERSION= 1.0.2 CATEGORIES= graphics -MASTER_SITES= http://www.complang.tuwien.ac.at/~schani/metapixel/ \ - http://dragon.roe.ch/mirrors/distfiles/metapixel/ +MASTER_SITES= http://www.complang.tuwien.ac.at/~schani/metapixel/files/ \ + http://mirror.roe.ch/dist/metapixel/ MAINTAINER= daniel@roe.ch COMMENT= A photomosaic generator LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ - jpeg.9:${PORTSDIR}/graphics/jpeg + jpeg.9:${PORTSDIR}/graphics/jpeg \ + ungif.5:${PORTSDIR}/graphics/libungif USE_GETOPT_LONG=yes USE_GMAKE= yes @@ -22,7 +23,7 @@ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" PLIST_FILES= bin/metapixel bin/metapixel-convert bin/metapixel-imagesize \ - bin/metapixel-prepare bin/metapixel-sizesort bin/metapixel-zoom \ + bin/metapixel-prepare bin/metapixel-sizesort \ share/examples/metapixel/metapixelrc PLIST_DIRS= share/examples/metapixel PORTDOCS= README NEWS @@ -37,7 +38,6 @@ ${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 ${INSTALL_MAN} ${WRKSRC}/metapixel.1 ${PREFIX}/man/man1 ${MKDIR} ${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/metapixelrc ${EXAMPLESDIR} diff -ruN metapixel.orig/distinfo metapixel/distinfo --- metapixel.orig/distinfo Sun Apr 2 16:31:47 2006 +++ metapixel/distinfo Mon Dec 18 00:06:04 2006 @@ -1,3 +1,3 @@ -MD5 (metapixel-1.0.1.tar.gz) = b0fcb1ad62708478478218190c355fd0 -SHA256 (metapixel-1.0.1.tar.gz) = 1a9a97563e4118acb48398735401fef642ca0e50ffb3f31c1d773d696fd06c62 -SIZE (metapixel-1.0.1.tar.gz) = 57926 +MD5 (metapixel-1.0.2.tar.gz) = af5d77d38826756af213a08e3ada9941 +SHA256 (metapixel-1.0.2.tar.gz) = 8d77810978da397c070b9b4e228ae6204e9f5c524518ad1a4fcab9462171f55b +SIZE (metapixel-1.0.2.tar.gz) = 63197 diff -ruN metapixel.orig/files/patch-Makefile metapixel/files/patch-Makefile --- metapixel.orig/files/patch-Makefile Sun Apr 2 16:31:47 2006 +++ metapixel/files/patch-Makefile Mon Dec 18 00:44:09 2006 @@ -1,61 +1,67 @@ ---- Makefile.orig Sun Feb 19 22:30:56 2006 -+++ Makefile Sun Apr 2 15:57:00 2006 -@@ -1,5 +1,5 @@ +--- Makefile.orig Sun Dec 10 18:59:54 2006 ++++ Makefile Mon Dec 18 00:44:03 2006 +@@ -1,52 +1,36 @@ -PREFIX = /usr/local -INSTALL = install -+#PREFIX = /usr/local -+#INSTALL = install - MANPAGE_XSL = /sw/share/xml/xsl/docbook-xsl/manpages/docbook.xsl - +-MANPAGE_XSL = /sw/share/xml/xsl/docbook-xsl/manpages/docbook.xsl +- BINDIR = $(PREFIX)/bin -@@ -8,24 +8,24 @@ - VERSION = 1.0.1 + MANDIR = $(PREFIX)/share/man - #DEBUG = -g --OPTIMIZE = -O2 -+#OPTIMIZE = -O2 - #PROFILE = -pg + VERSION = 1.0.2 - MACOS_LDOPTS = -L/sw/lib - MACOS_CCOPTS = -I/sw/include +-#DEBUG = -g +-OPTIMIZE = -O2 +-#PROFILE = -pg +- +-MACOS_LDOPTS = -L/sw/lib +-MACOS_CCOPTS = -I/sw/include +- + FORMATDEFS = -DRWIMG_JPEG -DRWIMG_PNG -DRWIMG_GIF -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)\" +-CCOPTS = $(MACOS_CCOPTS) -I/usr/X11R6/include -I/usr/X11R6/include/X11 -I. -Irwimg -Wall $(OPTIMIZE) $(DEBUG) $(PROFILE) -DMETAPIXEL_VERSION=\"$(VERSION)\" -CC = gcc +-#LIBFFM = -lffm +LDOPTS = ${LDFLAGS} $(PROFILE) $(DEBUG) -+CCOPTS = ${CFLAGS} ${CPPFLAGS} -Wall $(OPTIMIZE) $(DEBUG) $(PROFILE) -DMETAPIXEL_VERSION=\"$(VERSION)\" -+#CC = gcc - #LIBFFM = -lffm ++CCOPTS = ${CFLAGS} ${CPPFLAGS} -Irwimg -Wall $(FORMATDEFS) -DMETAPIXEL_VERSION=\"$(VERSION)\" + + export CCOPTS CC FORMATDEFS LISPREADER_OBJS = lispreader.o pools.o allocator.o - OBJS = metapixel.o vector.o zoom.o rwpng.o rwjpeg.o readimage.o writeimage.o \ -- $(LISPREADER_OBJS) getopt.o getopt1.o +-OBJS = metapixel.o vector.o zoom.o $(LISPREADER_OBJS) getopt.o getopt1.o -CONVERT_OBJS = convert.o $(LISPREADER_OBJS) getopt.o getopt1.o -+ $(LISPREADER_OBJS) ++OBJS = metapixel.o vector.o zoom.o $(LISPREADER_OBJS) +CONVERT_OBJS = convert.o $(LISPREADER_OBJS) - IMAGESIZE_OBJS = imagesize.o rwpng.o rwjpeg.o readimage.o + IMAGESIZE_OBJS = imagesize.o -all : metapixel metapixel.1 convert metapixel-imagesize -+all : metapixel metapixel.1 metapixel-convert metapixel-imagesize metapixel-zoom ++all : metapixel metapixel-convert metapixel-imagesize - metapixel : $(OBJS) - $(CC) $(LDOPTS) -o metapixel $(OBJS) -lpng -ljpeg $(LIBFFM) -lm -lz -@@ -33,14 +33,14 @@ - metapixel.1 : metapixel.xml - xsltproc --nonet $(MANPAGE_XSL) metapixel.xml + metapixel : $(OBJS) librwimg +- $(CC) $(LDOPTS) -o metapixel $(OBJS) rwimg/librwimg.a -lpng -ljpeg -lgif $(LIBFFM) -lm -lz +- +-metapixel.1 : metapixel.xml +- xsltproc --nonet $(MANPAGE_XSL) metapixel.xml ++ $(CC) $(LDOPTS) -o metapixel $(OBJS) rwimg/librwimg.a -lpng -ljpeg -lungif $(LIBFFM) -lm -lz -convert : $(CONVERT_OBJS) - $(CC) $(LDOPTS) -o convert $(CONVERT_OBJS) +metapixel-convert : $(CONVERT_OBJS) -+ $(CC) $(LDOPTS) -o $@ $(CONVERT_OBJS) - - metapixel-imagesize : $(IMAGESIZE_OBJS) - $(CC) $(LDOPTS) -o metapixel-imagesize $(IMAGESIZE_OBJS) -lpng -ljpeg -lm -lz ++ $(CC) $(LDOPTS) -o metapixel-convert $(CONVERT_OBJS) --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) $(LDOPTS) -o $@ -DTEST_ZOOM zoom.c rwjpeg.c rwpng.c readimage.c writeimage.c -lpng -ljpeg -lm -lz + metapixel-imagesize : $(IMAGESIZE_OBJS) librwimg +- $(CC) $(LDOPTS) -o metapixel-imagesize $(IMAGESIZE_OBJS) rwimg/librwimg.a -lpng -ljpeg -lgif -lm -lz ++ $(CC) $(LDOPTS) -o metapixel-imagesize $(IMAGESIZE_OBJS) rwimg/librwimg.a -lpng -ljpeg -lungif -lm -lz + +-zoom : zoom.c librwimg +- $(CC) -o zoom $(OPTIMIZE) $(PROFILE) $(MACOS_CCOPTS) -DTEST_ZOOM zoom.c $(MACOS_LDOPTS) rwimg/librwimg.a -lpng -ljpeg -lgif -lm -lz ++metapixel-zoom : zoom.c librwimg ++ $(CC) $(CCOPTS) $(LDOPTS) -o $@ -DTEST_ZOOM zoom.c rwimg/librwimg.a -lpng -ljpeg -lungif -lm -lz %.o : %.c - $(CC) $(CCOPTS) -c $< +- $(CC) $(CCOPTS) $(FORMATDEFS) -c $< ++ $(CC) $(CCOPTS) -c $< + + librwimg : + $(MAKE) -C rwimg --- metapixel-1.0.1-1.0.2.diff ends here --- >Release-Note: >Audit-Trail: Responsible-Changed-From-To: freebsd-ports-bugs->jmelo Responsible-Changed-By: edwin Responsible-Changed-When: Sun Dec 17 23:50:24 UTC 2006 Responsible-Changed-Why: jmelo@ wants to have WWW and MASTER_SITES PRs http://www.freebsd.org/cgi/query-pr.cgi?pr=106846 State-Changed-From-To: open->closed State-Changed-By: ijliao State-Changed-When: Mon Dec 18 05:46:50 UTC 2006 State-Changed-Why: committed, thanks http://www.freebsd.org/cgi/query-pr.cgi?pr=106846 From: dfilter@FreeBSD.ORG (dfilter service) To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/106846: commit references a PR Date: Mon, 18 Dec 2006 05:46:46 +0000 (UTC) ijliao 2006-12-18 05:46:41 UTC FreeBSD ports repository Modified files: graphics/metapixel Makefile distinfo graphics/metapixel/files patch-Makefile Log: upgrade to 1.0.2 PR: 106846 Submitted by: maintainer Revision Changes Path 1.14 +6 -6 ports/graphics/metapixel/Makefile 1.7 +3 -3 ports/graphics/metapixel/distinfo 1.8 +44 -38 ports/graphics/metapixel/files/patch-Makefile _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org" >Unformatted: