ports/114565: Update port: sysutils/nvclock to version 0.8b2

[Petar Zhivkov Petrov]

>Number:         114565
>Category:       ports
>Synopsis:       Update port: sysutils/nvclock to version 0.8b2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jul 13 19:20:01 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Petar Zhivkov Petrov
>Release:        FreeBSD 7.0-CURRENT i386
>Organization:
N/A
>Environment:
System: FreeBSD mira 7.0-CURRENT FreeBSD 7.0-CURRENT #4: Fri Jul 6 20:51:43 EEST 2007 root at mira:/usr/obj/usr/src/sys/MIRA i386

>Description:
- Update sysutils/nvclock to 0.8b2
- Fix compilation problems with GCC 4.2 on -CURRENT
- Fix WWW in pkg-descr

>How-To-Repeat:
>Fix:

--- nvclock-update.patch begins here ---
diff -ruN nvclock/Makefile nvclock_new/Makefile
--- nvclock/Makefile	2007-05-19 23:23:29.000000000 +0300
+++ nvclock_new/Makefile	2007-07-07 10:42:22.000000000 +0300
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	nvclock
-PORTVERSION=	0.7
-PORTREVISION=	6
+PORTVERSION=	0.8b2
+PORTREVISION=	0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.linuxhardware.org/nvclock/ \
 		http://www.kerneled.com/freebsd/ports/
@@ -29,6 +29,8 @@
 PLIST_SUB+=	GTK=""
 .endif
 
+MAN1=		nvclock.1
+
 pre-everything::
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "************************************************"
@@ -42,4 +44,15 @@
 	@${REINPLACE_CMD} -e 's|"CFLAGS="|"CFLAGS+="|g' ${WRKSRC}/${i}
 .endfor
 
+do-install:
+	@${GMAKE} -C ${WRKSRC}/src install
+	@${GMAKE} -C ${WRKSRC} install-man
+.if !defined(WITHOUT_GUI)
+	@${GMAKE} -C ${WRKSRC}/src/gtk install
+.endif
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	@${GMAKE} -C ${WRKSRC} install-docs
+.endif
+
 .include <bsd.port.mk>
