Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 14 Aug 2014 17:54:11 +0000 (UTC)
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r364860 - in head/net/radiusclient: . files
Message-ID:  <201408141754.s7EHsBEY019131@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mat
Date: Thu Aug 14 17:54:11 2014
New Revision: 364860
URL: http://svnweb.freebsd.org/changeset/ports/364860
QAT: https://qat.redports.org/buildarchive/r364860/

Log:
  Do *not* overwrite config files on upgrades.
  
  Sponsored by:	Absolight

Added:
  head/net/radiusclient/files/patch-etc__Makefile.in   (contents, props changed)
Modified:
  head/net/radiusclient/Makefile
  head/net/radiusclient/pkg-plist

Modified: head/net/radiusclient/Makefile
==============================================================================
--- head/net/radiusclient/Makefile	Thu Aug 14 17:39:29 2014	(r364859)
+++ head/net/radiusclient/Makefile	Thu Aug 14 17:54:11 2014	(r364860)
@@ -3,7 +3,7 @@
 
 PORTNAME=	radiusclient
 PORTVERSION=	0.5.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://download.berlios.de/radiusclient-ng/ \
 		http://download2.berlios.de/radiusclient-ng/
@@ -15,5 +15,6 @@ COMMENT=	Client library and basic utilit
 USES=		gmake
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
+ETCDIR=		${PREFIX}/etc/${PORTNAME}-ng
 
 .include <bsd.port.mk>

Added: head/net/radiusclient/files/patch-etc__Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/radiusclient/files/patch-etc__Makefile.in	Thu Aug 14 17:54:11 2014	(r364860)
@@ -0,0 +1,24 @@
+--- ./etc/Makefile.in.orig	2007-02-16 08:55:15.000000000 +0100
++++ ./etc/Makefile.in	2014-08-14 19:47:04.000000000 +0200
+@@ -233,8 +233,8 @@
+ 	@list='$(pkgsysconf_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+-	  echo " $(pkgsysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgsysconfdir)/$$f'"; \
+-	  $(pkgsysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgsysconfdir)/$$f"; \
++	  echo " $(pkgsysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgsysconfdir)/$$f.sample'"; \
++	  $(pkgsysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgsysconfdir)/$$f.sample"; \
+ 	done
+ 
+ uninstall-pkgsysconfDATA:
+@@ -386,8 +386,8 @@
+ 
+ install-data-local: servers
+ 	$(mkinstalldirs) $(DESTDIR)$(pkgsysconfdir); \
+-        echo " $(INSTALL) -m 600 $(srcdir)/servers $(DESTDIR)$(pkgsysconfdir)/servers"; \
+-        $(INSTALL) -m 600 $(srcdir)/servers $(DESTDIR)$(pkgsysconfdir)/servers
++        echo " $(INSTALL) -m 600 $(srcdir)/servers $(DESTDIR)$(pkgsysconfdir)/servers.sample"; \
++        $(INSTALL) -m 600 $(srcdir)/servers $(DESTDIR)$(pkgsysconfdir)/servers.sample
+ 
+ uninstall-local:
+ 	rm -f $(pkgsysconfdir)/servers

Modified: head/net/radiusclient/pkg-plist
==============================================================================
--- head/net/radiusclient/pkg-plist	Thu Aug 14 17:39:29 2014	(r364859)
+++ head/net/radiusclient/pkg-plist	Thu Aug 14 17:54:11 2014	(r364860)
@@ -1,12 +1,12 @@
-etc/radiusclient-ng/dictionary
-etc/radiusclient-ng/dictionary.ascend
-etc/radiusclient-ng/dictionary.compat
-etc/radiusclient-ng/dictionary.merit
-etc/radiusclient-ng/dictionary.sip
-etc/radiusclient-ng/issue
-etc/radiusclient-ng/port-id-map
-etc/radiusclient-ng/radiusclient.conf
-etc/radiusclient-ng/servers
+@sample %%ETCDIR%%/dictionary.ascend.sample
+@sample %%ETCDIR%%/dictionary.compat.sample
+@sample %%ETCDIR%%/dictionary.merit.sample
+@sample %%ETCDIR%%/dictionary.sample
+@sample %%ETCDIR%%/dictionary.sip.sample
+@sample %%ETCDIR%%/issue.sample
+@sample %%ETCDIR%%/port-id-map.sample
+@sample %%ETCDIR%%/radiusclient.conf.sample
+@sample %%ETCDIR%%/servers.sample
 include/radiusclient-ng.h
 lib/libradiusclient-ng.a
 lib/libradiusclient-ng.so
@@ -17,4 +17,4 @@ sbin/radexample
 sbin/radiusclient
 sbin/radlogin
 sbin/radstatus
-@dirrm etc/radiusclient-ng
+@dirrmtry %%ETCDIR%%



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