aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MOVED1
-rw-r--r--news/Makefile2
-rw-r--r--news/cleanfeed/Makefile6
-rw-r--r--news/inn-current/Makefile (renamed from news/inn-CURRENT/Makefile)4
-rw-r--r--news/inn-current/distinfo (renamed from news/inn-CURRENT/distinfo)0
-rw-r--r--news/inn-current/pkg-descr (renamed from news/inn-CURRENT/pkg-descr)0
-rw-r--r--news/inn/Makefile2
7 files changed, 7 insertions, 8 deletions
diff --git a/MOVED b/MOVED
index 80d7021cc8b4..fe7de0f8fc35 100644
--- a/MOVED
+++ b/MOVED
@@ -676,7 +676,6 @@ net-im/ocaml-jabbr||2009-06-13|Removed
net-mgmt/nav||2009-06-13|Removed
net/evolution-rss||2009-06-13|Removed
net/openpbx.org||2009-06-13|Removed
-news/inn-current||2009-06-13|Removed
science/elmerfront||2009-06-13|Removed
science/openfoam||2009-06-13|Removed
www/cacheboy||2009-06-13|Removed
diff --git a/news/Makefile b/news/Makefile
index 426ae13f536a..386f8d9c5c1b 100644
--- a/news/Makefile
+++ b/news/Makefile
@@ -21,7 +21,7 @@
SUBDIR += husky-sqpack
SUBDIR += ifmail
SUBDIR += inn
- SUBDIR += inn-CURRENT
+ SUBDIR += inn-current
SUBDIR += knews
SUBDIR += leafnode
SUBDIR += lusernet
diff --git a/news/cleanfeed/Makefile b/news/cleanfeed/Makefile
index 214a0583d635..57b0cd4a50c6 100644
--- a/news/cleanfeed/Makefile
+++ b/news/cleanfeed/Makefile
@@ -14,12 +14,12 @@ COMMENT= Spam filter for Usenet news servers
FLAVORS= inn inncurrent
FLAVOR?= ${FLAVORS:[1]}
-inn_CONFLICTS_INSTALL= cleanfeed-CURRENT
+inn_CONFLICTS_INSTALL= cleanfeed-current
inn_RUN_DEPENDS= ${LOCALBASE}/news/bin/innd:news/inn
-inncurrent_PKGNAMESUFFIX= -CURRENT
+inncurrent_PKGNAMESUFFIX= -current
inncurrent_CONFLICTS_INSTALL= cleanfeed
-inncurrent_RUN_DEPENDS= ${LOCALBASE}/news/bin/innd:news/inn-CURRENT
+inncurrent_RUN_DEPENDS= ${LOCALBASE}/news/bin/innd:news/inn-current
NO_ARCH= yes
NO_BUILD= yes
diff --git a/news/inn-CURRENT/Makefile b/news/inn-current/Makefile
index aed70c2ddbad..87148b7ae20d 100644
--- a/news/inn-CURRENT/Makefile
+++ b/news/inn-current/Makefile
@@ -1,9 +1,9 @@
# Created by: kbowling
-PORTNAME= inn-CURRENT
+PORTNAME= inn-current
PORTVERSION= ${SNAPSHOT}
MASTER_SITE_SUBDIR= inn/snapshots
-DISTNAME= ${PORTNAME}-${SNAPSHOT}
+DISTNAME= inn-${BRANCH}-${SNAPSHOT}
BRANCH= CURRENT
SNAPSHOT= 20210610
diff --git a/news/inn-CURRENT/distinfo b/news/inn-current/distinfo
index d06ed321fe4a..d06ed321fe4a 100644
--- a/news/inn-CURRENT/distinfo
+++ b/news/inn-current/distinfo
diff --git a/news/inn-CURRENT/pkg-descr b/news/inn-current/pkg-descr
index 6fa82bd23a93..6fa82bd23a93 100644
--- a/news/inn-CURRENT/pkg-descr
+++ b/news/inn-current/pkg-descr
diff --git a/news/inn/Makefile b/news/inn/Makefile
index 6d4c5e0d7110..0ca43367ff6e 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -21,7 +21,7 @@ SUB_FILES= pkg-install
USES= cpe gmake libtool perl5 uidfix
CPE_VENDOR= isc
-CONFLICTS?= inn-CURRENT-[0-9]*
+CONFLICTS?= inn-current-[0-9]*
OPTIONS_DEFINE= BERKELEYDB GNUPG KERBEROS PYTHON SASL KEYWORDS \
LARGE_FILES OPENSSL SETGID_INEWS TAGGED_HASH \