diff options
| author | John Marino <marino@FreeBSD.org> | 2014-11-25 18:06:51 +0000 |
|---|---|---|
| committer | John Marino <marino@FreeBSD.org> | 2014-11-25 18:06:51 +0000 |
| commit | 4c27ce9bdfb0e1f77c23a77c16511a6e6ae1c916 (patch) | |
| tree | fd6dd2d00154c83f8136fb071e2a973062bc996d /x11/nvidia-settings | |
| parent | 8a5d0b6e7d0673262bac3b87dc635ec9ec0a0027 (diff) | |
| download | ports-4c27ce9bdfb0e1f77c23a77c16511a6e6ae1c916.tar.gz ports-4c27ce9bdfb0e1f77c23a77c16511a6e6ae1c916.zip | |
x11/nvidia-settings: restore stripping of program during install
PR: 193078
Submitted by: Jan Beich
Approved by: maintainer timeout (3 months)
Notes
Notes:
svn path=/head/; revision=373423
Diffstat (limited to 'x11/nvidia-settings')
| -rw-r--r-- | x11/nvidia-settings/Makefile | 11 | ||||
| -rw-r--r-- | x11/nvidia-settings/files/patch-doc__Makefile | 11 | ||||
| -rw-r--r-- | x11/nvidia-settings/files/patch-utils.mk | 10 |
3 files changed, 4 insertions, 28 deletions
diff --git a/x11/nvidia-settings/Makefile b/x11/nvidia-settings/Makefile index be48e91be66a..acdb51d9a689 100644 --- a/x11/nvidia-settings/Makefile +++ b/x11/nvidia-settings/Makefile @@ -24,20 +24,17 @@ 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:Ninstall}" \ + INSTALL_DOC_ARGS="${INSTALL_MAN:Ninstall}" \ 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 '/^prefix/s/=/?&/' \ + ${REINPLACE_CMD} \ -e '/^MANDIR/s|share/||' ${WRKSRC}/utils.mk .include <bsd.port.mk> diff --git a/x11/nvidia-settings/files/patch-doc__Makefile b/x11/nvidia-settings/files/patch-doc__Makefile deleted file mode 100644 index 780160afb1ea..000000000000 --- a/x11/nvidia-settings/files/patch-doc__Makefile +++ /dev/null @@ -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 \ diff --git a/x11/nvidia-settings/files/patch-utils.mk b/x11/nvidia-settings/files/patch-utils.mk deleted file mode 100644 index 4c21302924fe..000000000000 --- a/x11/nvidia-settings/files/patch-utils.mk +++ /dev/null @@ -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) |