Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 5 Aug 2012 23:05:24 +0000 (UTC)
From:      Doug Barton <dougb@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r302140 - head/security/openssh-portable
Message-ID:  <201208052305.q75N5O5d039532@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dougb
Date: Sun Aug  5 23:05:24 2012
New Revision: 302140
URL: http://svn.freebsd.org/changeset/ports/302140

Log:
  When installing in the base, USE_RCORDER does the right thing without
  all the gymnastics

Modified:
  head/security/openssh-portable/Makefile

Modified: head/security/openssh-portable/Makefile
==============================================================================
--- head/security/openssh-portable/Makefile	Sun Aug  5 22:56:23 2012	(r302139)
+++ head/security/openssh-portable/Makefile	Sun Aug  5 23:05:24 2012	(r302140)
@@ -161,8 +161,7 @@ CONFIGURE_ARGS+=	--localstatedir=/var
 EMPTYDIR=		/var/empty
 PREFIX=			/usr
 ETCSSH=			/etc/ssh
-USE_RC_SUBR=		yes
-SUB_FILES+=		openssh
+USE_RCORDER=		openssh
 PLIST_SUB+=		NOTBASE="@comment "
 PLIST_SUB+=		BASE=""
 PLIST_SUB+=		BASEPREFIX="${PREFIX}"
@@ -223,14 +222,7 @@ pre-su-install:
 post-install:
 	${INSTALL_DATA} -c ${WRKSRC}/ssh_config.out ${ETCSSH}/ssh_config-dist
 	${INSTALL_DATA} -c ${WRKSRC}/sshd_config.out ${ETCSSH}/sshd_config-dist
-.if defined(WITH_OVERWRITE_BASE)
-	@${ECHO_CMD} "===> Installing rc.d startup script(s)"
-	@${ECHO_CMD} "@cwd ${LOCALBASE}" >> ${TMPPLIST}
-	@${MKDIR} ${LOCALBASE}/etc/rc.d
-	@${INSTALL_SCRIPT} ${WRKDIR}/openssh ${LOCALBASE}/etc/rc.d/${RC_SCRIPT_NAME}
-	@${ECHO_CMD} "etc/rc.d/${RC_SCRIPT_NAME}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}
-.endif
+
 	@${CAT} ${PKGMESSAGE}
 
 test:	build



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208052305.q75N5O5d039532>