diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-08-21 20:17:15 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-08-21 20:17:15 +0000 |
| commit | 0e87acee3bea2990e2a58dca00998a5e16789b4b (patch) | |
| tree | 016f1eb265283efc18505cb7909586dfd101e7bf /sysutils | |
| parent | Thanks to Jamie Jones <jamie@bishopston.net> for tracking down a header (diff) | |
Fix build on -STABLE.
Submitted by: maintainer
Tested by: Pav Lucistnik <pav@oook.cz>
Notes
Notes:
svn path=/head/; revision=87463
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/nvclock/Makefile | 10 | ||||
| -rw-r--r-- | sysutils/nvclock/files/patch-src-gtk::callbacks.c | 33 | ||||
| -rw-r--r-- | sysutils/nvclock/files/patch-src::Makefile.in | 17 |
3 files changed, 58 insertions, 2 deletions
diff --git a/sysutils/nvclock/Makefile b/sysutils/nvclock/Makefile index 5b8b0ceb0494..1669d9fba5a9 100644 --- a/sysutils/nvclock/Makefile +++ b/sysutils/nvclock/Makefile @@ -13,16 +13,17 @@ MASTER_SITES= http://www.linuxhardware.org/nvclock/ \ DISTNAME= nvclock${PORTVERSION} MAINTAINER= samy@kerneled.com -COMMENT= nVidia graphic card status and overclocking tool +COMMENT= The nVidia graphic card status and overclocking tool USE_GMAKE= yes +USE_REINPLACE= yes USE_GETOPT_LONG=yes GNU_CONFIGURE= yes USE_GNOME= pkgconfig .if defined(WITHOUT_GUI) PLIST_SUB+= GTK="@comment " -CONFIGURE_ARGS+= "--enable-gtk=no" +CONFIGURE_ARGS+="--enable-gtk=no" .else USE_GNOME+= gtk20 PLIST_SUB+= GTK="" @@ -36,4 +37,9 @@ pre-everything:: @${ECHO_MSG} "************************************************" @${ECHO_MSG} "" +post-patch: +.for i in src/gtk/Makefile.in src/backend/Makefile.in + @${REINPLACE_CMD} -e 's|"CFLAGS="|"CFLAGS+="|g' ${WRKSRC}/${i} +.endfor + .include <bsd.port.mk> diff --git a/sysutils/nvclock/files/patch-src-gtk::callbacks.c b/sysutils/nvclock/files/patch-src-gtk::callbacks.c new file mode 100644 index 000000000000..d8437a10b95a --- /dev/null +++ b/sysutils/nvclock/files/patch-src-gtk::callbacks.c @@ -0,0 +1,33 @@ +--- 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 --git a/sysutils/nvclock/files/patch-src::Makefile.in b/sysutils/nvclock/files/patch-src::Makefile.in new file mode 100644 index 000000000000..9df67e915664 --- /dev/null +++ b/sysutils/nvclock/files/patch-src::Makefile.in @@ -0,0 +1,17 @@ +--- 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 |