Date: Sat, 5 Aug 2006 22:18:29 +0200 (CEST) From: Gabor Kovesdan <gabor@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Gabor Kovesdan <gabor@FreeBSD.org> Subject: ports/101433: [patch] devel/gmake Message-ID: <20060805201829.5AEEA289C1C@catv-50635cb6.catv.broadband.hu> Resent-Message-ID: <200608052020.k75KKGxM084680@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 101433
>Category: ports
>Synopsis: [patch] devel/gmake
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Aug 05 20:20:16 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Gabor Kovesdan
>Release: FreeBSD 6.1-STABLE i386
>Organization:
n/a
>Environment:
System: FreeBSD spitfire 6.1-STABLE FreeBSD 6.1-STABLE #0: Sat Jul 29 18:31:18 CEST 2006 gabor@spitfire:/usr/src/sys/i386/compile/SPITFIRE i386
>Description:
- Respect DESTDIR
- s/chgrp/${CHGRP}/
- Use REINPLACE_CMD instead of a patch
>How-To-Repeat:
>Fix:
--- devel-gmake.diff begins here ---
Index: Makefile
===================================================================
RCS file: /usr/cvs/ports/devel/gmake/Makefile,v
retrieving revision 1.62
diff -u -r1.62 Makefile
--- Makefile 29 Jun 2006 22:39:05 -0000 1.62
+++ Makefile 5 Aug 2006 20:10:37 -0000
@@ -29,7 +29,7 @@
CONFIGURE_ARGS+=--disable-nls
PLIST_SUB= NLS="@comment "
.endif
-CONFIGURE_ENV+= MAKEINFO="/usr/bin/makeinfo --no-split"
+CONFIGURE_ENV+= MAKEINFO="${DESTDIR}/usr/bin/makeinfo --no-split"
MAN1= gmake.1
INFO= make
@@ -40,11 +40,13 @@
post-patch:
@${RM} ${WRKSRC}/doc/make.info*
+ @${REINPLACE_CMD} -e "s|@dircategory GNU Packages|@dircategory Programming & development tools|" \
+ -e "s|* Make:|* GNU make:|" ${WRKSRC}/doc/make.texi
# joerg@freebsd.org says our getloadavg() no longer requires setgid kmem
post-install:
- @${CHMOD} g-s ${PREFIX}/bin/gmake
- @chgrp ${BINGRP} ${PREFIX}/bin/gmake
+ @${CHMOD} g-s ${TARGETDIR}/bin/gmake
+ @${CHGRP} ${BINGRP} ${TARGETDIR}/bin/gmake
.include <bsd.port.mk>
Index: files/patch-ab
===================================================================
RCS file: files/patch-ab
diff -N files/patch-ab
--- files/patch-ab 7 Oct 2002 19:14:30 -0000 1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
---- doc/make.texi.orig Mon Oct 7 22:57:59 2002
-+++ doc/make.texi Mon Oct 7 22:58:03 2002
-@@ -25,9 +25,9 @@
- @c Combine the program and concept indices:
- @syncodeindex pg cp
-
--@dircategory GNU Packages
-+@dircategory Programming & development tools
- @direntry
--* Make: (make). Remake files automatically.
-+* GNU make: (make). Remake files automatically.
- @end direntry
-
- @ifinfo
--- devel-gmake.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060805201829.5AEEA289C1C>