diff options
| -rw-r--r-- | comms/asterisk/Makefile | 8 | ||||
| -rw-r--r-- | comms/asterisk13/Makefile | 8 | ||||
| -rw-r--r-- | comms/asterisk18/Makefile | 8 | ||||
| -rw-r--r-- | comms/xtel/Makefile | 7 | ||||
| -rw-r--r-- | cross/gcc-mips-current/Makefile | 10 | ||||
| -rw-r--r-- | cross/libtool-base/Makefile | 18 |
6 files changed, 20 insertions, 39 deletions
diff --git a/comms/asterisk/Makefile b/comms/asterisk/Makefile index 0ffd86a98d0..d48f744d83f 100644 --- a/comms/asterisk/Makefile +++ b/comms/asterisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.133 2016/02/07 08:18:43 jnemeth Exp $ +# $NetBSD: Makefile,v 1.134 2016/02/25 11:32:19 jperkin Exp $ # # NOTE: when updating this package, there are two places that sound # tarballs need to be checked @@ -151,19 +151,17 @@ SUBST_SED.configs+= -e "s|/usr/local/man|${ASTMANDIR}|" SUBST_SED.configs+= -e "s|/usr/local|${PREFIX}|" SUBST_SED.configs+= -e "s|/var|${VARBASE}|" -.if (${OPSYS} == "NetBSD") # XXX gross hack, remove when atomics properly implemented -SUBST_CLASSES+= atomics +SUBST_CLASSES.NetBSD+= atomics SUBST_STAGE.atomics= post-configure SUBST_FILES.atomics= include/asterisk/autoconfig.h SUBST_SED.atomics= -e "s|^\#define HAVE_GCC_ATOMICS 1|\#undef HAVE_GCC_ATOMICS|" # XXX gross hack, IP_PKTINFO in NetBSD isn't compatible with anything else -SUBST_CLASSES+= pktinfo +SUBST_CLASSES.NetBSD+= pktinfo SUBST_STAGE.pktinfo= post-configure SUBST_FILES.pktinfo= include/asterisk/autoconfig.h SUBST_SED.pktinfo= -e "s|^\#define HAVE_PKTINFO 1|\#undef HAVE_PKTINFO|" -.endif RCD_SCRIPTS= asterisk OWN_DIRS_PERMS+= ${ASTDBDIR} ${ASTERISK_USER} ${ASTERISK_GROUP} 0755 diff --git a/comms/asterisk13/Makefile b/comms/asterisk13/Makefile index 53b2fcad1a1..2e884e83eac 100644 --- a/comms/asterisk13/Makefile +++ b/comms/asterisk13/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2016/02/07 09:13:34 jnemeth Exp $ +# $NetBSD: Makefile,v 1.4 2016/02/25 11:32:19 jperkin Exp $ # # NOTE: when updating this package, there are two places that sound # tarballs need to be checked @@ -146,20 +146,18 @@ SUBST_SED.configs+= -e "s|/usr/local/man|${ASTMANDIR}|" SUBST_SED.configs+= -e "s|/usr/local|${PREFIX}|" SUBST_SED.configs+= -e "s|/var|${VARBASE}|" -.if (${OPSYS} == "NetBSD") # XXX gross hack, remove when item is fixed -SUBST_CLASSES+= autoconfig +SUBST_CLASSES.NetBSD+= autoconfig SUBST_STAGE.autoconfig= post-configure SUBST_FILES.autoconfig= include/asterisk/autoconfig.h SUBST_SED.autoconfig= -e "s|^\#define HAVE_GCC_ATOMICS 1|\#undef HAVE_GCC_ATOMICS|" SUBST_SED.autoconfig+= -e "s|^\#define HAVE_GETHOSTBYNAME_R_6 1|\#undef HAVE_GETHOSTBYNAME_R_6|" # XXX gross hack, IP_PKTINFO in NetBSD isn't compatible with anything else -SUBST_CLASSES+= pktinfo +SUBST_CLASSES.NetBSD+= pktinfo SUBST_STAGE.pktinfo= post-configure SUBST_FILES.pktinfo= include/asterisk/autoconfig.h SUBST_SED.pktinfo= -e "s|^\#define HAVE_PKTINFO 1|\#undef HAVE_PKTINFO|" -.endif RCD_SCRIPTS= asterisk OWN_DIRS_PERMS+= ${ASTDBDIR} ${ASTERISK_USER} ${ASTERISK_GROUP} 0755 diff --git a/comms/asterisk18/Makefile b/comms/asterisk18/Makefile index c0b524cd2f9..8f6b908b839 100644 --- a/comms/asterisk18/Makefile +++ b/comms/asterisk18/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.103 2015/11/02 12:02:23 tnn Exp $ +# $NetBSD: Makefile,v 1.104 2016/02/25 11:32:19 jperkin Exp $ # # NOTE: when updating this package, there are two places that sound # tarballs need to be checked @@ -133,19 +133,17 @@ SUBST_SED.configs+= -e "s|/usr/local/man|${ASTMANDIR}|" SUBST_SED.configs+= -e "s|/usr/local|${PREFIX}|" SUBST_SED.configs+= -e "s|/var|${VARBASE}|" -.if (${OPSYS} == "NetBSD") # XXX gross hack, remove when atomics properly implemented -SUBST_CLASSES+= atomics +SUBST_CLASSES.NetBSD+= atomics SUBST_STAGE.atomics= post-configure SUBST_FILES.atomics= include/asterisk/autoconfig.h SUBST_SED.atomics= -e "s|^\#define HAVE_GCC_ATOMICS 1|\#undef HAVE_GCC_ATOMICS|" # XXX gross hack, IP_PKTINFO in NetBSD isn't compatible with anything else -SUBST_CLASSES+= pktinfo +SUBST_CLASSES.NetBSD+= pktinfo SUBST_STAGE.pktinfo= post-configure SUBST_FILES.pktinfo= include/asterisk/autoconfig.h SUBST_SED.pktinfo= -e "s|^\#define HAVE_PKTINFO 1|\#undef HAVE_PKTINFO|" -.endif RCD_SCRIPTS= asterisk OWN_DIRS_PERMS+= ${ASTDBDIR} ${ASTERISK_USER} ${ASTERISK_GROUP} 0755 diff --git a/comms/xtel/Makefile b/comms/xtel/Makefile index 6fc218f3d8d..cc5bf0f9b9e 100644 --- a/comms/xtel/Makefile +++ b/comms/xtel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2014/06/01 16:44:38 wiz Exp $ +# $NetBSD: Makefile,v 1.29 2016/02/25 11:32:19 jperkin Exp $ DISTNAME= xtel-3.3.0 PKGREVISION= 14 @@ -33,10 +33,7 @@ INSTALL_MAKE_FLAGS= PPPDIR=${PREFIX}/share/examples/xtel SPECIAL_PERMS+= bin/mdmdetect ${SETUID_ROOT_PERMS} -.include "../../mk/bsd.prefs.mk" -.if ${OPSYS} == "SunOS" -BUILDLINK_TRANSFORM+= rm:-lucb -.endif +BUILDLINK_TRANSFORM.SunOS+= rm:-lucb .include "../../mk/jpeg.buildlink3.mk" .include "../../x11/libXaw/buildlink3.mk" diff --git a/cross/gcc-mips-current/Makefile b/cross/gcc-mips-current/Makefile index fd25f5d842d..89e354f1ee4 100644 --- a/cross/gcc-mips-current/Makefile +++ b/cross/gcc-mips-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2015/06/12 10:48:35 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2016/02/25 11:35:33 jperkin Exp $ GCC_DIST_VERSION=4.9.2 GCC_PKGNAME= gcc-mips-${GCC_DIST_VERSION} @@ -77,12 +77,8 @@ CONFIGURE_ARGS+= --enable-long-long CONFIGURE_ARGS+= --with-local-prefix=${PREFIX:Q} CONFIGURE_ARGS+= --enable-threads=posix CONFIGURE_ARGS+= --with-boot-ldflags=${BOOT_LDFLAGS:Q} -.if ${OPSYS} == "NetBSD" -MAKE_ENV+= ac_cv_func_clock_gettime=yes -.endif -.if ${OPSYS} == "DragonFly" -CONFIGURE_ARGS+= --disable-bootstrap -.endif +MAKE_ENV.NetBSD+= ac_cv_func_clock_gettime=yes +CONFIGURE_ARGS.DragonFly+= --disable-bootstrap TARGET= mipsel--netbsd CONFIGURE_ARGS+= --target=${TARGET} diff --git a/cross/libtool-base/Makefile b/cross/libtool-base/Makefile index 04edbbc5e52..1221b7c20b8 100644 --- a/cross/libtool-base/Makefile +++ b/cross/libtool-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2014/10/09 13:44:33 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2016/02/25 11:35:33 jperkin Exp $ # XXX This is kludgerific copypasta of devel/libtool-base/Makefile for # cross-compilation. Please make it go away! @@ -44,23 +44,17 @@ TEST_TARGET= check OVERRIDE_DIRDEPTH.install-sh= 1 -.if ${OPSYS} == "AIX" - -# always build libraries and executables that use the runtime linker. +# Always build libraries and executables that use the runtime linker. # in addition, disable libtool locking, as the test is broken on AIX, # and results in files being locked indefinitely. -LDFLAGS+= -Wl,-brtl -CONFIGURE_ARGS+= --disable-libtool-lock - -.elif ${OPSYS} == "IRIX" +LDFLAGS.AIX+= -Wl,-brtl +CONFIGURE_ARGS.AIX+= --disable-libtool-lock # The MIPSpro compiler doesn't support -c with -o, but the locking # workaround is itself broken. Disable it unconditionally. -CONFIGURE_ARGS+= --disable-libtool-lock +CONFIGURE_ARGS.IRIX+= --disable-libtool-lock -.elif ${OPSYS} == "SunOS" -CFLAGS+= ${_COMPILER_ABI_FLAG.${ABI}} -.endif +CFLAGS.SunOS+= ${_COMPILER_ABI_FLAG.${ABI}} # We are going to want libtool to find the same versions of the C, C++, # and Fortran compilers. |