Wed Dec 15 19:08:22 2010 UTC ()
get rid of un-needed cppflags in optflags, as it causes the compile to
fail on macosx (complains about -isystem).


(chuck)
diff -r1.66 -r1.67 pkgsrc/graphics/magicpoint/Makefile
diff -r1.16 -r1.17 pkgsrc/graphics/magicpoint/distinfo
diff -r1.3 -r1.4 pkgsrc/graphics/magicpoint/patches/patch-ac
cvs diff -r1.66 -r1.67 pkgsrc/graphics/magicpoint/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/magicpoint/Makefile 2010/06/13 22:44:38 1.66
+++ pkgsrc/graphics/magicpoint/Makefile 2010/12/15 19:08:21 1.67
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.66 2010/06/13 22:44:38 wiz Exp $ 1# $NetBSD: Makefile,v 1.67 2010/12/15 19:08:21 chuck Exp $
2 2
3DISTNAME= magicpoint-1.13a 3DISTNAME= magicpoint-1.13a
4PKGREVISION= 3 4PKGREVISION= 3
5CATEGORIES= x11 graphics 5CATEGORIES= x11 graphics
6MASTER_SITES= ftp://sh.wide.ad.jp/WIDE/free-ware/mgp/ 6MASTER_SITES= ftp://sh.wide.ad.jp/WIDE/free-ware/mgp/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://member.wide.ad.jp/wg/mgp/ 9HOMEPAGE= http://member.wide.ad.jp/wg/mgp/
10COMMENT= X11 based presentation tool 10COMMENT= X11 based presentation tool
11 11
12PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
13 13
14CONFLICTS= mgp-[0-9]* 14CONFLICTS= mgp-[0-9]*
@@ -69,13 +69,14 @@ post-install: @@ -69,13 +69,14 @@ post-install:
69 ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${DOCDIR} 69 ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${DOCDIR}
70.endfor 70.endfor
71.for f in ${EXAMPLES} 71.for f in ${EXAMPLES}
72 ${INSTALL_DATA} ${WRKSRC}/sample/${f} ${DESTDIR}${PREFIX}/${EGDIR} 72 ${INSTALL_DATA} ${WRKSRC}/sample/${f} ${DESTDIR}${PREFIX}/${EGDIR}
73.endfor 73.endfor
74 74
75.include "../../graphics/libungif/buildlink3.mk" 75.include "../../graphics/libungif/buildlink3.mk"
76.include "../../graphics/mng/buildlink3.mk" 76.include "../../graphics/mng/buildlink3.mk"
77.include "../../graphics/netpbm/buildlink3.mk" 77.include "../../graphics/netpbm/buildlink3.mk"
78.include "../../graphics/png/buildlink3.mk" 78.include "../../graphics/png/buildlink3.mk"
79.include "../../x11/libXext/buildlink3.mk" 79.include "../../x11/libXext/buildlink3.mk"
80.include "../../x11/libXmu/buildlink3.mk" 80.include "../../x11/libXmu/buildlink3.mk"
81.include "../../mk/bsd.pkg.mk" 81.include "../../mk/bsd.pkg.mk"
 82# DO NOT DELETE
