Date: Fri, 12 Jun 2020 07:44:24 +0000 (UTC) From: "Serhii (Sergey) Kozlov" <skozlov@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r538566 - in head/net: intel-ix-kmod intel-ixl-kmod Message-ID: <202006120744.05C7iOTN062671@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: skozlov Date: Fri Jun 12 07:44:24 2020 New Revision: 538566 URL: https://svnweb.freebsd.org/changeset/ports/538566 Log: Change approach to missing manpage in net/intel-ix-kmod Instead of not installing the missing man page - use the one from the previous version. Changes include: - Revert all the MANPAGEEXISTS-related changes from net/intel-{ixl,ix}-kmod - Allow slave ports of net/intel-ixl-kmod to set their own MASTER_SITES - Add previous version of intel-ix-kmod to it's DISTFILES - Add pre-install target to intel-ixl-kmod to place the man page where do-install expects to find it Modified: head/net/intel-ix-kmod/Makefile head/net/intel-ix-kmod/distinfo head/net/intel-ixl-kmod/Makefile Modified: head/net/intel-ix-kmod/Makefile ============================================================================== --- head/net/intel-ix-kmod/Makefile Fri Jun 12 07:36:07 2020 (r538565) +++ head/net/intel-ix-kmod/Makefile Fri Jun 12 07:44:24 2020 (r538566) @@ -3,14 +3,22 @@ PORTNAME= ix PORTVERSION= 3.3.14 -PORTREVISION= 0 +PORTREVISION= 1 PORTEPOCH= 0 -MASTER_SITE_SUBDIR= 14688/eng +MASTER_SITES?= https://downloadmirror.intel.com/14688/eng/ \ + http://downloadmirror.intel.com/14688/eng/ \ + https://downloadmirror.intel.com/29625/eng/:man \ + http://downloadmirror.intel.com/29625/eng/:man +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ + ${_MAN_SOURCE}${EXTRACT_SUFX}:man +_MAN_SOURCE= ${PORTNAME}-3.3.10 + MAINTAINER= freebsd@intel.com COMMENT= 10 gigabit FreeBSD Base Driver for Intel(R) Network Connections -MANPAGEEXISTS= 0 +MANPAGENAME= ixgbe +MANPAGELINKS= ix if_ix if_ixgbe MAX_NETMAP_OSVERSION= 9999999 @@ -23,5 +31,8 @@ SRIOV_DESC= Enable SR-IOV support (experimental) post-patch-SRIOV-on: @${SED} -i '' 's|SRIOV_ENABLE = 0|SRIOV_ENABLE = 1|g' ${WRKSRC}/Makefile + +pre-install: + ${CP} ${WRKDIR}/${_MAN_SOURCE}/src/${MANPAGENAME}.4 ${WRKSRC} .include "${MASTERDIR}/Makefile" Modified: head/net/intel-ix-kmod/distinfo ============================================================================== --- head/net/intel-ix-kmod/distinfo Fri Jun 12 07:36:07 2020 (r538565) +++ head/net/intel-ix-kmod/distinfo Fri Jun 12 07:44:24 2020 (r538566) @@ -1,3 +1,5 @@ -TIMESTAMP = 1591712557 +TIMESTAMP = 1591947342 SHA256 (ix-3.3.14.tar.gz) = 2340b065c5a3d1c3fdef4564045b42a6916d3730a9524a86f4271a1092b0f591 SIZE (ix-3.3.14.tar.gz) = 275148 +SHA256 (ix-3.3.10.tar.gz) = ed65546493c2af55827c27a86dca94c4efafedb653e94715923413f8ba7a7ca1 +SIZE (ix-3.3.10.tar.gz) = 272974 Modified: head/net/intel-ixl-kmod/Makefile ============================================================================== --- head/net/intel-ixl-kmod/Makefile Fri Jun 12 07:36:07 2020 (r538565) +++ head/net/intel-ixl-kmod/Makefile Fri Jun 12 07:44:24 2020 (r538566) @@ -5,7 +5,7 @@ PORTNAME?= ixl PORTVERSION?= 1.11.9 PORTREVISION?= 1 CATEGORIES= net -MASTER_SITES= https://downloadmirror.intel.com/${MASTER_SITE_SUBDIR}/ \ +MASTER_SITES?= https://downloadmirror.intel.com/${MASTER_SITE_SUBDIR}/ \ http://downloadmirror.intel.com/${MASTER_SITE_SUBDIR}/ MASTER_SITE_SUBDIR?= 25160/eng PKGNAMEPREFIX= intel- @@ -33,18 +33,15 @@ WRKSRC_SUBDIR= src SUB_FILES= pkg-message SUB_LIST= PORTNAME=${PORTNAME} -MAKE_ENV+= WERROR="" -PLIST_FILES= ${KMODDIR}/if_${PORTNAME}_updated.ko -MANPAGEEXISTS?= 1 MANPAGENAME?= ${PORTNAME} MANPAGELINKS?= if_${PORTNAME} +PLIST_FILES= ${KMODDIR}/if_${PORTNAME}_updated.ko \ + man/man4/${MANPAGENAME}.4.gz +MAKE_ENV+= WERROR="" -.if ${MANPAGEEXISTS} -PLIST_FILES+= man/man4/${MANPAGENAME}.4.gz -. for link in ${MANPAGELINKS} +.for link in ${MANPAGELINKS} PLIST_FILES+= man/man4/${link}.4.gz -. endfor -.endif +.endfor MAX_NETMAP_OSVERSION?= 1200500 # Maximum OSVERSION for which NETMAP support works @@ -62,11 +59,10 @@ CFLAGS+= -DDEV_NETMAP do-install: ${INSTALL_KLD} ${WRKSRC}/if_${PORTNAME}.ko ${STAGEDIR}${KMODDIR}/if_${PORTNAME}_updated.ko -.if ${MANPAGEEXISTS} ${INSTALL_MAN} ${WRKSRC}/${MANPAGENAME}.4 ${STAGEDIR}${MAN4PREFIX}/man/man4/ -. for link in ${MANPAGELINKS} + +.for link in ${MANPAGELINKS} ${LN} ${STAGEDIR}${MAN4PREFIX}/man/man4/${MANPAGENAME}.4 ${STAGEDIR}${MAN4PREFIX}/man/man4/${link}.4 -. endfor -.endif +.endfor .include <bsd.port.post.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006120744.05C7iOTN062671>