- update to 1.0.0

- use INSTALL_DATA for PORTDOCS instead of INSTALL_MAN

PR:		ports/84390
Submitted by:	maintainer
This commit is contained in:
Sergey Matveychuk 2005-08-01 15:42:22 +00:00
parent 3024cedeb0
commit 582c80b6cf
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=140679
3 changed files with 36 additions and 23 deletions

View file

@ -5,8 +5,7 @@
# $FreeBSD$
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 @@ 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
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 @@ do-install:
${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>

View file

@ -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

View file

@ -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 $<