Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 20 Jun 2014 09:31:33 +0000 (UTC)
From:      "Vanilla I. Shu" <vanilla@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r358540 - in head/net-mgmt/ipcad: . files
Message-ID:  <201406200931.s5K9VXPZ001968@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: vanilla
Date: Fri Jun 20 09:31:33 2014
New Revision: 358540
URL: http://svnweb.freebsd.org/changeset/ports/358540
QAT: https://qat.redports.org/buildarchive/r358540/

Log:
  1: Stagify.
  2: use @sample on pkg-plist, bump version.
  
  Approved by:	portmgr@

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

Modified: head/net-mgmt/ipcad/Makefile
==============================================================================
--- head/net-mgmt/ipcad/Makefile	Fri Jun 20 09:24:53 2014	(r358539)
+++ head/net-mgmt/ipcad/Makefile	Fri Jun 20 09:31:33 2014	(r358540)
@@ -3,7 +3,7 @@
 
 PORTNAME=	ipcad
 PORTVERSION=	3.7.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
 		http://ipcad.sourceforge.net/ \
@@ -16,20 +16,14 @@ USE_RC_SUBR=	ipcad
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-MANCOMPRESSED=	no
-MAN5=		ipcad.conf.5
-MAN8=		ipcad.8
-
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g ; \
 		s|/usr/local|${PREFIX}|g; s|pthread_detach|pthread_create|g'\
 		${WRKSRC}/configure
 
 post-install:
-	@${STRIP_CMD} ${PREFIX}/bin/ipcad
-	${INSTALL_MAN} ${WRKSRC}/ipcad.8 ${MANPREFIX}/man/man8
-	${INSTALL_MAN} ${WRKSRC}/ipcad.conf.5 ${MANPREFIX}/man/man5
-	@${CAT} ${PKGMESSAGE}
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ipcad
+	${INSTALL_MAN} ${WRKSRC}/ipcad.8 ${STAGEDIR}${MANPREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/ipcad.conf.5 ${STAGEDIR}${MANPREFIX}/man/man5
 
 .include <bsd.port.mk>

Added: head/net-mgmt/ipcad/files/patch-Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-mgmt/ipcad/files/patch-Makefile.in	Fri Jun 20 09:31:33 2014	(r358540)
@@ -0,0 +1,27 @@
+--- Makefile.in.orig	2014-06-20 17:27:10.338785483 +0800
++++ Makefile.in	2014-06-20 17:28:29.857773300 +0800
+@@ -132,23 +132,7 @@ install-man: man
+ install-conf:
+ 	@${INSTALL} -d $(DESTDIR)${sysconfdir}
+ 	${INSTALL} -m 644 ipcad.conf.simple $(DESTDIR)${sysconfdir}/ipcad.conf.simple
+-	-@diff ${sysconfdir}/ipcad.conf					\
+-	      ${sysconfdir}/ipcad.conf.default >/dev/null 2>&1;		\
+-	if [ "$$?" -eq 0 ] || [ ! -f ${sysconfdir}/ipcad.conf ]; then	\
+-	echo ${INSTALL} -m 644 ipcad.conf.default $(DESTDIR)${sysconfdir}/ipcad.conf.default; \
+-	${INSTALL} -m 644 ipcad.conf.default $(DESTDIR)${sysconfdir}/ipcad.conf.default; \
+-	echo ${INSTALL} -m 644 ipcad.conf.default $(DESTDIR)${sysconfdir}/ipcad.conf;	\
+-	${INSTALL} -m 644 ipcad.conf.default $(DESTDIR)${sysconfdir}/ipcad.conf;	\
+-	echo "**********************************************";		\
+-	echo "* Please customize ${sysconfdir}/ipcad.conf *";		\
+-	echo "**********************************************";		\
+-	else								\
+-	echo ${INSTALL} -m 644 ipcad.conf.default $(DESTDIR)${sysconfdir}/ipcad.conf.default; \
+-	${INSTALL} -m 644 ipcad.conf.default $(DESTDIR)${sysconfdir}/ipcad.conf.default; \
+-	echo "*********************************************";		\
+-	echo "* Updated ${sysconfdir}/ipcad.conf.default *";		\
+-	echo "*********************************************";		\
+-	fi
++	${INSTALL} -m 644 ipcad.conf.default $(DESTDIR)${sysconfdir}/ipcad.conf.sample;
+ 	@echo ""
+ 	@echo "Now you might want to 'make install-man'"
+ 	@echo ""

Modified: head/net-mgmt/ipcad/pkg-plist
==============================================================================
--- head/net-mgmt/ipcad/pkg-plist	Fri Jun 20 09:24:53 2014	(r358539)
+++ head/net-mgmt/ipcad/pkg-plist	Fri Jun 20 09:31:33 2014	(r358540)
@@ -1,4 +1,5 @@
 bin/ipcad
-@unexec if cmp -s %D/etc/ipcad.conf %D/etc/ipcad.conf.default; then rm -f %D/etc/ipcad.conf; fi
-etc/ipcad.conf.default
+@sample etc/ipcad.conf.sample
 etc/ipcad.conf.simple
+man/man5/ipcad.conf.5.gz
+man/man8/ipcad.8.gz



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