- Update long lived branch to version 331.49

- Provide a convenience target to merge new hash and size with existing
  distinfo: first, redefine DISTINFO_FILE (so that prerequisite target
  `makesum' would not overwrite existing distinfo file), then prepend
  relevant SHA256 and SIZE lines with tilde (~) to cope with join(1)'s
  requirement for sorted lines, truncate the old values thereof, join(1)
  two files so new lines are nicely placed just where intended, finally
  removing hackish tildes (improvements to this quick and dirty approach
  are very welcome)
- Remove no longer relevant (and now somewhat confusing) comment in the
  `pre-install' target after the port was staged
- Fix two identical typos (paqe -> page) in comments while I'm here

Tested by:	dhw

x11/nvidia-driver/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	nvidia-driver
-DISTVERSION?=	331.20
+DISTVERSION?=	331.49
 # Always try to set PORTREVISION as it can be overridden by the slave ports
 PORTREVISION?=	0
 CATEGORIES=	x11
@@ -121,9 +121,9 @@ post-patch: .SILENT
 		s/int nprot/&, vm_memattr_t *memattr/' \
 			${WRKSRC}/src/nvidia_dev.c
 .endif
-# In the legacy drivers: remove paqe queue locking and add page locking
+# In the legacy drivers: remove page queue locking and add page locking
 # around vm_page_(un)wire() after FreeBSD src SVN r207410, r207617, and
-# r207644; also remove paqe queue locking around vm_page_wakeup() after
+# r207644; also remove page queue locking around vm_page_wakeup() after
 # FreeBSD src SVN r163622
 .if ${OSVERSION} > 900011 && ${NVVERSION} < 3046400
 	${REINPLACE_CMD} -E '/vm_page_(un)?lock_queues\(\);/d ; \
@@ -227,9 +227,6 @@ post-patch: .SILENT
 		${WRKSRC}/lib/Makefile ${WRKSRC}/src/Makefile
 
 pre-install:
-# While this port silently assumes PREFIX == LOCALBASE, at least try to
-# pretend we support different paths thereof and make sure these directories
-# exist
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${MODULESDIR}/drivers \
 		${STAGEDIR}${PREFIX}/${MODULESDIR}/extensions
 
@@ -267,4 +264,20 @@ post-install: .SILENT
 	${REINPLACE_CMD} -e '/does not support PAE/,+1d' ${PKGMESSAGE}
 .endif
 
+# Target below can be used instead of standard `makesum' to correctly
+# update distinfo (i.e., keeping other driver version entries intact)
+.if ${.TARGETS:Mupdate-distinfo}
+DISTINFO_FILE=	${MASTERDIR}/distinfo.new
+JOIN?=		/usr/bin/join
+.endif
+
+update-distinfo: makesum .SILENT
+	${REINPLACE_CMD} -i '' -e '/${DISTNAME:R:R}/s/^/~/' \
+		${MASTERDIR}/distinfo ${DISTINFO_FILE}
+	${SED} -e '/^~/s/(.*//' ${MASTERDIR}/distinfo | ${JOIN} -a 1 \
+		- ${DISTINFO_FILE} | ${SED} -e 's/^~//' \
+		> ${MASTERDIR}/distinfo.tmp
+	${MV} ${MASTERDIR}/distinfo.tmp ${MASTERDIR}/distinfo
+	${RM} ${DISTINFO_FILE}
+
 .include <bsd.port.mk>

x11/nvidia-driver/distinfo

@@ -1,7 +1,7 @@
-SHA256 (NVIDIA-FreeBSD-x86_64-331.20.tar.gz) = 6a0396e828427fb928f18faa72288208702c3067c25c29ed3815a68a06e244c5
-SIZE (NVIDIA-FreeBSD-x86_64-331.20.tar.gz) = 46616176
-SHA256 (NVIDIA-FreeBSD-x86-331.20.tar.gz) = dca5c90a99ab151d97c1cbb23f37c7834867ce32f88c6916b2295b3945363b7e
-SIZE (NVIDIA-FreeBSD-x86-331.20.tar.gz) = 55524337
+SHA256 (NVIDIA-FreeBSD-x86_64-331.49.tar.gz) = 9ac938b54b85b4dd3fc22f10c6feee3d9c777d678dbc08dfa8214e7d917ae67d
+SIZE (NVIDIA-FreeBSD-x86_64-331.49.tar.gz) = 46988453
+SHA256 (NVIDIA-FreeBSD-x86-331.49.tar.gz) = 0686d20e647553f81afebc646b135b780c510679715344547ecc9244aff18cca
+SIZE (NVIDIA-FreeBSD-x86-331.49.tar.gz) = 55867593
 SHA256 (NVIDIA-FreeBSD-x86_64-304.88.tar.gz) = be0e20a543fa14a8f91481dd64b080093b19edf951bf631c62365a64dadb1934
 SIZE (NVIDIA-FreeBSD-x86_64-304.88.tar.gz) = 34597351
 SHA256 (NVIDIA-FreeBSD-x86-304.88.tar.gz) = 739325b26a93d934d015159c420ef1875a24ccd62a5bb482e688cf918d4fa33d