From 2571ce9ac7a1e77de3d23eed25df45a768bcd054 Mon Sep 17 00:00:00 2001 From: Alexey Dokuchaev Date: Tue, 28 Jun 2005 06:28:45 +0000 Subject: [PATCH] - Update to 1.0.7667 [1] - Fixed assignment of PORTREVISION. It needs to be set before including bsd.port.pre.mk [1] - Disabled exit upon failure to kldunload and kldload of NVidia driver for 7667 driver. This would break an upgrade of an earlier install [1] - Fix PREFIX expansion in pkg-message PR: ports/82554 [1] Submitted by: Sean Farley --- x11/nvidia-driver/Makefile | 21 +++++++++++++---- x11/nvidia-driver/distinfo | 4 ++-- ...lib::Makefile => 6113-patch-lib::Makefile} | 0 .../files/7667-patch-lib::Makefile | 11 +++++++++ .../files/7667-patch-scripts::setup.sh | 23 +++++++++++++++++++ .../{pkg-message => files/pkg-message.in} | 2 +- 6 files changed, 53 insertions(+), 8 deletions(-) rename x11/nvidia-driver/files/{patch-lib::Makefile => 6113-patch-lib::Makefile} (100%) create mode 100644 x11/nvidia-driver/files/7667-patch-lib::Makefile create mode 100644 x11/nvidia-driver/files/7667-patch-scripts::setup.sh rename x11/nvidia-driver/{pkg-message => files/pkg-message.in} (91%) diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile index d7d6c150aaa4..5cdc4217ac47 100644 --- a/x11/nvidia-driver/Makefile +++ b/x11/nvidia-driver/Makefile @@ -23,13 +23,23 @@ USE_REINPLACE= yes USE_X_PREFIX= yes NO_PACKAGE= should be recompiled for a particular FreeBSD kernel INSTALLS_SHLIB= yes +SUB_FILES+= pkg-message +PKGMESSAGE= ${WRKDIR}/pkg-message OPTIONS= FREEBSD_AGP "Use FreeBSD AGP GART driver" off \ VM86_INT10CALL "Use VM86 interface for video BIOS calls" off \ ACPI "Enable support for ACPI Power Management" off \ LINUX "Build with support for Linux compatibility" on -.include +# Get __FreeBSD_version. Needed to set PORTREVISION before including bsd.port.mk. +# XXX This is not required for -CURRENT XXX +.if !defined(OSVERSION) +.if exists(/sbin/sysctl) +OSVERSION!= /sbin/sysctl -n kern.osreldate +.else +OSVERSION!= /usr/sbin/sysctl -n kern.osreldate +.endif +.endif # Newer releases from NVidia do not play nicely with FreeBSD prior to 5.3. # While we support 4.x/5.2.1 releases, stick to 6113 version of driver for @@ -39,13 +49,14 @@ OPTIONS= FREEBSD_AGP "Use FreeBSD AGP GART driver" off \ .if ${OSVERSION} < 503000 NVVERSION= 6113 PORTREVISION= 4 -EXTRA_PATCHES+= ${FILESDIR}/6113-* PLIST_SUB+= DIFFS="" DRVSO="@comment " .else -NVVERSION= 7174 -PORTREVISION= 1 +NVVERSION= 7667 PLIST_SUB+= DIFFS="@comment " DRVSO="" .endif +EXTRA_PATCHES+= ${FILESDIR}/${NVVERSION}-* + +.include # XXX Should use ${PKG_INFO} XXX # @@ -75,7 +86,7 @@ PLIST_SUB+= FREEBSD5="" FREEBSD4="@comment " post-patch: .SILENT # We should support -CURRENT: kill the check -.if ${NVVERSION} == 7174 +.if ${NVVERSION} == 7667 ${REINPLACE_CMD} '24,26d' ${WRKSRC}/src/nv-freebsd.h .endif .if defined(WITH_FREEBSD_AGP) diff --git a/x11/nvidia-driver/distinfo b/x11/nvidia-driver/distinfo index 7213c6402748..9d1988375941 100644 --- a/x11/nvidia-driver/distinfo +++ b/x11/nvidia-driver/distinfo @@ -1,4 +1,4 @@ MD5 (NVIDIA-FreeBSD-x86-1.0-6113.tar.gz) = 1dab16b9ebf3ab4253811b6ba29fc701 SIZE (NVIDIA-FreeBSD-x86-1.0-6113.tar.gz) = 6215565 -MD5 (NVIDIA-FreeBSD-x86-1.0-7174.tar.gz) = b57a03e0325617092016144229ae6114 -SIZE (NVIDIA-FreeBSD-x86-1.0-7174.tar.gz) = 8433799 +MD5 (NVIDIA-FreeBSD-x86-1.0-7667.tar.gz) = d65d0e882aea8055ed49bf20d8e8d781 +SIZE (NVIDIA-FreeBSD-x86-1.0-7667.tar.gz) = 8438232 diff --git a/x11/nvidia-driver/files/patch-lib::Makefile b/x11/nvidia-driver/files/6113-patch-lib::Makefile similarity index 100% rename from x11/nvidia-driver/files/patch-lib::Makefile rename to x11/nvidia-driver/files/6113-patch-lib::Makefile diff --git a/x11/nvidia-driver/files/7667-patch-lib::Makefile b/x11/nvidia-driver/files/7667-patch-lib::Makefile new file mode 100644 index 000000000000..453550ee24f3 --- /dev/null +++ b/x11/nvidia-driver/files/7667-patch-lib::Makefile @@ -0,0 +1,11 @@ +--- lib/Makefile.orig Fri Jun 17 09:44:23 2005 ++++ lib/Makefile Wed Jun 22 19:12:16 2005 +@@ -6,7 +6,7 @@ + FIND_DIRS= /usr/lib \ + ${X11BASE}/lib + +-.if exists(/compat/linux) ++.if exists(/compat/linux) && !defined(WITHOUT_LINUX) + SUBDIR+= compat + FIND_DIRS+= /compat/linux/lib \ + /compat/linux/usr/lib \ diff --git a/x11/nvidia-driver/files/7667-patch-scripts::setup.sh b/x11/nvidia-driver/files/7667-patch-scripts::setup.sh new file mode 100644 index 000000000000..3cdb1808522d --- /dev/null +++ b/x11/nvidia-driver/files/7667-patch-scripts::setup.sh @@ -0,0 +1,23 @@ +--- scripts/setup.sh.orig Wed Jun 22 16:33:18 2005 ++++ scripts/setup.sh Wed Jun 22 19:18:06 2005 +@@ -4,16 +4,15 @@ + if [ ${RESULT} -eq 0 ]; then + kldunload -n nvidia > /dev/null 2>&1; RESULT=$? + if [ ${RESULT} -ne 0 ]; then +- echo 'ERROR: Failed to unload the NVIDIA module!' +- echo 'ERROR: Is nvidia.ko in use?' +- exit 1; ++ echo 'NOTICE: Failed to unload the NVIDIA module!' ++ echo 'NOTICE: Is nvidia.ko in use?' + fi + fi + + kldload nvidia > /dev/null 2>&1 ; RESULT=$? + if [ ${RESULT} -ne 0 ]; then +- echo 'ERROR: Failed to load the NVIDIA module!' +- exit 1; ++ echo 'NOTICE: Failed to load the NVIDIA module!' ++ echo 'NOTICE: Unload and load NVIDIA module manually, or reboot.' + fi + + grep nvidia_load /boot/loader.conf > /dev/null 2>&1; RESULT=$? diff --git a/x11/nvidia-driver/pkg-message b/x11/nvidia-driver/files/pkg-message.in similarity index 91% rename from x11/nvidia-driver/pkg-message rename to x11/nvidia-driver/files/pkg-message.in index 0f3dfbdb6468..7a6247193a2e 100644 --- a/x11/nvidia-driver/pkg-message +++ b/x11/nvidia-driver/files/pkg-message.in @@ -23,4 +23,4 @@ linux.ko is available as well (or have it compiled in kernel). Note that this driver does not support PAE-enabled kernels. -See ${PREFIX}/share/doc/NVIDIA_GLX-1.0/README for more information. +See %%PREFIX%%/share/doc/NVIDIA_GLX-1.0/README for more information.