Wed Feb 17 06:05:41 2016 UTC ()
On Darwin, this package builds against quartz, not x11, so remove unnecessary dependencies


(dbj)
diff -r1.22 -r1.23 pkgsrc/x11/fltk13/Makefile
diff -r1.8 -r1.9 pkgsrc/x11/fltk13/buildlink3.mk
cvs diff -r1.22 -r1.23 pkgsrc/x11/fltk13/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/fltk13/Makefile 2016/01/26 08:47:28 1.22
+++ pkgsrc/x11/fltk13/Makefile 2016/02/17 06:05:41 1.23
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.22 2016/01/26 08:47:28 dbj Exp $ 1# $NetBSD: Makefile,v 1.23 2016/02/17 06:05:41 dbj Exp $
2 2
3DISTNAME= fltk-1.3.3-source 3DISTNAME= fltk-1.3.3-source
4PKGREVISION= 1 4PKGREVISION= 2
5PKGNAME= ${DISTNAME:S/-source//} 5PKGNAME= ${DISTNAME:S/-source//}
6VERS= ${DISTNAME:S/fltk-//:S/-source//} 6VERS= ${DISTNAME:S/fltk-//:S/-source//}
7CATEGORIES= x11 7CATEGORIES= x11
8MASTER_SITES= http://fltk.org/pub/fltk/${VERS}/ 8MASTER_SITES= http://fltk.org/pub/fltk/${VERS}/
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.fltk.org/ 11HOMEPAGE= http://www.fltk.org/
12COMMENT= Fast Light Tool Kit for graphical user interfaces 12COMMENT= Fast Light Tool Kit for graphical user interfaces
13LICENSE= gnu-lgpl-v2 13LICENSE= gnu-lgpl-v2
14 14
15WRKSRC= ${WRKDIR}/${DISTNAME:S/-source//} 15WRKSRC= ${WRKDIR}/${DISTNAME:S/-source//}
16USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
17USE_LIBTOOL= yes 17USE_LIBTOOL= yes
@@ -38,35 +38,39 @@ PLIST_VARS+= cs # case-sensitive @@ -38,35 +38,39 @@ PLIST_VARS+= cs # case-sensitive
38CONFIGURE_ARGS+= --with-links 38CONFIGURE_ARGS+= --with-links
39PLIST.cs= yes 39PLIST.cs= yes
40.endif 40.endif
41 41
42#.if !empty(PKG_OPTIONS:Mcairo) 42#.if !empty(PKG_OPTIONS:Mcairo)
43#. include "../../graphics/cairo/buildlink3.mk" 43#. include "../../graphics/cairo/buildlink3.mk"
44#CONFIGURE_ARGS+= --enable-cairo 44#CONFIGURE_ARGS+= --enable-cairo
45#PLIST.cairo= yes 45#PLIST.cairo= yes
46#.else 46#.else
47#CONFIGURE_ARGS+= --disable-cairo 47#CONFIGURE_ARGS+= --disable-cairo
48#.endif 48#.endif
49 49
50.if !empty(PKG_OPTIONS:Mopengl) 50.if !empty(PKG_OPTIONS:Mopengl)
 51.if ${OPSYS} != "Darwin"
51. include "../../graphics/Mesa/buildlink3.mk" 52. include "../../graphics/Mesa/buildlink3.mk"
 53.endif
52CONFIGURE_ARGS+= --enable-gl 54CONFIGURE_ARGS+= --enable-gl
53PLIST.opengl= yes 55PLIST.opengl= yes
54.else 56.else
55CONFIGURE_ARGS+= --disable-gl 57CONFIGURE_ARGS+= --disable-gl
56.endif 58.endif
57 59
58CONFIGURE_ARGS+= --enable-shared 60CONFIGURE_ARGS+= --enable-shared
59# Use pkgsrc versions, not package's bundled versions. 61# Use pkgsrc versions, not package's bundled versions.
60CONFIGURE_ARGS+= --disable-localjpeg --disable-localzlib --disable-localpng 62CONFIGURE_ARGS+= --disable-localjpeg --disable-localzlib --disable-localpng
61 63
 64.if ${OPSYS} != "Darwin"
62.include "../../graphics/MesaLib/buildlink3.mk" 65.include "../../graphics/MesaLib/buildlink3.mk"
63.include "../../graphics/glu/buildlink3.mk" 66.include "../../graphics/glu/buildlink3.mk"
64.include "../../mk/jpeg.buildlink3.mk" 
65.include "../../graphics/png/buildlink3.mk" 
66.include "../../x11/libXext/buildlink3.mk" 67.include "../../x11/libXext/buildlink3.mk"
67.include "../../x11/libXft/buildlink3.mk" 68.include "../../x11/libXft/buildlink3.mk"
68.include "../../x11/libXinerama/buildlink3.mk" 69.include "../../x11/libXinerama/buildlink3.mk"
69BUILDLINK_DEPMETHOD.libXt?= build 70BUILDLINK_DEPMETHOD.libXt?= build
70.include "../../x11/libXt/buildlink3.mk" 71.include "../../x11/libXt/buildlink3.mk"
 72.endif
 73.include "../../mk/jpeg.buildlink3.mk"
 74.include "../../graphics/png/buildlink3.mk"
71.include "../../mk/pthread.buildlink3.mk" 75.include "../../mk/pthread.buildlink3.mk"
72.include "../../mk/bsd.pkg.mk" 76.include "../../mk/bsd.pkg.mk"
cvs diff -r1.8 -r1.9 pkgsrc/x11/fltk13/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/x11/fltk13/buildlink3.mk 2016/01/26 08:47:28 1.8
+++ pkgsrc/x11/fltk13/buildlink3.mk 2016/02/17 06:05:41 1.9
@@ -1,23 +1,25 @@ @@ -1,23 +1,25 @@
1# $NetBSD: buildlink3.mk,v 1.8 2016/01/26 08:47:28 dbj Exp $ 1# $NetBSD: buildlink3.mk,v 1.9 2016/02/17 06:05:41 dbj Exp $
2 2
3BUILDLINK_TREE+= fltk 3BUILDLINK_TREE+= fltk
4 4
5.if !defined(FLTK_BUILDLINK3_MK) 5.if !defined(FLTK_BUILDLINK3_MK)
6FLTK_BUILDLINK3_MK:= 6FLTK_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.fltk+= fltk>=1.3.0 8BUILDLINK_API_DEPENDS.fltk+= fltk>=1.3.0
9BUILDLINK_ABI_DEPENDS.fltk?= fltk>=1.3.3nb1 9BUILDLINK_ABI_DEPENDS.fltk?= fltk>=1.3.3nb1
10BUILDLINK_PKGSRCDIR.fltk?= ../../x11/fltk13 10BUILDLINK_PKGSRCDIR.fltk?= ../../x11/fltk13
11BUILDLINK_FILES.fltk+= include/Fl/* 11BUILDLINK_FILES.fltk+= include/Fl/*
12 12
 13.if ${OPSYS} != "Darwin"
13.include "../../graphics/MesaLib/buildlink3.mk" 14.include "../../graphics/MesaLib/buildlink3.mk"
14.include "../../graphics/glu/buildlink3.mk" 15.include "../../graphics/glu/buildlink3.mk"
15.include "../../mk/jpeg.buildlink3.mk" 
16.include "../../graphics/png/buildlink3.mk" 
17.include "../../mk/pthread.buildlink3.mk" 
18.include "../../x11/libXext/buildlink3.mk" 16.include "../../x11/libXext/buildlink3.mk"
19.include "../../x11/libXft/buildlink3.mk" 17.include "../../x11/libXft/buildlink3.mk"
20.include "../../x11/libXinerama/buildlink3.mk" 18.include "../../x11/libXinerama/buildlink3.mk"
 19.endif
 20.include "../../mk/jpeg.buildlink3.mk"
 21.include "../../graphics/png/buildlink3.mk"
 22.include "../../mk/pthread.buildlink3.mk"
21.endif # FLTK_BUILDLINK3_MK 23.endif # FLTK_BUILDLINK3_MK
22 24
23BUILDLINK_TREE+= -fltk 25BUILDLINK_TREE+= -fltk