Wed Mar 9 16:28:21 2011 UTC ()
libungif/buildlink3.mk -> mk/giflib.buildlink3.mk


(drochner)
diff -r1.11 -r1.12 pkgsrc/editors/emacs/options.mk
diff -r1.5 -r1.6 pkgsrc/editors/emacs-snapshot/options.mk
diff -r1.2 -r1.3 pkgsrc/editors/emacs21/options.mk
diff -r1.2 -r1.3 pkgsrc/editors/emacs22/options.mk
cvs diff -r1.11 -r1.12 pkgsrc/editors/emacs/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/editors/emacs/Attic/options.mk 2010/12/23 11:44:28 1.11
+++ pkgsrc/editors/emacs/Attic/options.mk 2011/03/09 16:28:21 1.12
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.11 2010/12/23 11:44:28 dsainty Exp $ 1# $NetBSD: options.mk,v 1.12 2011/03/09 16:28:21 drochner Exp $
2# 2#
3 3
4PKG_OPTIONS_VAR= PKG_OPTIONS.emacs 4PKG_OPTIONS_VAR= PKG_OPTIONS.emacs
5PKG_SUPPORTED_OPTIONS= dbus xft2 svg 5PKG_SUPPORTED_OPTIONS= dbus xft2 svg
6PKG_OPTIONS_OPTIONAL_GROUPS+= window-system 6PKG_OPTIONS_OPTIONAL_GROUPS+= window-system
7PKG_OPTIONS_GROUP.window-system= x11 nextstep 7PKG_OPTIONS_GROUP.window-system= x11 nextstep
8PKG_OPTIONS_OPTIONAL_GROUPS+= toolkit 8PKG_OPTIONS_OPTIONAL_GROUPS+= toolkit
9PKG_OPTIONS_GROUP.toolkit= gtk motif xaw 9PKG_OPTIONS_GROUP.toolkit= gtk motif xaw
10PKG_SUGGESTED_OPTIONS= dbus svg x11 xft2 10PKG_SUGGESTED_OPTIONS= dbus svg x11 xft2
11 11
12.include "../../mk/bsd.options.mk" 12.include "../../mk/bsd.options.mk"
13 13
14### 14###
@@ -51,27 +51,27 @@ PKG_OPTIONS+= gtk @@ -51,27 +51,27 @@ PKG_OPTIONS+= gtk
51### Support drawing pretty X11 widgets. 51### Support drawing pretty X11 widgets.
52### 52###
53.if !empty(PKG_OPTIONS:Mx11) 53.if !empty(PKG_OPTIONS:Mx11)
54 54
55CONFIGURE_ARGS+= --with-x 55CONFIGURE_ARGS+= --with-x
56CONFIGURE_ARGS+= --with-xpm 56CONFIGURE_ARGS+= --with-xpm
57CONFIGURE_ARGS+= --with-jpeg 57CONFIGURE_ARGS+= --with-jpeg
58CONFIGURE_ARGS+= --with-tiff 58CONFIGURE_ARGS+= --with-tiff
59CONFIGURE_ARGS+= --with-gif 59CONFIGURE_ARGS+= --with-gif
60CONFIGURE_ARGS+= --with-png 60CONFIGURE_ARGS+= --with-png
61 61
62.include "../../mk/jpeg.buildlink3.mk" 62.include "../../mk/jpeg.buildlink3.mk"
63.include "../../graphics/tiff/buildlink3.mk" 63.include "../../graphics/tiff/buildlink3.mk"
64.include "../../graphics/libungif/buildlink3.mk" 64.include "../../mk/giflib.buildlink3.mk"
65.include "../../graphics/png/buildlink3.mk" 65.include "../../graphics/png/buildlink3.mk"
66.include "../../x11/libSM/buildlink3.mk" 66.include "../../x11/libSM/buildlink3.mk"
67.include "../../x11/libXpm/buildlink3.mk" 67.include "../../x11/libXpm/buildlink3.mk"
68 68
69### 69###
70### Enable font backend 70### Enable font backend
71### 71###
72. if !empty(PKG_OPTIONS:Mxft2) 72. if !empty(PKG_OPTIONS:Mxft2)
73.include "../../fonts/fontconfig/buildlink3.mk" 73.include "../../fonts/fontconfig/buildlink3.mk"
74.include "../../graphics/libotf/buildlink3.mk" 74.include "../../graphics/libotf/buildlink3.mk"
75.include "../../graphics/freetype2/buildlink3.mk" 75.include "../../graphics/freetype2/buildlink3.mk"
76.include "../../x11/libXft/buildlink3.mk" 76.include "../../x11/libXft/buildlink3.mk"
77.include "../../devel/m17n-lib/buildlink3.mk" 77.include "../../devel/m17n-lib/buildlink3.mk"
cvs diff -r1.5 -r1.6 pkgsrc/editors/emacs-snapshot/options.mk (expand / switch to unified diff)

--- pkgsrc/editors/emacs-snapshot/options.mk 2010/12/23 11:44:28 1.5
+++ pkgsrc/editors/emacs-snapshot/options.mk 2011/03/09 16:28:20 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.5 2010/12/23 11:44:28 dsainty Exp $ 1# $NetBSD: options.mk,v 1.6 2011/03/09 16:28:20 drochner Exp $
2# 2#
3 3
4PKG_OPTIONS_VAR= PKG_OPTIONS.emacs 4PKG_OPTIONS_VAR= PKG_OPTIONS.emacs
5PKG_SUPPORTED_OPTIONS= dbus xft2 svg 5PKG_SUPPORTED_OPTIONS= dbus xft2 svg
6PKG_OPTIONS_OPTIONAL_GROUPS+= window-system 6PKG_OPTIONS_OPTIONAL_GROUPS+= window-system
7PKG_OPTIONS_GROUP.window-system= x11 nextstep 7PKG_OPTIONS_GROUP.window-system= x11 nextstep
8PKG_OPTIONS_OPTIONAL_GROUPS+= toolkit 8PKG_OPTIONS_OPTIONAL_GROUPS+= toolkit
9PKG_OPTIONS_GROUP.toolkit= gtk motif xaw 9PKG_OPTIONS_GROUP.toolkit= gtk motif xaw
10PKG_SUGGESTED_OPTIONS= dbus svg x11 xft2 10PKG_SUGGESTED_OPTIONS= dbus svg x11 xft2
11 11
12.include "../../mk/bsd.options.mk" 12.include "../../mk/bsd.options.mk"
13 13
14### 14###
@@ -51,27 +51,27 @@ PKG_OPTIONS+= gtk @@ -51,27 +51,27 @@ PKG_OPTIONS+= gtk
51### Support drawing pretty X11 widgets. 51### Support drawing pretty X11 widgets.
52### 52###
53.if !empty(PKG_OPTIONS:Mx11) 53.if !empty(PKG_OPTIONS:Mx11)
54 54
55CONFIGURE_ARGS+= --with-x 55CONFIGURE_ARGS+= --with-x
56CONFIGURE_ARGS+= --with-xpm 56CONFIGURE_ARGS+= --with-xpm
57CONFIGURE_ARGS+= --with-jpeg 57CONFIGURE_ARGS+= --with-jpeg
58CONFIGURE_ARGS+= --with-tiff 58CONFIGURE_ARGS+= --with-tiff
59CONFIGURE_ARGS+= --with-gif 59CONFIGURE_ARGS+= --with-gif
60CONFIGURE_ARGS+= --with-png 60CONFIGURE_ARGS+= --with-png
61 61
62.include "../../mk/jpeg.buildlink3.mk" 62.include "../../mk/jpeg.buildlink3.mk"
63.include "../../graphics/tiff/buildlink3.mk" 63.include "../../graphics/tiff/buildlink3.mk"
64.include "../../graphics/libungif/buildlink3.mk" 64.include "../../mk/giflib.buildlink3.mk"
65.include "../../graphics/png/buildlink3.mk" 65.include "../../graphics/png/buildlink3.mk"
66.include "../../x11/libSM/buildlink3.mk" 66.include "../../x11/libSM/buildlink3.mk"
67.include "../../x11/libXpm/buildlink3.mk" 67.include "../../x11/libXpm/buildlink3.mk"
68.include "../../x11/libXrender/buildlink3.mk" 68.include "../../x11/libXrender/buildlink3.mk"
69 69
70### 70###
71### Enable font backend 71### Enable font backend
72### 72###
73. if !empty(PKG_OPTIONS:Mxft2) 73. if !empty(PKG_OPTIONS:Mxft2)
74.include "../../fonts/fontconfig/buildlink3.mk" 74.include "../../fonts/fontconfig/buildlink3.mk"
75.include "../../graphics/libotf/buildlink3.mk" 75.include "../../graphics/libotf/buildlink3.mk"
76.include "../../graphics/freetype2/buildlink3.mk" 76.include "../../graphics/freetype2/buildlink3.mk"
77.include "../../x11/libXft/buildlink3.mk" 77.include "../../x11/libXft/buildlink3.mk"
cvs diff -r1.2 -r1.3 pkgsrc/editors/emacs21/options.mk (expand / switch to unified diff)

