Date: Wed, 10 Jul 2019 14:40:02 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r506352 - in head: . Mk Mk/Uses benchmarks/linux-vdbench devel/fb-adb devel/linux-c6-devtools devel/linux-c7-devtools emulators/linux-c7 emulators/linux_base-c6 emulators/linux_base-c7 ... Message-ID: <201907101440.x6AEe2cc017072@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Wed Jul 10 14:40:02 2019 New Revision: 506352 URL: https://svnweb.freebsd.org/changeset/ports/506352 Log: On amd64 adding DEFAULT_VERSIONS+=linux=c6 to /etc/make.conf made Linux infrastructure ports (linux_base-c6 and linux-c6*) install i386 CentOS 6 packages. Using c6_64 instead of c6 made them install mixed amd64/i386 CentOS 6 packages and allowed Linux application ports to install amd64 binaries when available. The i386-only configuration was only useful for users of x11/nvidia-driver* which didn't provide Linux amd64 emulation until recently. With x11/nvidia-driver* now supporting Linux amd64 there's no longer a need for i386-only Linux on amd64. Let DEFAULT_VERSIONS+=linux=c6 make Linux infrastructure ports install mixed amd64/i386 CentOS 6 packages, like c6_64 before, and remove support for c6_64 as a value. Replace LINUX_ARCH with ARCH everywhere because they are always the same now. Modified: head/Mk/Uses/linux.mk head/Mk/bsd.default-versions.mk head/UPDATING head/benchmarks/linux-vdbench/Makefile head/benchmarks/linux-vdbench/pkg-plist head/devel/fb-adb/Makefile head/devel/linux-c6-devtools/Makefile head/devel/linux-c7-devtools/Makefile head/emulators/linux-c7/Makefile head/emulators/linux_base-c6/Makefile head/emulators/linux_base-c7/Makefile head/games/linux-worldofgoo-demo/Makefile head/graphics/linux-c7-dri/Makefile head/java/linux-oracle-jre18/Makefile head/print/epson-inkjet-printer-201401w/Makefile head/print/epson-inkjet-printer-201601w/Makefile head/x11/nvidia-driver/Makefile Modified: head/Mk/Uses/linux.mk ============================================================================== --- head/Mk/Uses/linux.mk Wed Jul 10 12:39:56 2019 (r506351) +++ head/Mk/Uses/linux.mk Wed Jul 10 14:40:02 2019 (r506352) @@ -32,34 +32,23 @@ linux_ARGS= c6 .elif exists(${LINUXBASE}/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7) linux_ARGS= c7 .else -linux_ARGS= ${LINUX_DEFAULT:S/_64//} +linux_ARGS= ${LINUX_DEFAULT} .endif .endif .if ${linux_ARGS} == c6 LINUX_DIST_VER?= 6.10 -.if ${ARCH} == amd64 && ${LINUX_DEFAULT} != c6 -LINUX_ARCH= x86_64 -.elif ${ARCH} == amd64 || ${ARCH} == i386 -LINUX_ARCH= i386 -.else -LINUX_ARCH= ${ARCH} -IGNORE= Linux CentOS ${LINUX_DIST_VER} is unsupported on ${ARCH} -.endif .elif ${linux_ARGS} == c7 LINUX_DIST_VER?= 7.6.1810 -.if ${ARCH} == amd64 -LINUX_ARCH= x86_64 -.elif ${ARCH} == i386 -LINUX_ARCH= i386 .else -LINUX_ARCH= ${ARCH} -IGNORE= Linux CentOS ${LINUX_DIST_VER} is unsupported on ${ARCH} -.endif -.else IGNORE= Invalid Linux distribution: ${linux_ARGS} .endif +.ifndef ONLY_FOR_ARCHS +ONLY_FOR_ARCHS= amd64 i386 +ONLY_FOR_ARCHS_REASON= Linux compatibility is only available on amd64 and i386 +.endif + linux_allegro_DEP= linux-${linux_ARGS}-allegro>0:devel/linux-${linux_ARGS}-allegro linux_alsa-plugins-oss_DEP= linux-${linux_ARGS}-alsa-plugins-oss>0:audio/linux-${linux_ARGS}-alsa-plugins-oss linux_alsa-plugins-pulseaudio_DEP=linux-${linux_ARGS}-alsa-plugins-pulseaudio>0:audio/linux-${linux_ARGS}-alsa-plugins-pulseaudio @@ -266,7 +255,7 @@ EXTRACT_AFTER_ARGS= | ${TAR} xf - --no-same-owner --no .endif .if ${USE_LINUX_RPM} != noarch -PLIST?= ${PKGDIR}/pkg-plist.${LINUX_ARCH:S/x86_64/amd64/} +PLIST?= ${PKGDIR}/pkg-plist.${ARCH} .endif .if !target(do-install) @@ -299,21 +288,13 @@ DISTFILES_i386?= ${DISTNAME_i386}${EXTRACT_SUFX} _ALL_DISTFILES= ${DISTFILES_amd64} ${DISTFILES_i386} DISTFILES= ${_ALL_DISTFILES:O:u} .else -DISTFILES= ${DISTFILES_${LINUX_ARCH:S/x86_64/amd64/}} +DISTFILES= ${DISTFILES_${ARCH}} .endif -EXTRACT_ONLY?= ${DISTFILES_${LINUX_ARCH:S/x86_64/amd64/}:C/:[^:]+$//} +EXTRACT_ONLY?= ${DISTFILES_${ARCH}:C/:[^:]+$//} .endif .endif .if !empty(SRC_DISTFILES) && (make(makesum) || defined(PACKAGE_BUILDING)) DISTFILES+= ${SRC_DISTFILES} -.endif - -# This triggers on amd64 with DEFAULT_VERSIONS+=linux=c6 (i386 Linux) and -# ports with ONLY_FOR_ARCHS=amd64 or NOT_FOR_ARCHS=i386. It may be removed -# when c6 becomes an alias for c6_64 on amd64 (after FreeBSD 10.3 EoL). -.if (defined(ONLY_FOR_ARCHS) && empty(ONLY_FOR_ARCHS:M${LINUX_ARCH:S/x86_64/amd64/})) \ - || !empty(NOT_FOR_ARCHS:M${LINUX_ARCH:S/x86_64/amd64/}) -IGNORE= does not run on Linux/${LINUX_ARCH} .endif .endif # _POSTMKINCLUDED && ! _INCLUDE_USES_LINUX_POST_MK Modified: head/Mk/bsd.default-versions.mk ============================================================================== --- head/Mk/bsd.default-versions.mk Wed Jul 10 12:39:56 2019 (r506351) +++ head/Mk/bsd.default-versions.mk Wed Jul 10 14:40:02 2019 (r506352) @@ -51,13 +51,8 @@ GHOSTSCRIPT_DEFAULT?= agpl JULIA_DEFAULT?= 1.0 # Possible values: 2.0.0 LAZARUS_DEFAULT?= 2.0.0 -.if ${ARCH} == amd64 -# Possible values: c6, c6_64, c7 -LINUX_DEFAULT?= c6_64 -.else -# Possible values: c6 +# Possible values: c6, c7 LINUX_DEFAULT?= c6 -.endif # Possible values: 60, 70, 80, -devel (to be used when non-base compiler is required) # Please give notice to the Graphics Team (x11@FreeBSD.org) in advance before # bumping the LLVM version. Modified: head/UPDATING ============================================================================== --- head/UPDATING Wed Jul 10 12:39:56 2019 (r506351) +++ head/UPDATING Wed Jul 10 14:40:02 2019 (r506352) @@ -6,6 +6,42 @@ You should get into the habit of checking this file fo you update your ports collection, before attempting any port upgrades. +20190710: + AFFECTS: users with DEFAULT_VERSIONS+=linux=c6 or c6_64 in /etc/make.conf + AUTHOR: tij@FreeBSD.org + + On amd64 adding DEFAULT_VERSIONS+=linux=c6 to /etc/make.conf made Linux + infrastructure ports (linux_base-c6 and linux-c6*) install i386 CentOS 6 + packages. Using c6_64 instead of c6 made them install mixed amd64/i386 + CentOS 6 packages and allowed Linux application ports to install amd64 + binaries when available. The i386-only configuration was only useful for + users of x11/nvidia-driver* which didn't provide Linux amd64 emulation + until recently. + + With x11/nvidia-driver* now supporting Linux amd64 there's no longer a + need for i386-only Linux on amd64 so DEFAULT_VERSIONS+=linux=c6 has been + changed to make Linux infrastructure ports install mixed amd64/i386 + CentOS 6 packages, like c6_64 before, and support for c6_64 has been + removed. + + Users with DEFAULT_VERSIONS+=linux=c6 should reinstall linux_base-c6 and + all packages that depend on it. A list of dependent packages can be + obtained with the following command: + + pkg info -r linux_base-c6 + + Users with DEFAULT_VERSIONS+=linux=c6_64 only need to replace c6_64 with + c6 in /etc/make.conf. + + Users of x11/nvidia-driver* should upgrade to FreeBSD 11.3 or 12.0 if + they want to run Linux amd64 OpenGL programs. If you are running an + older version you may want to postpone installing or updating Linux + application ports until you find the time to upgrade because application + ports may install amd64 binaries now. Infrastructure ports are safe to + reinstall, and so is x11/nvidia-driver*. + + On i386 nothing has changed. + 20190707: AFFECTS: users of www/gitlab-ce AUTHOR: mfechner@FreeBSD.org Modified: head/benchmarks/linux-vdbench/Makefile ============================================================================== --- head/benchmarks/linux-vdbench/Makefile Wed Jul 10 12:39:56 2019 (r506351) +++ head/benchmarks/linux-vdbench/Makefile Wed Jul 10 14:40:02 2019 (r506352) @@ -25,6 +25,7 @@ EXTRACT_AFTER_ARGS= -d ${WRKSRC} JAVA_VERSION= 1.7+ JAVA_OS= linux NO_BUILD= yes +PLIST_SUB= LINUX_ARCH=${LINUX_ARCH} SHEBANG_FILES= ${PORTNAME} linux/config.sh bash_CMD= ${SH} @@ -38,12 +39,12 @@ DOWNLOAD_URL= https://www.oracle.com/technetwork/serve IGNORE=You must manually download ${DISTFILES} from ${DOWNLOAD_URL} and place it in ${DISTDIR} then run make again .endif -.if ${LINUX_ARCH} == "i386" -PLIST_SUB+= LINUX_ARCH_32="" LINUX_ARCH_64="@comment " +.if ${ARCH} == i386 +LINUX_ARCH= 32 .endif -.if ${LINUX_ARCH} == "x86_64" -PLIST_SUB+= LINUX_ARCH_32="@comment " LINUX_ARCH_64="" +.if ${ARCH} == amd64 +LINUX_ARCH= 64 .endif post-patch: @@ -59,12 +60,7 @@ do-install: for f in vdbench.jar build_sds.txt swatcharts.txt; do \ ${INSTALL_DATA} ${WRKSRC}/$${f} ${STAGEDIR}${DATADIR}; \ done -.if ${LINUX_ARCH} == "i386" - ${INSTALL_DATA} ${WRKSRC}/linux/linux32.so ${STAGEDIR}${DATADIR}/linux -.endif -.if ${LINUX_ARCH} == "x86_64" - ${INSTALL_DATA} ${WRKSRC}/linux/linux64.so ${STAGEDIR}${DATADIR}/linux -.endif + ${INSTALL_DATA} ${WRKSRC}/linux/linux${LINUX_ARCH}.so ${STAGEDIR}${DATADIR}/linux ${INSTALL_SCRIPT} ${WRKSRC}/linux/config.sh ${STAGEDIR}${DATADIR}/linux ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${DATADIR} ${RLN} ../${DATADIR_REL}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PKGNAMEPREFIX}${PORTNAME} Modified: head/benchmarks/linux-vdbench/pkg-plist ============================================================================== --- head/benchmarks/linux-vdbench/pkg-plist Wed Jul 10 12:39:56 2019 (r506351) +++ head/benchmarks/linux-vdbench/pkg-plist Wed Jul 10 14:40:02 2019 (r506352) @@ -39,8 +39,7 @@ bin/linux-vdbench %%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/raw/seq_write_xfersizes %%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/raw/tpcc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/readme.txt -%%LINUX_ARCH_32%%%%DATADIR%%/linux/linux32.so -%%LINUX_ARCH_64%%%%DATADIR%%/linux/linux64.so +%%DATADIR%%/linux/linux%%LINUX_ARCH%%.so %%DATADIR%%/build_sds.txt %%DATADIR%%/linux/config.sh %%DATADIR%%/swatcharts.txt Modified: head/devel/fb-adb/Makefile ============================================================================== --- head/devel/fb-adb/Makefile Wed Jul 10 12:39:56 2019 (r506351) +++ head/devel/fb-adb/Makefile Wed Jul 10 14:40:02 2019 (r506352) @@ -65,9 +65,9 @@ NDK_MASTER_SITES= https://dl.google.com/android/ndk/:7 # Prefer NDK from environment WRKSRC_ndk= ${ANDROID_NDK} .else -NDK_DISTFILES= ${NDK_DISTFILES_${LINUX_ARCH}} +NDK_DISTFILES= ${NDK_DISTFILES_${ARCH}} NDK_DISTFILES_i386= android-ndk-r10e-linux-x86.bin:7z -NDK_DISTFILES_x86_64= android-ndk-r12b-linux-x86_64.zip:zip +NDK_DISTFILES_amd64= android-ndk-r12b-linux-x86_64.zip:zip WRKSRC_ndk= ${WRKDIR}/${NDK_DISTFILES:R:C/(-[^-]+){2}$//} .endif NDK_USES= 7z:partial linux Modified: head/devel/linux-c6-devtools/Makefile ============================================================================== --- head/devel/linux-c6-devtools/Makefile Wed Jul 10 12:39:56 2019 (r506351) +++ head/devel/linux-c6-devtools/Makefile Wed Jul 10 14:40:02 2019 (r506352) @@ -37,10 +37,10 @@ SRC_DISTFILES= binutils-2.20.51.0.2-5.48.el6_10.1${SRC OPTIONS_DEFINE= DOCS NLS OPTIONS_SUB= yes -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> post-install: -.if ${LINUX_ARCH} == x86_64 +.if ${ARCH} == amd64 ${LN} -sfh ../../../../lib64/libgcc_s.so.1 \ ${STAGEDIR}${PREFIX}/usr/lib/gcc/x86_64-redhat-linux/4.4.4/libgcc_s.so @@ -51,4 +51,4 @@ post-install: ${STAGEDIR}${PREFIX}/usr/lib/gcc/i686-redhat-linux/4.4.4/libgcc_s.so .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/devel/linux-c7-devtools/Makefile ============================================================================== --- head/devel/linux-c7-devtools/Makefile Wed Jul 10 12:39:56 2019 (r506351) +++ head/devel/linux-c7-devtools/Makefile Wed Jul 10 14:40:02 2019 (r506352) @@ -47,11 +47,11 @@ CONFLICTS= linux-c6-${PORTNAME}-[0-9]* OPTIONS_DEFINE= DOCS NLS OPTIONS_SUB= yes -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> post-install: ${LN} -sf ld.bfd ${STAGEDIR}${PREFIX}/usr/bin/ld -.if ${LINUX_ARCH} == x86_64 +.if ${ARCH} == amd64 ${LN} -sfh ../../../../lib64/libgcc_s.so.1 \ ${STAGEDIR}${PREFIX}/usr/lib/gcc/x86_64-redhat-linux/4.8.2/libgcc_s.so @@ -62,4 +62,4 @@ post-install: ${STAGEDIR}${PREFIX}/usr/lib/gcc/i686-redhat-linux/4.8.2/libgcc_s.so .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/emulators/linux-c7/Makefile ============================================================================== --- head/emulators/linux-c7/Makefile Wed Jul 10 12:39:56 2019 (r506351) +++ head/emulators/linux-c7/Makefile Wed Jul 10 14:40:02 2019 (r506352) @@ -69,9 +69,9 @@ RUN_DEPENDS= linux-c7-libasyncns>0:dns/linux-c7-libasy USES= linux:c7 metaport -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if ${LINUX_ARCH} == x86_64 +.if ${ARCH} == amd64 RUN_DEPENDS+= linux-c7-sdl_image>0:graphics/linux-c7-sdl_image \ linux-c7-openal-soft>0:audio/linux-c7-openal-soft \ linux-c7-sdl20>0:devel/linux-c7-sdl20 \ @@ -80,4 +80,4 @@ RUN_DEPENDS+= linux-c7-sdl_image>0:graphics/linux-c7-s linux-c7-qtwebkit>0:www/linux-c7-qtwebkit .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/emulators/linux_base-c6/Makefile ============================================================================== --- head/emulators/linux_base-c6/Makefile Wed Jul 10 12:39:56 2019 (r506351) +++ head/emulators/linux_base-c6/Makefile Wed Jul 10 14:40:02 2019 (r506352) @@ -121,9 +121,9 @@ REMOVE_DIRS= boot home media mnt proc root sys tmp var REMOVE_FILES= bin/df bin/su etc/exports etc/group etc/gshadow etc/motd \ etc/passwd etc/printcap etc/protocols etc/services etc/shadow -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if ${LINUX_ARCH} == x86_64 +.if ${ARCH} == amd64 SYSCTLMIB= kern.features.linux64 .else SYSCTLMIB= compat.linux.osrelease @@ -135,7 +135,7 @@ post-patch: @${FIND} ${WRKSRC}/lib -type d -empty -delete @${FIND} ${WRKSRC}/usr -type d -empty -delete @${BRANDELF} -t Linux ${WRKSRC}/lib/ld-2.12.so -.if ${LINUX_ARCH} == x86_64 +.if ${ARCH} == amd64 @${FIND} ${WRKSRC}/lib64 -type d -empty -delete @${BRANDELF} -t Linux ${WRKSRC}/lib64/ld-2.12.so .endif @@ -155,8 +155,8 @@ post-install: ${LN} -sf usr/bin ${STAGEDIR}${PREFIX} ${LN} -sf usr/lib ${STAGEDIR}${PREFIX} ${LN} -sf usr/sbin ${STAGEDIR}${PREFIX} -.if ${LINUX_ARCH} == x86_64 +.if ${ARCH} == amd64 ${LN} -sf usr/lib64 ${STAGEDIR}${PREFIX} .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/emulators/linux_base-c7/Makefile ============================================================================== --- head/emulators/linux_base-c7/Makefile Wed Jul 10 12:39:56 2019 (r506351) +++ head/emulators/linux_base-c7/Makefile Wed Jul 10 14:40:02 2019 (r506352) @@ -131,9 +131,9 @@ REMOVE_DIRS= boot home media mnt proc root run sys tmp REMOVE_FILES= bin/su etc/exports etc/group etc/gshadow etc/motd \ etc/passwd etc/printcap etc/protocols etc/services etc/shadow -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if ${LINUX_ARCH} == x86_64 +.if ${ARCH} == amd64 SYSCTLMIB= kern.features.linux64 .else SYSCTLMIB= compat.linux.osrelease @@ -148,11 +148,11 @@ post-extract: ${FIND} ${d} | ${CPIO} -dumpl --quiet usr && ${RM} -r ${d}; fi) .endfor @(cd ${WRKSRC} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \ - ${DISTDIR}/${DIST_SUBDIR}/filesystem-3.2-25.el7${EXTRACT_SUFX_${LINUX_ARCH:S/x86_64/amd64/}} \ + ${DISTDIR}/${DIST_SUBDIR}/filesystem-3.2-25.el7${EXTRACT_SUFX_${ARCH}} \ ${EXTRACT_AFTER_ARGS}) -.if ${LINUX_ARCH} == i386 +.if ${ARCH} == i386 @${CHMOD} u+w ${WRKSRC}/usr/lib/pm-utils -.elif ${LINUX_ARCH} == x86_64 +.elif ${ARCH} == amd64 @${CHMOD} u+w ${WRKSRC}/usr/lib64/pm-utils .endif @@ -161,7 +161,7 @@ post-patch: @${RM} ${REMOVE_FILES:S|^|${WRKSRC}/|} @${FIND} ${WRKSRC}/usr -type d -empty -not -path '*/lib*/gio/*' -delete @${BRANDELF} -t Linux ${WRKSRC}/usr/lib/ld-2.17.so -.if ${LINUX_ARCH} == x86_64 +.if ${ARCH} == amd64 @${BRANDELF} -t Linux ${WRKSRC}/usr/lib64/ld-2.17.so .endif @@ -177,4 +177,4 @@ post-install: ${LN} -sf /var/run ${STAGEDIR}${PREFIX}/run ${LN} -sf /var/tmp ${STAGEDIR}${PREFIX}/usr/tmp -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/games/linux-worldofgoo-demo/Makefile ============================================================================== --- head/games/linux-worldofgoo-demo/Makefile Wed Jul 10 12:39:56 2019 (r506351) +++ head/games/linux-worldofgoo-demo/Makefile Wed Jul 10 14:40:02 2019 (r506352) @@ -23,9 +23,9 @@ DOCSDIR= ${PREFIX}/share/doc/WorldOfGoo OPTIONS_DEFINE= DOCS -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if ${LINUX_ARCH} == "i386" +.if ${ARCH} == i386 TARGET_BIN= WorldOfGoo.bin32 .else TARGET_BIN= WorldOfGoo.bin64 @@ -54,4 +54,4 @@ do-install: ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/graphics/linux-c7-dri/Makefile ============================================================================== --- head/graphics/linux-c7-dri/Makefile Wed Jul 10 12:39:56 2019 (r506351) +++ head/graphics/linux-c7-dri/Makefile Wed Jul 10 14:40:02 2019 (r506352) @@ -41,14 +41,14 @@ CONFLICTS= linux-c6-${PORTNAME}-[0-9]* OPTIONS_DEFINE= DOCS -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> post-install: ${LN} -sf libGLX_mesa.so.0 \ ${STAGEDIR}${PREFIX}/usr/lib/libGLX_system.so.0 -.if ${LINUX_ARCH} == x86_64 +.if ${ARCH} == amd64 ${LN} -sf libGLX_mesa.so.0 \ ${STAGEDIR}${PREFIX}/usr/lib64/libGLX_system.so.0 .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/java/linux-oracle-jre18/Makefile ============================================================================== --- head/java/linux-oracle-jre18/Makefile Wed Jul 10 12:39:56 2019 (r506351) +++ head/java/linux-oracle-jre18/Makefile Wed Jul 10 14:40:02 2019 (r506352) @@ -46,7 +46,7 @@ bash_CMD= ${SH} .include <bsd.port.pre.mk> -.if ${LINUX_ARCH} == "i386" +.if ${ARCH} == i386 PLIST_SUB+= JAVA_ARCHLIBDIR="i386" \ I386_ONLY="" \ AMD64_ONLY="@comment " Modified: head/print/epson-inkjet-printer-201401w/Makefile ============================================================================== --- head/print/epson-inkjet-printer-201401w/Makefile Wed Jul 10 12:39:56 2019 (r506351) +++ head/print/epson-inkjet-printer-201401w/Makefile Wed Jul 10 14:40:02 2019 (r506352) @@ -29,11 +29,11 @@ PLIST_SUB= LINUXBASE=${LINUXBASE} \ USES= linux USE_LINUX= cups-libs jpeg -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if ${LINUX_ARCH} == i386 +.if ${ARCH} == i386 PLIST_SUB+= LIBDIR=lib -.elif ${LINUX_ARCH} == x86_64 +.elif ${ARCH} == amd64 PLIST_SUB+= LIBDIR=lib64 .endif @@ -50,4 +50,4 @@ do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/share/cups/model/ ${LN} -sf ${LINUXBASE}/opt/${PORTNAME}/ppds/Epson ${STAGEDIR}${PREFIX}/share/cups/model/Epson-201401w -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/print/epson-inkjet-printer-201601w/Makefile ============================================================================== --- head/print/epson-inkjet-printer-201601w/Makefile Wed Jul 10 12:39:56 2019 (r506351) +++ head/print/epson-inkjet-printer-201601w/Makefile Wed Jul 10 14:40:02 2019 (r506352) @@ -29,11 +29,11 @@ PLIST_SUB= LINUXBASE=${LINUXBASE} \ USES= linux USE_LINUX= cups-libs jpeg -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if ${LINUX_ARCH} == i386 +.if ${ARCH} == i386 PLIST_SUB+= LIBDIR=lib -.elif ${LINUX_ARCH} == x86_64 +.elif ${ARCH} == amd64 PLIST_SUB+= LIBDIR=lib64 .endif @@ -50,4 +50,4 @@ do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/share/cups/model/ ${LN} -sf ${LINUXBASE}/opt/${PORTNAME}/ppds/Epson ${STAGEDIR}${PREFIX}/share/cups/model/Epson-201601w -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/x11/nvidia-driver/Makefile ============================================================================== --- head/x11/nvidia-driver/Makefile Wed Jul 10 12:39:56 2019 (r506351) +++ head/x11/nvidia-driver/Makefile Wed Jul 10 14:40:02 2019 (r506352) @@ -101,14 +101,13 @@ OPTIONS_DEFINE+= FREEBSD_AGP FREEBSD_AGP_DESC= Use FreeBSD AGP GART driver .endif -LINUX_MASTER_SITES=NVIDIA/XFree86/Linux-${LINUX_ARCH_SUFX}/${DISTVERSION}/:linux -LINUX_DISTFILES=NVIDIA-Linux-${LINUX_ARCH_SUFX}-${DISTVERSION}.run:linux +LINUX_MASTER_SITES=NVIDIA/XFree86/Linux-${ARCH_SUFX}/${DISTVERSION}/:linux +LINUX_DISTFILES=NVIDIA-Linux-${ARCH_SUFX}-${DISTVERSION}.run:linux LINUX_USES= linux LINUX_USE= LINUX=xorglibs -LINUX_ARCH_SUFX=${LINUX_ARCH:S/i386/x86/} -LINUX_LIBDIR= /usr/lib${LINUX_ARCH:S/i386//:S/x86_64/64/} -LINUX_WRKSRC= ${WRKDIR}/NVIDIA-Linux-${LINUX_ARCH_SUFX}-${DISTVERSION} +LINUX_LIBDIR= /usr/lib${ARCH:S/i386//:S/amd//} +LINUX_WRKSRC= ${WRKDIR}/NVIDIA-Linux-${ARCH_SUFX}-${DISTVERSION} LINUX_LIBS= libcuda.so.${PORTVERSION} \ libnvcuvid.so.${PORTVERSION} \ @@ -394,27 +393,30 @@ PLIST_RE+= '\,${LINUXBASE}.*libGLdispatch\.so,d' \ '\,${LINUXBASE}.*libOpenGL\.so,d' .endif .endif # ${NVVERSION} >= 390.042 && ${LINUX_DEFAULT:S/_64//} == c7 -.endif # ${PORT_OPTIONS:MLINUX} -.include <bsd.port.pre.mk> - +.if ${ARCH} == amd64 .if ${NVVERSION} >= 310.014 LINUX32_LIBS+= libnvcuvid.so.${PORTVERSION} LINUX32_LINKS+= libnvcuvid.so.${PORTVERSION} libnvcuvid.so.1 \ libnvcuvid.so.${PORTVERSION} libnvcuvid.so -.elif "${LINUX_ARCH}" == "x86_64" +.else PLIST_RE+= '\,${LINUXBASE}/usr/lib/libnvcuvid\.so,d' .endif +.endif +.endif # ${PORT_OPTIONS:MLINUX} -.if "${LINUX_ARCH}" == "x86_64" +.if ${PORT_OPTIONS:MLINUX} && ${ARCH} == amd64 PLIST_SUB+= LINUX32="" .else PLIST_SUB+= LINUX32="@comment " .endif +# XXX Only needed to obtain PORTVERSION. +.include <bsd.port.pre.mk> + post-extract-LINUX-on: @(cd ${WRKDIR} && ${SH} \ - ${DISTDIR}/NVIDIA-Linux-${LINUX_ARCH_SUFX}-${DISTVERSION}.run \ + ${DISTDIR}/NVIDIA-Linux-${ARCH_SUFX}-${DISTVERSION}.run \ --extract-only > /dev/null) pre-patch: @@ -615,7 +617,7 @@ post-install-LINUX-on: ${RLN} ${STAGEDIR}${LINUXBASE}${LINUX_LIBDIR}/${s} \ ${STAGEDIR}${LINUXBASE}${LINUX_LIBDIR}/${t} .endfor -.if "${LINUX_ARCH}" == "x86_64" +.if ${ARCH} == amd64 ${MKDIR} ${STAGEDIR}${LINUXBASE}/usr/lib/tls ${MKDIR} ${STAGEDIR}${LINUXBASE}/usr/lib/vdpau .for l in ${LINUX32_LIBS}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201907101440.x6AEe2cc017072>