Date: Sun, 31 Jul 2005 15:40:49 +0200 (CEST) From: Daniel Roethlisberger <daniel@roe.ch> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Daniel Roethlisberger <daniel@roe.ch> Subject: ports/84390: [maintainer update] graphics/metapixel to 1.0.0 Message-ID: <200507311340.j6VDenLr066837@marvin.roe> Resent-Message-ID: <200507311400.j6VE0Nf0029481@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 84390 >Category: ports >Synopsis: [maintainer update] graphics/metapixel to 1.0.0 >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 Jul 31 14:00:22 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Daniel Roethlisberger >Release: FreeBSD 5.4-RELEASE-p6 i386 >Organization: >Environment: System: FreeBSD marvin.roe 5.4-RELEASE-p6 FreeBSD 5.4-RELEASE-p6 #3: Sat Jul 30 19:53:45 CEST 2005 root@marvin.roe:/usr/obj/usr/src/sys/IBMTPX40 i386 >Description: Port changes: - update to metapixel-1.0.0 - use INSTALL_DATA for PORTDOCS instead of INSTALL_MAN Upstream changes: - config file (~/.metapixelrc) - manpage >How-To-Repeat: >Fix: --- metapixel-0.9-1.0.0.diff begins here --- diff -ruN metapixel-0.9/Makefile metapixel/Makefile --- metapixel-0.9/Makefile Fri Aug 27 18:31:26 2004 +++ metapixel/Makefile Sun Jul 31 15:06:46 2005 @@ -5,8 +5,7 @@ # $FreeBSD: ports/graphics/metapixel/Makefile,v 1.11 2004/08/27 16:31:26 vs Exp $ PORTNAME= metapixel -PORTVERSION= 0.9 -PORTREVISION= 1 +PORTVERSION= 1.0.0 CATEGORIES= graphics MASTER_SITES= http://www.complang.tuwien.ac.at/~schani/metapixel/ \ http://dragon.roe.ch/mirrors/distfiles/metapixel/ @@ -24,8 +23,11 @@ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" PLIST_FILES= bin/metapixel bin/metapixel-convert bin/metapixel-imagesize \ - bin/metapixel-prepare bin/metapixel-sizesort bin/metapixel-zoom -PORTDOCS= README + bin/metapixel-prepare bin/metapixel-sizesort bin/metapixel-zoom \ + share/examples/metapixel/metapixelrc +PLIST_DIRS= share/examples/metapixel +PORTDOCS= README NEWS +MAN1= metapixel.1 post-patch: @${RM} ${WRKSRC}/getopt.h @@ -40,9 +42,12 @@ ${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} .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} .endif .include <bsd.port.mk> diff -ruN metapixel-0.9/distinfo metapixel/distinfo --- metapixel-0.9/distinfo Thu May 6 09:35:42 2004 +++ metapixel/distinfo Sun Jul 31 13:39:23 2005 @@ -1,2 +1,2 @@ -MD5 (metapixel-0.9.tar.gz) = ad7fed7bcb43826cd2689f1da15585c5 -SIZE (metapixel-0.9.tar.gz) = 46348 +MD5 (metapixel-1.0.0.tar.gz) = df8709bb890061c2bea4c65db4a1057c +SIZE (metapixel-1.0.0.tar.gz) = 56426 diff -ruN metapixel-0.9/files/patch-Makefile metapixel/files/patch-Makefile --- metapixel-0.9/files/patch-Makefile Thu May 6 09:35:42 2004 +++ metapixel/files/patch-Makefile Sun Jul 31 13:59:42 2005 @@ -1,12 +1,15 @@ ---- Makefile.orig Tue May 4 23:57:09 2004 -+++ Makefile Thu May 6 04:12:47 2004 -@@ -1,39 +1,36 @@ +--- Makefile.orig Sun May 8 18:25:51 2005 ++++ Makefile Sun Jul 31 13:55:22 2005 +@@ -1,5 +1,5 @@ -PREFIX = /usr/local -INSTALL = install -- - BINDIR = $(PREFIX)/bin ++#PREFIX = /usr/local ++#INSTALL = install + MANPAGE_XSL = /sw/share/xml/xsl/docbook-xsl/manpages/docbook.xsl - VERSION = 0.9 + BINDIR = $(PREFIX)/bin +@@ -8,24 +8,24 @@ + VERSION = 1.0.0 #DEBUG = -g -OPTIMIZE = -O2 @@ -22,36 +25,41 @@ -CCOPTS = $(MACOS_CCOPTS) -I/usr/X11R6/include -I/usr/X11R6/include/X11 -I. -Wall $(OPTIMIZE) $(DEBUG) $(PROFILE) -DMETAPIXEL_VERSION=\"$(VERSION)\" -CC = gcc +LDOPTS = ${LDFLAGS} $(PROFILE) $(DEBUG) -+CCOPTS = ${CFLAGS} ${CPPFLAGS} -Wall $(DEBUG) $(PROFILE) -DMETAPIXEL_VERSION=\"$(VERSION)\" ++CCOPTS = ${CFLAGS} ${CPPFLAGS} -Wall $(OPTIMIZE) $(DEBUG) $(PROFILE) -DMETAPIXEL_VERSION=\"$(VERSION)\" +#CC = gcc #LIBFFM = -lffm --OBJS = metapixel.o vector.o zoom.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 zoom.o rwpng.o rwjpeg.o readimage.o writeimage.o lispreader.o -+CONVERT_OBJS = convert.o lispreader.o + 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 +-CONVERT_OBJS = convert.o $(LISPREADER_OBJS) getopt.o getopt1.o ++ $(LISPREADER_OBJS) ++CONVERT_OBJS = convert.o $(LISPREADER_OBJS) IMAGESIZE_OBJS = imagesize.o rwpng.o rwjpeg.o readimage.o --all : metapixel convert imagesize -+all : metapixel metapixel-convert metapixel-imagesize metapixel-zoom +-all : metapixel metapixel.1 convert imagesize ++all : metapixel metapixel.1 metapixel-convert metapixel-imagesize metapixel-zoom 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 -convert : $(CONVERT_OBJS) - $(CC) $(LDOPTS) -o convert $(CONVERT_OBJS) +metapixel-convert : $(CONVERT_OBJS) -+ $(CC) $(LDOPTS) -o 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 metapixel-imagesize $(IMAGESIZE_OBJS) -lpng -ljpeg -lm -lz ++ $(CC) $(LDOPTS) -o $@ $(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 metapixel-zoom -DTEST_ZOOM zoom.c rwjpeg.c rwpng.c readimage.c writeimage.c -lpng -ljpeg -lm -lz ++ $(CC) $(CCOPTS) $(LDFLAGS) -o $@ -DTEST_ZOOM zoom.c rwjpeg.c rwpng.c readimage.c writeimage.c -lpng -ljpeg -lm -lz %.o : %.c $(CC) $(CCOPTS) -c $< --- metapixel-0.9-1.0.0.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?200507311340.j6VDenLr066837>