Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 2 Apr 2006 16:19:13 +0200 (CEST)
From:      Daniel Roethlisberger <daniel@roe.ch>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        daniel@roe.ch
Subject:   ports/95229: [maintainer] Update graphics/metapixel to 1.0.1
Message-ID:  <200604021419.k32EJDw4031473@aphrodite.roe>
Resent-Message-ID: <200604021420.k32EKEjV029571@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         95229
>Category:       ports
>Synopsis:       [maintainer] Update graphics/metapixel to 1.0.1
>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:   Sun Apr 02 14:20:13 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Daniel Roethlisberger
>Release:        FreeBSD 5.4-STABLE i386
>Organization:
>Environment:
System: FreeBSD aphrodite.roe 5.4-STABLE
>Description:
 * Update to 1.0.1
>How-To-Repeat:
>Fix:
--- metapixel-1.0.0-1.0.1.diff begins here ---
diff -ruN metapixel.orig/Makefile metapixel/Makefile
--- metapixel.orig/Makefile	Mon Aug  1 17:42:22 2005
+++ metapixel/Makefile	Sun Apr  2 16:00:49 2006
@@ -5,7 +5,7 @@
 # $FreeBSD: ports/graphics/metapixel/Makefile,v 1.12 2005/08/01 15:42:22 sem Exp $
 
 PORTNAME=	metapixel
-PORTVERSION=	1.0.0
+PORTVERSION=	1.0.1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.complang.tuwien.ac.at/~schani/metapixel/ \
 		http://dragon.roe.ch/mirrors/distfiles/metapixel/
@@ -18,7 +18,6 @@
 
 USE_GETOPT_LONG=yes
 USE_GMAKE=	yes
-USE_REINPLACE=	yes
 MAKE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I." \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
 
@@ -31,9 +30,6 @@
 
 post-patch:
 	@${RM} ${WRKSRC}/getopt.h
-	@${MV} ${WRKSRC}/sizesort ${WRKSRC}/metapixel-sizesort
-	@${REINPLACE_CMD} -e 's/imagesize/metapixel-imagesize/' \
-				  ${WRKSRC}/metapixel-sizesort
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/metapixel ${PREFIX}/bin
diff -ruN metapixel.orig/distinfo metapixel/distinfo
--- metapixel.orig/distinfo	Wed Dec  7 10:52:32 2005
+++ metapixel/distinfo	Sun Apr  2 15:44:03 2006
@@ -1,3 +1,3 @@
-MD5 (metapixel-1.0.0.tar.gz) = df8709bb890061c2bea4c65db4a1057c
-SHA256 (metapixel-1.0.0.tar.gz) = 9b861e43ee851f23af6775f3499f7b96613c04da0d31d0d36c12ad18993e5a54
-SIZE (metapixel-1.0.0.tar.gz) = 56426
+MD5 (metapixel-1.0.1.tar.gz) = b0fcb1ad62708478478218190c355fd0
+SHA256 (metapixel-1.0.1.tar.gz) = 1a9a97563e4118acb48398735401fef642ca0e50ffb3f31c1d773d696fd06c62
+SIZE (metapixel-1.0.1.tar.gz) = 57926
diff -ruN metapixel.orig/files/patch-Makefile metapixel/files/patch-Makefile
--- metapixel.orig/files/patch-Makefile	Mon Aug  1 17:42:22 2005
+++ metapixel/files/patch-Makefile	Sun Apr  2 15:57:22 2006
@@ -1,5 +1,5 @@
---- Makefile.orig	Sun May  8 18:25:51 2005
-+++ Makefile	Sun Jul 31 13:55:22 2005
+--- Makefile.orig	Sun Feb 19 22:30:56 2006
++++ Makefile	Sun Apr  2 15:57:00 2006
 @@ -1,5 +1,5 @@
 -PREFIX = /usr/local
 -INSTALL = install
@@ -9,17 +9,15 @@
  
  BINDIR = $(PREFIX)/bin
 @@ -8,24 +8,24 @@
- VERSION = 1.0.0
+ VERSION = 1.0.1
  
  #DEBUG = -g
 -OPTIMIZE = -O2
 +#OPTIMIZE = -O2
  #PROFILE = -pg
  
--MACOS_LDOPTS = -L/sw/lib
--MACOS_CCOPTS = -I/sw/include
-+#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)\"
@@ -37,7 +35,7 @@
 +CONVERT_OBJS = convert.o $(LISPREADER_OBJS)
  IMAGESIZE_OBJS = imagesize.o rwpng.o rwjpeg.o readimage.o
  
--all : metapixel metapixel.1 convert imagesize
+-all : metapixel metapixel.1 convert metapixel-imagesize
 +all : metapixel metapixel.1 metapixel-convert metapixel-imagesize metapixel-zoom
  
  metapixel : $(OBJS)
@@ -51,15 +49,13 @@
 +metapixel-convert : $(CONVERT_OBJS)
 +	$(CC) $(LDOPTS) -o $@ $(CONVERT_OBJS)
  
--imagesize : $(IMAGESIZE_OBJS)
--	$(CC) $(LDOPTS) -o imagesize $(IMAGESIZE_OBJS) -lpng -ljpeg -lm -lz
-+metapixel-imagesize : $(IMAGESIZE_OBJS)
-+	$(CC) $(LDOPTS) -o $@ $(IMAGESIZE_OBJS) -lpng -ljpeg -lm -lz
+ metapixel-imagesize : $(IMAGESIZE_OBJS)
+ 	$(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 $@ -DTEST_ZOOM zoom.c rwjpeg.c rwpng.c readimage.c writeimage.c -lpng -ljpeg -lm -lz
++	$(CC) $(CCOPTS) $(LDOPTS) -o $@ -DTEST_ZOOM zoom.c rwjpeg.c rwpng.c readimage.c writeimage.c -lpng -ljpeg -lm -lz
  
  %.o : %.c
  	$(CC) $(CCOPTS) -c $<
--- metapixel-1.0.0-1.0.1.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?200604021419.k32EJDw4031473>