Date: Wed, 11 Feb 2004 18:30:53 +0100 (CET) From: Daniel Roethlisberger <daniel@roe.ch> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/62698: [maintainer update] graphics/metapixel to version 0.8 Message-ID: <200402111730.i1BHUrPQ002682@cuendillar.roe> Resent-Message-ID: <200402111810.i1BIA2TC012772@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 62698
>Category: ports
>Synopsis: [maintainer update] graphics/metapixel to version 0.8
>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 Feb 11 10:10:02 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: Daniel Roethlisberger
>Release: FreeBSD 5.2-RELEASE i386
>Organization:
>Environment:
System: FreeBSD cuendillar.roe 5.2-RELEASE FreeBSD 5.2-RELEASE #0: Sun Jan 11 04:21:45 GMT 2004 root@wv1u.btc.adaptec.com:/usr/obj/usr/src/sys/GENERIC i386
>Description:
[ADD] new file: files/patch-sizesort
[DELETE] obsolete file: files/patch-metapixel.c
Update to metapixel-0.8
Original package changes:
- two new photomosaik modes
- new tools convert, imagesize and sizesort
Port changes:
- install new tools as metapixel-{convert,imagesize,sizesort} to avoid
conflicts with other ports (eg. ImageMagick)
- add -I. to CPPFLAGS (new tools require it)
- add SIZE to distinfo
- general cleanup after taking over maintainership
- add mirror mastersite
>How-To-Repeat:
>Fix:
--- metapixel-0.7_3-0.8.diff begins here ---
diff -ruN metapixel-old/Makefile metapixel/Makefile
--- metapixel-old/Makefile Wed Feb 11 01:39:09 2004
+++ metapixel/Makefile Wed Feb 11 17:45:56 2004
@@ -5,13 +5,13 @@
# $FreeBSD: ports/graphics/metapixel/Makefile,v 1.8 2004/02/10 17:45:12 arved Exp $
PORTNAME= metapixel
-PORTVERSION= 0.7
-PORTREVISION= 3
+PORTVERSION= 0.8
CATEGORIES= graphics
-MASTER_SITES= http://www.complang.tuwien.ac.at/~schani/metapixel/
+MASTER_SITES= http://www.complang.tuwien.ac.at/~schani/metapixel/ \
+ http://dragon.roe.ch/mirrors/distfiles/metapixel/
MAINTAINER= daniel@roe.ch
-COMMENT= "Metapixel is a program for generating photomosaics"
+COMMENT= A photomosaic generator
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg
@@ -19,17 +19,21 @@
USE_GETOPT_LONG=yes
USE_GMAKE= yes
USE_REINPLACE= yes
-MAKE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
+MAKE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I." \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
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
+ s,MAXSHORT,SHRT_MAX,' ${WRKSRC}/libzoom/zoom.c
+ @${MV} ${WRKSRC}/sizesort ${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-sizesort ${PREFIX}/bin
.include <bsd.port.mk>
diff -ruN metapixel-old/distinfo metapixel/distinfo
--- metapixel-old/distinfo Thu May 23 21:07:57 2002
+++ metapixel/distinfo Wed Feb 11 17:44:14 2004
@@ -1 +1,2 @@
-MD5 (metapixel-0.7.tar.gz) = ffb60f432e8a4c85432f572cbd265aff
+MD5 (metapixel-0.8.tar.gz) = 882185b83a0e9c1e035a9eb8928dae9c
+SIZE (metapixel-0.8.tar.gz) = 62754
diff -ruN metapixel-old/files/patch-Makefile metapixel/files/patch-Makefile
--- metapixel-old/files/patch-Makefile Mon Jul 14 04:36:37 2003
+++ metapixel/files/patch-Makefile Wed Feb 11 17:45:36 2004
@@ -1,25 +1,47 @@
---- Makefile.orig Sat Jan 22 07:32:17 2000
-+++ Makefile Sun Jul 6 19:40:11 2003
-@@ -1,5 +1,3 @@
+--- Makefile.orig Thu Jan 15 20:56:02 2004
++++ Makefile Wed Feb 11 17:44:32 2004
+@@ -1,33 +1,30 @@
-PREFIX = /usr/local
-INSTALL = install
-
+-
BINDIR = $(PREFIX)/bin
-@@ -7,12 +5,12 @@
+ VERSION = 0.8
+ #DEBUG = -g
+-OPTIMIZE = -O3
++#OPTIMIZE = -O3
#PROFILE = -pg
--LDOPTS = -L/usr/X11R6/lib $(PROFILE)
--CCOPTS = -I/usr/X11R6/include -I/usr/X11R6/include/X11 -Wall -O9 $(PROFILE) -DMETAPIXEL_VERSION=\"$(VERSION)\"
+-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)\"
-CC = gcc
-+LDOPTS = ${LDFLAGS} $(PROFILE)
-+CCOPTS = ${CFLAGS} ${CPPFLAGS} -Wall $(PROFILE) -DMETAPIXEL_VERSION=\"$(VERSION)\"
++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 getopt.o getopt1.o
-+OBJS = metapixel.o vector.o rwpng.o rwjpeg.o readimage.o writeimage.o
-
- all : metapixel
+-OBJS = metapixel.o vector.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
++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
+
+ metapixel : $(OBJS) libzoom/libzoom.a
+ $(CC) $(LDOPTS) -o metapixel $(OBJS) libzoom/libzoom.a -lpng -ljpeg $(LIBFFM) -lm -lz
+
+-convert : $(CONVERT_OBJS)
+- $(CC) $(LDOPTS) -o convert $(CONVERT_OBJS)
++metapixel-convert : $(CONVERT_OBJS)
++ $(CC) $(LDOPTS) -o metapixel-convert $(CONVERT_OBJS)
+
+-imagesize : $(IMAGESIZE_OBJS)
+- $(CC) $(LDOPTS) -o imagesize $(IMAGESIZE_OBJS) libzoom/libzoom.a -lpng -ljpeg -lm -lz
++metapixel-imagesize : $(IMAGESIZE_OBJS)
++ $(CC) $(LDOPTS) -o metapixel-imagesize $(IMAGESIZE_OBJS) libzoom/libzoom.a -lpng -ljpeg -lm -lz
+ %.o : %.c
+ $(CC) $(CCOPTS) -c $<
diff -ruN metapixel-old/files/patch-metapixel.c metapixel/files/patch-metapixel.c
--- metapixel-old/files/patch-metapixel.c Thu May 23 21:07:58 2002
+++ metapixel/files/patch-metapixel.c Thu Jan 1 01:00:00 1970
@@ -1,11 +0,0 @@
---- metapixel.c.orig Fri May 24 03:05:45 2002
-+++ metapixel.c Fri May 24 03:06:16 2002
-@@ -1127,7 +1127,7 @@
- break;
-
- case 256 :
-- printf("metapixel " METAPIXEL_VERSION "\n"
-+ printf("metapixel \n"
- "\n"
- "Copyright (C) 1997-2000 Mark Probst\n"
- "\n"
diff -ruN metapixel-old/files/patch-sizesort metapixel/files/patch-sizesort
--- metapixel-old/files/patch-sizesort Thu Jan 1 01:00:00 1970
+++ metapixel/files/patch-sizesort Wed Feb 11 17:45:21 2004
@@ -0,0 +1,11 @@
+--- 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-old/pkg-descr metapixel/pkg-descr
--- metapixel-old/pkg-descr Thu May 23 21:07:57 2002
+++ metapixel/pkg-descr Wed Feb 11 17:44:14 2004
@@ -1,13 +1,9 @@
-Metapixel is a program for generating photomosaics. It can
-generate classical photomosaics, in which the source image is
-viewed as a matrix of equally sized rectangles for each of which
-a matching image is substitued, as well as collage-style
-photomosaics, in which rectangular parts of the source image at
-arbitrary positions (i.e. not aligned to a matrix) are
-substituted by matching images.
+Metapixel is a photomosaic generator. It can generate classical
+photomosaics, in which the source image is viewed as a matrix
+of equally sized rectangles for each of which a matching image
+is substituted, as well as collage-style photomosaics, where
+the images are placed at arbitrary positions in the source
+image, not aligned to a matrix.
Author: Mark Propst <schani@complang.tuwien.ac.at>
WWW: http://www.complang.tuwien.ac.at/~schani/metapixel/
-
-- Tilman Linneweh
-freebsdports@arved.de
diff -ruN metapixel-old/pkg-plist metapixel/pkg-plist
--- metapixel-old/pkg-plist Thu May 23 21:07:57 2002
+++ metapixel/pkg-plist Wed Feb 11 17:44:14 2004
@@ -1,2 +1,5 @@
bin/metapixel
bin/metapixel-prepare
+bin/metapixel-convert
+bin/metapixel-imagesize
+bin/metapixel-sizesort
--- metapixel-0.7_3-0.8.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200402111730.i1BHUrPQ002682>