Attachment #108323 for bug #149143

View | Details | Raw Unified | Return to bug 149143
Collapse All | Expand All




#

PORTNAME=	nvidia-settings
PORTVERSION=	256.44
CATEGORIES=	x11
MASTER_SITES=	ftp://download.nvidia.com/XFree86/nvidia-settings/ \
		ftp://download1.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

MANCOMPRESSED=	yes
PLIST_FILES=	bin/nvidia-settings
MAN1=		nvidia-settings.1

MAKE_ENV=	NV_VERBOSE= \
		STRIP_CMD=${TRUE} \
		INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
		INSTALL_MAN="${INSTALL_MAN}" \
		prefix=${PREFIX} \
		X11R6_LIB_DIR=${LOCALBASE}/lib \
		X11R6_INC_DIR=${LOCALBASE}/include \
		LDFLAGS="${PTHREAD_LIBS}"

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

post-patch:	.SILENT
	${REINPLACE_CMD} -e '/^prefix/s/=/?&/' \
		 -e '/^mandir/s|share/||' ${WRKSRC}/utils.mk
		-DXTHREADS -DXUSE_MTSAFE_API -DMALLOC_0_RETURNS_NULL NVCtrl.c; \
	${RM} -f libXNVCtrl.a; \
	ar clq libXNVCtrl.a NVCtrl.o; \
	ranlib libXNVCtrl.a

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)x11/nvidia-settings/distinfo (-3 / +3 lines)
1	MD5 (nvidia-settings-195.36.31.tar.gz) = 30782edbe54e99f678cb73e08cd67470	1	MD5 (nvidia-settings-256.44.tar.bz2) = c18cc98749e11ea2f13770a65217be5b
2	SHA256 (nvidia-settings-195.36.31.tar.gz) = 9e2b8d6078da595994e0577390f9e72fc4b866ff5f7131307b4570a12dda660a	2	SHA256 (nvidia-settings-256.44.tar.bz2) = abf8001f4ae2defb2824566a2fc61c27a0b0f5f4db3815d14f0d90069ab01d38
3	SIZE (nvidia-settings-195.36.31.tar.gz) = 1404726	3	SIZE (nvidia-settings-256.44.tar.bz2) = 1458780




--- Makefile.orig	Wed Aug  2 13:29:56 2006
+++ Makefile	Mon Aug 28 16:15:57 2006
@@ -84,7 +84,7 @@
 
 # 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
 
 exec_prefix = $(prefix)
 bindir = $(exec_prefix)/bin
-mandir = $(exec_prefix)/share/man/man1
+mandir = $(MANPREFIX)/man/man1
 
 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

Return to bug 149143

Lines 6-12 Link Here

(-)x11/nvidia-settings/Makefile (-10 / +13 lines)
6	#	6	#
7		7
8	PORTNAME= nvidia-settings	8	PORTNAME= nvidia-settings
9	PORTVERSION= 195.36.31	9	PORTVERSION= 256.44
10	CATEGORIES= x11	10	CATEGORIES= x11
11	MASTER_SITES= ftp://download.nvidia.com/XFree86/nvidia-settings/ \	11	MASTER_SITES= ftp://download.nvidia.com/XFree86/nvidia-settings/ \
12	ftp://download1.nvidia.com/XFree86/nvidia-settings/	12	ftp://download1.nvidia.com/XFree86/nvidia-settings/
Lines 14-40 MASTER_SITES= ftp://download.nvidia.com/ Link Here
14	MAINTAINER= bland@FreeBSD.org	14	MAINTAINER= bland@FreeBSD.org
15	COMMENT= Display Control Panel for X NVidia driver	15	COMMENT= Display Control Panel for X NVidia driver
16		16
		17	USE_BZIP2= yes
17	USE_GNOME= gtk20	18	USE_GNOME= gtk20
18	USE_GMAKE= yes	19	USE_GMAKE= yes
19	USE_GL= gl	20	USE_GL= gl
20	USE_XORG= xv	21	USE_XORG= xv
21		22
		23	MANCOMPRESSED= yes