diff -ruN nvclock/distinfo nvclock_new/distinfo
--- nvclock/distinfo	2006-01-24 03:06:21.000000000 +0200
+++ nvclock_new/distinfo	2007-07-07 08:45:52.000000000 +0300
@@ -1,3 +1,3 @@
-MD5 (nvclock0.7.tar.gz) = a3bb5ff1c2638317f1a69c7c2442b9e4
-SHA256 (nvclock0.7.tar.gz) = 469678f436b974b62af51aa4bf71fdf695c402ed0cd890c25fc0b757577657e8
-SIZE (nvclock0.7.tar.gz) = 68966
+MD5 (nvclock0.8b2.tar.gz) = 8b9f55115f3c5b7b9a9a16fe40cec4a5
+SHA256 (nvclock0.8b2.tar.gz) = b3c05f1cceb57a816cea096f9b71154c0ce5e2ec31febb85e3db831b0b3407aa
+SIZE (nvclock0.8b2.tar.gz) = 316510
diff -ruN nvclock/files/patch-src-backend-back_bsd.c nvclock_new/files/patch-src-backend-back_bsd.c
--- nvclock/files/patch-src-backend-back_bsd.c	1970-01-01 02:00:00.000000000 +0200
+++ nvclock_new/files/patch-src-backend-back_bsd.c	2007-07-07 09:40:59.000000000 +0300
@@ -0,0 +1,10 @@
+--- src/backend/back_bsd.c	2007-07-07 09:39:58.000000000 +0300
++++ src/backend/back_bsd.c_new	2007-07-07 09:39:15.000000000 +0300
+@@ -51,6 +51,7 @@
+ 
+ static void *map_dev_mem (int fd, unsigned long Base, unsigned long Size);
+ static void unmap_dev_mem (unsigned long Base, unsigned long Size);
++static int probe_devices();
+ 
+ int init_nvclock()
+ {
diff -ruN nvclock/files/patch-src-gtk::callbacks.c nvclock_new/files/patch-src-gtk::callbacks.c
--- nvclock/files/patch-src-gtk::callbacks.c	2003-08-21 23:17:15.000000000 +0300
+++ nvclock_new/files/patch-src-gtk::callbacks.c	1970-01-01 02:00:00.000000000 +0200
@@ -1,33 +0,0 @@
---- src/gtk/callbacks.c	Wed Aug 20 22:13:50 2003
-+++ src/gtk/callbacks.c.patch	Wed Aug 20 23:14:35 2003
-@@ -36,11 +36,12 @@
- {
-     va_list arg;
-     char* message;
-+    GtkWidget *dialog;
-+
-     va_start(arg, format);
- 
-     message = g_strdup_vprintf(format, arg);
-     
--    GtkWidget *dialog;
-     switch(code)
-     {
- 	case ERROR:
-@@ -108,6 +109,7 @@
- {
-     GtkWidget *label;
-     Timeout *timeout;
-+    gint result;
-     timeout = g_malloc(sizeof(Timeout));
- 
-     timeout->dialog = GTK_DIALOG(gtk_dialog_new_with_buttons("Testing the new speeds", 
-@@ -126,7 +128,7 @@
-     /* Create the real timeout */
-     timeout->timeout_id = g_timeout_add(1000, timeout_callback, timeout);
- 
--    gint result = gtk_dialog_run(GTK_DIALOG(timeout->dialog));
-+    result = gtk_dialog_run(GTK_DIALOG(timeout->dialog));
- 
-     /* Stop the timer because we got an answer back */
-     g_source_remove(timeout->timeout_id);
diff -ruN nvclock/files/patch-src::Makefile.in nvclock_new/files/patch-src::Makefile.in
--- nvclock/files/patch-src::Makefile.in	2003-08-21 23:17:15.000000000 +0300
+++ nvclock_new/files/patch-src::Makefile.in	1970-01-01 02:00:00.000000000 +0200
@@ -1,17 +0,0 @@
---- src/Makefile.in	Sun Jun 22 23:19:18 2003
-+++ src/Makefile.in.patch	Wed Aug 20 23:30:46 2003
-@@ -1,4 +1,5 @@
- CC=@CC@
-+LDFLAGS=@LDFLAGS@
- INSTALL=@INSTALL@
- 
- SOURCES=nvclock.c
-@@ -19,7 +20,7 @@
- 
- 
- nvclock: $(libbackend) nvclock.c
--	$(CC) -o nvclock $(INCLUDES) $(SOURCES) backend/libbackend.a
-+	$(CC) -o nvclock $(INCLUDES) -I$(LOCALBASE)/include $(LDFLAGS) $(SOURCES) backend/libbackend.a
- 
- 
- clean: clean-recursive clean-app
diff -ruN nvclock/pkg-descr nvclock_new/pkg-descr
--- nvclock/pkg-descr	2005-11-27 10:01:47.000000000 +0200
+++ nvclock_new/pkg-descr	2007-07-07 08:45:01.000000000 +0300
@@ -7,6 +7,6 @@
 and to make it play nice with current distros and 
 drivers.
 
- WWW: http://www.linuxhardware.org/nvclock/
-
 - Samy Al Bahra <samy at kerneled.com>
+
+WWW: http://www.linuxhardware.org/nvclock/
diff -ruN nvclock/pkg-plist nvclock_new/pkg-plist
--- nvclock/pkg-plist	2003-08-11 23:39:31.000000000 +0300
+++ nvclock_new/pkg-plist	2007-07-07 10:09:35.000000000 +0300
@@ -1,2 +1,8 @@
 bin/nvclock
 %%GTK%%bin/nvclock_gtk
+%%PORTDOCS%%%%DOCSDIR%%/ABOUT
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
--- nvclock-update.patch ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted: