From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 24 Aug 2019 09:33:45 +0000 (+0200)
Subject: perl-NetAddr-IP: move to core
X-Git-Tag: v2.23-core136~7^2~53
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=329f4a3fe15226cd4932cdb5452411ae12c00f18;p=ipfire-2.x.git

perl-NetAddr-IP: move to core

I had added this for spamassassin but now the geoip-converter needs it too.
It was not pushed yet so there is no need to remove it from pakfire databases.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/config/rootfiles/packages/perl-NetAddr-IP b/config/rootfiles/common/perl-NetAddr-IP
similarity index 100%
rename from config/rootfiles/packages/perl-NetAddr-IP
rename to config/rootfiles/common/perl-NetAddr-IP
diff --git a/lfs/perl-NetAddr-IP b/lfs/perl-NetAddr-IP
index 04e977c580..06763d524e 100644
--- a/lfs/perl-NetAddr-IP
+++ b/lfs/perl-NetAddr-IP
@@ -33,8 +33,6 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
 PROG       = perl-NetAddr-IP
-DEPS       = ""
-PAK_VER    = 1
 
 ###############################################################################
 # Top-level Rules
@@ -54,9 +52,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
-dist:
-	@$(PAK)
-
 ###############################################################################
 # Downloading, checking, md5sum
 ###############################################################################
diff --git a/lfs/spamassassin b/lfs/spamassassin
index 5055b1e41a..08f4f0c5e2 100644
--- a/lfs/spamassassin
+++ b/lfs/spamassassin
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = spamassassin
 PAK_VER    = 3
 
-DEPS       = "perl-NetAddr-IP"
+DEPS       = ""
 
 ###############################################################################
 # Top-level Rules