Attachment #146415 for bug #192953




# $FreeBSD$

PORTNAME=	nvidia-settings
PORTVERSION=	340.32
CATEGORIES=	x11
MASTER_SITES=	ftp://download.nvidia.com/XFree86/nvidia-settings/ \
		ftp://download1.nvidia.com/XFree86/nvidia-settings/

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_BIN_ARGS="${INSTALL_PROGRAM:Ninstall}" \
		INSTALL_DOC_ARGS="${INSTALL_MAN:Ninstall}" \
		prefix=${PREFIX} \
		X_CFLAGS=-I${LOCALBASE}/include \
		X_LDFLAGS=-L${LOCALBASE}/lib

OPTIONS_DEFINE=	EXAMPLES
	${RM} -f ${WRKSRC}/src/libXNVCtrl/libXNVCtrl.a

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 '/^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>

Lines 1-2 Link Here

(-)x11/nvidia-settings/distinfo (-2 / +2 lines)
1	SHA256 (nvidia-settings-340.24.tar.bz2) = 255697cb8558c7ceba0838ecaf1168747ea4718144039c534ff4a45afcf42b88	1	SHA256 (nvidia-settings-340.32.tar.bz2) = 6aba6dd39cf13edafb1dd2254cf8683afe450701027592d3be589235275505eb
2	SIZE (nvidia-settings-340.24.tar.bz2) = 1549714	2	SIZE (nvidia-settings-340.32.tar.bz2) = 1549764

Lines 1-11 Link Here

(-)x11/nvidia-settings/files/patch-doc__Makefile (-11 lines)
1	--- doc/Makefile.orig 2014-08-10 20:37:40.000000000 -0700
2	+++ doc/Makefile 2014-08-10 20:38:21.000000000 -0700
3	@@ -74,7 +74,7 @@
4
5	MANPAGE_install: $(MANPAGE)
6	$(MKDIR) $(MANDIR)
7	- $(INSTALL) $(INSTALL_DOC_ARGS) $< $(MANDIR)/$(notdir $<)
8	+ $(INSTALL_MAN) $< $(MANDIR)/$(notdir $<)
9
10	clean clobber:
11	rm -rf $(MANPAGE) ~ $(OUTPUTDIR)/.o $(OUTPUTDIR)/*.d \

Lines 1-10 Link Here

(-)x11/nvidia-settings/files/patch-utils.mk (-10 lines)
1	--- utils.mk.orig 2014-08-09 21:23:23.872132403 -0700
2	+++ utils.mk 2014-08-09 21:25:03.537126421 -0700
3	@@ -34,6 +34,7 @@
4	CFLAGS += -fno-strict-aliasing -fno-omit-frame-pointer -Wformat=2
5	CC_ONLY_CFLAGS ?=
6	LDFLAGS ?=
7	+LDFLAGS += -Wl,--as-needed
8	BIN_LDFLAGS ?=
9
10	HOST_CC ?= $(CC)

Return to bug 192953

Lines 2-8 Link Here

(-)x11/nvidia-settings/Makefile (-7 / +27 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= nvidia-settings	4	PORTNAME= nvidia-settings
5	PORTVERSION= 340.24	5	PORTVERSION= 340.32
6	CATEGORIES= x11	6	CATEGORIES= x11
7	MASTER_SITES= ftp://download.nvidia.com/XFree86/nvidia-settings/ \	7	MASTER_SITES= ftp://download.nvidia.com/XFree86/nvidia-settings/ \
8	ftp://download1.nvidia.com/XFree86/nvidia-settings/	8	ftp://download1.nvidia.com/XFree86/nvidia-settings/
Lines 23-42 USE_XORG= xv xext Link Here
23	PLIST_FILES= bin/nvidia-settings \	23	PLIST_FILES= bin/nvidia-settings \
24	man/man1/nvidia-settings.1.gz	24	man/man1/nvidia-settings.1.gz
25		25
		26	LDFLAGS+= -Wl,--as-needed
26	MAKE_ENV= NV_USE_BUNDLED_LIBJANSSON=0 \	27	MAKE_ENV= NV_USE_BUNDLED_LIBJANSSON=0 \
27	NV_VERBOSE= \	28	NV_VERBOSE= \
28	STRIP_CMD=${TRUE} \	29	STRIP_CMD=${TRUE} \
29	INSTALL_PROGRAM="${INSTALL_PROGRAM}" \	30	INSTALL_BIN_ARGS="${INSTALL_PROGRAM:Ninstall}" \
30	INSTALL_MAN="${INSTALL_MAN}" \	31	INSTALL_DOC_ARGS="${INSTALL_MAN:Ninstall}" \
31	prefix=${PREFIX} \
32	X_CFLAGS=-I${LOCALBASE}/include \	32	X_CFLAGS=-I${LOCALBASE}/include \
33	X_LDFLAGS=-L${LOCALBASE}/lib	33	X_LDFLAGS=-L${LOCALBASE}/lib
34		34
35	post-extract: .SILENT	35	OPTIONS_DEFINE= EXAMPLES
36	${RM} -f ${WRKSRC}/src/libXNVCtrl/libXNVCtrl.a
37		36
		37	EXAMPLES_PLIST_FILES= \
		38	bin/nv-control-3dvisionpro \
		39	bin/nv-control-dpy \
		40	bin/nv-control-dvc \
		41	bin/nv-control-events \
		42	bin/nv-control-framelock \
		43	bin/nv-control-gvi \
		44	bin/nv-control-info \
		45	bin/nv-control-targets \
		46	bin/nv-control-warpblend
		47
		48	.include <bsd.port.options.mk>
		49
38	post-patch: .SILENT	50	post-patch: .SILENT
39	${REINPLACE_CMD} -e '/^prefix/s/=/?&/' \	51	${REINPLACE_CMD} \
40	-e '/^MANDIR/s\|share/\|\|' ${WRKSRC}/utils.mk	52	-e '/^MANDIR/s\|share/\|\|' ${WRKSRC}/utils.mk
41		53
		54	.if ${PORT_OPTIONS:MEXAMPLES}
		55	post-install:
		56	. for f in ${PLIST_FILES:T:Mnv-control-*}
		57	${INSTALL_PROGRAM} ${WRKSRC}/samples/_out/${OPSYS}_${ARCH:S/i386/x86/}/${f} \
		58	${STAGEDIR}${PREFIX}/bin
		59	. endfor
		60	.endif
		61
42	.include <bsd.port.mk>	62	.include <bsd.port.mk>