cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use AUTOCONF_ENV and add correct env variables, so that those ports work

Browse Source 
even if /usr/local is not part of the builder's path.
This commit is contained in:
espie 2018-08-10 10:19:18 +00:00
parent ba234ba60b
commit bb921d2165
17 changed files with 44 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
archivers/deutex/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.2 2018/01/16 08:51:34 bentley Exp $ # $OpenBSD: Makefile,v 1.3 2018/08/10 10:19:18 espie Exp $
COMMENT = WAD composer for Doom, Heretic, Hexen, and Strife COMMENT = WAD composer for Doom, Heretic, Hexen, and Strife
@ -24,9 +24,6 @@ AUTOCONF_VERSION = 2.69
AUTOMAKE_VERSION = 1.15 AUTOMAKE_VERSION = 1.15
pre-configure: pre-configure:
cd ${WRKDIST} && \ cd ${WRKDIST} && ${AUTOCONF_ENV} autoreconf -i
AUTOCONF_VERSION="${AUTOCONF_VERSION}" \
AUTOMAKE_VERSION="${AUTOMAKE_VERSION}" \
autoreconf -i
.include <bsd.port.mk> .include <bsd.port.mk>

6
archivers/libtar/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.16 2018/08/03 07:07:44 espie Exp $ # $OpenBSD: Makefile,v 1.17 2018/08/10 10:19:18 espie Exp $
COMMENT= C library for manipulating tar files COMMENT= C library for manipulating tar files
@ -31,8 +31,6 @@ AUTOMAKE_VERSION= 1.11
NO_TEST= Yes NO_TEST= Yes
pre-configure: pre-configure:
cd ${WRKSRC} && AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \ cd ${WRKSRC} && ${AUTOCONF_ENV} autoreconf --force --install
AUTOCONF_VERSION=${AUTOCONF_VERSION} PATH=${PORTPATH} \
autoreconf --force --install
.include <bsd.port.mk> .include <bsd.port.mk>

4
archivers/luazlib/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.12 2016/03/18 20:49:27 naddy Exp $ # $OpenBSD: Makefile,v 1.13 2018/08/10 10:19:18 espie Exp $
COMMENT= lua binding of zlib COMMENT= lua binding of zlib
DISTNAME= luazlib-20100731 DISTNAME= luazlib-20100731
@ -16,7 +16,7 @@ TEST_DEPENDS += ${BASE_PKGPATH}
WANTLIB+= ${MODLUA_WANTLIB} m z WANTLIB+= ${MODLUA_WANTLIB} m z
CFLAGS+= `pkg-config --cflags ${MODLUA_DEP}` CFLAGS+= `pkg-config --cflags ${MODLUA_DEP}`
LINK= ${CC} ${CFLAGS} -fPIC -shared -L${LOCALBASE}/lib -o LINK= ${MAKE_ENV} ${CC} ${CFLAGS} -fPIC -shared -L${LOCALBASE}/lib -o
do-build: do-build:
cd ${WRKDIST} && ${LINK} zlib.so lua_zlib.c -lz ${MODLUA_LIB} -lm cd ${WRKDIST} && ${LINK} zlib.so lua_zlib.c -lz ${MODLUA_LIB} -lm

12
archivers/par2cmdline/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.17 2017/12/12 01:10:50 jca Exp $ # $OpenBSD: Makefile,v 1.18 2018/08/10 10:19:18 espie Exp $
COMMENT = command line implementation of the PAR v2.0 specification COMMENT = command line implementation of the PAR v2.0 specification
@ -27,14 +27,10 @@ CONFIGURE_STYLE = gnu
AUTOCONF_VERSION = 2.69 AUTOCONF_VERSION = 2.69
AUTOMAKE_VERSION = 1.15 AUTOMAKE_VERSION = 1.15
MAKE_ENV = AUTOCONF_VERSION=${AUTOCONF_VERSION} \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION}
post-patch: post-patch:
cd ${WRKSRC}; \ cd ${WRKSRC} && ${AUTOCONF_ENV} aclocal && \
export AUTOCONF_VERSION=${AUTOCONF_VERSION}; \ ${AUTOCONF_ENV} automake --add-missing && \
export AUTOMAKE_VERSION=${AUTOMAKE_VERSION}; \ ${AUTOCONF_ENV} autoconf
aclocal; automake --add-missing; autoconf
post-install: post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/par2cmdline ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/par2cmdline

