From 450d29924c105170447c67946ad56769f951a226 Mon Sep 17 00:00:00 2001
From: Ollivier Robert <roberto@FreeBSD.org>
Date: Wed, 28 May 2014 13:38:13 +0000
Subject: [PATCH] Rename calife-devel into calife. The original port (2.8) has
 been deprecated for some time now.

Approved by:	thomas (MAINTAINER)
---
 security/calife-devel/Makefile                | 31 -------------------
 security/calife-devel/distinfo                |  2 --
 security/calife-devel/pkg-descr               |  6 ----
 security/calife-devel/pkg-plist               |  3 --
 security/calife/Makefile                      | 15 ++++++---
 security/calife/distinfo                      |  4 +--
 security/calife/pkg-descr                     |  2 +-
 security/{calife-devel => calife}/pkg-message |  0
 security/calife/pkg-plist                     |  1 +
 9 files changed, 15 insertions(+), 49 deletions(-)
 delete mode 100644 security/calife-devel/Makefile
 delete mode 100644 security/calife-devel/distinfo
 delete mode 100644 security/calife-devel/pkg-descr
 delete mode 100644 security/calife-devel/pkg-plist
 rename security/{calife-devel => calife}/pkg-message (100%)

diff --git a/security/calife-devel/Makefile b/security/calife-devel/Makefile
deleted file mode 100644
index f8fdf1a2cbec..000000000000
--- a/security/calife-devel/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# Created by: Thomas Quinot <thomas@cuivre.fr.eu.org>
-# $FreeBSD$
-
-PORTNAME=	calife
-PORTVERSION=	3.0.1
-CATEGORIES=	security
-MASTER_SITES=	http://assets.keltia.net/calife/
-DISTNAME=	calife-3.0.1
-PKGNAMESUFFIX=	-devel
-
-MAINTAINER=	thomas@FreeBSD.org
-COMMENT=	Lightweight alternative to sudo
-
-USE_BZIP2=	yes
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-etcdir=${PREFIX}/etc
-
-CONFIGURE_ARGS+=	--with-pam
-
-CONFLICTS?=	calife-2.*
-
-MAN1=		calife.1
-MAN5=		calife.auth.5
-
-NO_STAGE=	yes
-post-install:
-	@${INSTALL_DATA} ${WRKSRC}/pam/freebsd5 ${PREFIX}/etc/pam.d/calife.sample
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.mk>
diff --git a/security/calife-devel/distinfo b/security/calife-devel/distinfo
deleted file mode 100644
index 034b7623140d..000000000000
--- a/security/calife-devel/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (calife-3.0.1.tar.bz2) = f5dee9ccb5e1c0d8a4a952ecd80abdd1d7952df45ac415dfa34a5890bd5e20aa
-SIZE (calife-3.0.1.tar.bz2) = 98548
diff --git a/security/calife-devel/pkg-descr b/security/calife-devel/pkg-descr
deleted file mode 100644
index 1947c875987e..000000000000
--- a/security/calife-devel/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Calife is a lightweight replacement to Sudo: it allows
-users listed in a particular file, $(PREFIX)/etc/calife.auth,
-to endorse the identity of any other user after entering their
-own password.
-
-WWW: http://www.keltia.net/programs/calife
diff --git a/security/calife-devel/pkg-plist b/security/calife-devel/pkg-plist
deleted file mode 100644
index 641665130209..000000000000
--- a/security/calife-devel/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/calife
-etc/calife.auth-dist
-etc/pam.d/calife.sample
diff --git a/security/calife/Makefile b/security/calife/Makefile
index 6b1baf97cee3..f8fdf1a2cbec 100644
--- a/security/calife/Makefile
+++ b/security/calife/Makefile
@@ -2,10 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	calife
-PORTVERSION=	2.8.6.5
+PORTVERSION=	3.0.1
 CATEGORIES=	security
 MASTER_SITES=	http://assets.keltia.net/calife/
-DISTNAME=	calife-2.8.6-p5
+DISTNAME=	calife-3.0.1
+PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	thomas@FreeBSD.org
 COMMENT=	Lightweight alternative to sudo
@@ -13,12 +14,18 @@ COMMENT=	Lightweight alternative to sudo
 USE_BZIP2=	yes
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--with-etcdir=${PREFIX}/etc"
+CONFIGURE_ARGS=	--with-etcdir=${PREFIX}/etc
 
-CONFLICTS?=	calife-3.*
+CONFIGURE_ARGS+=	--with-pam
+
+CONFLICTS?=	calife-2.*
 
 MAN1=		calife.1
 MAN5=		calife.auth.5
 
 NO_STAGE=	yes
+post-install:
+	@${INSTALL_DATA} ${WRKSRC}/pam/freebsd5 ${PREFIX}/etc/pam.d/calife.sample
+	@${CAT} ${PKGMESSAGE}
+
 .include <bsd.port.mk>
diff --git a/security/calife/distinfo b/security/calife/distinfo
index a6aa030445f0..034b7623140d 100644
--- a/security/calife/distinfo
+++ b/security/calife/distinfo
@@ -1,2 +1,2 @@
-SHA256 (calife-2.8.6-p5.tar.bz2) = e615f98fecd3b701f6e7c0bf31e583f4b7c7555e774e49f8afb21fe2252a011e
-SIZE (calife-2.8.6-p5.tar.bz2) = 82964
+SHA256 (calife-3.0.1.tar.bz2) = f5dee9ccb5e1c0d8a4a952ecd80abdd1d7952df45ac415dfa34a5890bd5e20aa
+SIZE (calife-3.0.1.tar.bz2) = 98548
diff --git a/security/calife/pkg-descr b/security/calife/pkg-descr
index b6dfd3bd186f..1947c875987e 100644
--- a/security/calife/pkg-descr
+++ b/security/calife/pkg-descr
@@ -3,4 +3,4 @@ users listed in a particular file, $(PREFIX)/etc/calife.auth,
 to endorse the identity of any other user after entering their
 own password.
 
-WWW: http://www.keltia.net/programs/calife/
+WWW: http://www.keltia.net/programs/calife
diff --git a/security/calife-devel/pkg-message b/security/calife/pkg-message
similarity index 100%
rename from security/calife-devel/pkg-message
rename to security/calife/pkg-message
diff --git a/security/calife/pkg-plist b/security/calife/pkg-plist
index a81fa6a224ab..641665130209 100644
--- a/security/calife/pkg-plist
+++ b/security/calife/pkg-plist
@@ -1,2 +1,3 @@
 bin/calife
 etc/calife.auth-dist
+etc/pam.d/calife.sample