Implement ports/70073.

PR:	ports/70073

2 files changed, 59 insertions, 59 deletions

diff --git a/net/mpd/Makefile b/net/mpd/Makefile
index fc67fb62c9df..fd4abf828fda 100644
--- a/net/mpd/Makefile
+++ b/net/mpd/Makefile
@@ -23,10 +23,10 @@ MANCOMPRESSED=	maybe
 USE_OPENSSL	=yes
 .if defined(WITH_OPENSSL_PORT)
 USE_OPENSSL_PORT=yes
-MAKE_ENV=	COPTS=-I${OPENSSLINC} LDADD=-L${OPENSSLLIB} MPD_CONF_DIR="${PREFIX}/etc/mpd"
+MAKE_ENV=	COPTS+=-I${OPENSSLINC} LDADD+=-L${OPENSSLLIB} MPD_CONF_DIR="${PREFIX}/etc/mpd"
 .else
 USE_OPENSSL_BASE=yes
-MAKE_ENV=	COPTS=-I${OPENSSLINC} MPD_CONF_DIR="${PREFIX}/etc/mpd"
+MAKE_ENV=	COPTS+=-I${OPENSSLINC} MPD_CONF_DIR="${PREFIX}/etc/mpd"
 .endif
 
 pre-build:
diff --git a/net/mpd/pkg-plist b/net/mpd/pkg-plist
index 9dfc7a67b6e2..2ab6bb4c9223 100644
--- a/net/mpd/pkg-plist
+++ b/net/mpd/pkg-plist
@@ -4,61 +4,61 @@ etc/mpd/mpd.secret.sample
 etc/mpd/mpd.script.sample
 etc/rc.d/mpd.sh.sample
 sbin/mpd
