From owner-freebsd-ports Wed Aug 16 10:30:12 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 7002E37CA1C for ; Wed, 16 Aug 2000 10:30:03 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id KAA85814; Wed, 16 Aug 2000 10:30:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 656D137C93F; Wed, 16 Aug 2000 10:20:23 -0700 (PDT) Message-Id: <20000816172023.656D137C93F@hub.freebsd.org> Date: Wed, 16 Aug 2000 10:20:23 -0700 (PDT) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-1.0 Subject: ports/20650: Update port: devel/mkcmd Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 20650 >Category: ports >Synopsis: Update port: devel/mkcmd >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Aug 16 10:30:01 PDT 2000 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.1-RELEASE i386 >Organization: >Environment: >Description: - Support CFLAGS/PREFIX properly New file: patches/patch-ae >How-To-Repeat: >Fix: diff -urN /usr/ports/devel/mkcmd/Makefile devel/mkcmd/Makefile --- /usr/ports/devel/mkcmd/Makefile Fri Aug 11 19:13:08 2000 +++ devel/mkcmd/Makefile Thu Aug 17 01:44:41 2000 @@ -1,6 +1,6 @@ -# New ports collection makefile for: mkcmd -# Date created: 17 November 1999 -# Whom: ajk@waterspout.com +# New ports collection makefile for: mkcmd +# Date created: 17 November 1999 +# Whom: ajk@waterspout.com # # $FreeBSD: ports/devel/mkcmd/Makefile,v 1.4 2000/08/11 00:12:28 will Exp $ # @@ -20,13 +20,18 @@ MAN1= mkcmd.1 MAN5= mkcmd.5 +post-patch: +.for f in bin/mkcmd/machine.h bin/mkcmd/mkcmd.man lib/mkcmd/mkcmd.man + @${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/${f} +.endfor + do-build: @(cd ${WRKSRC}/bin/mkcmd && ${SETENV} ${MAKE_ENV} makeme \ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) do-install: .for d in bin/mkcmd lib/mkcmd - @(cd ${WRKSRC}/$d && ${SETENV} ${MAKE_ENV} makeme \ + @(cd ${WRKSRC}/${d} && ${SETENV} ${MAKE_ENV} makeme \ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) .endfor ${INSTALL_MAN} ${WRKSRC}/bin/mkcmd/mkcmd.man \ diff -urN /usr/ports/devel/mkcmd/patches/patch-aa devel/mkcmd/patches/patch-aa --- /usr/ports/devel/mkcmd/patches/patch-aa Sat Jan 22 11:09:58 2000 +++ devel/mkcmd/patches/patch-aa Thu Aug 17 01:43:47 2000 @@ -5,7 +5,7 @@ #if !defined(DEFDIR) -#define DEFDIR "/usr/local/lib/mkcmd:/usr/local/lib/mkcmd/type" -+#define DEFDIR "/usr/local/share/mkcmd:/usr/local/share/mkcmd/type" ++#define DEFDIR "%%PREFIX%%/share/mkcmd:%%PREFIX%%/share/mkcmd/type" #endif #if !defined(TILDEDIR) diff -urN /usr/ports/devel/mkcmd/patches/patch-ab devel/mkcmd/patches/patch-ab --- /usr/ports/devel/mkcmd/patches/patch-ab Mon Dec 27 10:43:12 1999 +++ devel/mkcmd/patches/patch-ab Thu Aug 17 01:43:47 2000 @@ -5,7 +5,7 @@ .BI \-I directory \fBMkcmd\fP searches for the files on the command line first in the -current directory, then in a standard place (\*(lq/usr/local/lib/mkcmd\*(rq), -+current directory, then in a standard place (\*(lq/usr/local/share/mkcmd\*(rq), ++current directory, then in a standard place (\*(lq%%PREFIX%%/share/mkcmd\*(rq), then in any \fIdirectory\fP listed as parameters to this option. .TP .BI \-m manpage diff -urN /usr/ports/devel/mkcmd/patches/patch-ac devel/mkcmd/patches/patch-ac --- /usr/ports/devel/mkcmd/patches/patch-ac Fri Aug 11 19:13:09 2000 +++ devel/mkcmd/patches/patch-ac Thu Aug 17 01:43:47 2000 @@ -5,7 +5,7 @@ SHELL=/bin/sh -LIB= ${DESTDIR}/usr/local/lib/mkcmd -+LIB= ${DESTDIR}/usr/local/share/mkcmd ++LIB= ${PREFIX}/share/mkcmd TEMPL= Template.m bytes.m bytes.mi client.m \ bsd.m \ diff -urN /usr/ports/devel/mkcmd/patches/patch-ad devel/mkcmd/patches/patch-ad --- /usr/ports/devel/mkcmd/patches/patch-ad Sat Jan 22 11:09:59 2000 +++ devel/mkcmd/patches/patch-ad Thu Aug 17 01:43:47 2000 @@ -5,7 +5,7 @@ .TS l l. -\fI/usr/local/lib/mkcmd\fP the default directory for template files -+\fI/usr/local/share/mkcmd\fP the default directory for template files ++\fI%%PREFIX%%/share/mkcmd\fP the default directory for template files .TE .SH AUTHOR diff -urN /usr/ports/devel/mkcmd/patches/patch-ae devel/mkcmd/patches/patch-ae --- /usr/ports/devel/mkcmd/patches/patch-ae Thu Jan 1 09:00:00 1970 +++ devel/mkcmd/patches/patch-ae Thu Aug 17 01:43:47 2000 @@ -0,0 +1,24 @@ +--- bin/mkcmd/Make.host.orig Mon Jul 31 06:56:23 2000 ++++ bin/mkcmd/Make.host Fri Aug 11 19:44:39 2000 +@@ -5,7 +5,7 @@ + SHELL=/bin/sh + 'ifelse(HOSTTYPE,`PTX', + `BIN= ${ROOT}/bin', +-`BIN= ${DESTDIR}/usr/local/bin')` ++`BIN= ${PREFIX}/bin')` + PROG= mkcmd + + I=/usr/include +@@ -17,10 +17,10 @@ + # -D in CDEFS. See notes in machine.h. Change LIB (if you move DEFDIR) + # in the lib source Makefile. + INCLUDE= +-DEBUG='ifelse(HOSTTYPE,`V386',`',`-O')` ++DEBUG='ifelse(HOSTTYPE,`V386',`',`')` + CDEFS= -D'HOSTTYPE`'ifdef(`CPP_FIX',` CPP_FIX')`'ifelse( + HOSTTYPE,`IBMR2',` -D_AIX')` +-CFLAGS= ${DEBUG} ${CDEFS} ${INCLUDE} ++CFLAGS+= ${DEBUG} ${CDEFS} ${INCLUDE} + INSTALL= install + + HDR= main.h mkcmd.h check.h emit.h key.h list.h parser.h stracc.h option.h \ >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message