substitute TOPDIR in new perl modules

9 files changed, 31 insertions, 64 deletions

diff --git a/package/logitechmediaserver/Makefile b/package/logitechmediaserver/Makefile
index 1cf0b3ee4..abfe1eb3c 100644
--- a/package/logitechmediaserver/Makefile
+++ b/package/logitechmediaserver/Makefile
@@ -1,7 +1,7 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-include $(TOPDIR)/rules.mk
+include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		logitechmediaserver
 PKG_VERSION:=		7.8.0
@@ -19,7 +19,7 @@ PKG_SITES:=		http://downloads.slimdevices.com/LogitechMediaServer_v7.8.0/
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}-noCPAN.tgz
 WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}-noCPAN
 
-include $(TOPDIR)/mk/package.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LOGITECHMEDIASERVER,logitechmediaserver,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
@@ -31,4 +31,4 @@ logitechmediaserver-install:
 	$(INSTALL_DIR) $(IDIR_LOGITECHMEDIASERVER)/opt/lms
 	$(CP) $(WRKSRC)/* $(IDIR_LOGITECHMEDIASERVER)/opt/lms
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/p5-dbi/Makefile b/package/p5-dbi/Makefile
index 92775a238..6380059dd 100644
--- a/package/p5-dbi/Makefile
+++ b/package/p5-dbi/Makefile
@@ -1,7 +1,7 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-include $(TOPDIR)/rules.mk
+include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		p5-dbi
 PKG_VERSION:=		1.631
@@ -16,11 +16,11 @@ PKG_SITES:=		http://cpan.metacpan.org/authors/id/T/TI/TIMB/
 DISTFILES:=             DBI-${PKG_VERSION}.tar.gz
 WRKDIST=		${WRKDIR}/DBI-${PKG_VERSION}
 
-include $(TOPDIR)/mk/package.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,P5_DBI,p5-dbi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-include $(TOPDIR)/mk/perl.mk
+include $(ADK_TOPDIR)/mk/perl.mk
 
 CONFIG_STYLE:=		perl
 XAKE_FLAGS+=		$(PERL_ENV)
@@ -30,4 +30,4 @@ p5-dbi-install:
 	$(CP) $(WRKINST)$(PERL_SITEDIR)/* \
 		$(IDIR_P5_DBI)$(PERL_SITEDIR)
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/p5-disgest-sha1/Makefile b/package/p5-disgest-sha1/Makefile
deleted file mode 100644
index dd8e253c3..000000000
--- a/package/p5-disgest-sha1/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=		p5-digest-sha1
-PKG_VERSION:=		2.13
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		bd22388f268434f2b24f64e28bf1aa35
-PKG_DESCR:=		interface to the sha-1 algorithm
-PKG_SECTION:=		dev/perl
-PKG_DEPENDS:=		perl
-PKG_BUILDDEP:=		perl
-PKG_SITES:=		http://cpan.metacpan.org/authors/id/G/GA/GAAS/
-
-DISTFILES:=             Digest-SHA1-${PKG_VERSION}.tar.gz
-WRKDIST=		${WRKDIR}/Digest-SHA1-${PKG_VERSION}
-
-include $(TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,P5_DIGEST_SHA1,p5-digest-sha1,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-include $(TOPDIR)/mk/perl.mk
-
-CONFIG_STYLE:=		perl
-XAKE_FLAGS+=		$(PERL_ENV)
-
-p5-digest-sha1-install:
-	$(INSTALL_DIR) $(IDIR_P5_DIGEST_SHA1)$(PERL_SITEDIR)
-	$(CP) $(WRKINST)$(PERL_SITEDIR)/* \
-		$(IDIR_P5_DIGEST_SHA1)$(PERL_SITEDIR)
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/p5-ev/Makefile b/package/p5-ev/Makefile
index f04578ddd..68a1a101e 100644
--- a/package/p5-ev/Makefile
+++ b/package/p5-ev/Makefile
@@ -1,7 +1,7 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-include $(TOPDIR)/rules.mk
+include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		p5-ev
 PKG_VERSION:=		4.17
@@ -16,11 +16,11 @@ PKG_SITES:=		http://cpan.metacpan.org/authors/id/M/ML/MLEHMANN/
 DISTFILES:=             EV-${PKG_VERSION}.tar.gz
 WRKDIST=		${WRKDIR}/EV-${PKG_VERSION}
 
-include $(TOPDIR)/mk/package.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,P5_EV,p5-ev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-include $(TOPDIR)/mk/perl.mk
+include $(ADK_TOPDIR)/mk/perl.mk
 
 CONFIG_STYLE:=		perl
 XAKE_FLAGS+=		$(PERL_ENV)
@@ -30,4 +30,4 @@ p5-ev-install:
 	$(CP) $(WRKINST)$(PERL_SITEDIR)/* \
 		$(IDIR_P5_EV)$(PERL_SITEDIR)
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/p5-html-parser/Makefile b/package/p5-html-parser/Makefile
index 964a36f7a..817f9e538 100644
--- a/package/p5-html-parser/Makefile
+++ b/package/p5-html-parser/Makefile
@@ -1,7 +1,7 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-include $(TOPDIR)/rules.mk
+include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		p5-html-parser
 PKG_VERSION:=		3.71
@@ -16,11 +16,11 @@ PKG_SITES:=		http://cpan.metacpan.org/authors/id/G/GA/GAAS/
 DISTFILES:=             HTML-Parser-${PKG_VERSION}.tar.gz
 WRKDIST=		${WRKDIR}/HTML-Parser-${PKG_VERSION}
 
-include $(TOPDIR)/mk/package.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,P5_HTML_PARSER,p5-html-parser,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-include $(TOPDIR)/mk/perl.mk
+include $(ADK_TOPDIR)/mk/perl.mk
 
 CONFIG_STYLE:=		perl
 XAKE_FLAGS+=		$(PERL_ENV)
@@ -30,4 +30,4 @@ p5-html-parser-install:
 	$(CP) $(WRKINST)$(PERL_SITEDIR)/* \
 		$(IDIR_P5_HTML_PARSER)$(PERL_SITEDIR)
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/p5-json-xs/Makefile b/package/p5-json-xs/Makefile
index f1bb7318c..dd691c054 100644
--- a/package/p5-json-xs/Makefile
+++ b/package/p5-json-xs/Makefile
@@ -1,7 +1,7 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-include $(TOPDIR)/rules.mk
+include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		p5-json-xs
 PKG_VERSION:=		3.01
@@ -16,11 +16,11 @@ PKG_SITES:=		http://cpan.metacpan.org/authors/id/M/ML/MLEHMANN/
 DISTFILES:=             JSON-XS-${PKG_VERSION}.tar.gz
 WRKDIST=		${WRKDIR}/JSON-XS-${PKG_VERSION}
 
-include $(TOPDIR)/mk/package.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,P5_JSON_XS,p5-json-xs,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-include $(TOPDIR)/mk/perl.mk
+include $(ADK_TOPDIR)/mk/perl.mk
 
 CONFIG_STYLE:=		perl
 XAKE_FLAGS+=		$(PERL_ENV)
@@ -30,4 +30,4 @@ p5-json-xs-install:
 	$(CP) $(WRKINST)$(PERL_SITEDIR)/* \
 		$(IDIR_P5_JSON_XS)$(PERL_SITEDIR)
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/p5-sub-name/Makefile b/package/p5-sub-name/Makefile
index 9cf4f1efd..94dc5fcac 100644
--- a/package/p5-sub-name/Makefile
+++ b/package/p5-sub-name/Makefile
@@ -1,7 +1,7 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-include $(TOPDIR)/rules.mk
+include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		p5-sub-name
 PKG_VERSION:=		0.05
@@ -16,11 +16,11 @@ PKG_SITES:=		http://cpan.metacpan.org/authors/id/F/FL/FLORA/
 DISTFILES:=             Sub-Name-${PKG_VERSION}.tar.gz
 WRKDIST=		${WRKDIR}/Sub-Name-${PKG_VERSION}
 
-include $(TOPDIR)/mk/package.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,P5_SUB_NAME,p5-sub-name,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-include $(TOPDIR)/mk/perl.mk
+include $(ADK_TOPDIR)/mk/perl.mk
 
 CONFIG_STYLE:=		perl
 XAKE_FLAGS+=		$(PERL_ENV)
@@ -30,4 +30,4 @@ p5-sub-name-install:
 	$(CP) $(WRKINST)$(PERL_SITEDIR)/* \
 		$(IDIR_P5_SUB_NAME)$(PERL_SITEDIR)
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/p5-xml-parser-expat/Makefile b/package/p5-xml-parser-expat/Makefile
index f2a11bbb1..f49236326 100644
--- a/package/p5-xml-parser-expat/Makefile
+++ b/package/p5-xml-parser-expat/Makefile
@@ -1,7 +1,7 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-include $(TOPDIR)/rules.mk
+include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		p5-xml-parser-expat
 PKG_VERSION:=		2.41
@@ -16,11 +16,11 @@ PKG_SITES:=		http://cpan.metacpan.org/authors/id/T/TO/TODDR/
 DISTFILES:=             XML-Parser-${PKG_VERSION}.tar.gz
 WRKDIST=		${WRKDIR}/XML-Parser-${PKG_VERSION}
 
-include $(TOPDIR)/mk/package.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,P5_XML_PARSER_EXPAT,p5-xml-parser-expat,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-include $(TOPDIR)/mk/perl.mk
+include $(ADK_TOPDIR)/mk/perl.mk
 
 PERL_ENV+=		EXPATLIBPATH=${STAGING_TARGET_DIR}/usr/lib \
 			EXPATINCPATH=${STAGING_TARGET_DIR}/usr/include
@@ -32,4 +32,4 @@ p5-xml-parser-expat-install:
 	$(CP) $(WRKINST)$(PERL_SITEDIR)/* \
 		$(IDIR_P5_XML_PARSER_EXPAT)$(PERL_SITEDIR)
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/p5-yaml-xs/Makefile b/package/p5-yaml-xs/Makefile
index 20b4d17f9..8b7b08a61 100644
--- a/package/p5-yaml-xs/Makefile
+++ b/package/p5-yaml-xs/Makefile
@@ -1,7 +1,7 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-include $(TOPDIR)/rules.mk
+include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		p5-yaml-xs
 PKG_VERSION:=		0.41
@@ -16,11 +16,11 @@ PKG_SITES:=		http://cpan.metacpan.org/authors/id/I/IN/INGY/
 DISTFILES:=             YAML-LibYAML-${PKG_VERSION}.tar.gz
 WRKDIST=		${WRKDIR}/YAML-LibYAML-${PKG_VERSION}
 
-include $(TOPDIR)/mk/package.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,P5_YAML_XS,p5-yaml-xs,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-include $(TOPDIR)/mk/perl.mk
+include $(ADK_TOPDIR)/mk/perl.mk
 
 CONFIG_STYLE:=		perl
 XAKE_FLAGS+=		$(PERL_ENV)
@@ -30,4 +30,4 @@ p5-yaml-xs-install:
 	$(CP) $(WRKINST)$(PERL_SITEDIR)/* \
 		$(IDIR_P5_YAML_XS)$(PERL_SITEDIR)
 
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk