upgrade to 1.0.2

PR:		106846
Submitted by:	maintainer

3 files changed, 52 insertions, 46 deletions

diff --git a/graphics/metapixel/Makefile b/graphics/metapixel/Makefile
index 4421fc23b36b..1256db4e51df 100644
--- a/graphics/metapixel/Makefile
+++ b/graphics/metapixel/Makefile
@@ -5,16 +5,17 @@
 # $FreeBSD$
 
 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 @@ MAKE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I." \
 		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 @@ do-install:
 	${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 --git a/graphics/metapixel/distinfo b/graphics/metapixel/distinfo
index 4481009ea7f5..0057667c901c 100644
--- a/graphics/metapixel/distinfo
+++ b/graphics/metapixel/distinfo
@@ -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 --git a/graphics/metapixel/files/patch-Makefile b/graphics/metapixel/files/patch-Makefile
index 004025e7f234..0f6cc7a449bc 100644
--- a/graphics/metapixel/files/patch-Makefile
+++ b/graphics/metapixel/files/patch-Makefile
@@ -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)
++	$(CC) $(LDOPTS) -o metapixel-convert $(CONVERT_OBJS)
  
- metapixel-imagesize : $(IMAGESIZE_OBJS)
- 	$(CC) $(LDOPTS) -o metapixel-imagesize $(IMAGESIZE_OBJS) -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 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
+-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