- add stage support

Approved by:	lev@ (explicit)

2 files changed, 120 insertions, 100 deletions

diff --git a/www/neon29/Makefile b/www/neon29/Makefile
index ec3029e9f883..4b83b45b4e54 100644
--- a/www/neon29/Makefile
+++ b/www/neon29/Makefile
@@ -11,15 +11,16 @@ DISTNAME=	neon-${PORTVERSION}
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	An HTTP and WebDAV client library for Unix systems
 
-CONFLICTS=	neon2[6|8]-[0-9]*
+CONFLICTS=	neon2[^9]-[0-9]*
 
-OPTIONS_DEFINE=	OPENSSL NLS GSSAPI PROXY DOCS
+OPTIONS_DEFINE=		OPENSSL NLS GSSAPI PROXY DOCS
 OPTIONS_DEFAULT=	EXPAT OPENSSL NLS GSSAPI
-OPTIONS_SINGLE=	XML
+OPTIONS_SINGLE=		XML
 OPTIONS_SINGLE_XML=	EXPAT LIBXML
-XML_DESC=	XML parser library
-LIBXML_DESC=	libxml2 XML parser support
-PROXY_DESC=	libproxy support
+
+XML_DESC=		XML parser library
+LIBXML_DESC=		libxml2 XML parser support
+PROXY_DESC=		libproxy support
 
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
@@ -30,7 +31,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared \
 		--with-libs=${LOCALBASE}:${PREFIX}
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MEXPAT}
@@ -67,87 +67,12 @@ LIB_DEPENDS+=	proxy.1:${PORTSDIR}/net/libproxy
 CONFIGURE_ARGS+=--without-libproxy
 .endif
 
