From 2cb319feb6e120ba66e108eb95455d8407ab25c8 Mon Sep 17 00:00:00 2001 From: Pav Lucistnik Date: Fri, 5 Sep 2008 07:51:50 +0000 Subject: - Update to 0.8b3a PR: ports/126786 Submitted by: Bernhard Fruehlich Approved by: Samy Al Bahra (maintainer) --- sysutils/nvclock/Makefile | 20 ++++++++++---------- sysutils/nvclock/distinfo | 6 +++--- sysutils/nvclock/files/patch-configure.in | 27 +++++++++++++++++++++++++++ sysutils/nvclock/files/patch-src-gtk-main.c | 22 ++++++++++++++++++++++ sysutils/nvclock/pkg-plist | 2 -- 5 files changed, 62 insertions(+), 15 deletions(-) create mode 100644 sysutils/nvclock/files/patch-configure.in create mode 100644 sysutils/nvclock/files/patch-src-gtk-main.c delete mode 100644 sysutils/nvclock/pkg-plist (limited to 'sysutils/nvclock') diff --git a/sysutils/nvclock/Makefile b/sysutils/nvclock/Makefile index 6d368c71c7d3..2aa80381f6a6 100644 --- a/sysutils/nvclock/Makefile +++ b/sysutils/nvclock/Makefile @@ -6,11 +6,10 @@ # PORTNAME= nvclock -DISTVERSION= 0.8b2 -PORTREVISION= 1 +DISTVERSION= 0.8b3a CATEGORIES= sysutils -MASTER_SITES= http://www.linuxhardware.org/nvclock/ \ - http://www.kerneled.com/freebsd/ports/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITE_SUBDIR= nvclock DISTNAME= nvclock${DISTVERSION} MAINTAINER= sbahra@gwu.edu @@ -19,13 +18,16 @@ COMMENT= The nVidia graphic card status and overclocking tool USE_GMAKE= yes GNU_CONFIGURE= yes USE_GNOME= pkgconfig +USE_AUTOTOOLS= aclocal:19 autoheader:262 autoconf:262 + +PLIST_FILES= bin/nvclock .if defined(WITHOUT_GUI) -PLIST_SUB+= GTK="@comment " -CONFIGURE_ARGS+="--enable-gtk=no" +CONFIGURE_ARGS+=--enable-gtk=no --enable-qt=no --enable-nvcontrol=no .else +USE_XORG= xext USE_GNOME+= gtk20 -PLIST_SUB+= GTK="" +PLIST_FILES+= bin/nvclock_gtk .endif MAN1= nvclock.1 @@ -41,9 +43,7 @@ pre-everything:: @${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 + @${REINPLACE_CMD} -e 's|$$(DISTDIR)||' ${WRKSRC}/src/Makefile.in do-install: @${GMAKE} -C ${WRKSRC}/src install diff --git a/sysutils/nvclock/distinfo b/sysutils/nvclock/distinfo index ce01c2aa1f15..a7a5c4ed7797 100644 --- a/sysutils/nvclock/distinfo +++ b/sysutils/nvclock/distinfo @@ -1,3 +1,3 @@ -MD5 (nvclock0.8b2.tar.gz) = 8b9f55115f3c5b7b9a9a16fe40cec4a5 -SHA256 (nvclock0.8b2.tar.gz) = b3c05f1cceb57a816cea096f9b71154c0ce5e2ec31febb85e3db831b0b3407aa -SIZE (nvclock0.8b2.tar.gz) = 316510 +MD5 (nvclock0.8b3a.tar.gz) = 8e5c47ff638603e4a7ccd1325ef765ef +SHA256 (nvclock0.8b3a.tar.gz) = 03a280f2369288310dd948a7f3f34eff2f843ed28db3b54f1edcb1a80294dae5 +SIZE (nvclock0.8b3a.tar.gz) = 326939 diff --git a/sysutils/nvclock/files/patch-configure.in b/sysutils/nvclock/files/patch-configure.in new file mode 100644 index 000000000000..12c76627a0ba --- /dev/null +++ b/sysutils/nvclock/files/patch-configure.in @@ -0,0 +1,27 @@ +--- configure.in.orig 2008-08-16 16:45:25.000000000 +0200 ++++ configure.in 2008-08-16 16:46:26.000000000 +0200 +@@ -120,12 +120,18 @@ + HAVE_NVCONTROL=no + fi + +- if test x"$HAVE_NVCONTROL" = "xyes" ; then +- X11_CFLAGS=$X_CFLAGS +- X11_LIBS="$X_LIBS $LIBS" +- AC_SUBST(X11_CFLAGS) +- AC_SUBST(X11_LIBS) +- AC_DEFINE([HAVE_NVCONTROL], [1], [NV-CONTROL support for changing OpenGL settings]) ++ if test x"$enable_nvcontrol" = "xyes"; then ++ PKG_CHECK_MODULES([X11], [x11], , AC_MSG_ERROR("X11 required for nvcontrol support")) ++ PKG_CHECK_MODULES([XEXT], [xext], , AC_MSG_ERROR("Xext required for nvcontrol support")) ++ ++ X11_CFLAGS="$X11_CFLAGS $XEXT_CFLAGS" ++ X11_LIBS="$X11_LIBS $XEXT_LIBS" ++ if test x"$X11_LIBS" != x ; then ++ HAVE_NVCONTROL=yes ++ AC_SUBST(X11_CFLAGS) ++ AC_SUBST(X11_LIBS) ++ AC_DEFINE([HAVE_NVCONTROL], [1], [NV-CONTROL support for changing OpenGL settings]) ++ fi + fi + fi + diff --git a/sysutils/nvclock/files/patch-src-gtk-main.c b/sysutils/nvclock/files/patch-src-gtk-main.c new file mode 100644 index 000000000000..26a69b2cf7ed --- /dev/null +++ b/sysutils/nvclock/files/patch-src-gtk-main.c @@ -0,0 +1,22 @@ +--- src/gtk/main.c.orig 2008-08-16 17:39:31.000000000 +0200 ++++ src/gtk/main.c 2008-08-16 17:40:29.000000000 +0200 +@@ -255,6 +255,9 @@ + { + GtkWidget *window_nvclock; + ++ gtk_set_locale (); ++ gtk_init (&argc, &argv); ++ + /* Initialize nvclock. This must be done here instead of in the hardware backend + / because of the configuration file which gets initialized by init_nvclock. + */ +@@ -269,9 +272,6 @@ + return 0; + } + +- gtk_set_locale (); +- gtk_init (&argc, &argv); +- + window_nvclock = create_window_main (); + gtk_widget_show (window_nvclock); + diff --git a/sysutils/nvclock/pkg-plist b/sysutils/nvclock/pkg-plist deleted file mode 100644 index 03b977056f8b..000000000000 --- a/sysutils/nvclock/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -bin/nvclock -%%GTK%%bin/nvclock_gtk -- cgit v1.2.3