Attachment #55906 for bug #84390

View | Details | Raw Unified | Return to bug 84390
Collapse All | Expand All

Lines 5-12 Link Here

(-)metapixel/Makefile (-5 / +10 lines)
5	# $FreeBSD: ports/graphics/metapixel/Makefile,v 1.11 2004/08/27 16:31:26 vs Exp $	5	# $FreeBSD: ports/graphics/metapixel/Makefile,v 1.11 2004/08/27 16:31:26 vs Exp $
6		6
7	PORTNAME= metapixel	7	PORTNAME= metapixel
8	PORTVERSION= 0.9	8	PORTVERSION= 1.0.0
9	PORTREVISION= 1
10	CATEGORIES= graphics	9	CATEGORIES= graphics
11	MASTER_SITES= http://www.complang.tuwien.ac.at/~schani/metapixel/ \	10	MASTER_SITES= http://www.complang.tuwien.ac.at/~schani/metapixel/ \
12	http://dragon.roe.ch/mirrors/distfiles/metapixel/	11	http://dragon.roe.ch/mirrors/distfiles/metapixel/
Lines 24-31 Link Here
24	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"	23	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
25		24
26	PLIST_FILES= bin/metapixel bin/metapixel-convert bin/metapixel-imagesize \	25	PLIST_FILES= bin/metapixel bin/metapixel-convert bin/metapixel-imagesize \
27	bin/metapixel-prepare bin/metapixel-sizesort bin/metapixel-zoom	26	bin/metapixel-prepare bin/metapixel-sizesort bin/metapixel-zoom \
28	PORTDOCS= README	27	share/examples/metapixel/metapixelrc
		28	PLIST_DIRS= share/examples/metapixel
		29	PORTDOCS= README NEWS
		30	MAN1= metapixel.1
29		31
30	post-patch:	32	post-patch:
31	@${RM} ${WRKSRC}/getopt.h	33	@${RM} ${WRKSRC}/getopt.h
Lines 40-48 Link Here
40	${INSTALL_SCRIPT} ${WRKSRC}/metapixel-prepare ${PREFIX}/bin	42	${INSTALL_SCRIPT} ${WRKSRC}/metapixel-prepare ${PREFIX}/bin
41	${INSTALL_SCRIPT} ${WRKSRC}/metapixel-sizesort ${PREFIX}/bin	43	${INSTALL_SCRIPT} ${WRKSRC}/metapixel-sizesort ${PREFIX}/bin
42	${INSTALL_PROGRAM} ${WRKSRC}/metapixel-zoom ${PREFIX}/bin	44	${INSTALL_PROGRAM} ${WRKSRC}/metapixel-zoom ${PREFIX}/bin
		45	${INSTALL_MAN} ${WRKSRC}/metapixel.1 ${PREFIX}/man/man1
		46	${MKDIR} ${EXAMPLESDIR}
		47	${INSTALL_DATA} ${WRKSRC}/metapixelrc ${EXAMPLESDIR}
43	.if !defined(NOPORTDOCS)	48	.if !defined(NOPORTDOCS)
44	${MKDIR} ${DOCSDIR}	49	${MKDIR} ${DOCSDIR}
45	${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR}	50	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
46	.endif	51	.endif
47		52
48	.include <bsd.port.mk>	53	.include <bsd.port.mk>

Lines 1-2 Link Here

(-)metapixel/distinfo (-2 / +2 lines)
1	MD5 (metapixel-0.9.tar.gz) = ad7fed7bcb43826cd2689f1da15585c5	1	MD5 (metapixel-1.0.0.tar.gz) = df8709bb890061c2bea4c65db4a1057c
2	SIZE (metapixel-0.9.tar.gz) = 46348	2	SIZE (metapixel-1.0.0.tar.gz) = 56426




