diff options
27 files changed, 109 insertions, 109 deletions
diff --git a/archivers/bsdtar/Makefile b/archivers/bsdtar/Makefile index e0ea5f3866e..54752f8d355 100644 --- a/archivers/bsdtar/Makefile +++ b/archivers/bsdtar/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2018/02/13 12:50:40 ryoon Exp $ +# $NetBSD: Makefile,v 1.26 2019/11/02 22:54:25 rillig Exp $ .include "../../archivers/libarchive/Makefile.common" .include "../../mk/bsd.prefs.mk" @@ -8,7 +8,7 @@ COMMENT= Fast multi-format tape archiver # Explicitly do not depend on libtool as this can be used # as bootstrap dependency. -#USE_LIBTOOL= yes +#USE_LIBTOOL= yes CONFIGURE_ARGS+= --enable-bsdtar=static CONFIGURE_ARGS+= --disable-bsdcpio CONFIGURE_ARGS+= --disable-shared @@ -24,17 +24,17 @@ CHECK_BUILTIN.openssl:= yes CHECK_BUILTIN.openssl:= no .if empty(USE_BUILTIN.bzip2:M[yY][eE][sS]) -CPPFLAGS+= -I${WRKDIR}/bzip2 -LDFLAGS+= -L${WRKDIR}/bzip2 +CPPFLAGS+= -I${WRKDIR}/bzip2 +LDFLAGS+= -L${WRKDIR}/bzip2 .endif .if empty(USE_BUILTIN.zlib:M[yY][eE][sS]) -CPPFLAGS+= -I${WRKDIR}/zlib -LDFLAGS+= -L${WRKDIR}/zlib +CPPFLAGS+= -I${WRKDIR}/zlib +LDFLAGS+= -L${WRKDIR}/zlib .endif .if empty(USE_BUILTIN.openssl:M[yY][eE][sS]) CONFIGURE_ARGS+= --without-openssl .else -LDFLAGS+= -lcrypto +LDFLAGS+= -lcrypto .endif .if empty(USE_BUILTIN.xz:M[yY][eE][sS]) CONFIGURE_ARGS+= --without-lzma diff --git a/archivers/bzip2/builtin.mk b/archivers/bzip2/builtin.mk index 04f75d74784..6ddb569a2b9 100644 --- a/archivers/bzip2/builtin.mk +++ b/archivers/bzip2/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.9 2013/11/23 10:51:09 obache Exp $ +# $NetBSD: builtin.mk,v 1.10 2019/11/02 22:54:26 rillig Exp $ BUILTIN_PKG:= bzip2 @@ -18,7 +18,7 @@ IS_BUILTIN.bzip2= no IS_BUILTIN.bzip2= yes . endif .endif -MAKEVARS+= IS_BUILTIN.bzip2 +MAKEVARS+= IS_BUILTIN.bzip2 ### ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to @@ -43,7 +43,7 @@ BUILTIN_VERSION.bzip2!= \ BUILTIN_PKG.bzip2= bzip2-${BUILTIN_VERSION.bzip2} .endif -MAKEVARS+= BUILTIN_PKG.bzip2 +MAKEVARS+= BUILTIN_PKG.bzip2 ### ### Determine whether we should use the built-in implementation if it @@ -80,7 +80,7 @@ USE_BUILTIN.bzip2= no . endfor . endif # PREFER.bzip2 .endif -MAKEVARS+= USE_BUILTIN.bzip2 +MAKEVARS+= USE_BUILTIN.bzip2 # if USE_BZIP2 is defined, then force the use of a true bzip2 # implementation. diff --git a/archivers/dar/Makefile b/archivers/dar/Makefile index dbb70b8402f..cf6f9dac50e 100644 --- a/archivers/dar/Makefile +++ b/archivers/dar/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.55 2019/07/06 16:29:10 bsiegert Exp $ +# $NetBSD: Makefile,v 1.56 2019/11/02 22:54:26 rillig Exp $ DISTNAME= dar-2.4.13 PKGREVISION= 1 @@ -35,7 +35,7 @@ REPLACE_BASH+= doc/samples/*.bash doc/samples/*.sh doc/samples/*.duc ## Our threading check here is the same as the one used in devel/perl5. # CHECK_BUILTIN.pthread:=yes -. include "../../mk/pthread.builtin.mk" +.include "../../mk/pthread.builtin.mk" CHECK_BUILTIN.pthread:=no ## XXX I'm following the USE_FEATURES semantics used in security/openssl. diff --git a/archivers/fastjar/Makefile b/archivers/fastjar/Makefile index d45ee729f32..40decb4c9f7 100644 --- a/archivers/fastjar/Makefile +++ b/archivers/fastjar/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2016/09/18 11:17:41 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2019/11/02 22:54:26 rillig Exp $ DISTNAME= fastjar-0.98 PKGREVISION= 1 @@ -12,7 +12,7 @@ LICENSE= gnu-gpl-v2 GNU_CONFIGURE= YES -INFO_FILES= YES +INFO_FILES= YES INSTALLATION_DIRS= ${PKGMANDIR}/man1 post-install: diff --git a/archivers/lha/Makefile b/archivers/lha/Makefile index b40a56885b3..ffbbe3b8a6a 100644 --- a/archivers/lha/Makefile +++ b/archivers/lha/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2016/02/25 09:28:36 jperkin Exp $ +# $NetBSD: Makefile,v 1.41 2019/11/02 22:54:26 rillig Exp $ DISTNAME= lha-114i PKGNAME= lha-114.9 @@ -11,18 +11,18 @@ HOMEPAGE= http://www2m.biglobe.ne.jp/~dolphin/lha/lha-unix.htm COMMENT= Archive files using LZW compression (.lzh files) LICENSE= lha-license -RESTRICTED= Other than for-free distribution of the unmodified source \ +RESTRICTED= Other than for-free distribution of the unmodified source \ over a network, redistribution terms are complex. -NO_SRC_ON_CDROM=${RESTRICTED} -NO_BIN_ON_FTP= ${RESTRICTED} -NO_BIN_ON_CDROM=${RESTRICTED} +NO_SRC_ON_CDROM= ${RESTRICTED} +NO_BIN_ON_FTP= ${RESTRICTED} +NO_BIN_ON_CDROM= ${RESTRICTED} MAKE_FLAGS+= MAKE=${MAKE_PROGRAM:Q} -OPSYSVARS+= LHA_CPPFLAGS -LHA_CPPFLAGS= -DSYSTIME_HAS_NO_TM -DMKTIME -DUSESTRCASECMP -DSYSV_SYSTEM_DIR +OPSYSVARS+= LHA_CPPFLAGS +LHA_CPPFLAGS= -DSYSTIME_HAS_NO_TM -DMKTIME -DUSESTRCASECMP -DSYSV_SYSTEM_DIR LHA_CPPFLAGS.Darwin+= -DHAVE_NO_LCHOWN -MAKE_FLAGS+= MACHINE=${LHA_CPPFLAGS:Q} +MAKE_FLAGS+= MACHINE=${LHA_CPPFLAGS:Q} INSTALLATION_DIRS= bin ${PKGMANDIR}/ja_JP.EUC/man1 diff --git a/archivers/libarchive/builtin.mk b/archivers/libarchive/builtin.mk index 3637ac3610e..cb5aa0d250c 100644 --- a/archivers/libarchive/builtin.mk +++ b/archivers/libarchive/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.10 2019/04/10 08:24:03 adam Exp $ +# $NetBSD: builtin.mk,v 1.11 2019/11/02 22:54:26 rillig Exp $ BUILTIN_PKG:= libarchive @@ -17,7 +17,7 @@ IS_BUILTIN.libarchive= no IS_BUILTIN.libarchive= yes . endif .endif -MAKEVARS+= IS_BUILTIN.libarchive +MAKEVARS+= IS_BUILTIN.libarchive ### ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to @@ -60,7 +60,7 @@ BUILTIN_PKG.libarchive= libarchive-${BUILTIN_VERSION.libarchive} IS_BUILTIN.libarchive= no . endif .endif -MAKEVARS+= BUILTIN_PKG.libarchive +MAKEVARS+= BUILTIN_PKG.libarchive ### ### Determine whether we should use the built-in implementation if it @@ -87,7 +87,7 @@ USE_BUILTIN.libarchive!= \ . endif . endif # PREFER.libarchive .endif -MAKEVARS+= USE_BUILTIN.libarchive +MAKEVARS+= USE_BUILTIN.libarchive ### ### The section below only applies if we are not including this file diff --git a/archivers/libcomprex/Makefile b/archivers/libcomprex/Makefile index aa3d87b592f..560704b1f19 100644 --- a/archivers/libcomprex/Makefile +++ b/archivers/libcomprex/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2019/08/22 12:22:48 ryoon Exp $ +# $NetBSD: Makefile,v 1.44 2019/11/02 22:54:26 rillig Exp $ DISTNAME= libcomprex-0.3.3 PKGREVISION= 20 @@ -9,14 +9,14 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://gnupdate.sourceforge.net/components/libcomprex/index.xml COMMENT= Library to handle (de)compression of files -USE_LIBTOOL= yes -USE_TOOLS+= pkg-config -USE_PKGLOCALEDIR= yes -PKGCONFIG_OVERRIDE= libcomprex.pc.in -GNU_CONFIGURE= yes +USE_LIBTOOL= yes +USE_TOOLS+= pkg-config +USE_PKGLOCALEDIR= yes +PKGCONFIG_OVERRIDE= libcomprex.pc.in +GNU_CONFIGURE= yes BROKEN_GETTEXT_DETECTION= yes -CONFIGURE_ENV+= ac_cv_lib_curl_curl_formparse=yes -REPLACE_SH= comprex-config.in +CONFIGURE_ENV+= ac_cv_lib_curl_curl_formparse=yes +REPLACE_SH= comprex-config.in .include "../../archivers/bzip2/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/archivers/libunrar/buildlink3.mk b/archivers/libunrar/buildlink3.mk index 3c9fa298e14..ed1fda99779 100644 --- a/archivers/libunrar/buildlink3.mk +++ b/archivers/libunrar/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2018/12/14 16:02:55 bsiegert Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2019/11/02 22:54:26 rillig Exp $ BUILDLINK_TREE+= libunrar @@ -6,7 +6,7 @@ BUILDLINK_TREE+= libunrar LIBUNRAR_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libunrar+= libunrar>=5.6.8 -BUILDLINK_PKGSRCDIR.libunrar?= ../../archivers/libunrar +BUILDLINK_PKGSRCDIR.libunrar?= ../../archivers/libunrar .endif # LIBUNRAR_BUILDLINK3_MK BUILDLINK_TREE+= -libunrar diff --git a/archivers/nulib2/Makefile b/archivers/nulib2/Makefile index b3f20f1d879..87401271b88 100644 --- a/archivers/nulib2/Makefile +++ b/archivers/nulib2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2016/01/23 05:15:22 zafer Exp $ +# $NetBSD: Makefile,v 1.25 2019/11/02 22:54:26 rillig Exp $ # DISTNAME= nulibdist-220 @@ -19,7 +19,7 @@ GNU_CONFIGURE= yes .include "../../mk/bsd.prefs.mk" -CONFIGURE_ARGS+=--cache-file=${WRKDIR}/config.cache +CONFIGURE_ARGS+= --cache-file=${WRKDIR}/config.cache CFLAGS+= -D__unix__ diff --git a/archivers/ocaml-bz2/Makefile b/archivers/ocaml-bz2/Makefile index 5b4de444d31..9c387dfedd4 100644 --- a/archivers/ocaml-bz2/Makefile +++ b/archivers/ocaml-bz2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2018/11/12 16:10:17 jaapb Exp $ +# $NetBSD: Makefile,v 1.19 2019/11/02 22:54:26 rillig Exp $ PKGNAME= ocaml-bz2-${VERSION} DISTNAME= camlbz2-${VERSION} @@ -12,9 +12,9 @@ COMMENT= OCaml library to manipulate bz2 archives HOMEPAGE= http://camlbz2.forge.ocamlcore.org/ LICENSE= gnu-lgpl-v2.1 -GNU_CONFIGURE= yes -USE_TOOLS+= gmake -MAKE_JOBS_SAFE= no +GNU_CONFIGURE= yes +USE_TOOLS+= gmake +MAKE_JOBS_SAFE= no OCAML_USE_FINDLIB= yes .include "../../mk/ocaml.mk" diff --git a/archivers/ocaml-decompress/buildlink3.mk b/archivers/ocaml-decompress/buildlink3.mk index 6ab9ddf7ac3..66540539a31 100644 --- a/archivers/ocaml-decompress/buildlink3.mk +++ b/archivers/ocaml-decompress/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2019/03/12 18:00:02 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2019/11/02 22:54:27 rillig Exp $ BUILDLINK_TREE+= ocaml-decompress @@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-decompress OCAML_DECOMPRESS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-decompress+= ocaml-decompress>=0.8.1 -BUILDLINK_PKGSRCDIR.ocaml-decompress?= ../../archivers/ocaml-decompress +BUILDLINK_PKGSRCDIR.ocaml-decompress?= ../../archivers/ocaml-decompress .endif # OCAML_DECOMPRESS_BUILDLINK3_MK diff --git a/archivers/ocaml-zip/Makefile b/archivers/ocaml-zip/Makefile index dade90fc528..74a0bec64bc 100644 --- a/archivers/ocaml-zip/Makefile +++ b/archivers/ocaml-zip/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2018/11/12 16:10:17 jaapb Exp $ +# $NetBSD: Makefile,v 1.25 2019/11/02 22:54:27 rillig Exp $ # VERSION= 1.07 @@ -15,9 +15,9 @@ MAINTAINER= jaapb@NetBSD.org HOMEPAGE= https://github.com/xavierleroy/camlzip COMMENT= OCaml library to manipulate ZIP/GZIP/JAR archives -BUILD_TARGET= all -INSTALL_TARGET= install-findlib -USE_TOOLS+= gmake +BUILD_TARGET= all +INSTALL_TARGET= install-findlib +USE_TOOLS+= gmake OCAML_USE_FINDLIB= yes .include "../../mk/ocaml.mk" diff --git a/archivers/pax/Makefile b/archivers/pax/Makefile index 396519ca092..8167c5948ba 100644 --- a/archivers/pax/Makefile +++ b/archivers/pax/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.53 2018/10/29 20:18:02 triaxx Exp $ +# $NetBSD: Makefile,v 1.54 2019/11/02 22:54:27 rillig Exp $ DISTNAME= pax-20080110 PKGREVISION= 4 @@ -12,7 +12,7 @@ COMMENT= POSIX standard archiver with many extensions LICENSE= 2-clause-bsd AND modified-bsd AND public-domain BOOTSTRAP_PKG= yes -CHECK_PERMS= no +CHECK_PERMS= no MAKE_ENV+= CATMAN_SECTION_SUFFIX=${CATMAN_SECTION_SUFFIX:Q} MAKE_ENV+= MANINSTALL=${MANINSTALL:Q} diff --git a/archivers/py-czipfile/Makefile b/archivers/py-czipfile/Makefile index be078443794..b76ec6ebde3 100644 --- a/archivers/py-czipfile/Makefile +++ b/archivers/py-czipfile/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2019/09/02 13:19:58 adam Exp $ +# $NetBSD: Makefile,v 1.7 2019/11/02 22:54:27 rillig Exp $ DISTNAME= czipfile-1.0.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -10,7 +10,7 @@ HOMEPAGE= https://pypi.python.org/pypi/czipfile COMMENT= Replacement for builtin zipfile, with fast, C-based zipfile decryption LICENSE= python-software-foundation -PYTHON_VERSIONS_ACCEPTED= 27 # for 2.x only +PYTHON_VERSIONS_ACCEPTED= 27 # for 2.x only .include "../../lang/python/egg.mk" .include "../../devel/py-cython/buildlink3.mk" diff --git a/archivers/rox-archive/Makefile b/archivers/rox-archive/Makefile index dbed65fe64b..0d470c6d02f 100644 --- a/archivers/rox-archive/Makefile +++ b/archivers/rox-archive/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2019/04/25 07:32:34 maya Exp $ +# $NetBSD: Makefile,v 1.14 2019/11/02 22:54:27 rillig Exp $ # DISTNAME= archive-2.0 @@ -22,7 +22,7 @@ USE_TOOLS+= pax NO_BUILD= yes REPLACE_PYTHON= AppRun tests/testall.py -REPLACE_SH= Messages/dist Messages/update-po +REPLACE_SH= Messages/dist Messages/update-po INSTALLATION_DIRS= share/rox/Archive diff --git a/archivers/rzip/Makefile b/archivers/rzip/Makefile index bd652f3354b..9ea1eb7edb2 100644 --- a/archivers/rzip/Makefile +++ b/archivers/rzip/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2016/01/23 05:47:38 zafer Exp $ +# $NetBSD: Makefile,v 1.13 2019/11/02 22:54:27 rillig Exp $ DISTNAME= rzip-2.1 CATEGORIES= archivers @@ -8,7 +8,7 @@ MAINTAINER= carton@Ivy.NET HOMEPAGE= http://rzip.samba.org/ COMMENT= Create or extract .rz files, like gzip but smaller -GNU_CONFIGURE= yes +GNU_CONFIGURE= yes INSTALL_MAKE_FLAGS+= INSTALL_BIN=${DESTDIR}${PREFIX}/bin \ INSTALL_MAN=${DESTDIR}${PREFIX}/${PKGMANDIR} diff --git a/archivers/sarab/Makefile b/archivers/sarab/Makefile index 4eb51b4e278..24b103edd52 100644 --- a/archivers/sarab/Makefile +++ b/archivers/sarab/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2018/07/04 13:40:08 jperkin Exp $ +# $NetBSD: Makefile,v 1.9 2019/11/02 22:54:27 rillig Exp $ DISTNAME= sarab-1.0.0 CATEGORIES= archivers @@ -20,9 +20,9 @@ REPLACE.bash.new= ${TOOLS_PATH.bash} REPLACE_FILES.bash= sarab.sh EGDIR= ${PREFIX}/share/examples/sarab -CONF_FILES+= ${EGDIR}/rotation.schedule ${PKG_SYSCONFDIR}/rotation.schedule -CONF_FILES+= ${EGDIR}/sarab.conf ${PKG_SYSCONFDIR}/sarab.conf -CONF_FILES+= ${EGDIR}/sarab.dcf ${PKG_SYSCONFDIR}/sarab.dcf +CONF_FILES+= ${EGDIR}/rotation.schedule ${PKG_SYSCONFDIR}/rotation.schedule +CONF_FILES+= ${EGDIR}/sarab.conf ${PKG_SYSCONFDIR}/sarab.conf +CONF_FILES+= ${EGDIR}/sarab.dcf ${PKG_SYSCONFDIR}/sarab.dcf SUBST_CLASSES+= dar SUBST_STAGE.dar= pre-configure diff --git a/archivers/szip/Makefile b/archivers/szip/Makefile index 3bd9bd59143..089cf4b95a5 100644 --- a/archivers/szip/Makefile +++ b/archivers/szip/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2017/09/04 18:08:18 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2019/11/02 22:54:27 rillig Exp $ DISTNAME= szip-2.1 PKGREVISION= 3 @@ -8,7 +8,7 @@ MASTER_SITES= ftp://ftp.hdfgroup.org/lib-external/szip/2.1/src/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://www.hdfgroup.org/doc_resource/SZIP/ COMMENT= Extended-Rice lossless compression -LICENSE= szip-license +LICENSE= szip-license RESTRICTED= No permission to redistribute NO_SRC_ON_FTP= ${RESTRICTED} diff --git a/archivers/torrentzip/Makefile b/archivers/torrentzip/Makefile index f1d0160a89f..4fa9610878a 100644 --- a/archivers/torrentzip/Makefile +++ b/archivers/torrentzip/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2017/09/06 09:02:59 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2019/11/02 22:54:28 rillig Exp $ # DISTNAME= trrntzip_v02_src @@ -10,8 +10,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://sourceforge.net/projects/trrntzip/ COMMENT= Create identical zip archives from identical files -USE_TOOLS+= aclocal autoconf automake autoheader -GNU_CONFIGURE= yes +USE_TOOLS+= aclocal autoconf automake autoheader +GNU_CONFIGURE= yes INSTALLATION_DIRS= share/doc/torrentzip WRKSRC= ${WRKDIR}/trrntzip diff --git a/archivers/unace-bin/Makefile b/archivers/unace-bin/Makefile index 6e1701def27..e569b490c4a 100644 --- a/archivers/unace-bin/Makefile +++ b/archivers/unace-bin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2017/09/06 10:40:25 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2019/11/02 22:54:28 rillig Exp $ # DISTNAME= linunace25 @@ -10,7 +10,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= pkgsrc-users@NetBSD.org #HOMEPAGE= http://www.winace.com/ COMMENT= Extract, list and test files in ACE archives (Linux binary) -LICENSE= unace-license +LICENSE= unace-license RESTRICTED= Only original file distribution. NO_BIN_ON_FTP= ${RESTRICTED} diff --git a/archivers/unace/Makefile b/archivers/unace/Makefile index b3140d15697..010f5d2f15d 100644 --- a/archivers/unace/Makefile +++ b/archivers/unace/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2017/09/06 10:40:25 wiz Exp $ +# $NetBSD: Makefile,v 1.26 2019/11/02 22:54:28 rillig Exp $ # DISTNAME= unace-1.2b @@ -10,7 +10,7 @@ MASTER_SITES= ${MASTER_SITE_SUNSITE:=utils/compress/} MAINTAINER= pkgsrc-users@NetBSD.org #HOMEPAGE= http://www.winace.com/ COMMENT= Extract, list and test files in ACE archives -LICENSE= unace-source-license +LICENSE= unace-source-license # clang: error: no such file or directory: 'uac_crc.o' MAKE_JOBS_SAFE= no diff --git a/archivers/unarj/Makefile b/archivers/unarj/Makefile index 7e191cb7b16..e271d0989a9 100644 --- a/archivers/unarj/Makefile +++ b/archivers/unarj/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2014/10/09 14:05:54 wiz Exp $ +# $NetBSD: Makefile,v 1.30 2019/11/02 22:54:28 rillig Exp $ DISTNAME= unarj-2.65 PKGREVISION= 1 @@ -10,9 +10,9 @@ HOMEPAGE= http://www.arjsoftware.com/ COMMENT= Allows files to be extracted from ARJ archives LICENSE= unarj-license -RESTRICTED= Do not charge a fee for use, copying, or distribution -NO_SRC_ON_CDROM=${RESTRICTED} -NO_BIN_ON_CDROM=${RESTRICTED} +RESTRICTED= Do not charge a fee for use, copying, or distribution +NO_SRC_ON_CDROM= ${RESTRICTED} +NO_BIN_ON_CDROM= ${RESTRICTED} NO_CONFIGURE= yes diff --git a/archivers/upx/Makefile b/archivers/upx/Makefile index 8b3786f222e..f2ad1462622 100644 --- a/archivers/upx/Makefile +++ b/archivers/upx/Makefile @@ -1,13 +1,13 @@ -# $NetBSD: Makefile,v 1.29 2019/08/12 11:08:36 leot Exp $ - -DISTNAME= upx-3.91-src -PKGNAME= ${DISTNAME:S/-src//1} -PKGREVISION= 6 -CATEGORIES= archivers -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=upx/} -EXTRACT_SUFX= .tar.bz2 +# $NetBSD: Makefile,v 1.30 2019/11/02 22:54:28 rillig Exp $ + +DISTNAME= upx-3.91-src +PKGNAME= ${DISTNAME:S/-src//1} +PKGREVISION= 6 +CATEGORIES= archivers +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=upx/} +EXTRACT_SUFX= .tar.bz2 # consult src/stub/src/c/Makevars.lzma for the supported LZMA SDK version -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} lzma443${EXTRACT_SUFX} +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} lzma443${EXTRACT_SUFX} SITES.lzma443.tar.bz2= ${MASTER_SITE_SOURCEFORGE:=sevenzip/} MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/archivers/xbin/Makefile b/archivers/xbin/Makefile index 9740579124f..ed18c6b02f5 100644 --- a/archivers/xbin/Makefile +++ b/archivers/xbin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2014/10/09 14:05:55 wiz Exp $ +# $NetBSD: Makefile,v 1.34 2019/11/02 22:54:28 rillig Exp $ DISTNAME= ${PRGNAME}unix PKGNAME= ${PRGNAME}-2.3 @@ -10,9 +10,9 @@ DISTFILES= ${DISTNAME}.c ${PRGNAME}.man MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Convert mailable BinHex format into binary -RESTRICTED= May not be sold without permission. -NO_SRC_ON_CDROM=${RESTRICTED} -NO_BIN_ON_CDROM=${RESTRICTED} +RESTRICTED= May not be sold without permission. +NO_SRC_ON_CDROM= ${RESTRICTED} +NO_BIN_ON_CDROM= ${RESTRICTED} WRKSRC= ${WRKDIR} @@ -23,9 +23,9 @@ EXTRACT_ONLY= # empty .if !empty(OPSYS:M*BSD) || ${OPSYS} == "DragonFly" CFLAGS+= -DBSD -.if ${OPSYS} != "OpenBSD" +. if ${OPSYS} != "OpenBSD" LDFLAGS+= -lcompat -.endif +. endif .endif CFLAGS.Interix+= -DBSD CFLAGS.Darwin+= -DBSD diff --git a/archivers/xz/builtin.mk b/archivers/xz/builtin.mk index ddcdf6b533e..d2a79962cbf 100644 --- a/archivers/xz/builtin.mk +++ b/archivers/xz/builtin.mk @@ -1,11 +1,11 @@ -# $NetBSD: builtin.mk,v 1.5 2018/04/29 21:18:16 ryoon Exp $ +# $NetBSD: builtin.mk,v 1.6 2019/11/02 22:54:28 rillig Exp $ BUILTIN_PKG:= xz -BUILTIN_FIND_HEADERS_VAR:= H_LZMA H_LZMA_VERSION -BUILTIN_FIND_HEADERS.H_LZMA= lzma.h -BUILTIN_FIND_HEADERS.H_LZMA_VERSION=lzma/version.h -BUILTIN_FIND_GREP.H_LZMA= LZMA_ +BUILTIN_FIND_HEADERS_VAR:= H_LZMA H_LZMA_VERSION +BUILTIN_FIND_HEADERS.H_LZMA= lzma.h +BUILTIN_FIND_HEADERS.H_LZMA_VERSION= lzma/version.h +BUILTIN_FIND_GREP.H_LZMA= LZMA_ .include "../../mk/buildlink3/bsd.builtin.mk" @@ -14,9 +14,9 @@ BUILTIN_FIND_GREP.H_LZMA= LZMA_ ### set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). ### .if !defined(IS_BUILTIN.xz) -IS_BUILTIN.xz= no +IS_BUILTIN.xz= no . if empty(H_LZMA:M__nonexistent__) && empty(H_LZMA:M${LOCALBASE}/*) -IS_BUILTIN.xz= yes +IS_BUILTIN.xz= yes . endif .endif MAKEVARS+= IS_BUILTIN.xz @@ -40,7 +40,7 @@ BUILTIN_VERSION.xz!= \ END { printf "%s%s%s%s\n", M, m, p, s} \ ' ${H_LZMA_VERSION:Q} -BUILTIN_PKG.xz= xz-${BUILTIN_VERSION.xz} +BUILTIN_PKG.xz= xz-${BUILTIN_VERSION.xz} .endif MAKEVARS+= BUILTIN_PKG.xz @@ -100,11 +100,11 @@ BUILDLINK_FILES.xz+= lib/pkgconfig/xz.pc # Fake pkg-config for builtin xz on NetBSD -.if !empty(USE_BUILTIN.xz:M[yY][eE][sS]) -. if !empty(USE_TOOLS:C/:.*//:Mpkg-config) +. if !empty(USE_BUILTIN.xz:M[yY][eE][sS]) +. if !empty(USE_TOOLS:C/:.*//:Mpkg-config) do-configure-pre-hook: override-liblzma-pkgconfig -BLKDIR_PKGCFG= ${BUILDLINK_DIR}/lib/pkgconfig +BLKDIR_PKGCFG= ${BUILDLINK_DIR}/lib/pkgconfig LIBLZMA_PKGCFGF= liblzma.pc override-liblzma-pkgconfig: override-message-liblzma-pkgconfig @@ -127,7 +127,7 @@ override-liblzma-pkgconfig: ${ECHO} "Libs.private: -pthread"; \ ${ECHO} "Cflags: -I\$${includedir}"; \ } >> ${BLKDIR_PKGCFG}/${LIBLZMA_PKGCFGF}; +. endif . endif -.endif .endif # CHECK_BUILTIN.xz diff --git a/archivers/zutils/Makefile b/archivers/zutils/Makefile index 9a0167cc721..2a6634d5484 100644 --- a/archivers/zutils/Makefile +++ b/archivers/zutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2018/07/04 13:40:08 jperkin Exp $ +# $NetBSD: Makefile,v 1.10 2019/11/02 22:54:28 rillig Exp $ # DISTNAME= zutils-1.6 @@ -25,11 +25,11 @@ INFO_FILES= yes EGDIR= ${PREFIX}/share/examples/zutils CONF_FILES= ${EGDIR}/zutilsrc ${PREFIX}/etc/zutilsrc -SUBST_CLASSES+= sysconfdir -SUBST_STAGE.sysconfdir= pre-configure -SUBST_FILES.sysconfdir= zutilsrc -SUBST_MESSAGE.sysconfdir= path of sysconfdir in example (zutilsrc) -SUBST_SED.sysconfdir= -e '/sysconfdir/s,$${sysconfdir},${PREFIX}/etc,' +SUBST_CLASSES+= sysconfdir +SUBST_STAGE.sysconfdir= pre-configure +SUBST_FILES.sysconfdir= zutilsrc +SUBST_MESSAGE.sysconfdir= path of sysconfdir in example (zutilsrc) +SUBST_SED.sysconfdir= -e '/sysconfdir/s,$${sysconfdir},${PREFIX}/etc,' TEST_TARGET= check diff --git a/archivers/zziplib/Makefile b/archivers/zziplib/Makefile index a52c1bc921c..aff17627999 100644 --- a/archivers/zziplib/Makefile +++ b/archivers/zziplib/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.24 2018/08/06 12:55:38 snj Exp $ +# $NetBSD: Makefile,v 1.25 2019/11/02 22:54:28 rillig Exp $ DISTNAME= zziplib-0.13.69 CATEGORIES= archivers -MASTER_SITES= ${MASTER_SITE_GITHUB:=gdraheim/} +MASTER_SITES= ${MASTER_SITE_GITHUB:=gdraheim/} GITHUB_TAG= v${PKGVERSION_NOREV} MAINTAINER= pkgsrc-users@NetBSD.org |