diff options
| -rw-r--r-- | x11/nvidia-settings/Makefile | 28 | ||||
| -rw-r--r-- | x11/nvidia-settings/distinfo | 6 | ||||
| -rw-r--r-- | x11/nvidia-settings/files/patch-Makefile | 52 |
3 files changed, 34 insertions, 52 deletions
diff --git a/x11/nvidia-settings/Makefile b/x11/nvidia-settings/Makefile index 23026e2ff861..9bf82116caad 100644 --- a/x11/nvidia-settings/Makefile +++ b/x11/nvidia-settings/Makefile @@ -6,7 +6,7 @@ # PORTNAME= nvidia-settings -PORTVERSION= 195.36.31 +PORTVERSION= 256.53 CATEGORIES= x11 MASTER_SITES= ftp://download.nvidia.com/XFree86/nvidia-settings/ \ ftp://download1.nvidia.com/XFree86/nvidia-settings/ @@ -14,27 +14,29 @@ MASTER_SITES= ftp://download.nvidia.com/XFree86/nvidia-settings/ \ MAINTAINER= bland@FreeBSD.org COMMENT= Display Control Panel for X NVidia driver +USE_BZIP2= yes USE_GNOME= gtk20 USE_GMAKE= yes USE_GL= gl USE_XORG= xv PLIST_FILES= bin/nvidia-settings +MANCOMPRESSED= yes MAN1= nvidia-settings.1 -MAKE_ENV= ROOT=${PREFIX} \ - X11R6_LIB_DIR=${LOCALBASE}/lib \ - X11R6_INC_DIR=${LOCALBASE}/include \ - LDFLAGS="${PTHREAD_LIBS}" +MAKE_ENV= NV_VERBOSE= \ + STRIP_CMD=${TRUE} \ + INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ + INSTALL_MAN="${INSTALL_MAN}" \ + prefix=${PREFIX} \ + X_CFLAGS=-I${LOCALBASE}/include \ + X_LDLAGS=-L${LOCALBASE}/lib -WRKSRC= ${WRKDIR}/nvidia-settings-1.0 +post-extract: .SILENT + ${RM} -f ${WRKSRC}/src/libXNVCtrl/libXNVCtrl.a -pre-build: - cd ${WRKSRC}/src/libXNVCtrl; \ - ${CC} -c -I${LOCALBASE}/include -DCSRG_BASED -DFUNCPROTO=15 -DNARROWPROTO \ - -DXTHREADS -DXUSE_MTSAFE_API -DMALLOC_0_RETURNS_NULL NVCtrl.c; \ - ${RM} -f libXNVCtrl.a; \ - ar clq libXNVCtrl.a NVCtrl.o; \ - ranlib libXNVCtrl.a +post-patch: .SILENT + ${REINPLACE_CMD} -e '/^prefix/s/=/?&/' \ + -e '/^mandir/s|share/||' ${WRKSRC}/utils.mk .include <bsd.port.mk> diff --git a/x11/nvidia-settings/distinfo b/x11/nvidia-settings/distinfo index f92aabe23a90..fd36779f8a5d 100644 --- a/x11/nvidia-settings/distinfo +++ b/x11/nvidia-settings/distinfo @@ -1,3 +1,3 @@ -MD5 (nvidia-settings-195.36.31.tar.gz) = 30782edbe54e99f678cb73e08cd67470 -SHA256 (nvidia-settings-195.36.31.tar.gz) = 9e2b8d6078da595994e0577390f9e72fc4b866ff5f7131307b4570a12dda660a -SIZE (nvidia-settings-195.36.31.tar.gz) = 1404726 +MD5 (nvidia-settings-256.53.tar.bz2) = 6bcc65485ec194791228a7df0ab62750 +SHA256 (nvidia-settings-256.53.tar.bz2) = d2a7310c11c0fa83bf6c565ebf7bd6a2054b67edd0d34bb6caa2129579981f49 +SIZE (nvidia-settings-256.53.tar.bz2) = 1458846 diff --git a/x11/nvidia-settings/files/patch-Makefile b/x11/nvidia-settings/files/patch-Makefile index 8cbc8c64787a..ef0100dff88e 100644 --- a/x11/nvidia-settings/files/patch-Makefile +++ b/x11/nvidia-settings/files/patch-Makefile @@ -1,39 +1,19 @@ ---- Makefile.orig Wed Aug 2 13:29:56 2006 -+++ Makefile Mon Aug 28 16:15:57 2006 -@@ -84,7 +84,7 @@ +--- Makefile.orig ++++ Makefile +@@ -149,11 +149,14 @@ install: NVIDIA_SETTINGS_install MANPAGE - # default prefix - ifdef ROOT -- prefix = $(ROOT)/usr -+ prefix = $(ROOT) - else - prefix = /usr/local - endif -@@ -102,16 +102,14 @@ - else - ECHO=echo - define INSTALL_RULE -- $(INSTALL) -m 755 $(NVIDIA_SETTINGS) $(bindir)/$(NVIDIA_SETTINGS) -- mkdir -p $(mandir) -- $(INSTALL) -m 644 doc/$(MANPAGE) $(mandir) -- gzip -9f $(mandir)/$(MANPAGE) -+ $(BSD_INSTALL_PROGRAM) $(NVIDIA_SETTINGS) $(bindir)/$(NVIDIA_SETTINGS) -+ $(BSD_INSTALL_MAN) doc/$(MANPAGE) $(mandir) - endef - endif + NVIDIA_SETTINGS_install: $(NVIDIA_SETTINGS) + $(MKDIR) $(bindir) +- $(INSTALL) $(INSTALL_BIN_ARGS) $< $(bindir)/$(notdir $<) ++ $(INSTALL_PROGRAM) $< $(bindir)/$(notdir $<) - exec_prefix = $(prefix) - bindir = $(exec_prefix)/bin --mandir = $(exec_prefix)/share/man/man1 -+mandir = $(MANPREFIX)/man/man1 + MANPAGE_install: $(MANPAGE) + $(MKDIR) $(mandir) +- $(INSTALL) $(INSTALL_BIN_ARGS) $< $(mandir)/$(notdir $<) ++ $(INSTALL_MAN) $< $(mandir)/$(notdir $<) ++ ++$(XNVCTRL_ARCHIVE): ++ $(MAKE) -C $(XNVCTRL_DIR) - X11R6_CFLAGS = -I $(X11R6_INC_DIR) - -@@ -200,7 +198,6 @@ - all: $(NVIDIA_SETTINGS) doc/$(MANPAGE) - - install: all -- $(STRIP) $(NVIDIA_SETTINGS) - $(INSTALL_RULE) - - $(OBJS_DIR)/%.o: %.c + $(NVIDIA_SETTINGS): $(OBJS) $(XNVCTRL_ARCHIVE) + $(call quiet_cmd,LINK) -o $@ $(OBJS) $(XNVCTRL_ARCHIVE) \ |