From baf201de316b2e1705fe16a7afca5f1d67d71151 Mon Sep 17 00:00:00 2001 From: cy Date: Wed, 26 Oct 2005 17:14:38 +0000 Subject: Make this port sysinstall friendly. --- security/sudosh/Makefile | 5 +---- security/sudosh/files/patch-src::Makefile.in | 5 +++-- security/sudosh/pkg-message | 13 ------------- security/sudosh/pkg-plist | 2 ++ security/sudosh2/Makefile | 5 +---- security/sudosh2/files/patch-src::Makefile.in | 5 +++-- security/sudosh2/pkg-message | 13 ------------- security/sudosh2/pkg-plist | 2 ++ security/sudosh3/Makefile | 5 +---- security/sudosh3/files/patch-src::Makefile.in | 5 +++-- security/sudosh3/pkg-message | 13 ------------- security/sudosh3/pkg-plist | 2 ++ 12 files changed, 18 insertions(+), 57 deletions(-) delete mode 100644 security/sudosh/pkg-message delete mode 100644 security/sudosh2/pkg-message delete mode 100644 security/sudosh3/pkg-message (limited to 'security') 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 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 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 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 -- cgit