-share/doc/mpd/README
-share/doc/mpd/mpd.ps
-share/doc/mpd/mpd.html
-share/doc/mpd/mpd1.html
-share/doc/mpd/mpd10.html
-share/doc/mpd/mpd11.html
-share/doc/mpd/mpd12.html
-share/doc/mpd/mpd13.html
-share/doc/mpd/mpd14.html
-share/doc/mpd/mpd15.html
-share/doc/mpd/mpd16.html
-share/doc/mpd/mpd17.html
-share/doc/mpd/mpd18.html
-share/doc/mpd/mpd19.html
-share/doc/mpd/mpd2.html
-share/doc/mpd/mpd20.html
-share/doc/mpd/mpd21.html
-share/doc/mpd/mpd22.html
-share/doc/mpd/mpd23.html
-share/doc/mpd/mpd24.html
-share/doc/mpd/mpd25.html
-share/doc/mpd/mpd26.html
-share/doc/mpd/mpd27.html
-share/doc/mpd/mpd28.html
-share/doc/mpd/mpd29.html
-share/doc/mpd/mpd3.html
-share/doc/mpd/mpd30.html
-share/doc/mpd/mpd31.html
-share/doc/mpd/mpd32.html
-share/doc/mpd/mpd33.html
-share/doc/mpd/mpd34.html
-share/doc/mpd/mpd35.html
-share/doc/mpd/mpd36.html
-share/doc/mpd/mpd37.html
-share/doc/mpd/mpd38.html
-share/doc/mpd/mpd39.html
-share/doc/mpd/mpd4.html
-share/doc/mpd/mpd40.html
-share/doc/mpd/mpd41.html
-share/doc/mpd/mpd42.html
-share/doc/mpd/mpd43.html
-share/doc/mpd/mpd44.html
-share/doc/mpd/mpd45.html
-share/doc/mpd/mpd46.html
-share/doc/mpd/mpd47.html
-share/doc/mpd/mpd48.html
-share/doc/mpd/mpd49.html
-share/doc/mpd/mpd5.html
-share/doc/mpd/mpd50.html
-share/doc/mpd/mpd51.html
-share/doc/mpd/mpd52.html
-share/doc/mpd/mpd6.html
-share/doc/mpd/mpd7.html
-share/doc/mpd/mpd8.html
-share/doc/mpd/mpd9.html
-share/doc/mpd/mpd_toc.html
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/mpd.ps
+%%PORTDOCS%%%%DOCSDIR%%/mpd.html
+%%PORTDOCS%%%%DOCSDIR%%/mpd1.html
+%%PORTDOCS%%%%DOCSDIR%%/mpd10.html
+%%PORTDOCS%%%%DOCSDIR%%/mpd11.html
+%%PORTDOCS%%%%DOCSDIR%%/mpd12.html
+%%PORTDOCS%%%%DOCSDIR%%/mpd13.html
+%%PORTDOCS%%%%DOCSDIR%%/mpd14.html
+%%PORTDOCS%%%%DOCSDIR%%/mpd15.html
+%%PORTDOCS%%%%DOCSDIR%%/mpd16.html
+%%PORTDOCS%%%%DOCSDIR%%/mpd17.html
+%%PORTDOCS%%%%DOCSDIR%%/mpd18.html
+%%PORTDOCS%%%%DOCSDIR%%/mpd19.html
+%%PORTDOCS%%%%DOCSDIR%%/mpd2.html
+%%PORTDOCS%%%%DOCSDIR%%/mpd20.html
+%%PORTDOCS%%%%DOCSDIR%%/mpd21.html
+%%PORTDOCS%%%%DOCSDIR%%/mpd22.html
+%%PORTDOCS%%%%DOCSDIR%%/mpd23.html
+%%PORTDOCS%%%%DOCSDIR%%/mpd24.html
+%%PORTDOCS%%%%DOCSDIR%%/mpd25.html
+%%PORTDOCS%%%%DOCSDIR%%/mpd26.html
+%%PORTDOCS%%%%DOCSDIR%%/mpd27.html
+%%PORTDOCS%%%%DOCSDIR%%/mpd28.html
+%%PORTDOCS%%%%DOCSDIR%%/mpd29.html
+%%PORTDOCS%%%%DOCSDIR%%/mpd3.html
+%%PORTDOCS%%%%DOCSDIR%%/mpd30.html
+%%PORTDOCS%%%%DOCSDIR%%/mpd31.html
+%%PORTDOCS%%%%DOCSDIR%%/mpd32.html
+%%PORTDOCS%%%%DOCSDIR%%/mpd33.html
+%%PORTDOCS%%%%DOCSDIR%%/mpd34.html
+%%PORTDOCS%%%%DOCSDIR%%/mpd35.html
+%%PORTDOCS%%%%DOCSDIR%%/mpd36.html
+%%PORTDOCS%%%%DOCSDIR%%/mpd37.html
+%%PORTDOCS%%%%DOCSDIR%%/mpd38.html
+%%PORTDOCS%%%%DOCSDIR%%/mpd39.html
+%%PORTDOCS%%%%DOCSDIR%%/mpd4.html
+%%PORTDOCS%%%%DOCSDIR%%/mpd40.html
+%%PORTDOCS%%%%DOCSDIR%%/mpd41.html
+%%PORTDOCS%%%%DOCSDIR%%/mpd42.html
+%%PORTDOCS%%%%DOCSDIR%%/mpd43.html
+%%PORTDOCS%%%%DOCSDIR%%/mpd44.html
+%%PORTDOCS%%%%DOCSDIR%%/mpd45.html
+%%PORTDOCS%%%%DOCSDIR%%/mpd46.html
+%%PORTDOCS%%%%DOCSDIR%%/mpd47.html
+%%PORTDOCS%%%%DOCSDIR%%/mpd48.html
+%%PORTDOCS%%%%DOCSDIR%%/mpd49.html
+%%PORTDOCS%%%%DOCSDIR%%/mpd5.html
+%%PORTDOCS%%%%DOCSDIR%%/mpd50.html
+%%PORTDOCS%%%%DOCSDIR%%/mpd51.html
+%%PORTDOCS%%%%DOCSDIR%%/mpd52.html
+%%PORTDOCS%%%%DOCSDIR%%/mpd6.html
+%%PORTDOCS%%%%DOCSDIR%%/mpd7.html
+%%PORTDOCS%%%%DOCSDIR%%/mpd8.html
+%%PORTDOCS%%%%DOCSDIR%%/mpd9.html
+%%PORTDOCS%%%%DOCSDIR%%/mpd_toc.html
+@dirrm %%PORTDOCS%%%%DOCSDIR%%
 @dirrm etc/mpd
-@dirrm share/doc/mpd