[Midnightbsd-cvs] mports: bsd.mport.mk: Use the new shell version of chkfake.
ctriv at midnightbsd.org
ctriv at midnightbsd.org
Sun Sep 9 19:00:54 EDT 2007
Log Message:
-----------
Use the new shell version of chkfake.
Modified Files:
--------------
mports/Mk:
bsd.mport.mk (r1.60 -> r1.61)
-------------- next part --------------
Index: bsd.mport.mk
===================================================================
RCS file: /home/cvs/mports/Mk/bsd.mport.mk,v
retrieving revision 1.60
retrieving revision 1.61
diff -LMk/bsd.mport.mk -LMk/bsd.mport.mk -u -r1.60 -r1.61
--- Mk/bsd.mport.mk
+++ Mk/bsd.mport.mk
@@ -2192,7 +2192,6 @@
PORTDIRNAME?= ${_PORTDIRNAME}
PKGORIGIN?= ${PKGCATEGORY}/${PORTDIRNAME}
-
.if !defined(DESTDIR)
PKG_CMD?= /usr/sbin/pkg_create
PKG_ADD?= /usr/sbin/pkg_add
@@ -5112,13 +5111,14 @@
describe-yaml:
@perl -MYAML -e ' \
my %port = ( \
- name => q(${PKGNAME}), \
- origin => q(${PKGORIGIN}), \
+ pkgname => q(${PKGNAME}), \
+ name => q(${PKGORIGIN}), \
version => q(${PKGVERSION}), \
description => qq(${COMMENT:S/'/\x27/g}), \
license => q(${LICENSE}), \
+ categories => [qw(${CATEGORIES})], \
); \
- $$port{name} =~ s/^(.*)-.*/$$1/; \
+ $$port{pkgname} =~ s/^(.*)-.*/$$1/; \
$$port{license} ||= undef; \
my %depends; \
$$depends{extract} = [ map((split /:/)[1], qw{${EXTRACT_DEPENDS:S|${PORTSDIR}/||g}}) ]; \
@@ -5129,6 +5129,14 @@
$$depends{misc} = [ map((split /:/)[0], qw{${DEPENDS:S|${PORTSDIR}/||}}) ]; \
$$depends{lib} = [ map((split /:/)[1], qw{${LIB_DEPENDS:S|${PORTSDIR}/||}}) ]; \
$$port{depends} = \%depends; \
+ open(my $$desc, q(<), q(${DESCR})) || die qq(Could not open ${DESCR}: $$!\n); \
+ while (<$$desc>) { \
+ if (m/^WWW:\s+(\S+)/) { \
+ $$port{www} = $$1; \
+ last; \
+ } \
+ } \
+ $$port{www} ||= undef; \
print Dump(\%port); '
.endif
@@ -5517,7 +5525,7 @@
#
.if !target(check-fake)
check-fake:
- @${PORTSDIR}/Tools/scripts/chkfake.pl ${TMPPLIST} ${FAKE_DESTDIR} ${PREFIX}
+ @${PORTSDIR}/Tools/scripts/chkfake ${TMPPLIST} ${FAKE_DESTDIR} ${PREFIX}
.endif
More information about the Midnightbsd-cvs
mailing list