-MAN1=	neon-config.1
-MAN3=	ne_add_request_header.3 ne_addr_resolve.3 ne_buffer.3 \
-	ne_buffer_append.3 ne_buffer_clear.3 ne_buffer_create.3 \
-	ne_buffer_destroy.3 ne_get_error.3 ne_get_response_header.3 \
-	ne_get_status.3 ne_i18n_init.3 ne_iaddr_make.3 ne_has_support.3 \
-	ne_malloc.3 ne_request_create.3 ne_session_create.3 \
-	ne_set_request_body_buffer.3 ne_set_request_flag.3 ne_set_session_flag.3 \
-	ne_set_server_auth.3 ne_set_useragent.3 ne_shave.3 ne_sock_init.3 \
-	ne_ssl_cert_cmp.3 ne_ssl_cert_identity.3 ne_ssl_cert_read.3 \
-	ne_ssl_clicert_read.3 ne_ssl_readable_dname.3 ne_ssl_set_verify.3 \
-	ne_ssl_trust_cert.3 ne_status.3 ne_token.3 ne_version_match.3 \
-	ne_xml_create.3 neon.3
-MLINKS=	ne_add_request_header.3 ne_print_request_header.3 \
-	ne_addr_resolve.3 ne_addr_destroy.3 \
-	ne_addr_resolve.3 ne_addr_error.3 \
-	ne_addr_resolve.3 ne_addr_first.3 \
-	ne_addr_resolve.3 ne_addr_next.3 \
-	ne_addr_resolve.3 ne_addr_result.3 \
-	ne_buffer_append.3 ne_buffer_concat.3 \
-	ne_buffer_append.3 ne_buffer_zappend.3 \
-	ne_buffer_clear.3 ne_buffer_altered.3 \
-	ne_buffer_clear.3 ne_buffer_grow.3 \
-	ne_buffer_create.3 ne_buffer_ncreate.3 \
-	ne_buffer_destroy.3 ne_buffer_finish.3 \
-	ne_get_error.3 ne_set_error.3 \
-	ne_get_response_header.3 ne_response_header_iterate.3 \
-	ne_iaddr_make.3 ne_iaddr_cmp.3 \
-	ne_iaddr_make.3 ne_iaddr_free.3 \
-	ne_iaddr_make.3 ne_iaddr_print.3 \
-	ne_iaddr_make.3 ne_iaddr_typeof.3 \
-	ne_iaddr_make.3 ne_iaddr_parse.3 \
-	ne_iaddr_make.3 ne_iaddr_raw.3 \
-	ne_iaddr_make.3 ne_iaddr_reverse.3 \
-	ne_malloc.3 ne_calloc.3 \
-	ne_malloc.3 ne_oom_callback.3 \
-	ne_malloc.3 ne_realloc.3 \
-	ne_malloc.3 ne_strdup.3 \
-	ne_malloc.3 ne_strndup.3 \
-	ne_request_create.3 ne_request_destroy.3 \
-	ne_request_create.3 ne_request_dispatch.3 \
-	ne_session_create.3 ne_close_connection.3 \
-	ne_session_create.3 ne_session_destroy.3 \
-	ne_session_create.3 ne_session_proxy.3 \
-	ne_set_request_body_buffer.3 ne_set_request_body_fd.3 \
-	ne_set_request_body_buffer.3 ne_set_request_body_fd64.3 \
-	ne_set_session_flag.3 ne_get_session_flag.3 \
-	ne_set_request_flag.3 ne_get_request_flag.3 \
-	ne_set_server_auth.3 ne_forget_auth.3 \
-	ne_set_server_auth.3 ne_set_proxy_auth.3 \
-	ne_set_useragent.3 ne_get_scheme.3 \
-	ne_set_useragent.3 ne_get_server_hostport.3 \
-	ne_set_useragent.3 ne_set_persist.3 \
-	ne_set_useragent.3 ne_set_read_timeout.3 \
-	ne_set_useragent.3 ne_set_connect_timeout.3 \
-	ne_sock_init.3 ne_sock_exit.3 \
-	ne_ssl_cert_cmp.3 ne_ssl_cert_free.3 \
-	ne_ssl_cert_identity.3 ne_ssl_cert_issuer.3 \
-	ne_ssl_cert_identity.3 ne_ssl_cert_signedby.3 \
-	ne_ssl_cert_identity.3 ne_ssl_cert_subject.3 \
-	ne_ssl_cert_read.3 ne_ssl_cert_export.3 \
-	ne_ssl_cert_read.3 ne_ssl_cert_import.3 \
-	ne_ssl_cert_read.3 ne_ssl_cert_write.3 \
-	ne_ssl_clicert_read.3 ne_ssl_clicert_decrypt.3 \
-	ne_ssl_clicert_read.3 ne_ssl_clicert_encrypted.3 \
-	ne_ssl_clicert_read.3 ne_ssl_clicert_free.3 \
-	ne_ssl_clicert_read.3 ne_ssl_clicert_name.3 \
-	ne_ssl_clicert_read.3 ne_ssl_clicert_owner.3 \
-	ne_ssl_readable_dname.3 ne_ssl_dname_cmp.3 \
-	ne_ssl_trust_cert.3 ne_ssl_trust_default_ca.3 \
-	ne_token.3 ne_qtoken.3 \
-	ne_version_match.3 ne_version_string.3 \
-	ne_xml_create.3 ne_xml_destroy.3
-
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 DOCSDIR=	${PREFIX}/share/doc/neon
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/doc/man/*.1 ${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/doc/man/*.3 ${MANPREFIX}/man/man3
-.if ${PORT_OPTIONS:MDOCS}
-	(cd ${WRKSRC} ; ${MAKE} install-html)
-.endif
+	${INSTALL_MAN} ${WRKSRC}/doc/man/*.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/man/*.3 ${STAGEDIR}${MANPREFIX}/man/man3
+	${MAKE} -C ${WRKSRC} install-html ${MAKE_ARGS}
 
 .include <bsd.port.mk>
diff --git a/www/neon29/pkg-plist b/www/neon29/pkg-plist
index 78e7c324db1e..569bdaab4cf2 100644
--- a/www/neon29/pkg-plist
+++ b/www/neon29/pkg-plist
@@ -11,6 +11,7 @@ include/neon/ne_defs.h
 include/neon/ne_i18n.h
 include/neon/ne_locks.h
 include/neon/ne_md5.h
+include/neon/ne_pkcs11.h
 include/neon/ne_props.h
 include/neon/ne_redirect.h
 include/neon/ne_request.h
@@ -22,21 +23,106 @@ include/neon/ne_uri.h
 include/neon/ne_utils.h
 include/neon/ne_xml.h
 include/neon/ne_xmlreq.h
-include/neon/ne_pkcs11.h
-lib/libneon.so.27
-lib/libneon.so
-lib/libneon.la
 lib/libneon.a
+lib/libneon.la
+lib/libneon.so
+lib/libneon.so.27
 libdata/pkgconfig/neon.pc
-%%NLS%%share/locale/cs/LC_MESSAGES/neon.mo
-%%NLS%%share/locale/de/LC_MESSAGES/neon.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/neon.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/neon.mo
-%%NLS%%share/locale/nn/LC_MESSAGES/neon.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/neon.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/neon.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/neon.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/neon.mo
+man/man1/neon-config.1.gz
+man/man3/ne_add_request_header.3.gz
+man/man3/ne_addr_destroy.3.gz
+man/man3/ne_addr_error.3.gz
+man/man3/ne_addr_first.3.gz
+man/man3/ne_addr_next.3.gz
+man/man3/ne_addr_resolve.3.gz
+man/man3/ne_addr_result.3.gz
+man/man3/ne_buffer.3.gz
+man/man3/ne_buffer_altered.3.gz
+man/man3/ne_buffer_append.3.gz
+man/man3/ne_buffer_clear.3.gz
+man/man3/ne_buffer_concat.3.gz
+man/man3/ne_buffer_create.3.gz
+man/man3/ne_buffer_destroy.3.gz
+man/man3/ne_buffer_finish.3.gz
+man/man3/ne_buffer_grow.3.gz
+man/man3/ne_buffer_ncreate.3.gz
+man/man3/ne_buffer_zappend.3.gz
+man/man3/ne_calloc.3.gz
+man/man3/ne_close_connection.3.gz
+man/man3/ne_forget_auth.3.gz
+man/man3/ne_get_error.3.gz
+man/man3/ne_get_request_flag.3.gz
+man/man3/ne_get_response_header.3.gz
+man/man3/ne_get_scheme.3.gz
+man/man3/ne_get_server_hostport.3.gz
+man/man3/ne_get_session_flag.3.gz
+man/man3/ne_get_status.3.gz
+man/man3/ne_has_support.3.gz
+man/man3/ne_i18n_init.3.gz
+man/man3/ne_iaddr_cmp.3.gz
+man/man3/ne_iaddr_free.3.gz
+man/man3/ne_iaddr_make.3.gz
+man/man3/ne_iaddr_parse.3.gz
+man/man3/ne_iaddr_print.3.gz
+man/man3/ne_iaddr_raw.3.gz
+man/man3/ne_iaddr_reverse.3.gz
+man/man3/ne_iaddr_typeof.3.gz
+man/man3/ne_malloc.3.gz
+man/man3/ne_oom_callback.3.gz
+man/man3/ne_print_request_header.3.gz
+man/man3/ne_qtoken.3.gz
+man/man3/ne_realloc.3.gz
+man/man3/ne_request_create.3.gz
+man/man3/ne_request_destroy.3.gz
+man/man3/ne_request_dispatch.3.gz
+man/man3/ne_response_header_iterate.3.gz
+man/man3/ne_session_create.3.gz
+man/man3/ne_session_destroy.3.gz
+man/man3/ne_session_proxy.3.gz
+man/man3/ne_set_connect_timeout.3.gz
+man/man3/ne_set_error.3.gz
+man/man3/ne_set_proxy_auth.3.gz
+man/man3/ne_set_read_timeout.3.gz
+man/man3/ne_set_request_body_buffer.3.gz
+man/man3/ne_set_request_body_fd.3.gz
+man/man3/ne_set_request_body_fd64.3.gz
+man/man3/ne_set_request_flag.3.gz
+man/man3/ne_set_server_auth.3.gz
+man/man3/ne_set_session_flag.3.gz
+man/man3/ne_set_useragent.3.gz
+man/man3/ne_shave.3.gz
+man/man3/ne_sock_exit.3.gz
+man/man3/ne_sock_init.3.gz
+man/man3/ne_ssl_cert_cmp.3.gz
+man/man3/ne_ssl_cert_export.3.gz
+man/man3/ne_ssl_cert_free.3.gz
+man/man3/ne_ssl_cert_identity.3.gz
+man/man3/ne_ssl_cert_import.3.gz
+man/man3/ne_ssl_cert_issuer.3.gz
+man/man3/ne_ssl_cert_read.3.gz
+man/man3/ne_ssl_cert_signedby.3.gz
+man/man3/ne_ssl_cert_subject.3.gz
+man/man3/ne_ssl_cert_write.3.gz
+man/man3/ne_ssl_clicert_decrypt.3.gz
+man/man3/ne_ssl_clicert_encrypted.3.gz
+man/man3/ne_ssl_clicert_free.3.gz
+man/man3/ne_ssl_clicert_name.3.gz
+man/man3/ne_ssl_clicert_owner.3.gz
+man/man3/ne_ssl_clicert_read.3.gz
+man/man3/ne_ssl_dname_cmp.3.gz
+man/man3/ne_ssl_readable_dname.3.gz
+man/man3/ne_ssl_set_verify.3.gz
+man/man3/ne_ssl_trust_cert.3.gz
+man/man3/ne_ssl_trust_default_ca.3.gz
+man/man3/ne_status.3.gz
+man/man3/ne_strdup.3.gz
+man/man3/ne_strndup.3.gz
+man/man3/ne_token.3.gz
+man/man3/ne_version_match.3.gz
+man/man3/ne_version_string.3.gz
+man/man3/ne_xml_create.3.gz
+man/man3/ne_xml_destroy.3.gz
+man/man3/neon.3.gz
 %%PORTDOCS%%%%DOCSDIR%%/html/api.html
 %%PORTDOCS%%%%DOCSDIR%%/html/biblio.html
 %%PORTDOCS%%%%DOCSDIR%%/html/compliance.html
@@ -63,12 +149,12 @@ libdata/pkgconfig/neon.pc
 %%PORTDOCS%%%%DOCSDIR%%/html/refopts.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refreq.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refreqbody.html
-%%PORTDOCS%%%%DOCSDIR%%/html/refreqhdr.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refreqflags.html
-%%PORTDOCS%%%%DOCSDIR%%/html/refsessflags.html
+%%PORTDOCS%%%%DOCSDIR%%/html/refreqhdr.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refresolve.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refresphdr.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refsess.html
+%%PORTDOCS%%%%DOCSDIR%%/html/refsessflags.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refshave.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refsockinit.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refsslca.html
@@ -83,6 +169,15 @@ libdata/pkgconfig/neon.pc
 %%PORTDOCS%%%%DOCSDIR%%/html/security.html
 %%PORTDOCS%%%%DOCSDIR%%/html/using.html
 %%PORTDOCS%%%%DOCSDIR%%/html/xml.html
+%%NLS%%share/locale/cs/LC_MESSAGES/neon.mo
+%%NLS%%share/locale/de/LC_MESSAGES/neon.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/neon.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/neon.mo
+%%NLS%%share/locale/nn/LC_MESSAGES/neon.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/neon.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/neon.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/neon.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/neon.mo
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/neon