Attachment #146399 for bug #193078




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

post-extract:	.SILENT
	${RM} -f ${WRKSRC}/src/libXNVCtrl/libXNVCtrl.a

post-patch:	.SILENT
	${REINPLACE_CMD} \
		 -e '/^MANDIR/s|share/||' ${WRKSRC}/utils.mk

.include <bsd.port.mk>

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 193078

Lines 23-42 USE_XORG= xv xext Link Here

(-)x11/nvidia-settings/Makefile (-7 / +4 lines)
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:N${INSTALL}}" \
30	INSTALL_MAN="${INSTALL_MAN}" \	31	INSTALL_DOC_ARGS="${INSTALL_MAN:N${INSTALL}}" \
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
36	${RM} -f ${WRKSRC}/src/libXNVCtrl/libXNVCtrl.a
37
38	post-patch: .SILENT	35	post-patch: .SILENT
39	${REINPLACE_CMD} -e '/^prefix/s/=/?&/' \	36	${REINPLACE_CMD} \
40	-e '/^MANDIR/s\|share/\|\|' ${WRKSRC}/utils.mk	37	-e '/^MANDIR/s\|share/\|\|' ${WRKSRC}/utils.mk
41		38
42	.include <bsd.port.mk>	39	.include <bsd.port.mk>