Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 12 Jun 2021 07:43:38 GMT
From:      Kevin Bowling <kbowling@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: c6482faef438 - main - news/inn-current: Lower case port name
Message-ID:  <202106120743.15C7hcT5020288@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by kbowling:

URL: https://cgit.FreeBSD.org/ports/commit/?id=c6482faef43824abe71edc71f850cc38fa25b78b

commit c6482faef43824abe71edc71f850cc38fa25b78b
Author:     Kevin Bowling <kbowling@FreeBSD.org>
AuthorDate: 2021-06-12 07:24:11 +0000
Commit:     Kevin Bowling <kbowling@FreeBSD.org>
CommitDate: 2021-06-12 07:29:31 +0000

    news/inn-current: Lower case port name
    
    Requested by: sunpoet
---
 MOVED                                       | 1 -
 news/Makefile                               | 2 +-
 news/cleanfeed/Makefile                     | 6 +++---
 news/{inn-CURRENT => inn-current}/Makefile  | 4 ++--
 news/{inn-CURRENT => inn-current}/distinfo  | 0
 news/{inn-CURRENT => inn-current}/pkg-descr | 0
 news/inn/Makefile                           | 2 +-
 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
similarity index 85%
rename from news/inn-CURRENT/Makefile
rename to 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
similarity index 100%
rename from news/inn-CURRENT/distinfo
rename to news/inn-current/distinfo
diff --git a/news/inn-CURRENT/pkg-descr b/news/inn-current/pkg-descr
similarity index 100%
rename from news/inn-CURRENT/pkg-descr
rename to 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 \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202106120743.15C7hcT5020288>