3 files changed, 45 insertions, 23 deletions

diff --git a/graphics/metapixel/files/patch-Makefile b/graphics/metapixel/files/patch-Makefile
index 0da82060c998..c67e894cbd3c 100644
--- a/graphics/metapixel/files/patch-Makefile
+++ b/graphics/metapixel/files/patch-Makefile
@@ -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
+-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)
  
- all : metapixel
+-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 --git a/graphics/metapixel/files/patch-metapixel.c b/graphics/metapixel/files/patch-metapixel.c
deleted file mode 100644
index 644d1a7e9f40..000000000000
--- a/graphics/metapixel/files/patch-metapixel.c
+++ /dev/null
@@ -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 --git a/graphics/metapixel/files/patch-sizesort b/graphics/metapixel/files/patch-sizesort
new file mode 100644
index 000000000000..2da5f547c9eb
--- /dev/null
+++ b/graphics/metapixel/files/patch-sizesort
@@ -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);