6
astro/sunclock/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.25 2018/05/12 09:41:31 espie Exp $ # $OpenBSD: Makefile,v 1.26 2018/08/10 10:19:18 espie Exp $
COMMENT-main= display the phase of the Sun on a map of the Earth COMMENT-main= display the phase of the Sun on a map of the Earth
COMMENT-maps= additional maps of the Earth for sunclock COMMENT-maps= additional maps of the Earth for sunclock
@ -52,9 +52,9 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
DISTFILES+= ${SUPDISTFILES} DISTFILES+= ${SUPDISTFILES}
post-extract: post-extract:
${BZIP2} -dkc ${FULLDISTDIR}/medium_images_270804.tar.bz2 | tar -xf - \ PATH=${PORTPATH} ${BZIP2} -dkc ${FULLDISTDIR}/medium_images_270804.tar.bz2 | tar -xf - \
-C ${WRKSRC}/vmf -s '#images/medium#.#' -C ${WRKSRC}/vmf -s '#images/medium#.#'
${BZIP2} -dkc ${FULLDISTDIR}/big_images_270804.tar.bz2 | tar -xf - \ PATH=${PORTPATH} ${BZIP2} -dkc ${FULLDISTDIR}/big_images_270804.tar.bz2 | tar -xf - \
-C ${WRKSRC}/vmf -s '#images/big#.#' -C ${WRKSRC}/vmf -s '#images/big#.#'
cp ${FULLDISTDIR}/e43_color1_sh_16k.jpg ${WRKSRC}/vmf/ cp ${FULLDISTDIR}/e43_color1_sh_16k.jpg ${WRKSRC}/vmf/
cp ${FULLDISTDIR}/huge.jpg ${WRKSRC}/vmf/ cp ${FULLDISTDIR}/huge.jpg ${WRKSRC}/vmf/

