[Midnightbsd-cvs] CVS Commit: bsd.mport.mk: Fix CD mount points to work with Distfiles

[ctriv at midnightbsd.org]

Log Message:
-----------
Fix CD mount points to work with Distfiles not distfiles.
Cleaned up describe-yaml some.

Modified Files:
--------------
    mports/Mk:
        bsd.mport.mk (r1.55 -> r1.56)

-------------- next part --------------
Index: bsd.mport.mk
===================================================================
RCS file: /home/cvs/mports/Mk/bsd.mport.mk,v
retrieving revision 1.55
retrieving revision 1.56
diff -LMk/bsd.mport.mk -LMk/bsd.mport.mk -u -r1.55 -r1.56
--- Mk/bsd.mport.mk
+++ Mk/bsd.mport.mk
@@ -2431,8 +2431,8 @@
 # Search CDROM first if mounted, symlink instead of copy if
 # FETCH_SYMLINK_DISTFILES is set
 .for MOUNTPT in ${CD_MOUNTPTS}
-.if exists(${MOUNTPT}/mports/distfiles)
-_MASTER_SITE_OVERRIDE:=	file:${MOUNTPT}/mports/distfiles/${DIST_SUBDIR}/ ${_MASTER_SITE_OVERRIDE}
+.if exists(${MOUNTPT}/mports/Distfiles)
+_MASTER_SITE_OVERRIDE:=	file:${MOUNTPT}/mports/Distfiles/${DIST_SUBDIR}/ ${_MASTER_SITE_OVERRIDE}
 .if defined(FETCH_SYMLINK_DISTFILES)
 FETCH_BEFORE_ARGS+=	-l
 .endif
@@ -5060,11 +5060,12 @@
 describe-yaml:
 	@perl -MYAML -e ' \
 		my %port = ( \
-			name       => q(${UNIQUENAME}), \
+			name       => q(${PKGNAME}), \
 			origin     => q(${PKGORIGIN}), \
 			version    => q(${PKGVERSION}), \
-			desciption => q(${COMMENT}), \
+			description => qq(${COMMENT:S/'/\x27/g}), \
 		); \
+		$$port{name} =~ s/^(.*)-.*/$$1/; \
 		$$port{extract_depends} = [ map((split /:/)[1], qw{${EXTRACT_DEPENDS}}) ]; \
 		$$port{patch_depends}   = [ map((split /:/)[1], qw{${PATCH_DEPENDS}})   ]; \
 		$$port{fetch_depends}   = [ map((split /:/)[1], qw{${FETCH_DEPENDS}})   ]; \
@@ -5072,7 +5073,7 @@
 		$$port{run_depends}     = [ map((split /:/)[1], qw{${RUN_DEPENDS}})     ]; \
 		$$port{depends}         = [ map((split /:/)[0], qw{${DEPENDS}})         ]; \
 		$$port{lib_depends}     = [ map((split /:/)[1], qw{${LIB_DEPENDS}})     ]; \
-		print Dump(\%port); '
+		print Dump(\%port);  '
 .endif
 
 www-site: