Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/pkgsrc/lang/php5/Attic/Makefile.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- pkgsrc/lang/php5/Attic/Makefile.php	2005/04/08 20:58:49	1.5
+++ pkgsrc/lang/php5/Attic/Makefile.php	2005/05/31 10:01:37	1.6
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.5 2005/04/08 20:58:49 jdolecek Exp $
+# $NetBSD: Makefile.php,v 1.6 2005/05/31 10:01:37 dillo Exp $
 #
 
 .include "../../lang/php5/Makefile.common"
@@ -32,25 +32,21 @@ CONFIGURE_ARGS+=	--enable-track-vars
 CONFIGURE_ARGS+=	--disable-posix
 CONFIGURE_ARGS+=	--disable-dom
 
-.if defined(USE_INET6) && ${USE_INET6} == "NO"
-CONFIGURE_ARGS+=	--disable-ipv6
-.else
-CONFIGURE_ARGS+=	--enable-ipv6
-.endif
-
 CONFIGURE_ARGS+=	--enable-xml
 CONFIGURE_ARGS+=	--with-libxml-dir=${PREFIX}
 .include "../../textproc/libxml2/buildlink3.mk"
 
-# Global and legacy options
-.if defined(USE_SSL) && !empty(USE_SSL:M[Yy][Ee][Ss])
-PKG_DEFAULT_OPTIONS+=	ssl
-.endif
-
 PKG_OPTIONS_VAR=		PKG_OPTIONS.${PKGNAME:C/-[^-]*$//}
 PKG_SUPPORTED_OPTIONS+=	ssl
+
 .include "../../mk/bsd.options.mk"
 
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+=	--enable-ipv6
+.else
+CONFIGURE_ARGS+=	--disable-ipv6
+.endif
+
 .if !empty(PKG_OPTIONS:Mssl)
 .  include "../../security/openssl/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-openssl