22	PLIST_FILES= bin/nvidia-settings	24	PLIST_FILES= bin/nvidia-settings
23	MAN1= nvidia-settings.1	25	MAN1= nvidia-settings.1
24		26
25	MAKE_ENV= ROOT=${PREFIX} \	27	MAKE_ENV= NV_VERBOSE= \
		28	STRIP_CMD=${TRUE} \
		29	INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
		30	INSTALL_MAN="${INSTALL_MAN}" \
		31	prefix=${PREFIX} \
26	X11R6_LIB_DIR=${LOCALBASE}/lib \	32	X11R6_LIB_DIR=${LOCALBASE}/lib \
27	X11R6_INC_DIR=${LOCALBASE}/include \	33	X11R6_INC_DIR=${LOCALBASE}/include \
28	LDFLAGS="${PTHREAD_LIBS}"	34	LDFLAGS="${PTHREAD_LIBS}"
29		35
30	WRKSRC= ${WRKDIR}/nvidia-settings-1.0	36	post-extract: .SILENT
		37	${RM} -f ${WRKSRC}/src/libXNVCtrl/libXNVCtrl.a
31		38
32	pre-build:	39	post-patch: .SILENT
33	cd ${WRKSRC}/src/libXNVCtrl; \	40	${REINPLACE_CMD} -e '/^prefix/s/=/?&/' \
34	${CC} -c -I${LOCALBASE}/include -DCSRG_BASED -DFUNCPROTO=15 -DNARROWPROTO \	41	-e '/^mandir/s\|share/\|\|' ${WRKSRC}/utils.mk
35	-DXTHREADS -DXUSE_MTSAFE_API -DMALLOC_0_RETURNS_NULL NVCtrl.c; \
36	${RM} -f libXNVCtrl.a; \
37	ar clq libXNVCtrl.a NVCtrl.o; \
38	ranlib libXNVCtrl.a
39		42
40	.include <bsd.port.mk>	43	.include <bsd.port.mk>

Removed Link Here

(-)x11/nvidia-settings/files/patch-Makefile (-39 lines)
1	--- Makefile.orig Wed Aug 2 13:29:56 2006
2	+++ Makefile Mon Aug 28 16:15:57 2006
3	@@ -84,7 +84,7 @@
4
5	# default prefix
6	ifdef ROOT
7	- prefix = $(ROOT)/usr
8	+ prefix = $(ROOT)
9	else
10	prefix = /usr/local
11	endif
12	@@ -102,16 +102,14 @@
13	else
14	ECHO=echo
15	define INSTALL_RULE
16	- $(INSTALL) -m 755 $(NVIDIA_SETTINGS) $(bindir)/$(NVIDIA_SETTINGS)
17	- mkdir -p $(mandir)
18	- $(INSTALL) -m 644 doc/$(MANPAGE) $(mandir)
19	- gzip -9f $(mandir)/$(MANPAGE)
20	+ $(BSD_INSTALL_PROGRAM) $(NVIDIA_SETTINGS) $(bindir)/$(NVIDIA_SETTINGS)
21	+ $(BSD_INSTALL_MAN) doc/$(MANPAGE) $(mandir)
22	endef
23	endif
24
25	exec_prefix = $(prefix)
26	bindir = $(exec_prefix)/bin
27	-mandir = $(exec_prefix)/share/man/man1
28	+mandir = $(MANPREFIX)/man/man1
29
30	X11R6_CFLAGS = -I $(X11R6_INC_DIR)
31
32	@@ -200,7 +198,6 @@
33	all: $(NVIDIA_SETTINGS) doc/$(MANPAGE)
34
35	install: all
36	- $(STRIP) $(NVIDIA_SETTINGS)
37	$(INSTALL_RULE)
38
39	$(OBJS_DIR)/%.o: %.c