Date: Sun, 18 Mar 2012 23:10:14 GMT From: Alex de Kruijff <akruijff@dds.nl> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/161981: [maintainer update] sysutils/samesame to v1.10 Message-ID: <201203182310.q2INAEae030527@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/161981; it has been noted by GNATS.
From: Alex de Kruijff <akruijff@dds.nl>
To: bug-followup@FreeBSD.org
Cc:
Subject: Re: ports/161981: [maintainer update] sysutils/samesame to v1.10
Date: Mon, 19 Mar 2012 00:09:01 +0100
The RC script is installed conditionally, depending on the options the
user chose. It cleans up directories in /tmp/ so it must run before
cleantmp or it will result in an error on the screen. If it is run after
login, then this might cause unexpected behavior, so its run before
login.
--- samesame.diff2 begins here ---
diff -ru -ru port.org/Makefile port/Makefile
--- port.org/Makefile Sun Mar 18 23:08:56 2012
+++ port/Makefile Sun Mar 18 23:51:20 2012
@@ -25,6 +25,9 @@
bin/samearchive-lite bin/sameln bin/samemv \
bin/samechflags bin/samerm bin/samechmod \
bin/samechown bin/samedelay
+.if defined(WITH_DISK_STORAGE)
+USE_RC_SUBR= samesame_clean
+.endif
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --enable-samechflags --enable-samechmod \
@@ -47,7 +50,6 @@
.if defined(WITH_DISK_STORAGE)
CONFIGURE_ARGS+= --enable-disk-storage
-PLIST_FILES+= etc/rc.d/samesame.sh
.endif
.if defined(WITH_EXPERIMENTAL)
@@ -87,9 +89,6 @@
.if defined(WITH_EXPERIMENTAL)
${STRIP_CMD} ${PREFIX}/bin/fsort
.endif
-.endif
-.if defined(WITH_DISK_STORAGE)
- ${INSTALL_SCRIPT} ${FILESDIR}/samesame.sh ${PREFIX}/etc/rc.d/
.endif
@${ECHO}
@${CAT} pkg-message
Only in port.org/files: samesame.sh
Only in port/files: samesame_clean.in
--- samesame.diff2 ends here ---
--- samesame_clean.in begins here ---
# This is a shell archive. Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file". Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
# port/files/samesame_clean.in
#
echo x - port/files/samesame_clean.in
sed 's/^X//' >port/files/samesame_clean.in <<
'END-of-port/files/samesame_clean.in'
X#!/bin/sh
X#
X# $FreeBSD$
X#
X
X# PROVIDE: samesame_clean
X# REQUIRE: DAEMON
X# BEFORE: LOGIN cleantmp
X# KEYWORD: shutdown
X#
X
Xname=samesame_clean
Xstart_cmd="${name}_start"
X
Xsamesame_clean_start() {
X rm -rf /tmp/samefile /tmp/samearchive
X ;;
X}
X
Xload_rc_config $name
Xrun_rc_command "$1"
X
END-of-port/files/samesame_clean.in
exit
--- samesame_clean.in ends here ---
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201203182310.q2INAEae030527>