Revision: 11966
http://gar.svn.sourceforge.net/gar/?rev=11966&view=rev
Author: dmichelsen
Date: 2010-12-16 10:44:42 +0000 (Thu, 16 Dec 2010)
Log Message:
-----------
mGAR v2: Add META.yml for cpan packages as cswpm-meta.yml to package
Modified Paths:
--------------
csw/mgar/gar/v2/categories/cpan/category.mk
csw/mgar/gar/v2/gar.pkg.mk
Modified: csw/mgar/gar/v2/categories/cpan/category.mk
===================================================================
--- csw/mgar/gar/v2/categories/cpan/category.mk 2010-12-16 10:33:49 UTC (rev
11965)
+++ csw/mgar/gar/v2/categories/cpan/category.mk 2010-12-16 10:44:42 UTC (rev
11966)
@@ -48,6 +48,9 @@
# upstream chose uppercase or not as case must match.
_CATEGORY_CHECKPKG_OVERRIDES += pkginfo-description-not-starting-with-uppercase
+# Copy in META.yml if it exists so checkpkg can check Perl dependencies
+_CATEGORY_FILTER = | ( cat; if test -f "$(WORKDIR_GLOBAL)/META.yml";then echo
"i cswpm-meta.yml=META.yml"; fi)
+
include gar/gar.mk
CONFIGURE_ENV += PERL5LIB=$(PERL5LIB)
@@ -89,6 +92,9 @@
( cd $* ; $(INSTALL_ENV) ./Build install $(PERLBUILD_INSTALL_ARGS) )
@$(MAKECOOKIE)
+pre-package:
+ test -f $(WORKSRC_FIRSTMOD)/META.yml && cp $(WORKSRC_FIRSTMOD)/META.yml
$(WORKDIR_GLOBAL)
+
# Check for a CPAN module version update
update-check:
@echo " ==> Update Check: $(NAME) $(VERSION)"
Modified: csw/mgar/gar/v2/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2/gar.pkg.mk 2010-12-16 10:33:49 UTC (rev 11965)
+++ csw/mgar/gar/v2/gar.pkg.mk 2010-12-16 10:44:42 UTC (rev 11966)
@@ -432,9 +432,9 @@
) \
<$(PROTOTYPE); \
if [ -n "$(EXTRA_PKGFILES_$*)" ]; then echo "$(EXTRA_PKGFILES_$*)";
fi \
- ) $(call checkpkg_override_filter,$*) $(_CSWCLASS_FILTER)
$(_PROTOTYPE_MODIFIERS) $(_PROTOTYPE_FILTER_$*) >$@; \
+ ) $(call checkpkg_override_filter,$*) $(_CSWCLASS_FILTER)
$(_CATEGORY_FILTER) $(_PROTOTYPE_MODIFIERS) $(_PROTOTYPE_FILTER_$*) >$@; \
else \
- cat $(PROTOTYPE) $(call checkpkg_override_filter,$*)
$(_CSWCLASS_FILTER) $(_PROTOTYPE_MODIFIERS) $(_PROTOTYPE_FILTER_$*) >$@; \
+ cat $(PROTOTYPE) $(call checkpkg_override_filter,$*)
$(_CSWCLASS_FILTER) $(_CATEGORY_FILTER) $(_PROTOTYPE_MODIFIERS)
$(_PROTOTYPE_FILTER_$*) >$@; \
fi
$(if $(ALLOW_RELOCATE),$(call dontrelocate,opt,$(PROTOTYPE)))
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
