diff options
-rw-r--r-- | misc/buffer/Makefile | 10 | ||||
-rw-r--r-- | misc/cstream/Makefile | 8 | ||||
-rw-r--r-- | misc/dpkg/Makefile | 8 | ||||
-rw-r--r-- | misc/kdeadmin3/Makefile | 11 | ||||
-rw-r--r-- | misc/kdeutils3/Makefile | 6 | ||||
-rw-r--r-- | misc/mmv/Makefile | 8 | ||||
-rw-r--r-- | misc/most/Makefile | 8 | ||||
-rw-r--r-- | misc/multitail/Makefile | 10 | ||||
-rw-r--r-- | misc/reed/Makefile | 8 | ||||
-rw-r--r-- | misc/rpm/Makefile | 11 | ||||
-rw-r--r-- | misc/ttyrec/Makefile | 8 | ||||
-rw-r--r-- | misc/xorg-docs/Makefile | 8 |
12 files changed, 28 insertions, 76 deletions
diff --git a/misc/buffer/Makefile b/misc/buffer/Makefile index 1a32cb8ee1f..4b6d0ac9fe4 100644 --- a/misc/buffer/Makefile +++ b/misc/buffer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2012/10/08 09:57:17 asau Exp $ +# $NetBSD: Makefile,v 1.20 2016/02/25 15:35:30 jperkin Exp $ DISTNAME= buffer-1.17 CATEGORIES= misc @@ -9,11 +9,7 @@ COMMENT= Buffer sporadic binary I/O for faster tape use INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -CPPFLAGS+= -DSYS5 -MAKE_ENV+= CC=${CC:Q} -.endif +CPPFLAGS.SunOS+= -DSYS5 +MAKE_ENV.SunOS+= CC=${CC:Q} .include "../../mk/bsd.pkg.mk" diff --git a/misc/cstream/Makefile b/misc/cstream/Makefile index 785b94a1920..4ebfa55f9e5 100644 --- a/misc/cstream/Makefile +++ b/misc/cstream/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2014/12/10 02:40:04 mef Exp $ +# $NetBSD: Makefile,v 1.12 2016/02/25 15:35:30 jperkin Exp $ DISTNAME= cstream-3.1.1 CATEGORIES= misc @@ -11,10 +11,6 @@ LICENSE= x11 GNU_CONFIGURE= yes -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -LDFLAGS+= -lsocket -lnsl -lresolv -.endif +LDFLAGS.SunOS+= -lsocket -lnsl -lresolv .include "../../mk/bsd.pkg.mk" diff --git a/misc/dpkg/Makefile b/misc/dpkg/Makefile index 92b8caea364..d9a988d868a 100644 --- a/misc/dpkg/Makefile +++ b/misc/dpkg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2015/12/30 12:47:57 bsiegert Exp $ +# $NetBSD: Makefile,v 1.35 2016/02/25 15:35:30 jperkin Exp $ # DISTNAME= dpkg_1.16.17 @@ -35,11 +35,7 @@ CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/share/dpkg # or uses GCC version specific warning flags unconditionally. CONFIGURE_ARGS+= --disable-compiler-warnings -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "Darwin" -CONFIGURE_ARGS+= --enable-linker-optimisations=no -.endif +CONFIGURE_ARGS.Darwin+= --enable-linker-optimisations=no SUBST_CLASSES+= tool-path SUBST_STAGE.tool-path= pre-build diff --git a/misc/kdeadmin3/Makefile b/misc/kdeadmin3/Makefile index a20e32a324f..eaa3b1b0afc 100644 --- a/misc/kdeadmin3/Makefile +++ b/misc/kdeadmin3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.77 2015/04/25 14:23:33 tnn Exp $ +# $NetBSD: Makefile,v 1.78 2016/02/25 15:35:30 jperkin Exp $ DISTNAME= kdeadmin-${_KDE_VERSION} PKGREVISION= 29 @@ -7,13 +7,8 @@ COMMENT= System administration tools for the KDE integrated X11 desktop .include "../../meta-pkgs/kde3/Makefile.kde3" -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "Linux" -CONFIGURE_ARGS+= --with-shadow -.else -CONFIGURE_ARGS+= --without-shadow -.endif +CONFIGURE_ARGS.Linux+= --with-shadow +CONFIGURE_ARGS.*+= --without-shadow CONFIGURE_ENV+= DO_NOT_COMPILE="ksysv kdat" REPLACE_PERL+= knetworkconf/backends/*.pl.in \ diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile index df739e4c232..83295841945 100644 --- a/misc/kdeutils3/Makefile +++ b/misc/kdeutils3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.109 2015/12/05 21:25:50 adam Exp $ +# $NetBSD: Makefile,v 1.110 2016/02/25 15:35:30 jperkin Exp $ DISTNAME= kdeutils-${_KDE_VERSION} PKGREVISION= 36 @@ -26,9 +26,7 @@ SUBST_SED.tarexe= -e 's:<default>tar</default>:<default>${TOOLS_PATH.gtar}</defa CPPFLAGS+= -D__NetBSD_APM__ .endif -.if ${OPSYS} == "DragonFly" -CONFIGURE_ENV+= ac_cv_c_long_double=no -.endif +CONFIGURE_ENV.DragonFly+= ac_cv_c_long_double=no CONFIGURE_ARGS+= --with-snmp=no CONFIGURE_ARGS+= --with-pythondir=${LOCALBASE} diff --git a/misc/mmv/Makefile b/misc/mmv/Makefile index 241d0ece6ec..b6f30298c7b 100644 --- a/misc/mmv/Makefile +++ b/misc/mmv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2012/10/08 09:57:30 asau Exp $ +# $NetBSD: Makefile,v 1.17 2016/02/25 15:35:30 jperkin Exp $ # DISTNAME= mmv_1.01b.orig @@ -13,11 +13,7 @@ COMMENT= Move, copy, append or link multiple files using wildcard patterns WRKSRC= ${WRKDIR}/mmv-1.01b.orig BUILD_TARGET= mmv -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -CFLAGS+= -DIS_SYSV -.endif +CFLAGS.SunOS+= -DIS_SYSV INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 diff --git a/misc/most/Makefile b/misc/most/Makefile index 68a7bd200b0..a0571e9bccd 100644 --- a/misc/most/Makefile +++ b/misc/most/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2013/02/16 11:23:25 wiz Exp $ +# $NetBSD: Makefile,v 1.30 2016/02/25 15:35:30 jperkin Exp $ DISTNAME= most-5.0.0a PKGREVISION= 5 @@ -16,12 +16,8 @@ CONFIGURE_ARGS+= --without-x CONFIGURE_ARGS+= --with-slang=${BUILDLINK_PREFIX.libslang2} -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "Darwin" # prevent duplicate definition of zopen -CFLAGS+= -D_POSIX_C_SOURCE -.endif +CFLAGS.Darwin+= -D_POSIX_C_SOURCE .include "../../devel/libslang2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/multitail/Makefile b/misc/multitail/Makefile index e03097e57e0..9f089e95be4 100644 --- a/misc/multitail/Makefile +++ b/misc/multitail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2015/08/18 07:31:13 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2016/02/25 15:35:31 jperkin Exp $ # DISTNAME= multitail-4.0.6 @@ -18,12 +18,8 @@ INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/doc/multitail \ CONF_FILES= ${PREFIX:Q}/share/examples/multitail/multitail.conf \ ${PKG_SYSCONFDIR:Q}/multitail.conf -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -BUILDLINK_TRANSFORM+= rm:-lutil -LDFLAGS+= -lsocket -lnsl -.endif +BUILDLINK_TRANSFORM.SunOS+= rm:-lutil +LDFLAGS.SunOS+= -lsocket -lnsl do-install: ${INSTALL_PROGRAM} ${WRKSRC:Q}/multitail ${DESTDIR}${PREFIX:Q}/bin/ diff --git a/misc/reed/Makefile b/misc/reed/Makefile index 7ebe8469eda..42b25981ff3 100644 --- a/misc/reed/Makefile +++ b/misc/reed/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2015/09/08 11:57:50 jperkin Exp $ +# $NetBSD: Makefile,v 1.30 2016/02/25 15:35:31 jperkin Exp $ DISTNAME= reed-5.4 PKGREVISION= 8 @@ -17,17 +17,13 @@ REPLACE_PERL= breed fix_bookmarks.pl wrap INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -SUBST_CLASSES+= sysdir1 sysdir2 +SUBST_CLASSES.SunOS+= sysdir1 sysdir2 SUBST_STAGE.sysdir1= pre-configure SUBST_FILES.sysdir1= cfg.data SUBST_SED.sysdir1= -e "s,sys/dir.h,,g" SUBST_STAGE.sysdir2= pre-configure SUBST_FILES.sysdir2= reed.c SUBST_SED.sysdir2= -e "/sys\/dir.h/d" -.endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/reed ${DESTDIR}${PREFIX}/bin diff --git a/misc/rpm/Makefile b/misc/rpm/Makefile index 249202d6dcc..4dd74a6df3b 100644 --- a/misc/rpm/Makefile +++ b/misc/rpm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.87 2015/06/12 10:50:36 wiz Exp $ +# $NetBSD: Makefile,v 1.88 2016/02/25 15:35:31 jperkin Exp $ DISTNAME= rpm-4.12.0.1 PKGREVISION= 2 @@ -54,18 +54,13 @@ MAKE_FLAGS+= ROOT=${DESTDIR} RPMDIR= ${RPM_DB_PREFIX}/lib/rpm FILES_SUBST+= RPMDIR=${RPMDIR:Q} -.include "../../mk/bsd.prefs.mk" - # The configure script doesn't detect whether libintl.so has any # library dependencies. # BROKEN_GETTEXT_DETECTION= yes -.if ${OPSYS} == "SunOS" -CFLAGS+= -fno-stack-protector -BUILDLINK_TRANSFORM+= rm:-fstack-protector -.endif - +BUILDLINK_TRANSFORM.SunOS+= rm:-fstack-protector +CFLAGS.SunOS+= -fno-stack-protector pre-configure: set -e; cd ${WRKSRC}; \ diff --git a/misc/ttyrec/Makefile b/misc/ttyrec/Makefile index a9ce6fd1c77..cb3ac91a6b2 100644 --- a/misc/ttyrec/Makefile +++ b/misc/ttyrec/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2013/04/06 03:45:18 rodent Exp $ +# $NetBSD: Makefile,v 1.14 2016/02/25 15:35:31 jperkin Exp $ DISTNAME= ttyrec-1.0.8 CATEGORIES= misc @@ -9,11 +9,7 @@ HOMEPAGE= http://0xcc.net/ttyrec/ COMMENT= Tty recorder LICENSE= original-bsd -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -CFLAGS+= -DSVR4 -.endif +CFLAGS.SunOS+= -DSVR4 INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 diff --git a/misc/xorg-docs/Makefile b/misc/xorg-docs/Makefile index 9bdc39f3120..7bb8f6addc7 100644 --- a/misc/xorg-docs/Makefile +++ b/misc/xorg-docs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2015/05/01 08:51:51 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2016/02/25 15:35:31 jperkin Exp $ DISTNAME= xorg-docs-1.7.1 CATEGORIES= devel x11 @@ -14,10 +14,6 @@ CONFIGURE_ARGS+= --with-xmlto=no CONFIGURE_ARGS+= --with-xsltproc=no CONFIGURE_ARGS+= --with-fop=no -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= MISC_MAN_SUFFIX=7 -.endif +CONFIGURE_ENV.SunOS+= MISC_MAN_SUFFIX=7 .include "../../mk/bsd.pkg.mk" |