Fri Dec 30 23:18:53 2016 UTC ()
Simplify previous.


(wiz)
diff -r1.90 -r1.91 pkgsrc/editors/xemacs-current/Makefile
diff -r1.13 -r1.14 pkgsrc/editors/xemacs-current/options.mk
cvs diff -r1.90 -r1.91 pkgsrc/editors/xemacs-current/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/xemacs-current/Makefile 2016/12/30 23:09:41 1.90
+++ pkgsrc/editors/xemacs-current/Makefile 2016/12/30 23:18:53 1.91
@@ -1,98 +1,18 @@ @@ -1,98 +1,18 @@
1# $NetBSD: Makefile,v 1.90 2016/12/30 23:09:41 wiz Exp $ 1# $NetBSD: Makefile,v 1.91 2016/12/30 23:18:53 wiz Exp $
2 2
3PKGNAME= ${DISTNAME} 3PKGNAME= ${DISTNAME}
4PKGREVISION= 23 4PKGREVISION= 23
5COMMENT= *BETA* XEmacs text editor version ${PKGVERSION_NOREV} 5COMMENT= *BETA* XEmacs text editor version ${PKGVERSION_NOREV}
6 6
7# extra options for x11 support, not for sharing with xemacs-current-nox11 7# extra options for x11 support, not for sharing with xemacs-current-nox11
8 8
9PKG_SUPPORTED_OPTIONS+= x11 xft 9PKG_SUPPORTED_OPTIONS+= x11 xft
10PKG_OPTIONS_OPTIONAL_GROUPS= toolkit 10PKG_OPTIONS_OPTIONAL_GROUPS= toolkit
11PKG_OPTIONS_GROUP.toolkit= gtk lucid motif 11PKG_OPTIONS_GROUP.toolkit= gtk lucid motif
12PKG_SUGGESTED_OPTIONS+= x11 12PKG_SUGGESTED_OPTIONS+= x11
13 13
14.include "options.mk" 14.include "options.mk"
15 15
16### 
17### Any of the "toolkit" options or "xft" implies "x11". 
18### 
19.if !empty(PKG_OPTIONS:Mgtk) || !empty(PKG_OPTIONS:Mlucid) || \ 
20 !empty(PKG_OPTIONS:Mmotif) || !empty(PKG_OPTIONS:Mxft) 
21. if empty(PKG_OPTIONS:Mx11) 
22PKG_OPTIONS+= x11 
23. endif 
24.endif 
25 
26### 
27### Default to using the Lucid X11 toolkit if none is specified. 
28### 
29.if !empty(PKG_OPTIONS:Mx11) 
30. if empty(PKG_OPTIONS:Mgtk) && empty(PKG_OPTIONS:Mlucid) && \ 
31 empty(PKG_OPTIONS:Mmotif) 
32PKG_OPTIONS+= lucid 
33. endif 
34.endif 
35 
36### 
37### Support drawing pretty X11 widgets. 
38### 
39.if !empty(PKG_OPTIONS:Mx11) 
40. include "../../mk/jpeg.buildlink3.mk" 
41. include "../../graphics/png/buildlink3.mk" 
42. include "../../graphics/tiff/buildlink3.mk" 
43. include "../../x11/xbitmaps/buildlink3.mk" 
44CONFIGURE_ARGS+= --with-x 
45. if ${X11_TYPE} != "modular" 
46CONFIGURE_ARGS+= --with-site-prefixes=${PREFIX}:${X11BASE} 
47CONFIGURE_ARGS+= --with-site-runtime-libraries=${PREFIX}/lib:${X11BASE}/lib 
48. else 
49CONFIGURE_ARGS+= --with-site-prefixes=${PREFIX} 
50CONFIGURE_ARGS+= --with-site-runtime-libraries=${PREFIX}/lib 
51. endif 
52.else 
53CONFIGURE_ARGS+= --without-x 
54CONFIGURE_ARGS+= --without-jpeg 
55CONFIGURE_ARGS+= --without-png 
56CONFIGURE_ARGS+= --without-tiff 
57CONFIGURE_ARGS+= --without-xpm 
58CONFIGURE_ARGS+= --with-site-prefixes=${PREFIX} 
59CONFIGURE_ARGS+= --with-site-runtime-libraries=${PREFIX}/lib 
60.endif 
61 
62### 
63### Support using Xft for rendering TrueType fonts. 
64### 
65.if !empty(PKG_OPTIONS:Mxft) 
66. include "../../fonts/fontconfig/buildlink3.mk" 
67. include "../../graphics/freetype2/buildlink3.mk" 
68. include "../../x11/libXft/buildlink3.mk" 
69. include "../../x11/libXrender/buildlink3.mk" 
70CONFIGURE_ARGS+= --with-xft=emacs,tabs,menubars,gauges 
71.endif 
72 
73### 
74### Support using GTK X11 widgets. 
75### 
76.if !empty(PKG_OPTIONS:Mgtk) 
77. include "../../x11/gtk/buildlink3.mk" 
78CONFIGURE_ARGS+= --with-gtk 
79.endif 
80 
81### 
82### Support using Motif X11 widgets. 
83### 
84.if !empty(PKG_OPTIONS:Mmotif) 
85. include "../../mk/motif.buildlink3.mk" 
86.endif 
87 
88### 
89### Support using Lucid X11 widgets. 
90### 
91.if !empty(PKG_OPTIONS:Mlucid) 
92. include "../../mk/xaw.buildlink3.mk" 
93CONFIGURE_ARGS+= --with-widgets=lucid 
94.endif 
95 
96.include "Makefile.common" 16.include "Makefile.common"
97 17
98.include "../../mk/bsd.pkg.mk" 18.include "../../mk/bsd.pkg.mk"
cvs diff -r1.13 -r1.14 pkgsrc/editors/xemacs-current/options.mk (expand / switch to unified diff)

