Subject: elinks and imlib2 options.mk diffs: could someone commit these before the freeze?
To: None <pkgsrc-users@netbsd.org>
From: Blair Sadewitz <blair.sadewitz@gmail.com>
List: pkgsrc-users
Date: 12/15/2006 17:30:06
------=_Part_178940_3289271.1166221806213
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
I'm not sure that elinks's options.mk file (that I submitted originally)
does openssl support right. Moreover, there are some additional useful
options.
Also, imlib2 now has amd64 optimizations available, so I am including that,
too. I'm only sending this directly to the list because
of the freeze announcement.
Regards,
--Blair
Index: options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/www/elinks/options.mk,v
retrieving revision 1.2
diff -u -r1.2 options.mk
--- options.mk 6 Dec 2006 00:20:26 -0000 1.2
+++ options.mk 15 Dec 2006 22:25:57 -0000
@@ -2,10 +2,10 @@
PKG_OPTIONS_VAR= PKG_OPTIONS.elinks
PKG_SUPPORTED_OPTIONS+= bittorrent nntp spidermonkey fsp finger
gopher
-PKG_SUPPORTED_OPTIONS+= inet6 x11
-PKG_OPTIONS_GROUP.tls= gnutls ssl
+PKG_SUPPORTED_OPTIONS+= inet6 x11 expat elinks-fastmem
html-highlight
+PKG_OPTIONS_GROUP.tls= gnutls openssl
PKG_OPTIONS_REQUIRED_GROUPS= tls
-PKG_SUGGESTED_OPTIONS= ssl
+PKG_SUGGESTED_OPTIONS= openssl
.include "../../mk/bsd.options.mk"
@@ -44,8 +44,8 @@
.endif
.if !empty (PKG_OPTIONS:Mssl)
-CONFIGURE_ARGS+= --with-openssl
.include "../../security/openssl/buildlink3.mk"
+CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl}
CONFIGURE_ARGS+= --without-openssl
.elif !empty(PKG_OPTIONS:Mgnutls)
CONFIGURE_ARGS+= --with-gnutls-includes=${BUILDLINK_PREFIX.gnutls}/include
@@ -72,3 +72,21 @@
CONFIGURE_ARGS+= --disable-gopher
.endif
+.if !empty(PKG_OPTIONS:Mexpat)
+.include "../../textproc/expat/buildlink3.mk"
+CONFIGURE_ARGS+= --enable-xbel
+.else
+CONFIGURE_ARGS+= --disable-xbel
+.endif
+
+.if !empty(PKG_OPTIONS:Melinks-fastmem)
+CONFIGURE_ARGS+= --enable-fastmem
+.else
+CONFIGURE_ARGS+= --disable-fastmem
+.endif
+
+.if !empty(PKG_OPTIONS:Mhtml-highlight)
+CONFIGURE_ARGS+= --enable-html-highlight
+.else
+CONFIGURE_ARGS+= --disable-html-highlight
+.endif
Index: options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/imlib2/options.mk,v
retrieving revision 1.4
diff -u -r1.4 options.mk
--- options.mk 11 Jun 2005 16:54:31 -0000 1.4
+++ options.mk 15 Dec 2006 22:29:05 -0000
@@ -5,6 +5,8 @@
PKG_OPTIONS_VAR= PKG_OPTIONS.imlib2
.if ${MACHINE_ARCH} == "i386"
PKG_SUPPORTED_OPTIONS= mmx
+.elif ${MACHINE_ARCH} == "x86_64"
+PKG_SUPPORTED_OPTIONS= amd64
.endif
.include "../../mk/bsd.options.mk"
@@ -12,3 +14,7 @@
.if !empty(PKG_OPTIONS:Mmmx)
CONFIGURE_ARGS+= --enable-mmx
.endif
+
+.if !empty(PKG_OPTIONS:Mamd64)
+CONFIGURE_ARGS+= --enable-amd64
+.endif
--
Support WFMU-FM: free-form radio for the masses!
<http://www.wfmu.org/>
91.1 FM Jersey City, NJ
90.1 FM Mt. Hope, NY
"The Reggae Schoolroom":
<http://www.wfmu.org/playlists/RS/>
------=_Part_178940_3289271.1166221806213
Content-Type: text/html; charset=UTF-8
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
I'm not sure that elinks's <a href="http://options.mk">options.mk</a> file (that I submitted originally) does openssl support right. Moreover, there are some additional useful options.<br><br>Also, imlib2 now has amd64 optimizations available, so I am including that, too. I'm only sending this directly to the list because
<br>of the freeze announcement.<br><br>Regards,<br><br>--Blair<br>Index: <a href="http://options.mk">options.mk</a><br>===================================================================<br>RCS file: /cvsroot/pkgsrc/www/elinks/options.mk,v
<br>retrieving revision 1.2<br>diff -u -r1.2 <a href="http://options.mk">options.mk</a><br>--- <a href="http://options.mk">options.mk</a> 6 Dec 2006 00:20:26 -0000 1.2<br>+++ <a href="http://options.mk">options.mk</a>
15 Dec 2006 22:25:57 -0000<br>@@ -2,10 +2,10 @@<br> <br> PKG_OPTIONS_VAR= PKG_OPTIONS.elinks<br> PKG_SUPPORTED_OPTIONS+= bittorrent nntp spidermonkey fsp finger gopher<br>-PKG_SUPPORTED_OPTIONS+= inet6 x11
<br>-PKG_OPTIONS_GROUP.tls= gnutls ssl<br>+PKG_SUPPORTED_OPTIONS+= inet6 x11 expat elinks-fastmem html-highlight <br>+PKG_OPTIONS_GROUP.tls= gnutls openssl <br> PKG_OPTIONS_REQUIRED_GROUPS= tls<br>-PKG_SUGGESTED_OPTIONS= ssl
<br>+PKG_SUGGESTED_OPTIONS= openssl <br> <br> .include "../../mk/bsd.options.mk"<br> <br>@@ -44,8 +44,8 @@<br> .endif<br> <br> .if !empty (PKG_OPTIONS:Mssl)<br>-CONFIGURE_ARGS+= --with-openssl<br> .include "../../security/openssl/buildlink3.mk"
<br>+CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl}<br> CONFIGURE_ARGS+= --without-openssl<br> .elif !empty(PKG_OPTIONS:Mgnutls) <br> CONFIGURE_ARGS+= --with-gnutls-includes=${BUILDLINK_PREFIX.gnutls}/include
<br>@@ -72,3 +72,21 @@<br> CONFIGURE_ARGS+= --disable-gopher<br> .endif<br> <br>+.if !empty(PKG_OPTIONS:Mexpat)<br>+.include "../../textproc/expat/buildlink3.mk"<br>+CONFIGURE_ARGS+= --enable-xbel<br>
+.else<br>+CONFIGURE_ARGS+= --disable-xbel<br>+.endif<br>+<br>+.if !empty(PKG_OPTIONS:Melinks-fastmem)<br>+CONFIGURE_ARGS+= --enable-fastmem<br>+.else<br>+CONFIGURE_ARGS+= --disable-fastmem<br>+.endif<br>
+<br>+.if !empty(PKG_OPTIONS:Mhtml-highlight)<br>+CONFIGURE_ARGS+= --enable-html-highlight<br>+.else<br>+CONFIGURE_ARGS+= --disable-html-highlight<br>+.endif<br><br><br clear="all">Index: <a href="http://options.mk">
options.mk</a><br>===================================================================<br>RCS file: /cvsroot/pkgsrc/graphics/imlib2/options.mk,v<br>retrieving revision 1.4<br>diff -u -r1.4 <a href="http://options.mk">options.mk
</a><br>--- <a href="http://options.mk">options.mk</a> 11 Jun 2005 16:54:31 -0000 1.4<br>+++ <a href="http://options.mk">options.mk</a> 15 Dec 2006 22:29:05 -0000<br>@@ -5,6 +5,8 @@<br> PKG_OPTIONS_VAR= PKG_OPTIONS.imlib2
<br> .if ${MACHINE_ARCH} == "i386"<br> PKG_SUPPORTED_OPTIONS= mmx<br>+.elif ${MACHINE_ARCH} == "x86_64"<br>+PKG_SUPPORTED_OPTIONS= amd64<br> .endif<br> <br> .include "../../mk/bsd.options.mk"
<br>@@ -12,3 +14,7 @@<br> .if !empty(PKG_OPTIONS:Mmmx)<br> CONFIGURE_ARGS+= --enable-mmx<br> .endif<br>+<br>+.if !empty(PKG_OPTIONS:Mamd64)<br>+CONFIGURE_ARGS+= --enable-amd64<br>+.endif<br><br>-- <br>Support WFMU-FM: free-form radio for the masses!
<br><br><<a href="http://www.wfmu.org/">http://www.wfmu.org/</a>><br>91.1 FM Jersey City, NJ<br>90.1 FM Mt. Hope, NY<br><br>"The Reggae Schoolroom":<br><<a href="http://www.wfmu.org/playlists/RS/">http://www.wfmu.org/playlists/RS/
</a>>
------=_Part_178940_3289271.1166221806213--