From owner-freebsd-ports@FreeBSD.ORG Sun May 25 05:12:53 2014 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B87E36BC; Sun, 25 May 2014 05:12:53 +0000 (UTC) Received: from agora.rdrop.com (agora.rdrop.com [IPv6:2607:f678:1010::34]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 41B9C2DC8; Sun, 25 May 2014 05:12:53 +0000 (UTC) Received: from agora.rdrop.com (66@localhost [127.0.0.1]) by agora.rdrop.com (8.13.1/8.12.7) with ESMTP id s4P5Cpmm037102 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Sat, 24 May 2014 22:12:51 -0700 (PDT) (envelope-from perryh@pluto.rain.com) Received: (from uucp@localhost) by agora.rdrop.com (8.13.1/8.14.2/Submit) with UUCP id s4P5Cpe4037101; Sat, 24 May 2014 22:12:51 -0700 (PDT) (envelope-from perryh@pluto.rain.com) Received: from fbsd81 by pluto.rain.com (4.1/SMI-4.1-pluto-M2060407) id AA02177; Sat, 24 May 14 22:04:29 PDT Date: Sat, 24 May 2014 22:04:25 -0700 From: perryh@pluto.rain.com (Perry Hutchison) To: bapt@freebsd.org Subject: Is staging a port really this simple? Message-Id: <538179d9.ERL3ZKEnk4pQKKib%perryh@pluto.rain.com> References: <524CE820.5060003@missouri.edu> <20131003061511.GF85314@ithaqua.etoilebsd.net> In-Reply-To: <20131003061511.GF85314@ithaqua.etoilebsd.net> User-Agent: nail 11.25 7/29/05 Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: freebsd-ports@freebsd.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 May 2014 05:12:53 -0000 Some months ago, Baptiste Daroussin wrote: > ... if you need any help staging your ports I can provide reviews. I have a couple of ports that need staging support added, and I've finally managed to find time to look into it. Having read such documentation as I could easily find using Google, and looked at the ports, I am feeling as if I must have overlooked something -- because the only changes that seem to be needed are to insert ${STAGEDIR} into a few lines in the Makefiles. Granted these are not complex ports, but if it really is this easy I have to wonder what all the uproar has been about :) What-all have I missed? --- misc/gtkfind/Makefile +++ misc/gtkfind/Makefile-staged @@ -26,7 +26,7 @@ ${REINPLACE_CMD} -e "s,-O2,${CFLAGS}," ${WRKSRC}/configure ${WRKSRC}/Makefile.in do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/gtkfind ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/gtkfind.1 ${MANPREFIX}/man/man1 + ${INSTALL_PROGRAM} ${WRKSRC}/gtkfind ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/gtkfind.1 ${STAGEDIR}${MANPREFIX}/man/man1 .include --- sysutils/diskcheckd/Makefile +++ sysutils/diskcheckd/Makefile-staged @@ -19,7 +19,6 @@ MAKEFILE= /usr/share/mk/bsd.prog.mk MAKE_ARGS= PROG=diskcheckd MAN8=${MAN8} -NO_STAGE= yes do-extract: @${MKDIR} ${WRKSRC} .for f in diskcheckd.c diskcheckd.8 @@ -30,13 +29,14 @@ @${REINPLACE_CMD} -e 's|/usr/local/etc/diskcheckd.conf|${PREFIX}/etc/diskcheckd.conf|g' ${WRKSRC}/diskcheckd.8 do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/diskcheckd ${PREFIX}/sbin - ${INSTALL_DATA} ${FILESDIR}/diskcheckd.conf ${PREFIX}/etc/diskcheckd.conf.sample - ${INSTALL_MAN} ${WRKSRC}/diskcheckd.8 ${MAN8PREFIX}/man/man8 + ${INSTALL_PROGRAM} ${WRKSRC}/diskcheckd ${STAGEDIR}${PREFIX}/sbin + ${INSTALL_DATA} ${FILESDIR}/diskcheckd.conf \ + ${STAGEDIR}${PREFIX}/etc/diskcheckd.conf.sample + ${INSTALL_MAN} ${WRKSRC}/diskcheckd.8 ${STAGEDIR}${MAN8PREFIX}/man/man8 post-install: - @[ -f ${PREFIX}/etc/diskcheckd.conf ] \ - || ${CP} -p ${PREFIX}/etc/diskcheckd.conf.sample \ - ${PREFIX}/etc/diskcheckd.conf + @[ -f ${STAGEDIR}${PREFIX}/etc/diskcheckd.conf ] \ + || ${CP} -p ${STAGEDIR}${PREFIX}/etc/diskcheckd.conf.sample \ + ${STAGEDIR}${PREFIX}/etc/diskcheckd.conf .include