5
audio/deadbeef/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.37 2018/06/29 22:16:08 espie Exp $ # $OpenBSD: Makefile,v 1.38 2018/08/10 10:19:18 espie Exp $
COMMENT = DeaDBeeF is an audio player COMMENT = DeaDBeeF is an audio player
DISTNAME = deadbeef-0.7.2 DISTNAME = deadbeef-0.7.2
@ -95,8 +95,7 @@ post-patch:
@cp ${FILESDIR}/{Makefile.am,sndio.c} ${WRKSRC}/plugins/sndio @cp ${FILESDIR}/{Makefile.am,sndio.c} ${WRKSRC}/plugins/sndio
pre-configure: pre-configure:
@cd ${WRKSRC}; env AUTOCONF_VERSION=${AUTOCONF_VERSION} \ @cd ${WRKSRC} && ${AUTOCONF_ENV} autoreconf
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} autoreconf
post-install: post-install:
@rm ${PREFIX}/lib/deadbeef/*.la @rm ${PREFIX}/lib/deadbeef/*.la

6
audio/faad/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.59 2016/08/30 12:29:17 jasper Exp $ # $OpenBSD: Makefile,v 1.60 2018/08/10 10:19:18 espie Exp $
# gcc -iquote # gcc -iquote
NOT_FOR_ARCHS= ${GCC3_ARCHS} NOT_FOR_ARCHS= ${GCC3_ARCHS}
@ -40,8 +40,6 @@ post-extract:
@mv ${WRKSRC}/frontend/faad.man ${WRKSRC}/frontend/faad.1 @mv ${WRKSRC}/frontend/faad.man ${WRKSRC}/frontend/faad.1
post-patch: post-patch:
@cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \ @cd ${WRKSRC} && ${AUTOCONF_ENV} sh bootstrap
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} PATH=${PORTPATH} \
sh bootstrap
.include <bsd.port.mk> .include <bsd.port.mk>

5
audio/fluidsynth/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.25 2017/11/21 00:12:59 naddy Exp $ # $OpenBSD: Makefile,v 1.26 2018/08/10 10:19:18 espie Exp $
COMMENT = SoundFont2 software synthesizer COMMENT = SoundFont2 software synthesizer
DISTNAME = fluidsynth-1.1.6 DISTNAME = fluidsynth-1.1.6
@ -49,7 +49,6 @@ post-patch:
cp ${FILESDIR}/fluid_sndio.c ${WRKSRC}/src/drivers/ cp ${FILESDIR}/fluid_sndio.c ${WRKSRC}/src/drivers/
pre-configure: pre-configure:
cd ${WRKSRC} && AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \ cd ${WRKSRC} && ${AUTOCONF_ENV} ./autogen.sh
AUTOCONF_VERSION=${AUTOCONF_VERSION} ./autogen.sh
.include <bsd.port.mk> .include <bsd.port.mk>

9
audio/jack/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.38 2018/01/20 14:03:39 jsg Exp $ # $OpenBSD: Makefile,v 1.39 2018/08/10 10:19:18 espie Exp $
COMMENT = low latency sound server COMMENT = low latency sound server
@ -47,13 +47,10 @@ CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/db4" \
CONFIGURE_ARGS += --enable-debug CONFIGURE_ARGS += --enable-debug
.endif .endif
AUTO_ENV= AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
AUTOCONF_VERSION=${AUTOCONF_VERSION}
post-patch: post-patch:
cd ${WRKSRC}; ${AUTO_ENV} aclocal cd ${WRKSRC} && ${AUTOCONF_ENV} aclocal
pre-configure: pre-configure:
cd ${WRKSRC}; ${AUTO_ENV} automake --add-missing --foreign cd ${WRKSRC} && ${AUTOCONF_ENV} automake --add-missing --foreign
.include <bsd.port.mk> .include <bsd.port.mk>

7
audio/schismtracker/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.13 2018/06/27 21:03:37 espie Exp $ # $OpenBSD: Makefile,v 1.14 2018/08/10 10:19:18 espie Exp $
COMMENT = open-source reimplementation of Impulse Tracker COMMENT = open-source reimplementation of Impulse Tracker
@ -34,9 +34,6 @@ AUTOCONF_VERSION = 2.69
AUTOMAKE_VERSION = 1.15 AUTOMAKE_VERSION = 1.15
pre-configure: pre-configure:
@cd ${WRKSRC} && \ @cd ${WRKSRC} && ${AUTOCONF_ENV} autoreconf -i
AUTOCONF_VERSION=${AUTOCONF_VERSION} \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
autoreconf -i
.include <bsd.port.mk> .include <bsd.port.mk>

4
databases/sqlports/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.70 2018/05/26 14:20:43 espie Exp $ # $OpenBSD: Makefile,v 1.71 2018/08/10 10:19:18 espie Exp $
CATEGORIES = databases CATEGORIES = databases
V = 6.7 V = 6.7
@ -23,7 +23,7 @@ BUILD_DEPENDS = databases/p5-DBD-SQLite \
RUN_DEPENDS = databases/sqlite3 RUN_DEPENDS = databases/sqlite3
do-build: do-build:
@cd ${PORTSDIR} && PORTSDIR=${PORTSDIR} perl ${FILESDIR}/mksqlitedb -v ${DBNAME} -p ${WRKBUILD}/ouch @cd ${PORTSDIR} && PORTSDIR=${PORTSDIR} ${MAKE_ENV} perl ${FILESDIR}/mksqlitedb -v ${DBNAME} -p ${WRKBUILD}/ouch
@if test -s ${WRKBUILD}/ouch; then \ @if test -s ${WRKBUILD}/ouch; then \
cat ${WRKBUILD}/ouch; \ cat ${WRKBUILD}/ouch; \
exit 1; \ exit 1; \

7
devel/glib2/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.277 2018/07/30 08:34:07 ajacoutot Exp $ # $OpenBSD: Makefile,v 1.278 2018/08/10 10:19:18 espie Exp $
# Everything is a Freaking GLib/GTK+ problem # Everything is a Freaking GLib/GTK+ problem
CFLAGS += -g CFLAGS += -g
@ -78,9 +78,6 @@ pre-configure:
sed -i "s,/usr/share,${PREFIX}/share,g" \ sed -i "s,/usr/share,${PREFIX}/share,g" \
${WRKSRC}/docs/reference/gio/html/glib-compile-schemas.html \ ${WRKSRC}/docs/reference/gio/html/glib-compile-schemas.html \
${WRKSRC}/docs/reference/gio/glib-compile-schemas.xml ${WRKSRC}/docs/reference/gio/glib-compile-schemas.xml
cd ${WRKSRC} && env -i \ cd ${WRKSRC} && env -i ${AUTOCONF_ENV} autoreconf -fi
AUTOCONF_VERSION=${AUTOCONF_VERSION} \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
autoreconf -fi
.include <bsd.port.mk> .include <bsd.port.mk>

7
devel/libuv/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.7 2018/06/28 10:06:12 matthieu Exp $ # $OpenBSD: Makefile,v 1.8 2018/08/10 10:19:18 espie Exp $
# BROKEN-hppa = undefined reference to __sync atomic ops # BROKEN-hppa = undefined reference to __sync atomic ops
@ -35,11 +35,10 @@ AUTOCONF_VERSION = 2.69
AUTOMAKE_VERSION = 1.14 AUTOMAKE_VERSION = 1.14
pre-configure: pre-configure:
cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \ cd ${WRKSRC} && ${AUTOCONF_ENV} sh autogen.sh
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} sh autogen.sh
post-build: post-build:
cd ${WRKSRC} && ${MAKE_PROGRAM} man -C docs cd ${WRKSRC} && ${MAKE_ENV} ${MAKE_PROGRAM} man -C docs
post-install: post-install:
${INSTALL_MAN} ${WRKSRC}/docs/build/man/libuv.1 ${PREFIX}/man/man1/ ${INSTALL_MAN} ${WRKSRC}/docs/build/man/libuv.1 ${PREFIX}/man/man1/

4
devel/p5-Module-Build-Tiny/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.5 2017/08/15 14:44:25 afresh1 Exp $ # $OpenBSD: Makefile,v 1.6 2018/08/10 10:19:18 espie Exp $
COMMENT = tiny replacement for Module::Build COMMENT = tiny replacement for Module::Build
@ -23,7 +23,7 @@ RUN_DEPENDS = devel/p5-ExtUtils-Config \
BUILD_DEPENDS = ${RUN_DEPENDS} BUILD_DEPENDS = ${RUN_DEPENDS}
do-install: do-install:
@cd ${WRKSRC} && perl \ @cd ${WRKSRC} && ${MAKE_ENV} perl \
${MODPERL_BUILD} ${FAKE_TARGET} \ ${MODPERL_BUILD} ${FAKE_TARGET} \
--destdir "${PREFIX}" \ --destdir "${PREFIX}" \
--install_path lib="libdata/perl5/site_perl" \ --install_path lib="libdata/perl5/site_perl" \

5
net/avahi/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.131 2018/06/27 21:03:59 espie Exp $ # $OpenBSD: Makefile,v 1.132 2018/08/10 10:19:18 espie Exp $
COMMENT-main= framework for Multicast DNS Service Discovery COMMENT-main= framework for Multicast DNS Service Discovery
COMMENT-gtk= gtk+2 avahi-ui libraries COMMENT-gtk= gtk+2 avahi-ui libraries
@ -217,8 +217,7 @@ pre-configure:
sed -i -e 's,Libs:,Libs: -pthread,;' \ sed -i -e 's,Libs:,Libs: -pthread,;' \
-e 's,Cflags:,Cflags: -pthread,' ${WRKSRC}/$${i}.in; done -e 's,Cflags:,Cflags: -pthread,' ${WRKSRC}/$${i}.in; done
cd ${WRKSRC} && ${SETENV} \ cd ${WRKSRC} && ${SETENV} \
AUTOCONF_VERSION=${AUTOCONF_VERSION} \ ${AUTOCONF_ENV} \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
NOCONFIGURE=1 \ NOCONFIGURE=1 \
/bin/sh ./autogen.sh /bin/sh ./autogen.sh

14
net/ssvnc/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.33 2018/07/05 14:55:22 jcs Exp $ # $OpenBSD: Makefile,v 1.34 2018/08/10 10:19:18 espie Exp $
COMMENT-gui = enhanced TightVNC client GUI and wrappers COMMENT-gui = enhanced TightVNC client GUI and wrappers
COMMENT-main = enhanced TightVNC client COMMENT-main = enhanced TightVNC client
@ -52,16 +52,16 @@ VNCSRC = ${WRKSRC}/vnc_unixsrc/
VNCLIB = ${PREFIX}/lib/ssvnc/ VNCLIB = ${PREFIX}/lib/ssvnc/
pre-configure: pre-configure:
cd ${WRKSRC}/scripts; ${SUBST_CMD} ssvnc util/ss_vncviewer cd ${WRKSRC}/scripts && ${SUBST_CMD} ssvnc util/ss_vncviewer
do-configure: do-configure:
cd ${VNCSRC}/libvncauth; ${XMKMF} cd ${VNCSRC}/libvncauth && ${MAKE_ENV} ${XMKMF}
cd ${VNCSRC}/vncviewer; ${XMKMF} cd ${VNCSRC}/vncviewer && ${MAKE_ENV} ${XMKMF}
do-build: do-build:
cd ${VNCSRC}/libvncauth; ${SETENV} ${MAKE_ENV} ${MAKE} cd ${VNCSRC}/libvncauth && ${SETENV} ${MAKE_ENV} ${MAKE}
cd ${VNCSRC}/vncviewer; ${SETENV} ${MAKE_ENV} ${MAKE} cd ${VNCSRC}/vncviewer && ${SETENV} ${MAKE_ENV} ${MAKE}
cd ${WRKSRC}/vncstorepw; ${SETENV} ${MAKE_ENV} ${MAKE} cd ${WRKSRC}/vncstorepw && ${SETENV} ${MAKE_ENV} ${MAKE}
do-install: do-install:
${INSTALL_PROGRAM_DIR} ${VNCLIB} ${INSTALL_PROGRAM_DIR} ${VNCLIB}

7
textproc/enchant/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.39 2017/12/29 08:30:05 ajacoutot Exp $ # $OpenBSD: Makefile,v 1.40 2018/08/10 10:19:18 espie Exp $
PORTROACH= limit:^1 PORTROACH= limit:^1
@ -58,10 +58,7 @@ BUILD_DEPENDS += ${MODGNU_AUTOCONF_DEPENDS} \
devel/libtool # libtoolize devel/libtool # libtoolize
pre-configure: pre-configure:
cd ${WRKSRC} && ${SETENV} \ cd ${WRKSRC} && ${SETENV} ${AUTOCONF_ENV} autoreconf -fi
AUTOCONF_VERSION=${AUTOCONF_VERSION} \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
autoreconf -fi
### ###
post-install: post-install: