- Update to version 0.9

PR:		ports/66308
Submitted by:	maintainer
This commit is contained in:
Kirill Ponomarev 2004-05-06 07:35:43 +00:00
parent 384ae64310
commit a851cdc111
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=108520
5 changed files with 34 additions and 34 deletions

View File

@ -5,7 +5,7 @@
# $FreeBSD$
PORTNAME= metapixel
PORTVERSION= 0.8
PORTVERSION= 0.9
CATEGORIES= graphics
MASTER_SITES= http://www.complang.tuwien.ac.at/~schani/metapixel/ \
http://dragon.roe.ch/mirrors/distfiles/metapixel/
@ -24,16 +24,16 @@ MAKE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I." \
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
@${MV} ${WRKSRC}/sizesort ${WRKSRC}/metapixel-sizesort
@${REINPLACE_CMD} -e 's/imagesize/metapixel-imagesize/' \
${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-prepare ${PREFIX}/bin
${INSTALL_SCRIPT} ${WRKSRC}/metapixel-sizesort ${PREFIX}/bin
${INSTALL_PROGRAM} ${WRKSRC}/metapixel-zoom ${PREFIX}/bin
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
MD5 (metapixel-0.8.tar.gz) = 882185b83a0e9c1e035a9eb8928dae9c
SIZE (metapixel-0.8.tar.gz) = 62754
MD5 (metapixel-0.9.tar.gz) = ad7fed7bcb43826cd2689f1da15585c5
SIZE (metapixel-0.9.tar.gz) = 46348

View File

@ -1,37 +1,42 @@
--- Makefile.orig Thu Jan 15 20:56:02 2004
+++ Makefile Wed Feb 11 17:44:32 2004
@@ -1,33 +1,30 @@
--- Makefile.orig Tue May 4 23:57:09 2004
+++ Makefile Thu May 6 04:12:47 2004
@@ -1,39 +1,36 @@
-PREFIX = /usr/local
-INSTALL = install
-
BINDIR = $(PREFIX)/bin
VERSION = 0.8
VERSION = 0.9
#DEBUG = -g
-OPTIMIZE = -O3
+#OPTIMIZE = -O3
-OPTIMIZE = -O2
+#OPTIMIZE = -O2
#PROFILE = -pg
-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)\"
-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)\"
-CC = gcc
+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 lispreader.o getopt.o getopt1.o
-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 rwpng.o rwjpeg.o readimage.o writeimage.o lispreader.o
+OBJS = metapixel.o vector.o zoom.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
+all : metapixel metapixel-convert metapixel-imagesize metapixel-zoom
metapixel : $(OBJS) libzoom/libzoom.a
$(CC) $(LDOPTS) -o metapixel $(OBJS) libzoom/libzoom.a -lpng -ljpeg $(LIBFFM) -lm -lz
metapixel : $(OBJS)
$(CC) $(LDOPTS) -o metapixel $(OBJS) -lpng -ljpeg $(LIBFFM) -lm -lz
-convert : $(CONVERT_OBJS)
- $(CC) $(LDOPTS) -o convert $(CONVERT_OBJS)
@ -39,9 +44,14 @@
+ $(CC) $(LDOPTS) -o metapixel-convert $(CONVERT_OBJS)
-imagesize : $(IMAGESIZE_OBJS)
- $(CC) $(LDOPTS) -o imagesize $(IMAGESIZE_OBJS) libzoom/libzoom.a -lpng -ljpeg -lm -lz
- $(CC) $(LDOPTS) -o imagesize $(IMAGESIZE_OBJS) -lpng -ljpeg -lm -lz
+metapixel-imagesize : $(IMAGESIZE_OBJS)
+ $(CC) $(LDOPTS) -o metapixel-imagesize $(IMAGESIZE_OBJS) libzoom/libzoom.a -lpng -ljpeg -lm -lz
+ $(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 metapixel-zoom -DTEST_ZOOM zoom.c rwjpeg.c rwpng.c readimage.c writeimage.c -lpng -ljpeg -lm -lz
%.o : %.c
$(CC) $(CCOPTS) -c $<

View File

@ -1,11 +0,0 @@
--- 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);

View File

@ -1,5 +1,6 @@
bin/metapixel
bin/metapixel-prepare
bin/metapixel-convert
bin/metapixel-imagesize
bin/metapixel-prepare
bin/metapixel-sizesort
bin/metapixel-zoom