cvs diff -r1.16 -r1.17 pkgsrc/graphics/magicpoint/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/magicpoint/distinfo 2008/09/10 13:32:47 1.16
+++ pkgsrc/graphics/magicpoint/distinfo 2010/12/15 19:08:21 1.17
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1$NetBSD: distinfo,v 1.16 2008/09/10 13:32:47 taca Exp $ 1$NetBSD: distinfo,v 1.17 2010/12/15 19:08:21 chuck Exp $
2 2
3SHA1 (magicpoint-1.13a.tar.gz) = 2bc662ad0a482d42578766258a143b06a4718ae3 3SHA1 (magicpoint-1.13a.tar.gz) = 2bc662ad0a482d42578766258a143b06a4718ae3
4RMD160 (magicpoint-1.13a.tar.gz) = 067d7dee3b90ec354975d9ad4ea0c0df48cca191 4RMD160 (magicpoint-1.13a.tar.gz) = 067d7dee3b90ec354975d9ad4ea0c0df48cca191
5Size (magicpoint-1.13a.tar.gz) = 890670 bytes 5Size (magicpoint-1.13a.tar.gz) = 890670 bytes
6SHA1 (patch-aa) = 7270255c2002c66d10ab911ed22ce67067183e17 6SHA1 (patch-aa) = 7270255c2002c66d10ab911ed22ce67067183e17
7SHA1 (patch-ab) = eb6558d6981e5d5f41f55dddc1b3debc9ca27d36 7SHA1 (patch-ab) = eb6558d6981e5d5f41f55dddc1b3debc9ca27d36
8SHA1 (patch-ac) = 9442e1893475ff53180f7facce0f31bf2e412759 8SHA1 (patch-ac) = b886607033a89e3ab46c41a2a5a8368b473682f4
9SHA1 (patch-ad) = 33c8fa61cb03cb53ad8783d2d79fa457cb21d235 9SHA1 (patch-ad) = 33c8fa61cb03cb53ad8783d2d79fa457cb21d235
10SHA1 (patch-ae) = ca59b94955f2de6f19ea1e2210ede7eaeba50a95 10SHA1 (patch-ae) = ca59b94955f2de6f19ea1e2210ede7eaeba50a95
11SHA1 (patch-af) = 615e845dfbeba9b35c5a138841962631dac3b4bb 11SHA1 (patch-af) = 615e845dfbeba9b35c5a138841962631dac3b4bb
12SHA1 (patch-ag) = 96d7cac9157b9183dd2ba76b12f0927fc15dd5a6 12SHA1 (patch-ag) = 96d7cac9157b9183dd2ba76b12f0927fc15dd5a6
13SHA1 (patch-ai) = 809b2cf509bab0ee1bed1fecb2cf2d8df912ce8b 13SHA1 (patch-ai) = 809b2cf509bab0ee1bed1fecb2cf2d8df912ce8b
14SHA1 (patch-aj) = 07ed5e995bf35dcbe65fc7c0ab800d1b8905e004 14SHA1 (patch-aj) = 07ed5e995bf35dcbe65fc7c0ab800d1b8905e004
15SHA1 (patch-al) = 25faf28b240d90ead9a4283e46d1461118c509df 15SHA1 (patch-al) = 25faf28b240d90ead9a4283e46d1461118c509df
16SHA1 (patch-am) = dcc58a02946353262a78d5dfd81f81b25990019e 16SHA1 (patch-am) = dcc58a02946353262a78d5dfd81f81b25990019e
17SHA1 (patch-an) = f5e3158b972feb20bf464e57c703e871537d074e 17SHA1 (patch-an) = f5e3158b972feb20bf464e57c703e871537d074e
18SHA1 (patch-ao) = 64ba2d7ceaf6429f4bb8b88bebb26a83c12fbacd 18SHA1 (patch-ao) = 64ba2d7ceaf6429f4bb8b88bebb26a83c12fbacd
19SHA1 (patch-ap) = 6c81429affe9dce518c304178dd6dfe571e5e44c 19SHA1 (patch-ap) = 6c81429affe9dce518c304178dd6dfe571e5e44c
20SHA1 (patch-aq) = 1c67df7538626e9a497e702e246291155417892a 20SHA1 (patch-aq) = 1c67df7538626e9a497e702e246291155417892a
21SHA1 (patch-ar) = 8279fba385c3013626aa74401201e37246c9cc82 21SHA1 (patch-ar) = 8279fba385c3013626aa74401201e37246c9cc82
cvs diff -r1.3 -r1.4 pkgsrc/graphics/magicpoint/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/graphics/magicpoint/patches/patch-ac 2008/09/10 13:32:47 1.3
+++ pkgsrc/graphics/magicpoint/patches/patch-ac 2010/12/15 19:08:22 1.4
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-ac,v 1.3 2008/09/10 13:32:47 taca Exp $ 1$NetBSD: patch-ac,v 1.4 2010/12/15 19:08:22 chuck Exp $
2 2
3--- Imakefile.in.orig 2007-12-03 18:08:40.000000000 +0900 3--- Imakefile.in.orig 2007-12-03 18:08:40.000000000 +0900
4+++ Imakefile.in 4+++ Imakefile.in
5@@ -22,8 +22,9 @@ LEX= @LEX@ 5@@ -22,8 +22,9 @@ LEX= @LEX@
6 OPTFLAGS= @OPTFLAGS@ ${CPPFLAGS} 6 OPTFLAGS= @OPTFLAGS@ ${CPPFLAGS}
7 DEFS= @DEFS@ -DMGPLIBDIR=\"$(LIBDIR)/mgp\" 7 DEFS= @DEFS@ -DMGPLIBDIR=\"$(LIBDIR)/mgp\"
8 #DEFS+= -DGLYPHEDGE 8 #DEFS+= -DGLYPHEDGE
9+DEPENDFLAGS= $(DEFS) $(OPTFLAGS) 9+DEPENDFLAGS= $(DEFS) @OPTFLAGS@
10  10
11-SYS_LIBRARIES= -L$(srcdir)/image -lmgpimage @LIBS@ 11-SYS_LIBRARIES= -L$(srcdir)/image -lmgpimage @LIBS@
12+SYS_LIBRARIES= -L$(srcdir)/image -lmgpimage @LDFLAGS@ @LIBS@ 12+SYS_LIBRARIES= -L$(srcdir)/image -lmgpimage @LDFLAGS@ @LIBS@
13 EXTRA_DEPLIBS= @DEPLIBS@ 13 EXTRA_DEPLIBS= @DEPLIBS@
14  14
15 #undef DefaultCDebugFlags 15 #undef DefaultCDebugFlags