From owner-svn-ports-all@FreeBSD.ORG Mon Jun 9 08:40:08 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 75E301DC; Mon, 9 Jun 2014 08:40:08 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 63A442B8F; Mon, 9 Jun 2014 08:40:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s598e8j4080472; Mon, 9 Jun 2014 08:40:08 GMT (envelope-from vanilla@svn.freebsd.org) Received: (from vanilla@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s598e755080468; Mon, 9 Jun 2014 08:40:07 GMT (envelope-from vanilla@svn.freebsd.org) Message-Id: <201406090840.s598e755080468@svn.freebsd.org> From: "Vanilla I. Shu" Date: Mon, 9 Jun 2014 08:40:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r357116 - in head/net-mgmt/netustad: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Jun 2014 08:40:08 -0000 Author: vanilla Date: Mon Jun 9 08:40:07 2014 New Revision: 357116 URL: http://svnweb.freebsd.org/changeset/ports/357116 QAT: https://qat.redports.org/buildarchive/r357116/ Log: 1: Stagify. 2: add pkg-message to SUB_FILES 3: use @sample on pkg-plist. 4: bump version. Added: head/net-mgmt/netustad/files/patch-data__freebsd__Makefile.in (contents, props changed) head/net-mgmt/netustad/files/pkg-message.in (contents, props changed) Deleted: head/net-mgmt/netustad/pkg-message Modified: head/net-mgmt/netustad/Makefile head/net-mgmt/netustad/pkg-plist Modified: head/net-mgmt/netustad/Makefile ============================================================================== --- head/net-mgmt/netustad/Makefile Mon Jun 9 08:34:07 2014 (r357115) +++ head/net-mgmt/netustad/Makefile Mon Jun 9 08:40:07 2014 (r357116) @@ -3,19 +3,17 @@ PORTNAME= netustad PORTVERSION= 0.3.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net-mgmt security MASTER_SITES= http://www.enderunix.org/netustad/ MAINTAINER= ports@FreeBSD.org COMMENT= A Web based admin tool that manages network services -#MAN8= netustad.8 netustadpasswd.8 -#MAN5= netustad.conf.5 - USE_RC_SUBR= ${PORTNAME} USES= gettext GNU_CONFIGURE= yes +SUB_FILES= pkg-message OPTIONS_DEFINE= SSL NLS OPTIONS_DEFAULT=SSL @@ -23,7 +21,6 @@ SSL_DESC= Use netUstad with SSL support LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX} -NO_STAGE= yes .include .if ${PORT_OPTIONS:MSSL} @@ -42,6 +39,6 @@ post-patch: .endif post-install: - @${CAT} ${PKGMESSAGE} + @${MV} ${STAGEDIR}${ETCDIR}/netustad.conf-dist ${STAGEDIR}${ETCDIR}/netustad.conf.sample .include Added: head/net-mgmt/netustad/files/patch-data__freebsd__Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/netustad/files/patch-data__freebsd__Makefile.in Mon Jun 9 08:40:07 2014 (r357116) @@ -0,0 +1,13 @@ +--- data/freebsd/Makefile.in.orig 2014-06-09 16:27:43.643840330 +0800 ++++ data/freebsd/Makefile.in 2014-06-09 16:28:29.258834214 +0800 +@@ -453,8 +453,8 @@ uninstall-am: uninstall-info-am uninstal + + + install-data-hook: +- /bin/sh ../chperm.sh 700 ${netustad_freebsddir} ${netustad_freebsd_SCRIPTS}; \ +- /bin/sh ../chperm.sh 600 ${netustad_freebsddir} ${netustad_freebsd_DATA} ++ /bin/sh ../chperm.sh 700 $(DESTDIR)${netustad_freebsddir} ${netustad_freebsd_SCRIPTS}; \ ++ /bin/sh ../chperm.sh 600 $(DESTDIR)${netustad_freebsddir} ${netustad_freebsd_DATA} + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: Added: head/net-mgmt/netustad/files/pkg-message.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/netustad/files/pkg-message.in Mon Jun 9 08:40:07 2014 (r357116) @@ -0,0 +1,9 @@ +***************************************************************** +* You must run this program as root * +* Program path : %%PREFIX%%/sbin/netustad * +* Your AdminUser : admin * +* Your AdminPassword : admin * +* Config file path : %%PREFIX%%/etc/netustad/netustad.conf * +* Check lc_all variable in config file. * +* Don't forget to change your password! * +***************************************************************** Modified: head/net-mgmt/netustad/pkg-plist ============================================================================== --- head/net-mgmt/netustad/pkg-plist Mon Jun 9 08:34:07 2014 (r357115) +++ head/net-mgmt/netustad/pkg-plist Mon Jun 9 08:40:07 2014 (r357116) @@ -1,9 +1,7 @@ bin/netustadctl bin/netustadpasswd +@sample etc/netustad/netustad.conf.sample sbin/netustad -@unexec if cmp -s %D/etc/netustad/netustad.conf %D/etc/netustad/netustad.conf-dist; then rm -f %D/etc/netustad/netustad.conf; fi -etc/netustad/netustad.conf-dist -@exec [ -f %B/netustad/netustad.conf ] || cp %B/%f %B/netustad/netustad.conf share/locale/tr/LC_MESSAGES/netustad.mo %%DATADIR%%/script/action1.inc %%DATADIR%%/script/action2.inc