The Heirloom Toolchest is a collection of standard Unix utilities. How-To-Repeat: n/a
State Changed From-To: open->feedback
Class Changed From-To: maintainer-update->change-request 1) I propose the following patch to respect CC: diff -urN sysutils/heirloom.orig/Makefile sysutils/heirloom/Makefile --- sysutils/heirloom.orig/Makefile Sat Jun 5 01:04:28 2004 +++ sysutils/heirloom/Makefile Sat Jun 5 00:53:18 2004 @@ -20,6 +20,7 @@ USE_REINPLACE= yes USE_GMAKE= yes MAKEFILE= makefile +MAKE_ENV= CC=${CC} ALL_TARGET= # none DATADIR= ${PREFIX}/${PORTNAME} REINPLACE_SUB= DATADIR="${DATADIR}" @@ -77,7 +78,6 @@ ${WRKSRC}/build/mk.config ${WRKSRC}/su/su.dfl.in post-install: compress-man install-doc - install-doc: .if !defined(NOPORTDOCS) diff -urN sysutils/heirloom.orig/files/patch-build::mk.config sysutils/heirloom/files/patch-build::mk.config --- sysutils/heirloom.orig/files/patch-build::mk.config Sat Jun 5 01:04:28 2004 +++ sysutils/heirloom/files/patch-build::mk.config Sat Jun 5 00:49:53 2004 @@ -1,5 +1,5 @@ ---- build/mk.config.orig Mon May 17 21:43:22 2004 -+++ build/mk.config Thu Jun 3 16:25:47 2004 +--- ./build/mk.config.orig Mon May 17 21:43:22 2004 ++++ ./build/mk.config Sat Jun 5 00:49:30 2004 @@ -14,57 +14,57 @@ # Location for binaries that have no special personality. This location # may be identical to that of one of the first three personalities below. @@ -111,6 +111,15 @@ USE_BZLIB = 1 # +@@ -129,7 +129,7 @@ + # + + #CC = $(HOME)/src/diet gcc +-CC = cc ++#CC = cc + WARN = -Wchar-subscripts -Wformat -Wno-format-y2k -Wimplicit + -Wmissing-braces -Wsequence-point -Wreturn-type -Wtrigraphs + -Wunused-function -Wunused-label -Wunused-variable -Wunused-value @@ -178,9 +178,9 @@ # defines here. Leave XO5FL, XO6FL, and GNUFL empty on Solaris, Open UNIX, # and FreeBSD. 2) It builds fine on -5, but fails on -STABLE: gmake[1]: Entering directory `/usr/ports/sysutils/heirloom/work/heirloom-040517/libuxre' cc -O2 -fomit-frame-pointer -D__NO_STRING_INLINES -I. -c onefile.c In file included from bracket.c:32, from onefile.c:33: re.h:51: syntax error before `wctype_t' re.h:54: syntax error before `wctype_t' In file included from onefile.c:33: bracket.c: In function `chcls': bracket.c:153: syntax error before `wct' bracket.c:159: `wct' undeclared (first use in this function) bracket.c:159: (Each undeclared identifier is reported only once bracket.c:159: for each function it appears in.) bracket.c:162: structure has no member named `type' bracket.c:165: structure has no member named `extype' bracket.c:166: structure has no member named `extype' bracket.c:166: `wctype_t' undeclared (first use in this function) bracket.c:171: structure has no member named `extype' bracket.c: In function `libuxre_bktfree': bracket.c:678: structure has no member named `extype' bracket.c:679: structure has no member named `extype' bracket.c: In function `libuxre_bktmbexec': bracket.c:703: `wctype_t' undeclared (first use in this function) bracket.c:703: `wctp' undeclared (first use in this function) bracket.c:703: structure has no member named `type' bracket.c:720: structure has no member named `type' bracket.c:721: structure has no member named `extype' gmake[1]: *** [onefile.o] Erreur 1 gmake[1]: Leaving directory `/usr/ports/sysutils/heirloom/work/heirloom-040517/libuxre' gmake: *** [all] Erreur 2 *** Error code 2 Stop in /usr/ports/sysutils/heirloom.
Hi, MAKE_ENV should be MAKE_ARGS w/ gmake. let's try : cat << EOF > Makefile CC=cc all:;@echo CC is ${CC} EOF $ make CC is cc $ CC=gcc make CC is cc $ make CC=gcc CC is gcc so, the files/patch-build::mk.config patch you proposed isn't needed. about the failing 4.x build, sorry, but I can't fix the problem since I don't have any 4.x machine under my hand. so, I propose to add an IGNORE clause until the problem gets fixed (see below). PS : humm! while I was submitting this PR, there was a new release... also, fix removal of possibly non-existing empty dirs in pkg-plist. --- Makefile.orig Thu Jun 3 23:15:08 2004 +++ Makefile Mon Jun 7 04:15:11 2004 @@ -6,7 +6,7 @@ # PORTNAME= heirloom -PORTVERSION= 040517 +PORTVERSION= 040603 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -16,11 +16,18 @@ RUN_DEPENDS= ksh:${PORTSDIR}/shells/pdksh +.include <bsd.port.pre.mk> + +.if ${OSVERSION} < 500000 +IGNORE= does not build on FreeBSD 4.x which is missing wide-characters +.endif + USE_BZIP2= yes USE_REINPLACE= yes USE_GMAKE= yes +MAKE_ARGS= CC=${CC} MAKEFILE= makefile -ALL_TARGET= # none +ALL_TARGET= bsd DATADIR= ${PREFIX}/${PORTNAME} REINPLACE_SUB= DATADIR="${DATADIR}" @@ -91,4 +98,4 @@ . endfor .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> --- distinfo.orig Thu Jun 3 23:16:04 2004 +++ distinfo Thu Jun 3 23:04:15 2004 @@ -1,2 +1,2 @@ -MD5 (heirloom-040517.tar.bz2) = 2b0a5d7c68de557bf4e9ae5e08d9eb25 -SIZE (heirloom-040517.tar.bz2) = 808302 +MD5 (heirloom-040603.tar.bz2) = 8ea6afa405737853119af480e224bb4a +SIZE (heirloom-040603.tar.bz2) = 809372 --- pkg-plist.orig Fri Jun 4 01:58:40 2004 +++ pkg-plist Fri Jun 4 02:02:09 2004 @@ -270,11 +270,11 @@ @dirrm %%DATADIR%%/usr/ucb @dirrm %%DATADIR%%/usr/share/man/5man/man8 @dirrm %%DATADIR%%/usr/share/man/5man/man7 -@dirrm %%DATADIR%%/usr/share/man/5man/man6 +@unexec rmdir %%DATADIR%%/usr/share/man/5man/man6 2> /dev/null || : @dirrm %%DATADIR%%/usr/share/man/5man/man5 -@dirrm %%DATADIR%%/usr/share/man/5man/man4 -@dirrm %%DATADIR%%/usr/share/man/5man/man3 -@dirrm %%DATADIR%%/usr/share/man/5man/man2 +@unexec rmdir %%DATADIR%%/usr/share/man/5man/man4 2> /dev/null || : +@unexec rmdir %%DATADIR%%/usr/share/man/5man/man3 2> /dev/null || : +@unexec rmdir %%DATADIR%%/usr/share/man/5man/man2 2> /dev/null || : @dirrm %%DATADIR%%/usr/share/man/5man/man1m @dirrm %%DATADIR%%/usr/share/man/5man/man1b @dirrm %%DATADIR%%/usr/share/man/5man/man1 Cyrille Lefevre -- mailto:cyrille.lefevre@laposte.net
State Changed From-To: feedback->closed New port added, thanks!