elinks and imlib2 options.mk diffs: could someone commit these before the freeze?

["Blair Sadewitz" <blair.sadewitz%gmail.com@localhost>]

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/
>