--- pkgsrc/editors/xemacs-current/options.mk 2016/12/30 23:09:41 1.13
+++ pkgsrc/editors/xemacs-current/options.mk 2016/12/30 23:18:53 1.14
@@ -1,21 +1,41 @@ @@ -1,21 +1,41 @@
1# $NetBSD: options.mk,v 1.13 2016/12/30 23:09:41 wiz Exp $ 1# $NetBSD: options.mk,v 1.14 2016/12/30 23:18:53 wiz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.xemacs 3PKG_OPTIONS_VAR= PKG_OPTIONS.xemacs
4PKG_SUPPORTED_OPTIONS+= ldap xface canna debug 4PKG_SUPPORTED_OPTIONS+= ldap xface canna debug
5#PKG_SUPPORTED_OPTIONS+= esound 5#PKG_SUPPORTED_OPTIONS+= esound
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
 9###
 10### Any of the "toolkit" options or "xft" implies "x11".
 11###
 12.if !empty(PKG_OPTIONS:Mgtk) || !empty(PKG_OPTIONS:Mlucid) || \
 13 !empty(PKG_OPTIONS:Mmotif) || !empty(PKG_OPTIONS:Mxft)
 14. if empty(PKG_OPTIONS:Mx11)
 15PKG_OPTIONS+= x11
 16. endif
 17.endif
 18
 19###
 20### Default to using the Lucid X11 toolkit if none is specified.
 21###
 22.if !empty(PKG_OPTIONS:Mx11)
 23. if empty(PKG_OPTIONS:Mgtk) && empty(PKG_OPTIONS:Mlucid) && \
 24 empty(PKG_OPTIONS:Mmotif)
 25PKG_OPTIONS+= lucid
 26. endif
 27.endif
 28
