sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

upgrade to 1.0.2

Browse source 
PR:		106846
Submitted by:	maintainer
This commit is contained in:
Ying-Chieh Liao 2006-12-18 05:46:41 +00:00
parent a196e261fb
commit 9e9429b874
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=180054
3 changed files with 52 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
graphics/metapixel/Makefile
View file

@ -5,16 +5,17 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= metapixel PORTNAME= metapixel
PORTVERSION= 1.0.1 PORTVERSION= 1.0.2
CATEGORIES= graphics CATEGORIES= graphics
MASTER_SITES= http://www.complang.tuwien.ac.at/~schani/metapixel/ \ MASTER_SITES= http://www.complang.tuwien.ac.at/~schani/metapixel/files/ \
http://dragon.roe.ch/mirrors/distfiles/metapixel/ http://mirror.roe.ch/dist/metapixel/
MAINTAINER= daniel@roe.ch MAINTAINER= daniel@roe.ch
COMMENT= A photomosaic generator COMMENT= A photomosaic generator
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ 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_GETOPT_LONG=yes
USE_GMAKE= yes USE_GMAKE= yes
@ -22,7 +23,7 @@ MAKE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I." \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
PLIST_FILES= bin/metapixel bin/metapixel-convert bin/metapixel-imagesize \ 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 share/examples/metapixel/metapixelrc
PLIST_DIRS= share/examples/metapixel PLIST_DIRS= share/examples/metapixel
PORTDOCS= README NEWS PORTDOCS= README NEWS
@ -37,7 +38,6 @@ do-install:
${INSTALL_PROGRAM} ${WRKSRC}/metapixel-imagesize ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/metapixel-imagesize ${PREFIX}/bin
${INSTALL_SCRIPT} ${WRKSRC}/metapixel-prepare ${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/metapixel-prepare ${PREFIX}/bin
${INSTALL_SCRIPT} ${WRKSRC}/metapixel-sizesort ${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/metapixel-sizesort ${PREFIX}/bin
${INSTALL_PROGRAM} ${WRKSRC}/metapixel-zoom ${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/metapixel.1 ${PREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/metapixel.1 ${PREFIX}/man/man1
${MKDIR} ${EXAMPLESDIR} ${MKDIR} ${EXAMPLESDIR}
${INSTALL_DATA} ${WRKSRC}/metapixelrc ${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/metapixelrc ${EXAMPLESDIR}

6
graphics/metapixel/distinfo
View file

@ -1,3 +1,3 @@
MD5 (metapixel-1.0.1.tar.gz) = b0fcb1ad62708478478218190c355fd0 MD5 (metapixel-1.0.2.tar.gz) = af5d77d38826756af213a08e3ada9941
SHA256 (metapixel-1.0.1.tar.gz) = 1a9a97563e4118acb48398735401fef642ca0e50ffb3f31c1d773d696fd06c62 SHA256 (metapixel-1.0.2.tar.gz) = 8d77810978da397c070b9b4e228ae6204e9f5c524518ad1a4fcab9462171f55b
SIZE (metapixel-1.0.1.tar.gz) = 57926 SIZE (metapixel-1.0.2.tar.gz) = 63197

80
graphics/metapixel/files/patch-Makefile
View file

@ -1,61 +1,67 @@
--- Makefile.orig Sun Feb 19 22:30:56 2006 --- Makefile.orig Sun Dec 10 18:59:54 2006
+++ Makefile Sun Apr 2 15:57:00 2006 +++ Makefile Mon Dec 18 00:44:03 2006
@@ -1,5 +1,5 @@ @@ -1,52 +1,36 @@
-PREFIX = /usr/local -PREFIX = /usr/local
-INSTALL = install -INSTALL = install
+#PREFIX = /usr/local -MANPAGE_XSL = /sw/share/xml/xsl/docbook-xsl/manpages/docbook.xsl
+#INSTALL = install -
MANPAGE_XSL = /sw/share/xml/xsl/docbook-xsl/manpages/docbook.xsl
BINDIR = $(PREFIX)/bin BINDIR = $(PREFIX)/bin
@@ -8,24 +8,24 @@ MANDIR = $(PREFIX)/share/man
VERSION = 1.0.1
#DEBUG = -g VERSION = 1.0.2
-#DEBUG = -g
-OPTIMIZE = -O2 -OPTIMIZE = -O2
+#OPTIMIZE = -O2 -#PROFILE = -pg
#PROFILE = -pg -
-MACOS_LDOPTS = -L/sw/lib
MACOS_LDOPTS = -L/sw/lib -MACOS_CCOPTS = -I/sw/include
MACOS_CCOPTS = -I/sw/include -
FORMATDEFS = -DRWIMG_JPEG -DRWIMG_PNG -DRWIMG_GIF
-LDOPTS = $(MACOS_LDOPTS) -L/usr/X11R6/lib $(PROFILE) $(DEBUG) -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 -CC = gcc
-#LIBFFM = -lffm
+LDOPTS = ${LDFLAGS} $(PROFILE) $(DEBUG) +LDOPTS = ${LDFLAGS} $(PROFILE) $(DEBUG)
+CCOPTS = ${CFLAGS} ${CPPFLAGS} -Wall $(OPTIMIZE) $(DEBUG) $(PROFILE) -DMETAPIXEL_VERSION=\"$(VERSION)\" +CCOPTS = ${CFLAGS} ${CPPFLAGS} -Irwimg -Wall $(FORMATDEFS) -DMETAPIXEL_VERSION=\"$(VERSION)\"
+#CC = gcc
#LIBFFM = -lffm export CCOPTS CC FORMATDEFS
LISPREADER_OBJS = lispreader.o pools.o allocator.o LISPREADER_OBJS = lispreader.o pools.o allocator.o
OBJS = metapixel.o vector.o zoom.o rwpng.o rwjpeg.o readimage.o writeimage.o \ -OBJS = metapixel.o vector.o zoom.o $(LISPREADER_OBJS) getopt.o getopt1.o
- $(LISPREADER_OBJS) getopt.o getopt1.o
-CONVERT_OBJS = convert.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) +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 convert metapixel-imagesize
+all : metapixel metapixel.1 metapixel-convert metapixel-imagesize metapixel-zoom +all : metapixel metapixel-convert metapixel-imagesize
metapixel : $(OBJS) metapixel : $(OBJS) librwimg
$(CC) $(LDOPTS) -o metapixel $(OBJS) -lpng -ljpeg $(LIBFFM) -lm -lz - $(CC) $(LDOPTS) -o metapixel $(OBJS) rwimg/librwimg.a -lpng -ljpeg -lgif $(LIBFFM) -lm -lz
@@ -33,14 +33,14 @@ -
metapixel.1 : metapixel.xml -metapixel.1 : metapixel.xml
xsltproc --nonet $(MANPAGE_XSL) 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) -convert : $(CONVERT_OBJS)
- $(CC) $(LDOPTS) -o convert $(CONVERT_OBJS) - $(CC) $(LDOPTS) -o convert $(CONVERT_OBJS)
+metapixel-convert : $(CONVERT_OBJS) +metapixel-convert : $(CONVERT_OBJS)
+ $(CC) $(LDOPTS) -o $@ $(CONVERT_OBJS) + $(CC) $(LDOPTS) -o metapixel-convert $(CONVERT_OBJS)
metapixel-imagesize : $(IMAGESIZE_OBJS) metapixel-imagesize : $(IMAGESIZE_OBJS) librwimg
$(CC) $(LDOPTS) -o metapixel-imagesize $(IMAGESIZE_OBJS) -lpng -ljpeg -lm -lz - $(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 -zoom : zoom.c librwimg
- $(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 - $(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 rwjpeg.c rwpng.c readimage.c writeimage.c +metapixel-zoom : zoom.c librwimg
+ $(CC) $(CCOPTS) $(LDOPTS) -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 rwimg/librwimg.a -lpng -ljpeg -lungif -lm -lz
%.o : %.c %.o : %.c
$(CC) $(CCOPTS) -c $< - $(CC) $(CCOPTS) $(FORMATDEFS) -c $<
+ $(CC) $(CCOPTS) -c $<
librwimg :
$(MAKE) -C rwimg