--- pkgsrc/editors/emacs21/options.mk 2010/12/23 11:44:28 1.2
+++ pkgsrc/editors/emacs21/options.mk 2011/03/09 16:28:21 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.2 2010/12/23 11:44:28 dsainty Exp $ 1# $NetBSD: options.mk,v 1.3 2011/03/09 16:28:21 drochner Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.emacs 3PKG_OPTIONS_VAR= PKG_OPTIONS.emacs
4PKG_SUPPORTED_OPTIONS= x11 4PKG_SUPPORTED_OPTIONS= x11
5PKG_OPTIONS_OPTIONAL_GROUPS= toolkit 5PKG_OPTIONS_OPTIONAL_GROUPS= toolkit
6PKG_OPTIONS_GROUP.toolkit= emacs-xaw3d motif xaw 6PKG_OPTIONS_GROUP.toolkit= emacs-xaw3d motif xaw
7PKG_SUGGESTED_OPTIONS= x11 7PKG_SUGGESTED_OPTIONS= x11
8 8
9.include "../../mk/bsd.options.mk" 9.include "../../mk/bsd.options.mk"
10 10
11### 11###
12### Treat "emacs-xaw3d" as a special case of "xaw". 12### Treat "emacs-xaw3d" as a special case of "xaw".
13### 13###
14.if !empty(PKG_OPTIONS:Memacs-xaw3d) 14.if !empty(PKG_OPTIONS:Memacs-xaw3d)
@@ -36,27 +36,27 @@ PKG_OPTIONS+= xaw @@ -36,27 +36,27 @@ PKG_OPTIONS+= xaw
36.endif 36.endif
37 37
38### 38###
39### Support drawing pretty X11 widgets. 39### Support drawing pretty X11 widgets.
40### 40###
41.if !empty(PKG_OPTIONS:Mx11) 41.if !empty(PKG_OPTIONS:Mx11)
42. include "../../mk/jpeg.buildlink3.mk" 42. include "../../mk/jpeg.buildlink3.mk"
43. include "../../graphics/tiff/buildlink3.mk" 43. include "../../graphics/tiff/buildlink3.mk"
44. include "../../graphics/png/buildlink3.mk" 44. include "../../graphics/png/buildlink3.mk"
45. include "../../x11/libXpm/buildlink3.mk" 45. include "../../x11/libXpm/buildlink3.mk"
46 46
47# Need libungif>=4.1.0b1 (a bug in 4.1.0 can crash Emacs) 47# Need libungif>=4.1.0b1 (a bug in 4.1.0 can crash Emacs)
48BUILDLINK_API_DEPENDS.libungif+= libungif>=4.1.0.1 48BUILDLINK_API_DEPENDS.libungif+= libungif>=4.1.0.1
49. include "../../graphics/libungif/buildlink3.mk" 49. include "../../mk/giflib.buildlink3.mk"
50 50
51CONFIGURE_ARGS+= --with-gif 51CONFIGURE_ARGS+= --with-gif
52CONFIGURE_ARGS+= --with-jpeg 52CONFIGURE_ARGS+= --with-jpeg
53CONFIGURE_ARGS+= --with-png 53CONFIGURE_ARGS+= --with-png
54CONFIGURE_ARGS+= --with-tiff 54CONFIGURE_ARGS+= --with-tiff
55CONFIGURE_ARGS+= --with-x 55CONFIGURE_ARGS+= --with-x
56CONFIGURE_ARGS+= --with-xpm 56CONFIGURE_ARGS+= --with-xpm
57.else 57.else
58CONFIGURE_ARGS+= --without-gif 58CONFIGURE_ARGS+= --without-gif
59CONFIGURE_ARGS+= --without-jpeg 59CONFIGURE_ARGS+= --without-jpeg
60CONFIGURE_ARGS+= --without-png 60CONFIGURE_ARGS+= --without-png
61CONFIGURE_ARGS+= --without-tiff 61CONFIGURE_ARGS+= --without-tiff
62CONFIGURE_ARGS+= --without-x 62CONFIGURE_ARGS+= --without-x
cvs diff -r1.2 -r1.3 pkgsrc/editors/emacs22/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/editors/emacs22/Attic/options.mk 2010/12/23 11:44:29 1.2
+++ pkgsrc/editors/emacs22/Attic/options.mk 2011/03/09 16:28:21 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.2 2010/12/23 11:44:29 dsainty Exp $ 1# $NetBSD: options.mk,v 1.3 2011/03/09 16:28:21 drochner Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.emacs 3PKG_OPTIONS_VAR= PKG_OPTIONS.emacs
4PKG_SUPPORTED_OPTIONS= x11 4PKG_SUPPORTED_OPTIONS= x11
5PKG_OPTIONS_OPTIONAL_GROUPS= toolkit 5PKG_OPTIONS_OPTIONAL_GROUPS= toolkit
6PKG_OPTIONS_GROUP.toolkit= gtk motif xaw 6PKG_OPTIONS_GROUP.toolkit= gtk motif xaw
7PKG_SUGGESTED_OPTIONS= x11 7PKG_SUGGESTED_OPTIONS= x11
8 8
9.include "../../mk/bsd.options.mk" 9.include "../../mk/bsd.options.mk"
10 10
11### 11###
12### Any of the "toolkit" options implies "x11". 12### Any of the "toolkit" options implies "x11".
13### 13###
14.if !empty(PKG_OPTIONS:Mgtk) || !empty(PKG_OPTIONS:Mmotif) || \ 14.if !empty(PKG_OPTIONS:Mgtk) || !empty(PKG_OPTIONS:Mmotif) || \
@@ -29,27 +29,27 @@ PKG_OPTIONS+= xaw @@ -29,27 +29,27 @@ PKG_OPTIONS+= xaw
29.endif 29.endif
30 30
31### 31###
32### Support drawing pretty X11 widgets. 32### Support drawing pretty X11 widgets.
33### 33###
34.if !empty(PKG_OPTIONS:Mx11) 34.if !empty(PKG_OPTIONS:Mx11)
35. include "../../mk/jpeg.buildlink3.mk" 35. include "../../mk/jpeg.buildlink3.mk"
36. include "../../graphics/tiff/buildlink3.mk" 36. include "../../graphics/tiff/buildlink3.mk"
37. include "../../graphics/png/buildlink3.mk" 37. include "../../graphics/png/buildlink3.mk"
38. include "../../x11/libXpm/buildlink3.mk" 38. include "../../x11/libXpm/buildlink3.mk"
39 39
40# Need libungif>=4.1.0b1 (a bug in 4.1.0 can crash Emacs) 40# Need libungif>=4.1.0b1 (a bug in 4.1.0 can crash Emacs)
41BUILDLINK_API_DEPENDS.libungif+= libungif>=4.1.0.1 41BUILDLINK_API_DEPENDS.libungif+= libungif>=4.1.0.1
42. include "../../graphics/libungif/buildlink3.mk" 42. include "../../mk/giflib.buildlink3.mk"
43 43
44CONFIGURE_ARGS+= --with-gif 44CONFIGURE_ARGS+= --with-gif
45CONFIGURE_ARGS+= --with-jpeg 45CONFIGURE_ARGS+= --with-jpeg
46CONFIGURE_ARGS+= --with-png 46CONFIGURE_ARGS+= --with-png
47CONFIGURE_ARGS+= --with-tiff 47CONFIGURE_ARGS+= --with-tiff
48CONFIGURE_ARGS+= --with-x 48CONFIGURE_ARGS+= --with-x
49CONFIGURE_ARGS+= --with-xpm 49CONFIGURE_ARGS+= --with-xpm
50.else 50.else
51CONFIGURE_ARGS+= --without-gif 51CONFIGURE_ARGS+= --without-gif
52CONFIGURE_ARGS+= --without-jpeg 52CONFIGURE_ARGS+= --without-jpeg
53CONFIGURE_ARGS+= --without-png 53CONFIGURE_ARGS+= --without-png
54CONFIGURE_ARGS+= --without-tiff 54CONFIGURE_ARGS+= --without-tiff
55CONFIGURE_ARGS+= --without-x 55CONFIGURE_ARGS+= --without-x