diff options
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pbulk-base/Makefile | 12 | ||||
| -rw-r--r-- | pkgtools/pkg_install/Makefile | 14 | ||||
| -rw-r--r-- | pkgtools/pkgin/Makefile | 6 |
3 files changed, 10 insertions, 22 deletions
diff --git a/pkgtools/pbulk-base/Makefile b/pkgtools/pbulk-base/Makefile index 5819ab6b434..49a8691d71c 100644 --- a/pkgtools/pbulk-base/Makefile +++ b/pkgtools/pbulk-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2015/12/07 16:52:40 joerg Exp $ +# $NetBSD: Makefile,v 1.21 2016/02/25 17:25:05 jperkin Exp $ DISTNAME= pbulk-base-0.51 COMMENT= Core components of the modular bulk build framework @@ -21,14 +21,10 @@ CONFLICTS= pbulk<0.39 CPPFLAGS+= -Wno-clobbered .endif -.if ${OPSYS} == "SunOS" -LDADD+= -lsocket -lresolv -MAKE_ENV+= LDADD=${LDADD:Q} -.endif +LDADD.SunOS+= -lsocket -lresolv +MAKE_ENV.SunOS+= LDADD=${LDADD:Q} -.if ${OPSYS} == "Linux" -CPPFLAGS+= -D_GNU_SOURCE -.endif +CPPFLAGS.Linux+= -D_GNU_SOURCE BUILD_DIRS= lib pbuild presolve pscan diff --git a/pkgtools/pkg_install/Makefile b/pkgtools/pkg_install/Makefile index d5bdce66bb2..2fa0867a1b2 100644 --- a/pkgtools/pkg_install/Makefile +++ b/pkgtools/pkg_install/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.215 2016/01/21 21:32:22 tron Exp $ +# $NetBSD: Makefile,v 1.216 2016/02/25 17:25:05 jperkin Exp $ # Notes to package maintainers: # @@ -165,20 +165,14 @@ CONFIG_GUESS_OVERRIDE+= ${WRKDIR}/libarchive/build/autoconf/config.guess \ CONFIG_SUB_OVERRIDE+= ${WRKDIR}/libarchive/build/autoconf/config.sub \ ${WRKSRC}/config.sub -. if ${OPSYS} == "Cygwin" -CPPFLAGS+= -DLIBARCHIVE_STATIC -. endif +CPPFLAGS.Cygwin+= -DLIBARCHIVE_STATIC -. if ${OPSYS} == "Darwin" # Make sure that the linker used our static library instead of the # (outdated) dynamic library "/usr/lib/libarchive.dylib". -LDFLAGS+= -Wl,-search_paths_first -. endif +LDFLAGS.Darwin+= -Wl,-search_paths_first -. 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 # Hack to make sure that the libarchive version is replaced pre-configure: config-guess-override config-sub-override diff --git a/pkgtools/pkgin/Makefile b/pkgtools/pkgin/Makefile index daf6ae86f3c..57da4486449 100644 --- a/pkgtools/pkgin/Makefile +++ b/pkgtools/pkgin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.64 2016/02/08 16:39:30 jperkin Exp $ +# $NetBSD: Makefile,v 1.65 2016/02/25 17:25:05 jperkin Exp $ DISTNAME= pkgin-0.9.4 GITHUB_TAG= v${PKGVERSION_NOREV} @@ -38,13 +38,11 @@ USE_TOOLS+= nroff .include "../../mk/bsd.prefs.mk" -.if ${OPSYS} == "NetBSD" -SUBST_CLASSES+= osrel +SUBST_CLASSES.NetBSD+= osrel SUBST_STAGE.osrel= pre-configure SUBST_MESSAGE.osrel= Adjusting repository OS release SUBST_FILES.osrel= REPOSITORIES SUBST_SED.osrel= -e "s|@OSREL@|${OS_VERSION:C/_.*//}|" -.endif CFLAGS.SunOS+= -D_FILE_OFFSET_BITS=64 |