Attachment 146409 Details for Bug 192953 – 340.32 + STRIP + EXAMPLES

[patch] 340.32 + STRIP + EXAMPLES

nvidia-settings.combined.diff (text/plain), 3.43 KB, created by Jan Beich on 2014-08-27 21:49:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2014-08-27 21:49:08 UTC

Size: 3.43 KB

patch

obsolete

>Index: x11/nvidia-settings/Makefile
>===================================================================
>--- x11/nvidia-settings/Makefile	(revision 366345)
>+++ x11/nvidia-settings/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	nvidia-settings
>-PORTVERSION=	340.24
>+PORTVERSION=	340.32
> CATEGORIES=	x11
> MASTER_SITES=	ftp://download.nvidia.com/XFree86/nvidia-settings/ \
> 		ftp://download1.nvidia.com/XFree86/nvidia-settings/
>@@ -23,20 +23,40 @@ USE_XORG=	xv xext
> PLIST_FILES=	bin/nvidia-settings \
> 		man/man1/nvidia-settings.1.gz
> 
>+LDFLAGS+=	-Wl,--as-needed
> MAKE_ENV=	NV_USE_BUNDLED_LIBJANSSON=0 \
> 		NV_VERBOSE= \
> 		STRIP_CMD=${TRUE} \
>-		INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
>-		INSTALL_MAN="${INSTALL_MAN}" \
>-		prefix=${PREFIX} \
>+		INSTALL_BIN_ARGS="${INSTALL_PROGRAM:N${INSTALL}}" \
>+		INSTALL_DOC_ARGS="${INSTALL_MAN:N${INSTALL}}" \
> 		X_CFLAGS=-I${LOCALBASE}/include \
> 		X_LDFLAGS=-L${LOCALBASE}/lib
> 
>-post-extract:	.SILENT
>-	${RM} -f ${WRKSRC}/src/libXNVCtrl/libXNVCtrl.a
>+OPTIONS_DEFINE=	EXAMPLES
> 
>+EXAMPLES_PLIST_FILES=	\
>+		bin/nv-control-3dvisionpro \
>+		bin/nv-control-dpy \
>+		bin/nv-control-dvc \
>+		bin/nv-control-events \
>+		bin/nv-control-framelock \
>+		bin/nv-control-gvi \
>+		bin/nv-control-info \
>+		bin/nv-control-targets \
>+		bin/nv-control-warpblend
>+
>+.include <bsd.port.options.mk>
>+
> post-patch:	.SILENT
>-	${REINPLACE_CMD} -e '/^prefix/s/=/?&/' \
>+	${REINPLACE_CMD} \
> 		 -e '/^MANDIR/s|share/||' ${WRKSRC}/utils.mk
> 
>+.if ${PORT_OPTIONS:MEXAMPLES}
>+post-install:
>+. for f in ${PLIST_FILES:T:Mnv-control-*}
>+	${INSTALL_PROGRAM} ${WRKSRC}/samples/_out/${OPSYS}_${ARCH:S/i386/x86/}/${f} \
>+		${STAGEDIR}${PREFIX}/bin
>+. endfor
>+.endif
>+
> .include <bsd.port.mk>
>Index: x11/nvidia-settings/distinfo
>===================================================================
>--- x11/nvidia-settings/distinfo	(revision 366345)
>+++ x11/nvidia-settings/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (nvidia-settings-340.24.tar.bz2) = 255697cb8558c7ceba0838ecaf1168747ea4718144039c534ff4a45afcf42b88
>-SIZE (nvidia-settings-340.24.tar.bz2) = 1549714
>+SHA256 (nvidia-settings-340.32.tar.bz2) = 6aba6dd39cf13edafb1dd2254cf8683afe450701027592d3be589235275505eb
>+SIZE (nvidia-settings-340.32.tar.bz2) = 1549764
>Index: x11/nvidia-settings/files/patch-doc__Makefile
>===================================================================
>--- x11/nvidia-settings/files/patch-doc__Makefile	(revision 366345)
>+++ x11/nvidia-settings/files/patch-doc__Makefile	(working copy)
>@@ -1,11 +0,0 @@
>---- doc/Makefile.orig	2014-08-10 20:37:40.000000000 -0700
>-+++ doc/Makefile	2014-08-10 20:38:21.000000000 -0700
>-@@ -74,7 +74,7 @@
>- 
>- MANPAGE_install: $(MANPAGE)
>- 	$(MKDIR) $(MANDIR)
>--	$(INSTALL) $(INSTALL_DOC_ARGS) $< $(MANDIR)/$(notdir $<)
>-+	$(INSTALL_MAN) $< $(MANDIR)/$(notdir $<)
>- 
>- clean clobber:
>- 	rm -rf $(MANPAGE) *~ $(OUTPUTDIR)/*.o $(OUTPUTDIR)/*.d \
>Index: x11/nvidia-settings/files/patch-utils.mk
>===================================================================
>--- x11/nvidia-settings/files/patch-utils.mk	(revision 366345)
>+++ x11/nvidia-settings/files/patch-utils.mk	(working copy)
>@@ -1,10 +0,0 @@
>---- utils.mk.orig	2014-08-09 21:23:23.872132403 -0700
>-+++ utils.mk	2014-08-09 21:25:03.537126421 -0700
>-@@ -34,6 +34,7 @@
>- CFLAGS                += -fno-strict-aliasing -fno-omit-frame-pointer -Wformat=2
>- CC_ONLY_CFLAGS        ?=
>- LDFLAGS               ?=
>-+LDFLAGS               += -Wl,--as-needed
>- BIN_LDFLAGS           ?=
>-
>- HOST_CC               ?= $(CC)

Actions: View | Diff

Attachments on bug 192953: 146192 | 146409 | 146410 | 146415 | 146416 | 146422 | 146464 | 146465 | 146467 | 146468 | 146470 | 146472 | 158352