[Midnightbsd-cvs] CVS Commit: bsd.mport.mk: Added a start for the describe-yaml target,

[ctriv at midnightbsd.org]

Log Message:
-----------
Added a start for the describe-yaml target, which is not used be anything at
the moment.

Ldconfig files were being installed for standard library locations in some
situations.  Fixed.

Modified Files:
--------------
    mports/Mk:
        bsd.mport.mk (r1.51 -> r1.52)

-------------- next part --------------
Index: bsd.mport.mk
===================================================================
RCS file: /home/cvs/mports/Mk/bsd.mport.mk,v
retrieving revision 1.51
retrieving revision 1.52
diff -LMk/bsd.mport.mk -LMk/bsd.mport.mk -u -r1.51 -r1.52
--- Mk/bsd.mport.mk
+++ Mk/bsd.mport.mk
@@ -5044,6 +5044,33 @@
 		print qq{\n};'
 .endif
 
+
+#
+# describe-yaml
+#
+# Prints the port's description in YAML markup.  YAML is very human readable, and 
+# there are libraries in many languages for conversion to native data structures.
+#
+# This target requires perl.
+.if !target(describe-yaml)
+describe-yaml:
+	@perl -MYAML -e ' \
+		my %port = ( \
+			name       => q(${UNIQUENAME}), \
+			origin     => q(${PKGORIGIN}), \
+			version    => q(${PKGVERSION}), \
+			desciption => q(${COMMENT}), \
+		); \
+		$$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}})   ]; \
+		$$port{build_depends}   = [ map((split /:/)[1], qw{${BUILD_DEPENDS}})   ]; \
+		$$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); '
+.endif
+
 www-site:
 .if exists(${DESCR})
 	@${AWK} '$$1 ~ /^WWW:/ {print $$2}' ${DESCR} | ${HEAD} -1
@@ -5307,7 +5334,7 @@
 .if !target(install-ldconfig-file)
 install-ldconfig-file:
 .	if defined(USE_LDCONFIG) 
-.		if ${USE_LDCONFIG} != ${PREFIX}/lib 
+.		if (${USE_LDCONFIG} != ${PREFIX}/lib && ${USE_LDCONFIG} != %D/lib)
 			@${ECHO_MSG} "===>   Installing ldconfig configuration file."
 			@${ECHO_CMD} ${USE_LDCONFIG:S/%D/${PREFIX}/g} | ${TR} ' ' '\n' \
 				> ${FAKE_DESTDIR}${PREFIX}/${LDCONFIG_DIR}/${UNIQUENAME}