aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVanilla I. Shu <vanilla@FreeBSD.org>2014-06-09 08:40:07 +0000
committerVanilla I. Shu <vanilla@FreeBSD.org>2014-06-09 08:40:07 +0000
commit4ef47d86e15eab6f21e03ed7ad8fd79a320d5870 (patch)
tree41ecdd2d9620267585209572d1fc43557cbcb411
parentcc5aff4c03ff646e073bd26ee59ab03d066818c7 (diff)
downloadports-4ef47d86e15eab6f21e03ed7ad8fd79a320d5870.tar.gz
ports-4ef47d86e15eab6f21e03ed7ad8fd79a320d5870.zip
Notes
-rw-r--r--net-mgmt/netustad/Makefile9
-rw-r--r--net-mgmt/netustad/files/patch-data__freebsd__Makefile.in13
-rw-r--r--net-mgmt/netustad/files/pkg-message.in (renamed from net-mgmt/netustad/pkg-message)0
-rw-r--r--net-mgmt/netustad/pkg-plist4
4 files changed, 17 insertions, 9 deletions
diff --git a/net-mgmt/netustad/Makefile b/net-mgmt/netustad/Makefile
index 91128fbc99e5..e3f5bc4803bf 100644
--- a/net-mgmt/netustad/Makefile
+++ b/net-mgmt/netustad/Makefile
@@ -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 <bsd.port.options.mk>
.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 <bsd.port.mk>
diff --git a/net-mgmt/netustad/files/patch-data__freebsd__Makefile.in b/net-mgmt/netustad/files/patch-data__freebsd__Makefile.in
new file mode 100644
index 000000000000..f135fe6b1fba
--- /dev/null
+++ b/net-mgmt/netustad/files/patch-data__freebsd__Makefile.in
@@ -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:
diff --git a/net-mgmt/netustad/pkg-message b/net-mgmt/netustad/files/pkg-message.in
index a20fcf407163..a20fcf407163 100644
--- a/net-mgmt/netustad/pkg-message
+++ b/net-mgmt/netustad/files/pkg-message.in
diff --git a/net-mgmt/netustad/pkg-plist b/net-mgmt/netustad/pkg-plist
index ed520888f92c..17b50752cc41 100644
--- a/net-mgmt/netustad/pkg-plist
+++ b/net-mgmt/netustad/pkg-plist
@@ -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