--- 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
+#PREFIX = /usr/local
+#INSTALL = install
 MANPAGE_XSL = /sw/share/xml/xsl/docbook-xsl/manpages/docbook.xsl
 
 BINDIR = $(PREFIX)/bin
@@ -8,24 +8,24 @@
 VERSION = 1.0.0
 
 #DEBUG = -g
-OPTIMIZE = -O2

-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 $(OPTIMIZE) $(DEBUG) $(PROFILE) -DMETAPIXEL_VERSION=\"$(VERSION)\"
+#CC = gcc
 #LIBFFM = -lffm
 
 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 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 $@ $(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
 
-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
 
 %.o : %.c
 	$(CC) $(CCOPTS) -c $<

Return to bug 84390

Lines 1-12 Link Here

(-)metapixel/files/patch-Makefile (-16 / +24 lines)
1	--- Makefile.orig Tue May 4 23:57:09 2004	1	--- Makefile.orig Sun May 8 18:25:51 2005
2	+++ Makefile Thu May 6 04:12:47 2004	2	+++ Makefile Sun Jul 31 13:55:22 2005
3	@@ -1,39 +1,36 @@	3	@@ -1,5 +1,5 @@
4	-PREFIX = /usr/local	4	-PREFIX = /usr/local
5	-INSTALL = install	5	-INSTALL = install
6	-	6	+#PREFIX = /usr/local
7	BINDIR = $(PREFIX)/bin	7	+#INSTALL = install
		8	MANPAGE_XSL = /sw/share/xml/xsl/docbook-xsl/manpages/docbook.xsl
8		9
9	VERSION = 0.9	10	BINDIR = $(PREFIX)/bin
		11	@@ -8,24 +8,24 @@
		12	VERSION = 1.0.0
10		13
11	#DEBUG = -g	14	#DEBUG = -g
12	-OPTIMIZE = -O2	15	-OPTIMIZE = -O2
Lines 22-57 Link Here
22	-CCOPTS = $(MACOS_CCOPTS) -I/usr/X11R6/include -I/usr/X11R6/include/X11 -I. -Wall $(OPTIMIZE) $(DEBUG) $(PROFILE) -DMETAPIXEL_VERSION=\"$(VERSION)\"	25	-CCOPTS = $(MACOS_CCOPTS) -I/usr/X11R6/include -I/usr/X11R6/include/X11 -I. -Wall $(OPTIMIZE) $(DEBUG) $(PROFILE) -DMETAPIXEL_VERSION=\"$(VERSION)\"
23	-CC = gcc	26	-CC = gcc
24	+LDOPTS = ${LDFLAGS} $(PROFILE) $(DEBUG)	27	+LDOPTS = ${LDFLAGS} $(PROFILE) $(DEBUG)
25	+CCOPTS = ${CFLAGS} ${CPPFLAGS} -Wall $(DEBUG) $(PROFILE) -DMETAPIXEL_VERSION=\"$(VERSION)\"	28	+CCOPTS = ${CFLAGS} ${CPPFLAGS} -Wall $(OPTIMIZE) $(DEBUG) $(PROFILE) -DMETAPIXEL_VERSION=\"$(VERSION)\"
26	+#CC = gcc	29	+#CC = gcc
27	#LIBFFM = -lffm	30	#LIBFFM = -lffm
28		31
29	-OBJS = metapixel.o vector.o zoom.o rwpng.o rwjpeg.o readimage.o writeimage.o lispreader.o getopt.o getopt1.o	32	LISPREADER_OBJS = lispreader.o pools.o allocator.o
30	-CONVERT_OBJS = convert.o lispreader.o getopt.o getopt1.o	33	OBJS = metapixel.o vector.o zoom.o rwpng.o rwjpeg.o readimage.o writeimage.o \
31	+OBJS = metapixel.o vector.o zoom.o rwpng.o rwjpeg.o readimage.o writeimage.o lispreader.o	34	- $(LISPREADER_OBJS) getopt.o getopt1.o
32	+CONVERT_OBJS = convert.o lispreader.o	35	-CONVERT_OBJS = convert.o $(LISPREADER_OBJS) getopt.o getopt1.o
		36	+ $(LISPREADER_OBJS)
		37	+CONVERT_OBJS = convert.o $(LISPREADER_OBJS)
33	IMAGESIZE_OBJS = imagesize.o rwpng.o rwjpeg.o readimage.o	38	IMAGESIZE_OBJS = imagesize.o rwpng.o rwjpeg.o readimage.o
34		39
35	-all : metapixel convert imagesize	40	-all : metapixel metapixel.1 convert imagesize
36	+all : metapixel metapixel-convert metapixel-imagesize metapixel-zoom	41	+all : metapixel metapixel.1 metapixel-convert metapixel-imagesize metapixel-zoom
37		42
38	metapixel : $(OBJS)	43	metapixel : $(OBJS)
39	$(CC) $(LDOPTS) -o metapixel $(OBJS) -lpng -ljpeg $(LIBFFM) -lm -lz	44	$(CC) $(LDOPTS) -o metapixel $(OBJS) -lpng -ljpeg $(LIBFFM) -lm -lz
		45	@@ -33,14 +33,14 @@
		46	metapixel.1 : metapixel.xml
		47	xsltproc --nonet $(MANPAGE_XSL) metapixel.xml
40		48
41	-convert : $(CONVERT_OBJS)	49	-convert : $(CONVERT_OBJS)
42	- $(CC) $(LDOPTS) -o convert $(CONVERT_OBJS)	50	- $(CC) $(LDOPTS) -o convert $(CONVERT_OBJS)
43	+metapixel-convert : $(CONVERT_OBJS)	51	+metapixel-convert : $(CONVERT_OBJS)
44	+ $(CC) $(LDOPTS) -o metapixel-convert $(CONVERT_OBJS)	52	+ $(CC) $(LDOPTS) -o $@ $(CONVERT_OBJS)
45		53
46	-imagesize : $(IMAGESIZE_OBJS)	54	-imagesize : $(IMAGESIZE_OBJS)
47	- $(CC) $(LDOPTS) -o imagesize $(IMAGESIZE_OBJS) -lpng -ljpeg -lm -lz	55	- $(CC) $(LDOPTS) -o imagesize $(IMAGESIZE_OBJS) -lpng -ljpeg -lm -lz
48	+metapixel-imagesize : $(IMAGESIZE_OBJS)	56	+metapixel-imagesize : $(IMAGESIZE_OBJS)
49	+ $(CC) $(LDOPTS) -o metapixel-imagesize $(IMAGESIZE_OBJS) -lpng -ljpeg -lm -lz	57	+ $(CC) $(LDOPTS) -o $@ $(IMAGESIZE_OBJS) -lpng -ljpeg -lm -lz
50		58
51	-zoom : zoom.c rwjpeg.c rwpng.c readimage.c writeimage.c	59	-zoom : zoom.c rwjpeg.c rwpng.c readimage.c writeimage.c
52	- $(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	60	- $(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
53	+metapixel-zoom : zoom.c rwjpeg.c rwpng.c readimage.c writeimage.c	61	+metapixel-zoom : zoom.c rwjpeg.c rwpng.c readimage.c writeimage.c
54	+ $(CC) $(CCOPTS) $(LDFLAGS) -o metapixel-zoom -DTEST_ZOOM zoom.c rwjpeg.c rwpng.c readimage.c writeimage.c -lpng -ljpeg -lm -lz	62	+ $(CC) $(CCOPTS) $(LDFLAGS) -o $@ -DTEST_ZOOM zoom.c rwjpeg.c rwpng.c readimage.c writeimage.c -lpng -ljpeg -lm -lz
55		63
56	%.o : %.c	64	%.o : %.c
57	$(CC) $(CCOPTS) -c $<	65	$(CC) $(CCOPTS) -c $<