- Update to 1.0.5

- Add a note to UPDATING about the changed and renamed configuration file.

5 files changed, 21 insertions, 33 deletions

diff --git a/UPDATING b/UPDATING
index e5521d2817e4..793505b052d8 100644
--- a/UPDATING
+++ b/UPDATING
@@ -6,6 +6,16 @@ You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
 20131028:
+  AFFECTS: users of comms/dcf77pi
+  AUTHOR: rene@FreeBSD.org
+
+  As of version 1.0.5 the configuration file was renamed from
+  hardware.txt to config.txt and the format has been made more flexible.
+
+  If you have customized any parameters, be sure to copy them to
+  config.txt after which hardware.txt can be removed.
+
+20131028:
   AFFECTS: users of multimedia/ffmpeg1 and multimedia/ffmpeg-devel
   AUTHOR: wg@FreeBSD.org
 
diff --git a/comms/dcf77pi/Makefile b/comms/dcf77pi/Makefile
index 764b7a975e65..0af6cb3afef7 100644
--- a/comms/dcf77pi/Makefile
+++ b/comms/dcf77pi/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	dcf77pi
-PORTVERSION=	1.0.4
+PORTVERSION=	1.0.5
 CATEGORIES=	comms
 
 MAINTAINER=	rene@FreeBSD.org
@@ -12,7 +12,7 @@ LICENSE=	BSD
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	rene0
-GH_COMMIT=	75f6f04
+GH_COMMIT=	f5b0c0d
 
 MAKE_ARGS=	FULLPREFIX="${STAGEDIR}${PREFIX}"
 
@@ -21,12 +21,14 @@ OPTIONS_DEFINE=	DOCS
 .include <bsd.port.options.mk>
 
 post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/dcf77pi
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/readpin
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 .endif
-	if [ ! -f ${ETCDIR}/hardware.txt ] ; then \
-		${CP} -p ${STAGEDIR}${ETCDIR}/hardware.txt.sample ${STAGEDIR}${ETCDIR}/hardware.txt ; \
+	if [ ! -f ${ETCDIR}/config.txt ] ; then \
+		${CP} -p ${STAGEDIR}${ETCDIR}/config.txt.sample ${STAGEDIR}${ETCDIR}/config.txt ; \
 	fi
 
 .include <bsd.port.mk>
diff --git a/comms/dcf77pi/distinfo b/comms/dcf77pi/distinfo
index 236015326f5d..100202bfec82 100644
--- a/comms/dcf77pi/distinfo
+++ b/comms/dcf77pi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dcf77pi-1.0.4.tar.gz) = 98a058f0addcf3c53810bb04ee9539cbb3459f6258dd701aae623d166cf4c264
-SIZE (dcf77pi-1.0.4.tar.gz) = 10126
+SHA256 (dcf77pi-1.0.5.tar.gz) = 8515ed0fae015a3f81239e2605e5b4170f44d6faee169d29c5fd7c8ff2e79bd7
+SIZE (dcf77pi-1.0.5.tar.gz) = 11755
diff --git a/comms/dcf77pi/files/patch-Makefile b/comms/dcf77pi/files/patch-Makefile
deleted file mode 100644
index 7a2c9882eb00..000000000000
--- a/comms/dcf77pi/files/patch-Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
---- ./Makefile.orig	2013-09-10 17:47:08.000000000 +0200
-+++ ./Makefile	2013-09-28 15:21:45.000000000 +0200
-@@ -1,8 +1,9 @@
- .PHONY: all clean install
- 
- PREFIX?=.
--ETCDIR?=$(PREFIX)/etc/dcf77pi
--CFLAGS+=-Wall -DETCDIR=\"$(ETCDIR)\"
-+FULLPREFIX?=$(PREFIX)
-+ETCDIR?=etc/dcf77pi
-+CFLAGS+=-Wall -DETCDIR=\"$(PREFIX)/$(ETCDIR)\"
- 
- all: dcf77pi readpin
- 
-@@ -26,6 +27,6 @@
- 	rm readpin readpin.o
- 
- install:
--	install dcf77pi readpin $(PREFIX)/bin
--	mkdir -p $(ETCDIR)
--	install etc/dcf77pi/hardware.txt $(ETCDIR)/hardware.txt.sample
-+	install dcf77pi readpin $(FULLPREFIX)/bin
-+	mkdir -p $(FULLPREFIX)/$(ETCDIR)
-+	install etc/dcf77pi/hardware.txt $(FULLPREFIX)/$(ETCDIR)/hardware.txt.sample
diff --git a/comms/dcf77pi/pkg-plist b/comms/dcf77pi/pkg-plist
index 2e3d6ab12ba8..1fa3296dc0a0 100644
--- a/comms/dcf77pi/pkg-plist
+++ b/comms/dcf77pi/pkg-plist
@@ -1,8 +1,8 @@
 bin/dcf77pi
 bin/readpin
 %%PORTDOCS%%%%DOCSDIR%%/README.md
-@unexec if cmp -s %D/etc/dcf77pi/hardware.txt.sample %D/etc/dcf77pi/hardware.txt ; then rm -f %D/etc/dcf77pi/hardware.txt ; fi
-etc/dcf77pi/hardware.txt.sample
-@exec if [ ! -f %D/etc/dcf77pi/hardware.txt ] ; then cp -p %D/%F %B/hardware.txt ; fi
+@unexec if cmp -s %D/etc/dcf77pi/config.txt.sample %D/etc/dcf77pi/config.txt ; then rm -f %D/etc/dcf77pi/config.txt ; fi
+etc/dcf77pi/config.txt.sample
+@exec if [ ! -f %D/etc/dcf77pi/config.txt ] ; then cp -p %D/%F %B/config.txt ; fi
 @dirrmtry %%ETCDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%