Page MenuHomeFreeBSD
Files F163553297

D21835.id62698.diff
No OneTemporary
Actions

D21835.id62698.diff
View Options

Index: Mk/bsd.port.mk
===================================================================
--- Mk/bsd.port.mk
+++ Mk/bsd.port.mk
@@ -1334,6 +1334,7 @@
PACKAGES?= ${PORTSDIR}/packages
TEMPLATES?= ${PORTSDIR}/Templates
KEYWORDS?= ${PORTSDIR}/Keywords
+WRAPPERSDIR= ${PORTSDIR}/Templates/wrappers/
PATCHDIR?= ${MASTERDIR}/files
FILESDIR?= ${MASTERDIR}/files
@@ -5101,6 +5102,15 @@
.endif
.endif
+.if !empty(BINARY_WRAPPERS)
+.if !target(create-binary-wrappers)
+create-binary-wrappers: ${BINARY_LINKDIR}
+.for bin in ${BINARY_WRAPPERS}
+ @${INSTALL_SCRIPT} ${WRAPPERSDIR}/${bin} ${BINARY_LINKDIR}
+.endfor
+.endif
+.endif
+
.if defined(WARNING)
WARNING_WAIT?= 10
show-warnings:
@@ -5201,6 +5211,7 @@
${_OPTIONS_patch} ${_USES_patch}
_CONFIGURE_DEP= patch
_CONFIGURE_SEQ= 150:build-depends 151:lib-depends 160:create-binary-alias \
+ 161:create-binary-wrappers \
200:configure-message \
300:pre-configure 450:pre-configure-script \
490:run-autotools-fixup 500:do-configure 700:post-configure \
Index: Templates/wrappers/gm4
===================================================================
--- /dev/null
+++ Templates/wrappers/gm4
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+case " $@ " in
+*" --version "*) echo "m4 (GNU M4) 1.4.18" ;;
+*) exec m4 -g $@ ;;
+esac
Index: archivers/star/Makefile
===================================================================
--- archivers/star/Makefile
+++ archivers/star/Makefile
@@ -14,9 +14,8 @@
LICENSE_COMB= multi
LICENSE_FILE= ${WRKSRC}/CDDL.Schily.txt
-BUILD_DEPENDS= gm4:devel/m4
-
USES= gmake gettext iconv tar:bzip2
+BINARY_WRAPPERS= gm4
MAKE_ARGS= GMAKE_NOWARN=true DESTDIR=${STAGEDIR} INS_BASE=${PREFIX} \
MANBASE=
Index: cad/geda/Makefile
===================================================================
--- cad/geda/Makefile
+++ cad/geda/Makefile
@@ -21,7 +21,6 @@
LIB_DEPENDS= libstroke.so:devel/libstroke \
libguile.so:lang/guile
RUN_DEPENDS= gawk:lang/gawk\
- m4>=1.4.11:devel/m4
USES= desktop-file-utils gettext gmake libtool pathfix perl5 \
pkgconfig python:run shared-mime-info shebangfix
@@ -33,7 +32,6 @@
USE_GNOME= gtk20
USE_PERL5= run
GNU_CONFIGURE= yes
-CONFIGURE_ENV= M4=${LOCALBASE}/bin/gm4
CONFIGURE_ARGS= --with-libstroke=${LOCALBASE}
INSTALL_TARGET= install-strip
USE_LDCONFIG= yes
@@ -43,6 +41,7 @@
DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-gaf
DATADIR= ${PREFIX}/share/gEDA
INFO= geda-scheme
+BINARY_WRAPPERS= gm4
CONFLICTS= geda-docs-[0-9]* geda-examples-[0-9]* geda-gattrib-[0-9]* \
geda-gschem-[0-9]* geda-netlist-[0-9]* geda-symbols-[0-9]* \
Index: databases/libgdamm5/Makefile
===================================================================
--- databases/libgdamm5/Makefile
+++ databases/libgdamm5/Makefile
@@ -11,8 +11,6 @@
MAINTAINER= bland@FreeBSD.org
COMMENT= C++ wrapper for libgda5 library
-BUILD_DEPENDS= gm4:devel/m4
-
USES= gmake libtool pathfix pkgconfig tar:xz compiler:c++11-lang
USE_CXXSTD= c++11
USE_GNOME= libgda5 glibmm
@@ -20,6 +18,7 @@
INSTALL_TARGET= install-strip
USE_LDCONFIG= yes
CONFIGURE_ARGS= --disable-documentation
+BINARY_WRAPPERS= gm4
OPTIONS_DEFINE= BDB
Index: devel/gconfmm26/Makefile
===================================================================
--- devel/gconfmm26/Makefile
+++ devel/gconfmm26/Makefile
@@ -13,8 +13,7 @@
COMMENT= C++ wrapper for gconf2 API library
LIB_DEPENDS= libglibmm-2.4.so:devel/glibmm
-BUILD_DEPENDS= gm4:devel/m4 \
- ${LOCALBASE}/lib/libgtkmm-2.4.so.1:x11-toolkits/gtkmm24
+BUILD_DEPENDS= ${LOCALBASE}/lib/libgtkmm-2.4.so.1:x11-toolkits/gtkmm24
USES= compiler:c++11-lang gmake libtool:keepla pathfix pkgconfig \
tar:bzip2
@@ -25,6 +24,7 @@
USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-static --disable-documentation
INSTALL_TARGET= install-strip
+BINARY_WRAPPERS= gm4
PLIST_SUB= VERSION="2.6" API_VERSION="2.6"
Index: devel/glibmm-reference/Makefile
===================================================================
--- devel/glibmm-reference/Makefile
+++ devel/glibmm-reference/Makefile
@@ -3,8 +3,7 @@
PORTREVISION= 3
-BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/glibmm-2.4.pc:devel/glibmm \
- gm4:devel/m4
+BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/glibmm-2.4.pc:devel/glibmm
GNU_CONFIGURE= yes
USES= compiler:c++11-lang gmake pkgconfig
Index: devel/glibmm/Makefile
===================================================================
--- devel/glibmm/Makefile
+++ devel/glibmm/Makefile
@@ -21,8 +21,6 @@
.if !defined(REFERENCE_PORT)
-BUILD_DEPENDS= gm4:devel/m4
-
USES+= compiler:c++11-lang gettext gmake libtool pathfix \
perl5 pkgconfig
USE_GNOME= glib20 libsigc++20
@@ -30,6 +28,7 @@
USE_LDCONFIG= yes
CONFIGURE_ARGS= --disable-documentation
INSTALL_TARGET= install-strip
+BINARY_WRAPPERS= gm4
post-patch:
.for d in docs examples tests
Index: devel/gnome-vfsmm/Makefile
===================================================================
--- devel/gnome-vfsmm/Makefile
+++ devel/gnome-vfsmm/Makefile
@@ -12,8 +12,6 @@
MAINTAINER= bland@FreeBSD.org
COMMENT= C++ wrapper for gnomevfs2 library
-BUILD_DEPENDS= gm4:devel/m4
-
USES= gmake libtool:keepla pathfix pkgconfig tar:bzip2 \
compiler:c++11-lang
USE_CXXSTD= c++11
@@ -21,6 +19,7 @@
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
INSTALL_TARGET= install-strip
+BINARY_WRAPPERS= gm4
PLIST_SUB= VERSION="2.6" API_VERSION="2.6"
Index: devel/libglademm24/Makefile
===================================================================
--- devel/libglademm24/Makefile
+++ devel/libglademm24/Makefile
@@ -15,7 +15,6 @@
OPTIONS_DEFINE= DOCS
LIB_DEPENDS= libgtkmm-2.4.so:x11-toolkits/gtkmm24
-BUILD_DEPENDS= gm4:devel/m4
USE_XORG= x11 ice
USES= compiler:c++11-lang gmake libtool:keepla pathfix pkgconfig \
@@ -26,6 +25,7 @@
USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-static
INSTALL_TARGET= install-strip
+BINARY_WRAPPERS= gm4
PLIST_SUB= VERSION="2.4" API_VERSION="2.4"
Index: devel/libsigc++12/Makefile
===================================================================
--- devel/libsigc++12/Makefile
+++ devel/libsigc++12/Makefile
@@ -12,11 +12,12 @@
MAINTAINER= gnome@FreeBSD.org
COMMENT= Callback Framework for C++
-BUILD_DEPENDS= gm4:devel/m4
+LICENSE= LGPL21
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
USES= gmake libtool pathfix pkgconfig
USE_LDCONFIG= yes
+BINARY_WRAPPERS= gm4
.include <bsd.port.mk>
Index: graphics/gexiv2/Makefile
===================================================================
--- graphics/gexiv2/Makefile
+++ graphics/gexiv2/Makefile
@@ -13,14 +13,14 @@
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= gm4:devel/m4 \
- vala>=0:lang/vala
+BUILD_DEPENDS= vala>=0:lang/vala
LIB_DEPENDS= libexiv2.so:graphics/exiv2
USES= compiler:c++11-lang gnome libtool:build meson pathfix \
pkgconfig tar:xz
USE_GNOME= glib20 introspection:build
USE_LDCONFIG= yes
+BINARY_WRAPPERS= gm4
OPTIONS_DEFINE= DOCS
OPTIONS_SUB= yes
Index: graphics/libgnomecanvasmm26/Makefile
===================================================================
--- graphics/libgnomecanvasmm26/Makefile
+++ graphics/libgnomecanvasmm26/Makefile
@@ -13,7 +13,6 @@
COMMENT= C++ wrapper for libgnomecanvas library
LIB_DEPENDS= libgtkmm-2.4.so:x11-toolkits/gtkmm24
-BUILD_DEPENDS= gm4:devel/m4
USES= compiler:c++11-lang gmake libtool:keepla pathfix pkgconfig \
tar:bzip2
@@ -23,6 +22,7 @@
USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-static
INSTALL_TARGET= install-strip
+BINARY_WRAPPERS= gm4
PLIST_SUB= VERSION="2.6" API_VERSION="2.6"
Index: lang/parrot/Makefile
===================================================================
--- lang/parrot/Makefile
+++ lang/parrot/Makefile
@@ -14,7 +14,6 @@
LICENSE= ART20
BUILD_DEPENDS= ${LOCALBASE}/bin/flex:textproc/flex \
- gm4:devel/m4 \
pcre-config:devel/pcre
LIB_DEPENDS= libgmp.so:math/gmp \
libicudata.so:devel/icu
@@ -41,6 +40,7 @@
tools/dev/pprof2cg.pl \
tools/dev/reconfigure.pl
perl_OLD_CMD= perl
+BINARY_WRAPPERS= gm4
DOCSDIR= share/doc/${PORTNAME}/${PORTVERSION}
PLIST_SUB= PARROT_VER="${PORTVERSION}"
Index: net-mgmt/docsis/Makefile
===================================================================
--- net-mgmt/docsis/Makefile
+++ net-mgmt/docsis/Makefile
@@ -11,8 +11,7 @@
LICENSE= GPLv2+
-BUILD_DEPENDS= gm4:devel/m4 \
- flex:textproc/flex
+BUILD_DEPENDS= flex:textproc/flex
LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp \
libpkg.so:ports-mgmt/pkg
@@ -20,6 +19,7 @@
USE_GITHUB= yes
GNU_CONFIGURE= yes
MAKE_JOBS_UNSAFE= yes
+BINARY_WRAPPERS= gm4
PLIST_SUB= MIBS=share/snmp/mibs
Index: net/tigervnc-server/Makefile
===================================================================
--- net/tigervnc-server/Makefile
+++ net/tigervnc-server/Makefile
@@ -9,7 +9,6 @@
PATCH_DEPENDS+= ${NONEXISTENT}:x11-servers/xorg-server:patch
BUILD_DEPENDS+= ${LOCALBASE}/include/GL/internal/dri_interface.h:graphics/mesa-dri \
${LOCALBASE}/libdata/pkgconfig/fontutil.pc:x11-fonts/font-util \
- gm4:devel/m4 \
bash:shells/bash
LIB_DEPENDS= libxshmfence.so:x11/libxshmfence
# almost equivalent to x11-servers/xorg-server's
@@ -21,6 +20,8 @@
USE_GL+= gl
USE_XORG+= ice pixman sm x11 xau xdamage xdmcp xext xfixes xfont xkbfile \
xorg-macros xorgproto xrandr xrender xtrans xtst
+
+BINARY_WRAPPERS= gm4
OPTIONS_DEFINE= DOCS GNUTLS PAM
OPTIONS_DEFAULT= GNUTLS PAM
Index: sysutils/pacman/Makefile
===================================================================
--- sysutils/pacman/Makefile
+++ sysutils/pacman/Makefile
@@ -14,8 +14,7 @@
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= asciidoc:textproc/asciidoc \
- bash:shells/bash \
- gm4:devel/m4
+ bash:shells/bash
RUN_DEPENDS= bash:shells/bash
LIB_DEPENDS= libarchive.so.13:archivers/libarchive
@@ -27,6 +26,7 @@
--localstatedir=/var
CONFIGURE_ENV= LIBSSL_CFLAGS="-I${OPENSSLINC}" LIBSSL_LIBS="-L${OPENSSLLIB}"
USE_LDCONFIG= yes
+BINARY_WRAPPERS= gm4
SUB_FILES= pkg-message pkg-deinstall
SUB_LIST= PACMAN_ROOT="${PACMAN_ROOT}" PREFIX="${PREFIX}"
Index: textproc/libxml++26/Makefile
===================================================================
--- textproc/libxml++26/Makefile
+++ textproc/libxml++26/Makefile
@@ -19,14 +19,13 @@
.if !defined(REFERENCE_PORT)
-BUILD_DEPENDS= gm4:devel/m4
-
USES+= gmake libtool pathfix pkgconfig
USE_GNOME= glibmm libxml2
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-static --disable-documentation
INSTALL_TARGET= install-strip
+BINARY_WRAPPERS= gm4
post-patch:
@${REINPLACE_CMD} -e '/^SUBDIRS =/s/examples//' \
Index: x11-toolkits/gtkmm20/Makefile
===================================================================
--- x11-toolkits/gtkmm20/Makefile
+++ x11-toolkits/gtkmm20/Makefile
@@ -20,7 +20,6 @@
.if !defined(REFERENCE_PORT)
LIB_DEPENDS= libsigc-1.2.so:devel/libsigc++12
-BUILD_DEPENDS= gm4:devel/m4
USES+= autoreconf gmake libtool:keepla pathfix pkgconfig
GNU_CONFIGURE= yes
@@ -29,6 +28,7 @@
CONFIGURE_ARGS= --enable-static=yes \
--with-sigc-prefix=${LOCALBASE}
INSTALL_TARGET= install-strip
+BINARY_WRAPPERS= gm4
post-patch:
@${REINPLACE_CMD} -e 's|glib/gmessages.h|glib/gtestutils.h|g' \
Index: x11-toolkits/gtkmm24/Makefile
===================================================================
--- x11-toolkits/gtkmm24/Makefile
+++ x11-toolkits/gtkmm24/Makefile
@@ -18,7 +18,6 @@
.if !defined(REFERENCE_PORT)
-BUILD_DEPENDS= gm4:devel/m4
LIB_DEPENDS= libfreetype.so:print/freetype2 \
libfontconfig.so:x11-fonts/fontconfig
@@ -32,6 +31,7 @@
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --disable-documentation
INSTALL_TARGET= install-strip
+BINARY_WRAPPERS= gm4
PLIST_SUB= VERSION="2.4" API_VERSION="2.4"
Index: x11-toolkits/gtkmm30/Makefile
===================================================================
--- x11-toolkits/gtkmm30/Makefile
+++ x11-toolkits/gtkmm30/Makefile
@@ -20,8 +20,6 @@
.if !defined(REFERENCE_PORT)
-BUILD_DEPENDS= gm4:devel/m4
-
USES+= gettext gmake gnome libtool pathfix pkgconfig \
compiler:c++11-lang
USE_CXXSTD= c++11
@@ -30,6 +28,7 @@
USE_LDCONFIG= yes
CONFIGURE_ARGS= --disable-documentation
INSTALL_TARGET= install-strip
+BINARY_WRAPPERS= gm4
PLIST_SUB= API_VERSION="3.0"
Index: x11-toolkits/libgnomeprintuimm/Makefile
===================================================================
--- x11-toolkits/libgnomeprintuimm/Makefile
+++ x11-toolkits/libgnomeprintuimm/Makefile
@@ -13,7 +13,6 @@
LIB_DEPENDS= libgtkmm-2.4.so:x11-toolkits/gtkmm24 \
libgnomeprintmm-2.5.so:print/libgnomeprintmm
-BUILD_DEPENDS= gm4:devel/m4
USES= compiler:c++11-lang gmake libtool:keepla pathfix \
pkgconfig tar:bzip2
@@ -23,6 +22,7 @@
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-static
INSTALL_TARGET= install-strip
+BINARY_WRAPPERS= gm4
PLIST_SUB= VERSION="2.5" API_VERSION="2.6"
Index: x11-toolkits/libgnomeuimm26/Makefile
===================================================================
--- x11-toolkits/libgnomeuimm26/Makefile
+++ x11-toolkits/libgnomeuimm26/Makefile
@@ -17,7 +17,6 @@
libgconfmm-2.6.so:devel/gconfmm26 \
libglademm-2.4.so:devel/libglademm24 \
libgnomevfsmm-2.6.so:devel/gnome-vfsmm
-BUILD_DEPENDS= gm4:devel/m4
USES= compiler:c++11-lang gmake libtool:keepla pathfix pkgconfig \
tar:bzip2
@@ -28,6 +27,7 @@
USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-static
INSTALL_TARGET= install-strip
+BINARY_WRAPPERS= gm4
PLIST_SUB= VERSION="2.6" API_VERSION="2.6"
Index: x11-toolkits/pangomm/Makefile
===================================================================
--- x11-toolkits/pangomm/Makefile
+++ x11-toolkits/pangomm/Makefile
@@ -18,8 +18,6 @@
.if !defined(REFERENCE_PORT)
PORTSCOUT= limitw:1,even
-BUILD_DEPENDS= gm4:devel/m4
-
USES+= gmake libtool localbase pathfix pkgconfig compiler:c++11-lang
USE_CXXSTD= c++11
USE_GNOME= cairomm glibmm pango
@@ -28,6 +26,7 @@
CONFIGURE_ARGS= --disable-documentation \
--enable-static=yes
INSTALL_TARGET= install-strip
+BINARY_WRAPPERS= gm4
PLIST_SUB= VERSION="2.4" API_VERSION="1.4"
Index: x11/libgnomemm26/Makefile
===================================================================
--- x11/libgnomemm26/Makefile
+++ x11/libgnomemm26/Makefile
@@ -13,7 +13,6 @@
COMMENT= C++ wrapper for libgnome library
LIB_DEPENDS= libgtkmm-2.4.so:x11-toolkits/gtkmm24
-BUILD_DEPENDS= gm4:devel/m4
USES= compiler:c++11-lang gmake libtool:keepla pathfix pkgconfig \
tar:bzip2
@@ -24,6 +23,7 @@
USE_LDCONFIG= yes
CONFIGURE_ARGS= --enable-static
INSTALL_TARGET= install-strip
+BINARY_WRAPPERS= gm4
PLIST_SUB= VERSION="2.6" API_VERSION="2.6"

File Metadata

Mime Type
text/plain
Expires
Sat, Jul 25, 10:20 AM (12 h, 12 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35471059
Default Alt Text
D21835.id62698.diff (14 KB)

Event Timeline