From 85ec4f3cff4a3912e0aeaa424782ee5ec0083fd5 Mon Sep 17 00:00:00 2001 From: jperkin Date: Thu, 25 Feb 2016 09:28:36 +0000 Subject: Use OPSYSVARS. --- archivers/afio/Makefile | 8 +++----- archivers/gtar-base/Makefile | 10 +++------- archivers/gzip/Makefile | 8 ++------ archivers/lha/Makefile | 9 +++------ archivers/libarchive/Makefile | 8 ++------ archivers/mousetar/Makefile | 7 ++----- archivers/pax/Makefile | 7 ++----- archivers/upx/Makefile | 10 +++------- archivers/xz/Makefile | 13 +++++-------- 9 files changed, 25 insertions(+), 55 deletions(-) (limited to 'archivers') diff --git a/archivers/afio/Makefile b/archivers/afio/Makefile index 87a5ade9d75..0150bf30f39 100644 --- a/archivers/afio/Makefile +++ b/archivers/afio/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2015/02/15 14:45:48 ryoon Exp $ +# $NetBSD: Makefile,v 1.17 2016/02/25 09:28:36 jperkin Exp $ DISTNAME= afio-2.5.1 CATEGORIES= archivers @@ -11,11 +11,9 @@ COMMENT= Data corruption handling cpio-format archive creator BUILD_TARGET= afio -.include "../../mk/bsd.prefs.mk" -.if ${OPSYS} == "Darwin" # Don't define HAVE_LCHOWN -MAKE_FLAGS+= e2= -.endif +OPSYSVARS+= MAKE_FLAGS +MAKE_FLAGS.Darwin+= e2= INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 diff --git a/archivers/gtar-base/Makefile b/archivers/gtar-base/Makefile index 99d4d1abb66..1efa71792df 100644 --- a/archivers/gtar-base/Makefile +++ b/archivers/gtar-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.90 2015/05/03 14:32:11 sevan Exp $ +# $NetBSD: Makefile,v 1.91 2016/02/25 09:28:36 jperkin Exp $ # # Please run 'make files/gtar.1' when updating version of this package # to regenerate the man page. converters/help2man is needed. @@ -50,14 +50,10 @@ PLIST.rmt= yes CONFIGURE_ENV+= gt_cv_func_gnugettext3_libintl=yes .endif -.if ${OPSYS} == "MirBSD" -CPPFLAGS+= -Dstrtoimax=strtoll -Dstrtoumax=strtoull -.endif +CPPFLAGS.MirBSD+= -Dstrtoimax=strtoll -Dstrtoumax=strtoull -.if ${OPSYS} == "AIX" #bug 20453 in bug-gzip list, passed onto gnulib -CONFIGURE_ENV+= ac_cv_header_wctype_h=no -.endif +CONFIGURE_ENV.AIX+= ac_cv_header_wctype_h=no SYMLINKS= bin/gtar ${PKGGNUDIR}bin/tar \ ${PKGMANDIR}/man1/gtar.1 ${PKGGNUDIR}${PKGMANDIR}/man1/tar.1 diff --git a/archivers/gzip/Makefile b/archivers/gzip/Makefile index c4cc4435a13..a8eed7d8fd5 100644 --- a/archivers/gzip/Makefile +++ b/archivers/gzip/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2015/05/09 23:00:39 sevan Exp $ +# $NetBSD: Makefile,v 1.35 2016/02/25 09:28:36 jperkin Exp $ DISTNAME= gzip-1.6 CATEGORIES= archivers @@ -19,11 +19,7 @@ MAKE_FLAGS+= manlinks=so INFO_FILES= yes CHECK_PERMS= no # can't depend on checkperms; it's distfile is gzipped -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "AIX" #bug 20453 in bug-gzip list, passed onto gnulib -CONFIGURE_ENV+= ac_cv_header_wctype_h=no -.endif +CONFIGURE_ENV.AIX+= ac_cv_header_wctype_h=no .include "../../mk/bsd.pkg.mk" diff --git a/archivers/lha/Makefile b/archivers/lha/Makefile index ade3bfb73a0..b40a56885b3 100644 --- a/archivers/lha/Makefile +++ b/archivers/lha/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2014/10/09 14:05:52 wiz Exp $ +# $NetBSD: Makefile,v 1.40 2016/02/25 09:28:36 jperkin Exp $ DISTNAME= lha-114i PKGNAME= lha-114.9 @@ -17,14 +17,11 @@ NO_SRC_ON_CDROM=${RESTRICTED} NO_BIN_ON_FTP= ${RESTRICTED} NO_BIN_ON_CDROM=${RESTRICTED} -.include "../../mk/bsd.prefs.mk" - MAKE_FLAGS+= MAKE=${MAKE_PROGRAM:Q} +OPSYSVARS+= LHA_CPPFLAGS LHA_CPPFLAGS= -DSYSTIME_HAS_NO_TM -DMKTIME -DUSESTRCASECMP -DSYSV_SYSTEM_DIR -.if ${OPSYS} == "Darwin" -LHA_CPPFLAGS+= -DHAVE_NO_LCHOWN -.endif +LHA_CPPFLAGS.Darwin+= -DHAVE_NO_LCHOWN MAKE_FLAGS+= MACHINE=${LHA_CPPFLAGS:Q} INSTALLATION_DIRS= bin ${PKGMANDIR}/ja_JP.EUC/man1 diff --git a/archivers/libarchive/Makefile b/archivers/libarchive/Makefile index fdf08139529..2eb6f674d3e 100644 --- a/archivers/libarchive/Makefile +++ b/archivers/libarchive/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2015/01/17 12:44:47 adam Exp $ +# $NetBSD: Makefile,v 1.42 2016/02/25 09:28:36 jperkin Exp $ .include "Makefile.common" @@ -11,12 +11,8 @@ CONFIGURE_ARGS+= --disable-bsdtar do-extract: ${CP} -r ${FILESDIR} ${WRKSRC} -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == SunOS # workaround for pkg/45491 -CONFIGURE_ENV+= ac_cv_header_ext2fs_ext2_fs_h=no -.endif +CONFIGURE_ENV.SunOS+= ac_cv_header_ext2fs_ext2_fs_h=no .include "../../archivers/bzip2/buildlink3.mk" .include "../../archivers/xz/buildlink3.mk" diff --git a/archivers/mousetar/Makefile b/archivers/mousetar/Makefile index 7066cc0616a..9b03455f0f6 100644 --- a/archivers/mousetar/Makefile +++ b/archivers/mousetar/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2014/10/09 14:05:53 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2016/02/25 09:28:36 jperkin Exp $ # DISTNAME= mousetar-20021217 @@ -20,15 +20,12 @@ WRKSRC= ${WRKDIR} CPPFLAGS+= -DDIRENT_FIXUP CPPFLAGS.SunOS+= -DTAR_INODE_NONE -DLINUX_NAMLEN CPPFLAGS.SunOS+= -DL_SET=SEEK_SET -DL_INCR=SEEK_CUR -DL_XTND=SEEK_END +CPPFLAGS.Linux+= -DLINUX_NAMLEN .if !empty(MACHINE_PLATFORM:MNetBSD-[2-9].*-*) CPPFLAGS+= -DTAR_INODE_INTERNAL .endif -.if ${OPSYS} == "Linux" -CPPFLAGS+= -DLINUX_NAMLEN -.endif - INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-extract: diff --git a/archivers/pax/Makefile b/archivers/pax/Makefile index 6fad6f128a9..67b1bf2df06 100644 --- a/archivers/pax/Makefile +++ b/archivers/pax/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2016/01/29 10:53:07 jperkin Exp $ +# $NetBSD: Makefile,v 1.51 2016/02/25 09:28:37 jperkin Exp $ DISTNAME= pax-20080110 PKGREVISION= 2 @@ -21,7 +21,6 @@ USE_FEATURES= nbcompat .include "../../mk/bsd.prefs.mk" - .if defined(NBPAX_PROGRAM_PREFIX) && ${NBPAX_PROGRAM_PREFIX} != "" CONFIGURE_ARGS+= --program-prefix=${NBPAX_PROGRAM_PREFIX:Q} .endif @@ -35,11 +34,9 @@ do-extract: ${CP} -R ${FILESDIR} ${WRKSRC} # Haiku (BeFS) cannot support hard link -.if ${OPSYS} == "Haiku" -SUBST_CLASSES+= symlink +SUBST_CLASSES.Haiku+= symlink SUBST_STAGE.symlink= pre-configure SUBST_FILES.symlink= Makefile.in SUBST_SED.symlink= -e 's,ln -f ,ln -sf ,g' -.endif .include "../../mk/bsd.pkg.mk" diff --git a/archivers/upx/Makefile b/archivers/upx/Makefile index 75ec7fd4efb..509a00b6a05 100644 --- a/archivers/upx/Makefile +++ b/archivers/upx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2015/06/12 10:48:22 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2016/02/25 09:28:37 jperkin Exp $ DISTNAME= upx-3.91-src PKGNAME= ${DISTNAME:S/-src//1} @@ -23,12 +23,8 @@ MAKE_ENV+= PREFIX=${PREFIX} UCLDIR=${PREFIX} LDLIBDIRS=-L${PREFIX}/lib INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/doc/upx -BUILDLINK_TRANSFORM+= rm:-mcpu=i686 - -.include "../../mk/bsd.prefs.mk" -.if ${OPSYS} == "SunOS" -BUILDLINK_TRANSFORM+= rm:-Wl,-Map rm:-Wl,upx.map -.endif +BUILDLINK_TRANSFORM+= rm:-mcpu=i686 +BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,-Map rm:-Wl,upx.map post-extract: mkdir -p ${WRKSRC}/src/stub/src/c/lzma-sdk diff --git a/archivers/xz/Makefile b/archivers/xz/Makefile index 83618c97f8d..6dff91e57a5 100644 --- a/archivers/xz/Makefile +++ b/archivers/xz/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2015/10/01 05:11:36 adam Exp $ +# $NetBSD: Makefile,v 1.23 2016/02/25 09:28:37 jperkin Exp $ DISTNAME= xz-5.2.2 CATEGORIES= archivers @@ -10,9 +10,6 @@ HOMEPAGE= http://tukaani.org/xz/ COMMENT= XZ utilities LICENSE= public-domain AND gnu-gpl-v2 -.include "../../mk/bsd.prefs.mk" -.include "options.mk" - USE_LIBTOOL= yes GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE= src/liblzma/liblzma.pc.in @@ -27,10 +24,10 @@ CONFLICTS= lzma-[0-9]* lzma-utils-[0-9]* lzmalib-[0-9]* CONFIGURE_ARGS+= --disable-assembler .endif -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= ac_cv_have_decl_optreset=no -CONFIGURE_ENV+= gl_cv_cc_visibility=no -.endif +CONFIGURE_ENV.SunOS+= ac_cv_have_decl_optreset=no +CONFIGURE_ENV.SunOS+= gl_cv_cc_visibility=no + +.include "options.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3