6 files changed, 37 insertions, 8 deletions

diff --git a/devel/mkcmd/Makefile b/devel/mkcmd/Makefile
index 3f20f181f4e3..6b492baaa45e 100644
--- a/devel/mkcmd/Makefile
+++ b/devel/mkcmd/Makefile
@@ -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$
 #
@@ -20,13 +20,18 @@ MAKEFILE=
 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 --git a/devel/mkcmd/files/patch-aa b/devel/mkcmd/files/patch-aa
index 397e407c7969..6928844e98fe 100644
--- a/devel/mkcmd/files/patch-aa
+++ b/devel/mkcmd/files/patch-aa
@@ -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 --git a/devel/mkcmd/files/patch-ab b/devel/mkcmd/files/patch-ab
index 33bec42b053a..376e9361554c 100644
--- a/devel/mkcmd/files/patch-ab
+++ b/devel/mkcmd/files/patch-ab
@@ -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 --git a/devel/mkcmd/files/patch-ac b/devel/mkcmd/files/patch-ac
index bd783580f6d0..eea3be9addd2 100644
--- a/devel/mkcmd/files/patch-ac
+++ b/devel/mkcmd/files/patch-ac
@@ -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 --git a/devel/mkcmd/files/patch-ad b/devel/mkcmd/files/patch-ad
index a7e2517347ca..654aba7dce98 100644
--- a/devel/mkcmd/files/patch-ad
+++ b/devel/mkcmd/files/patch-ad
@@ -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 --git a/devel/mkcmd/files/patch-ae b/devel/mkcmd/files/patch-ae
new file mode 100644
index 000000000000..7e2710e4d9d9
--- /dev/null
+++ b/devel/mkcmd/files/patch-ae
@@ -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 \