ports/70073: [PATCH] net/mpd: fix default conf patch & correct pkg-plist

Fri Aug 6 11:40:26 UTC 2004

>Number:         70073
>Category:       ports
>Synopsis:       [PATCH] net/mpd: fix default conf patch & correct pkg-plist
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Aug 06 11:40:25 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Rong-En Fan
>Release:        FreeBSD 5.2.1-RELEASE-p9 i386
>Organization:
NTU CSIE
>Environment:
System: FreeBSD rafan.csie.org 5.2.1-RELEASE-p9 FreeBSD 5.2.1-RELEASE-p9 #2: Mon Jul 19 03:22:42 CST 2004
>Description:
After net/mpd adds WITH_OPENSSL_PORT knob, it 
doesn't correctly set $(COPTS), so MPD_CONF_DIR
is not correctly set.

I just saw 1.38 correct this, but i think
use COPTS+= is more wisely that directly set
MPD_CONF_DIR.

Besides this, this also correct pkg-plist to
use %%PORTDOCS%%

Port maintainer (archie at freebsd.org) is cc'd.

Generated with FreeBSD Port Tools 0.50
>How-To-Repeat:
>Fix:

--- mpd-3.18_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net/mpd/Makefile /home/rafan/tmp/ports/mpd/Makefile
--- /usr/ports/net/mpd/Makefile	Thu Aug  5 05:15:33 2004
+++ /home/rafan/tmp/ports/mpd/Makefile	Fri Aug  6 12:30:56 2004
@@ -2,7 +2,7 @@
 # Date created:				25 Feb 1999
 # Whom:					Archie Cobbs
 #
-# $FreeBSD: ports/net/mpd/Makefile,v 1.39 2004/08/04 21:15:33 archie Exp $
+# $FreeBSD: ports/net/mpd/Makefile,v 1.37 2004/08/03 01:41:52 archie Exp $
 #
 
 PORTNAME=	mpd
@@ -22,10 +22,10 @@
 
 .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}
 .else
 USE_OPENSSL_BASE=yes
-MAKE_ENV=	COPTS=-I${OPENSSLINC} MPD_CONF_DIR="${PREFIX}/etc/mpd"
+MAKE_ENV=	COPTS+=-I${OPENSSLINC}
 .endif
 
 pre-build:
diff -ruN --exclude=CVS /usr/ports/net/mpd/pkg-plist /home/rafan/tmp/ports/mpd/pkg-plist
--- /usr/ports/net/mpd/pkg-plist	Sun Nov 23 04:51:04 2003
+++ /home/rafan/tmp/ports/mpd/pkg-plist	Fri Aug  6 19:29:23 2004
@@ -4,61 +4,61 @@
 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
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm etc/mpd
- at dirrm share/doc/mpd
--- mpd-3.18_1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:

