aboutsummaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorCy Schubert <cy@FreeBSD.org>2005-10-26 17:14:38 +0000
committerCy Schubert <cy@FreeBSD.org>2005-10-26 17:14:38 +0000
commitccf06546789d3baf55d666d4e049b00f49238e80 (patch)
treee126d8dd3bf1039d3a70a209bb626479aa7d5ae4 /security
parent9adb1ba8a3d1acadded1e65e423dba41f007d198 (diff)
downloadports-ccf06546789d3baf55d666d4e049b00f49238e80.tar.gz
ports-ccf06546789d3baf55d666d4e049b00f49238e80.zip
Notes
Diffstat (limited to 'security')
-rw-r--r--security/sudosh/Makefile5
-rw-r--r--security/sudosh/files/patch-src::Makefile.in5
-rw-r--r--security/sudosh/pkg-message13
-rw-r--r--security/sudosh/pkg-plist2
-rw-r--r--security/sudosh2/Makefile5
-rw-r--r--security/sudosh2/files/patch-src::Makefile.in5
-rw-r--r--security/sudosh2/pkg-message13
-rw-r--r--security/sudosh2/pkg-plist2
-rw-r--r--security/sudosh3/Makefile5
-rw-r--r--security/sudosh3/files/patch-src::Makefile.in5
-rw-r--r--security/sudosh3/pkg-message13
-rw-r--r--security/sudosh3/pkg-plist2
12 files changed, 18 insertions, 57 deletions
diff --git a/security/sudosh/Makefile b/security/sudosh/Makefile
index 579863b7ddfc..c99dd49b4f82 100644
--- a/security/sudosh/Makefile
+++ b/security/sudosh/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sudosh
PORTVERSION= 1.8.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
MASTER_SITE_SUBDIR= ${PORTNAME:S/_/-/}
@@ -41,7 +41,4 @@ MAN8= sudosh-replay.8
BROKEN= "Does not compile on FreeBSD 4.x"
.endif
-post-install:
- @${CAT} ${PKGMESSAGE}
-
.include <bsd.port.post.mk>
diff --git a/security/sudosh/files/patch-src::Makefile.in b/security/sudosh/files/patch-src::Makefile.in
index e33811421ef7..81fcafdbceb1 100644
--- a/security/sudosh/files/patch-src::Makefile.in
+++ b/security/sudosh/files/patch-src::Makefile.in
@@ -1,6 +1,7 @@
--- src/Makefile.in.orig Sun Jun 12 19:33:29 2005
-+++ src/Makefile.in Tue Oct 25 10:06:54 2005
-@@ -428,6 +428,7 @@
++++ src/Makefile.in Wed Oct 26 06:59:17 2005
+@@ -427,7 +427,8 @@
+
install-sudosh.conf:
test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)"
test -f $(sysconfdir)/sudosh.conf || $(INSTALL) -o 0 -g 0 -m 0444 '$(srcdir)/sudosh.conf' '$(sysconfdir)/sudosh.conf'
diff --git a/security/sudosh/pkg-message b/security/sudosh/pkg-message
deleted file mode 100644
index 6e65af7c9a9e..000000000000
--- a/security/sudosh/pkg-message
+++ /dev/null
@@ -1,13 +0,0 @@
-
-****************************************************************************
-* *
-* If this is a brand new install, a copy a new copy of *
-* PREFIX/etc/sudoers.conf has been installed. Should you choose to *
-* uninstall sudosh, the sudoers.conf file will remain and should you *
-* choose to remove it, it must be manually deleted. Any previously *
-* existing sudoers.conf file has not been overwritten by this package. *
-* A reference copy of sudoers.conf may be found in *
-* PREFIX/etc/sudoers.conf.sample. *
-* *
-****************************************************************************
-
diff --git a/security/sudosh/pkg-plist b/security/sudosh/pkg-plist
index d922298d2fe0..43d308b7d677 100644
--- a/security/sudosh/pkg-plist
+++ b/security/sudosh/pkg-plist
@@ -1,3 +1,5 @@
+@unexec test -f %D/etc/sudosh.conf && cmp %D/etc/sudosh.conf.sample %D/etc/sudosh.conf > /dev/null 2>&1 && rm %D/etc/sudosh.conf && echo %D/etc/sudosh.conf has been removed; test -f %D/etc/sudosh.conf && echo %D/etc/sudosh.conf has not been removed; true
bin/sudosh
bin/sudosh-replay
etc/sudosh.conf.sample
+@exec test -f %D/etc/sudosh.conf || cp %D/etc/sudosh.conf.sample %D/etc/sudosh.conf
diff --git a/security/sudosh2/Makefile b/security/sudosh2/Makefile
index 579863b7ddfc..c99dd49b4f82 100644
--- a/security/sudosh2/Makefile
+++ b/security/sudosh2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sudosh
PORTVERSION= 1.8.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
MASTER_SITE_SUBDIR= ${PORTNAME:S/_/-/}
@@ -41,7 +41,4 @@ MAN8= sudosh-replay.8
BROKEN= "Does not compile on FreeBSD 4.x"
.endif
-post-install:
- @${CAT} ${PKGMESSAGE}
-
.include <bsd.port.post.mk>
diff --git a/security/sudosh2/files/patch-src::Makefile.in b/security/sudosh2/files/patch-src::Makefile.in
index e33811421ef7..81fcafdbceb1 100644
--- a/security/sudosh2/files/patch-src::Makefile.in
+++ b/security/sudosh2/files/patch-src::Makefile.in
@@ -1,6 +1,7 @@
--- src/Makefile.in.orig Sun Jun 12 19:33:29 2005
-+++ src/Makefile.in Tue Oct 25 10:06:54 2005
-@@ -428,6 +428,7 @@
++++ src/Makefile.in Wed Oct 26 06:59:17 2005
+@@ -427,7 +427,8 @@
+
install-sudosh.conf:
test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)"
test -f $(sysconfdir)/sudosh.conf || $(INSTALL) -o 0 -g 0 -m 0444 '$(srcdir)/sudosh.conf' '$(sysconfdir)/sudosh.conf'
diff --git a/security/sudosh2/pkg-message b/security/sudosh2/pkg-message
deleted file mode 100644
index 6e65af7c9a9e..000000000000
--- a/security/sudosh2/pkg-message
+++ /dev/null
@@ -1,13 +0,0 @@
-
-****************************************************************************
-* *
-* If this is a brand new install, a copy a new copy of *
-* PREFIX/etc/sudoers.conf has been installed. Should you choose to *
-* uninstall sudosh, the sudoers.conf file will remain and should you *
-* choose to remove it, it must be manually deleted. Any previously *
-* existing sudoers.conf file has not been overwritten by this package. *
-* A reference copy of sudoers.conf may be found in *
-* PREFIX/etc/sudoers.conf.sample. *
-* *
-****************************************************************************
-
diff --git a/security/sudosh2/pkg-plist b/security/sudosh2/pkg-plist
index d922298d2fe0..43d308b7d677 100644
--- a/security/sudosh2/pkg-plist
+++ b/security/sudosh2/pkg-plist
@@ -1,3 +1,5 @@
+@unexec test -f %D/etc/sudosh.conf && cmp %D/etc/sudosh.conf.sample %D/etc/sudosh.conf > /dev/null 2>&1 && rm %D/etc/sudosh.conf && echo %D/etc/sudosh.conf has been removed; test -f %D/etc/sudosh.conf && echo %D/etc/sudosh.conf has not been removed; true
bin/sudosh
bin/sudosh-replay
etc/sudosh.conf.sample
+@exec test -f %D/etc/sudosh.conf || cp %D/etc/sudosh.conf.sample %D/etc/sudosh.conf
diff --git a/security/sudosh3/Makefile b/security/sudosh3/Makefile
index 579863b7ddfc..c99dd49b4f82 100644
--- a/security/sudosh3/Makefile
+++ b/security/sudosh3/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sudosh
PORTVERSION= 1.8.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
MASTER_SITE_SUBDIR= ${PORTNAME:S/_/-/}
@@ -41,7 +41,4 @@ MAN8= sudosh-replay.8
BROKEN= "Does not compile on FreeBSD 4.x"
.endif
-post-install:
- @${CAT} ${PKGMESSAGE}
-
.include <bsd.port.post.mk>
diff --git a/security/sudosh3/files/patch-src::Makefile.in b/security/sudosh3/files/patch-src::Makefile.in
index e33811421ef7..81fcafdbceb1 100644
--- a/security/sudosh3/files/patch-src::Makefile.in
+++ b/security/sudosh3/files/patch-src::Makefile.in
@@ -1,6 +1,7 @@
--- src/Makefile.in.orig Sun Jun 12 19:33:29 2005
-+++ src/Makefile.in Tue Oct 25 10:06:54 2005
-@@ -428,6 +428,7 @@
++++ src/Makefile.in Wed Oct 26 06:59:17 2005
+@@ -427,7 +427,8 @@
+
install-sudosh.conf:
test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)"
test -f $(sysconfdir)/sudosh.conf || $(INSTALL) -o 0 -g 0 -m 0444 '$(srcdir)/sudosh.conf' '$(sysconfdir)/sudosh.conf'
diff --git a/security/sudosh3/pkg-message b/security/sudosh3/pkg-message
deleted file mode 100644
index 6e65af7c9a9e..000000000000
--- a/security/sudosh3/pkg-message
+++ /dev/null
@@ -1,13 +0,0 @@
-
-****************************************************************************
-* *
-* If this is a brand new install, a copy a new copy of *
-* PREFIX/etc/sudoers.conf has been installed. Should you choose to *
-* uninstall sudosh, the sudoers.conf file will remain and should you *
-* choose to remove it, it must be manually deleted. Any previously *
-* existing sudoers.conf file has not been overwritten by this package. *
-* A reference copy of sudoers.conf may be found in *
-* PREFIX/etc/sudoers.conf.sample. *
-* *
-****************************************************************************
-
diff --git a/security/sudosh3/pkg-plist b/security/sudosh3/pkg-plist
index d922298d2fe0..43d308b7d677 100644
--- a/security/sudosh3/pkg-plist
+++ b/security/sudosh3/pkg-plist
@@ -1,3 +1,5 @@
+@unexec test -f %D/etc/sudosh.conf && cmp %D/etc/sudosh.conf.sample %D/etc/sudosh.conf > /dev/null 2>&1 && rm %D/etc/sudosh.conf && echo %D/etc/sudosh.conf has been removed; test -f %D/etc/sudosh.conf && echo %D/etc/sudosh.conf has not been removed; true
bin/sudosh
bin/sudosh-replay
etc/sudosh.conf.sample
+@exec test -f %D/etc/sudosh.conf || cp %D/etc/sudosh.conf.sample %D/etc/sudosh.conf