9PLIST_VARS+= ldap 29PLIST_VARS+= ldap
10.if !empty(PKG_OPTIONS:Mldap) 30.if !empty(PKG_OPTIONS:Mldap)
11PLIST.ldap= yes 31PLIST.ldap= yes
12CONFIGURE_ARGS+= --with-ldap 32CONFIGURE_ARGS+= --with-ldap
13. include "../../databases/openldap-client/buildlink3.mk" 33. include "../../databases/openldap-client/buildlink3.mk"
14.else 34.else
15CONFIGURE_ARGS+= --without-ldap 35CONFIGURE_ARGS+= --without-ldap
16.endif 36.endif
17 37
18.if !empty(PKG_OPTIONS:Mxface) 38.if !empty(PKG_OPTIONS:Mxface)
19CONFIGURE_ARGS+= --with-xface 39CONFIGURE_ARGS+= --with-xface
20. include "../../mail/faces/buildlink3.mk" 40. include "../../mail/faces/buildlink3.mk"
21.else 41.else
@@ -28,13 +48,73 @@ CONFIGURE_ARGS+= --with-canna @@ -28,13 +48,73 @@ CONFIGURE_ARGS+= --with-canna
28.else 48.else
29CONFIGURE_ARGS+= --without-canna 49CONFIGURE_ARGS+= --without-canna
30.endif 50.endif
31 51
32.if !empty(PKG_OPTIONS:Mesound) 52.if !empty(PKG_OPTIONS:Mesound)
33. include "../../audio/esound/buildlink3.mk" 53. include "../../audio/esound/buildlink3.mk"
34.else 54.else
35CONFIGURE_ARGS+= --with-sound=none 55CONFIGURE_ARGS+= --with-sound=none
36.endif 56.endif
37 57
38.if !empty(PKG_OPTIONS:Mdebug) 58.if !empty(PKG_OPTIONS:Mdebug)
39CONFIGURE_ARGS+= --enable-debug=yes --with-debug 59CONFIGURE_ARGS+= --enable-debug=yes --with-debug
40.endif 60.endif
 61
 62###
 63### Support drawing pretty X11 widgets.
 64###
 65.if !empty(PKG_OPTIONS:Mx11)
 66. include "../../mk/jpeg.buildlink3.mk"
 67. include "../../graphics/png/buildlink3.mk"
 68. include "../../graphics/tiff/buildlink3.mk"
 69. include "../../x11/xbitmaps/buildlink3.mk"
 70CONFIGURE_ARGS+= --with-x
 71. if ${X11_TYPE} != "modular"
 72CONFIGURE_ARGS+= --with-site-prefixes=${PREFIX}:${X11BASE}
 73CONFIGURE_ARGS+= --with-site-runtime-libraries=${PREFIX}/lib:${X11BASE}/lib
 74. else
 75CONFIGURE_ARGS+= --with-site-prefixes=${PREFIX}
 76CONFIGURE_ARGS+= --with-site-runtime-libraries=${PREFIX}/lib
 77. endif
 78.else
 79CONFIGURE_ARGS+= --without-x
 80CONFIGURE_ARGS+= --without-jpeg
 81CONFIGURE_ARGS+= --without-png
 82CONFIGURE_ARGS+= --without-tiff
 83CONFIGURE_ARGS+= --without-xpm
 84CONFIGURE_ARGS+= --with-site-prefixes=${PREFIX}
 85CONFIGURE_ARGS+= --with-site-runtime-libraries=${PREFIX}/lib
 86.endif
 87
 88###
 89### Support using Xft for rendering TrueType fonts.
 90###
 91.if !empty(PKG_OPTIONS:Mxft)
 92. include "../../fonts/fontconfig/buildlink3.mk"
 93. include "../../graphics/freetype2/buildlink3.mk"
 94. include "../../x11/libXft/buildlink3.mk"
 95. include "../../x11/libXrender/buildlink3.mk"
 96CONFIGURE_ARGS+= --with-xft=emacs,tabs,menubars,gauges
 97.endif
 98
 99###
 100### Support using GTK X11 widgets.
 101###
 102.if !empty(PKG_OPTIONS:Mgtk)
 103. include "../../x11/gtk/buildlink3.mk"
 104CONFIGURE_ARGS+= --with-gtk
 105.endif
 106
 107###
 108### Support using Motif X11 widgets.
 109###
 110.if !empty(PKG_OPTIONS:Mmotif)
 111. include "../../mk/motif.buildlink3.mk"
 112.endif
 113
 114###
 115### Support using Lucid X11 widgets.
 116###
 117.if !empty(PKG_OPTIONS:Mlucid)
 118. include "../../mk/xaw.buildlink3.mk"
 119CONFIGURE_ARGS+= --with-widgets=lucid
 120.endif