2 files changed, 4 insertions, 214 deletions

diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
index 8ebdaab4dd9a..856fc239faf6 100644
--- a/ftp/curl/Makefile
+++ b/ftp/curl/Makefile
@@ -38,6 +38,9 @@ USE_PERL5=	build
 USE_XZ=		yes
 USES=		pathfix perl5
 
+PORTDOCS=	*
+PORTEXAMPLES=	*
+
 .if !defined(BUILDING_HIPHOP)
 USE_LDCONFIG=	yes
 
@@ -147,16 +150,12 @@ post-patch:
 post-install:
 .if !defined(BUILDING_HIPHOP)
 	${INSTALL_DATA} ${WRKSRC}/docs/libcurl/libcurl.m4 ${STAGEDIR}${PREFIX}/share/aclocal/
-.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/ ${STAGEDIR}${DOCSDIR}/libcurl/
 	cd ${WRKSRC}/docs/ && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}/
 	cd ${WRKSRC}/docs/libcurl/ && ${INSTALL_DATA} ABI *.html *.pdf *.m4 ${STAGEDIR}${DOCSDIR}/libcurl/
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
 	cd ${WRKSRC}/docs/examples/ && ${INSTALL_DATA} README Makefile.example makefile* *.c *.cpp ${STAGEDIR}${EXAMPLESDIR}/
 .endif
-.endif
 
 # Setting LC_ALL=C is a kludge; maybe curl/libcurl shouldn't actually use
 # the user's locale when dates are sent to the server.
diff --git a/ftp/curl/pkg-plist b/ftp/curl/pkg-plist
index ed7db000106c..d6267ef50fb8 100644
--- a/ftp/curl/pkg-plist
+++ b/ftp/curl/pkg-plist
@@ -10,7 +10,6 @@ include/curl/multi.h
 include/curl/stdcheaders.h
 include/curl/typecheck-gcc.h
 share/aclocal/libcurl.m4
-@dirrm include/curl
 lib/libcurl.a
 lib/libcurl.la
 lib/libcurl.so
@@ -72,212 +71,4 @@ man/man3/libcurl-multi.3.gz
 man/man3/libcurl-share.3.gz
 man/man3/libcurl-tutorial.3.gz
 man/man3/libcurl.3.gz
-%%PORTDOCS%%%%DOCSDIR%%/BINDINGS
-%%PORTDOCS%%%%DOCSDIR%%/BUGS
-%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTE
-%%PORTDOCS%%%%DOCSDIR%%/DISTRO-DILEMMA
-%%PORTDOCS%%%%DOCSDIR%%/FAQ
-%%PORTDOCS%%%%DOCSDIR%%/FEATURES
-%%PORTDOCS%%%%DOCSDIR%%/HISTORY
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL.devcpp
-%%PORTDOCS%%%%DOCSDIR%%/INTERNALS
-%%PORTDOCS%%%%DOCSDIR%%/KNOWN_BUGS
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE-MIXING
-%%PORTDOCS%%%%DOCSDIR%%/MANUAL
-%%PORTDOCS%%%%DOCSDIR%%/README.netware
-%%PORTDOCS%%%%DOCSDIR%%/README.win32
-%%PORTDOCS%%%%DOCSDIR%%/RESOURCES
-%%PORTDOCS%%%%DOCSDIR%%/SSLCERTS
-%%PORTDOCS%%%%DOCSDIR%%/THANKS
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/TheArtOfHttpScripting
-%%PORTDOCS%%%%DOCSDIR%%/VERSIONS
-%%PORTDOCS%%%%DOCSDIR%%/curl-config.html
-%%PORTDOCS%%%%DOCSDIR%%/curl-config.pdf
-%%PORTDOCS%%%%DOCSDIR%%/curl.html
-%%PORTDOCS%%%%DOCSDIR%%/curl.pdf
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/ABI
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_cleanup.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_cleanup.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_duphandle.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_duphandle.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_escape.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_escape.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_getinfo.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_getinfo.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_init.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_init.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_pause.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_pause.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_perform.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_perform.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_recv.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_recv.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_reset.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_reset.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_send.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_send.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_setopt.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_setopt.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_strerror.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_strerror.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_unescape.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_unescape.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_escape.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_escape.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formadd.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formadd.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formfree.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formfree.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formget.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_formget.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_free.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_free.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_getdate.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_getdate.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_getenv.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_getenv.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_cleanup.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_cleanup.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_init.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_init.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_init_mem.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_global_init_mem.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_mprintf.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_mprintf.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_add_handle.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_add_handle.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_assign.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_assign.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_cleanup.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_cleanup.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_fdset.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_fdset.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_info_read.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_info_read.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_init.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_init.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_perform.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_perform.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_remove_handle.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_remove_handle.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_setopt.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_setopt.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_socket.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_socket.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_socket_action.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_socket_action.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_strerror.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_strerror.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_timeout.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_timeout.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_wait.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_wait.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_cleanup.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_cleanup.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_init.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_init.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_setopt.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_setopt.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_strerror.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_strerror.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_slist_append.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_slist_append.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_slist_free_all.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_slist_free_all.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_strequal.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_strequal.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_unescape.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_unescape.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_version.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_version.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_version_info.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_version_info.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/index.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-easy.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-easy.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-errors.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-errors.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-multi.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-multi.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-share.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-share.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-tutorial.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-tutorial.pdf
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl.html
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl.m4
-%%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl.pdf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/libcurl
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/10-at-a-time.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile.example
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/anyauthput.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/asiohiper.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cacertinmem.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/certinfo.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/chkspeed.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cookie_interface.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/curlgtk.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/curlx.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/debug.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/evhiperfifo.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/externalsocket.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fileupload.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fopen.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftp-wildcard.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftpget.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftpgetinfo.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftpgetresp.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftpsget.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftpupload.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftpuploadresume.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/getinfo.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/getinmemory.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ghiper.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hiperfifo.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/href_extractor.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/htmltidy.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/htmltitle.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/http-post.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/httpcustomheader.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/httpput.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/https.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/imap.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/makefile.dj
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multi-app.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multi-debugcallback.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multi-double.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multi-post.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multi-single.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multi-uv.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multithread.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/opensslthreadlock.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/persistant.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pop3s.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pop3slist.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/post-callback.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/postinmemory.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/postit2.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/progressfunc.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/resolve.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rtsp.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sampleconv.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sepheaders.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sendrecv.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sftpget.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simple.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplepost.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplesmtp.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplessl.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/smooth-gtk-thread.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/smtp-multi.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/smtp-tls.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/synctime.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/threaded-ssl.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/url2file.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/usercertinmem.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xmlstream.c
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+@dirrm include/curl