From 5e0a3a9c6501ff98a7f9a2a38cf0fd8836f0b131 Mon Sep 17 00:00:00 2001
From: Ade Lovett <ade@FreeBSD.org>
Date: Sun, 18 Nov 2007 22:37:50 +0000
Subject: Replace remaining hardcoded instances of /usr/bin/makeinfo with
makeinfo as part of some cleanup work.
Approved by: portmgr (linimon)
---
devel/cutils/Makefile | 2 +-
devel/gmake/Makefile | 2 +-
devel/gmake381/Makefile | 2 +-
devel/libmatheval/Makefile | 2 +-
lang/Sather/Makefile | 2 +-
x11/xnee/Makefile | 11 ++---------
6 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/devel/cutils/Makefile b/devel/cutils/Makefile
index d0cd9f6c4770..7cdc6e747829 100644
--- a/devel/cutils/Makefile
+++ b/devel/cutils/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Miscellaneous C programmer's utilities
GNU_CONFIGURE= yes
-MAKE_ENV= MAKEINFO=/usr/bin/makeinfo
+MAKE_ENV= MAKEINFO=makeinfo
MAN1= cdecl.1 chilight.1 cobfusc.1 cundecl.1 cunloop.1 yyextract.1 \
yyref.1
INFO= cutils
diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile
index a9d47d2e8527..e3b3986f3578 100644
--- a/devel/gmake/Makefile
+++ b/devel/gmake/Makefile
@@ -29,7 +29,7 @@ PLIST_SUB= NLS=""
CONFIGURE_ARGS+=--disable-nls
PLIST_SUB= NLS="@comment "
.endif
-CONFIGURE_ENV+= MAKEINFO="/usr/bin/makeinfo --no-split"
+CONFIGURE_ENV+= MAKEINFO="makeinfo --no-split"
MAN1= gmake.1
INFO= make
diff --git a/devel/gmake381/Makefile b/devel/gmake381/Makefile
index a9d47d2e8527..e3b3986f3578 100644
--- a/devel/gmake381/Makefile
+++ b/devel/gmake381/Makefile
@@ -29,7 +29,7 @@ PLIST_SUB= NLS=""
CONFIGURE_ARGS+=--disable-nls
PLIST_SUB= NLS="@comment "
.endif
-CONFIGURE_ENV+= MAKEINFO="/usr/bin/makeinfo --no-split"
+CONFIGURE_ENV+= MAKEINFO="makeinfo --no-split"
MAN1= gmake.1
INFO= make
diff --git a/devel/libmatheval/Makefile b/devel/libmatheval/Makefile
index edf3b555edaf..ac7cd1636add 100644
--- a/devel/libmatheval/Makefile
+++ b/devel/libmatheval/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= guile.15:${PORTSDIR}/lang/guile
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV+= MAKEINFO="/usr/bin/makeinfo --no-split"
+CONFIGURE_ENV+= MAKEINFO="makeinfo --no-split"
USE_LDCONFIG= yes
CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib
diff --git a/lang/Sather/Makefile b/lang/Sather/Makefile
index 686d0737aeab..e281d45da3de 100644
--- a/lang/Sather/Makefile
+++ b/lang/Sather/Makefile
@@ -123,7 +123,7 @@ pre-build:
post-build:
.for file in sather-tutorial.texinfo sather-mode.texinfo sather.texinfo
- cd ${WRKSRC}/Emacs && /usr/bin/makeinfo --no-split ${file}
+ cd ${WRKSRC}/Emacs && makeinfo --no-split ${file}
.endfor
do-install:
diff --git a/x11/xnee/Makefile b/x11/xnee/Makefile
index c57821658063..41430ac681bb 100644
--- a/x11/xnee/Makefile
+++ b/x11/xnee/Makefile
@@ -40,14 +40,7 @@ PLIST_DIRS= %%DATADIR%%/pixmaps %%DATADIR%%
BUILD_DEPENDS+= ${LOCALBASE}/bin/makeinfo:${PORTSDIR}/print/texinfo
MAKEINFO= ${LOCALBASE}/bin/makeinfo
.else
-MAKEINFO= /usr/bin/makeinfo
-.endif
-
-.if ${OSVERSION} < 600000
-BUILD_DEPENDS+= ${MAKEINFO_CMD}:${PORTSDIR}/print/texinfo
-MAKEINFO_CMD= ${LOCALBASE}/bin/makeinfo
-.else
-MAKEINFO_CMD= /usr/bin/makeinfo
+MAKEINFO= makeinfo
.endif
.if defined(WITH_GNEE)
@@ -88,7 +81,7 @@ post-patch:
's|cp $$(PNEE)|$$(INSTALL_PROGRAM) $$(PNEE)|g' ${WRKSRC}/pnee/src/Makefile.in
post-build:
- cd ${WRKSRC}/cnee/src && ${MAKEINFO_CMD} --no-split cnee.texi
+ cd ${WRKSRC}/cnee/src && ${MAKEINFO} --no-split cnee.texi
post-install:
${INSTALL_DATA} ${WRKSRC}/cnee/src/cnee.info ${PREFIX}/${INFO_PATH}
--
cgit debian/1.2.3+git2.25.1-1-2-gaceb0