Date: Fri, 5 Sep 2008 00:12:59 +0200 From: Bernhard Froehlich <decke@bluelife.at> To: pav@FreeBSD.org Cc: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/126786: [PATCH] sysutils/nvclock: update to 0.8b3a Message-ID: <20080905001259.5a120f01@chii.bluelife.at> In-Reply-To: <200809042054.m84KsFRL052937@freefall.freebsd.org> References: <200809042054.m84KsFRL052937@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, 4 Sep 2008 20:54:15 GMT pav@FreeBSD.org wrote: > Synopsis: [PATCH] sysutils/nvclock: update to 0.8b3a > > State-Changed-From-To: open->feedback > State-Changed-By: pav > State-Changed-When: Thu Sep 4 20:53:52 UTC 2008 > State-Changed-Why: > The patch in the PR is malformed - long lines got wrapped. > Can you resend, making sure the patch arrives intact? > > > Responsible-Changed-From-To: freebsd-ports-bugs->pav > Responsible-Changed-By: pav > Responsible-Changed-When: Thu Sep 4 20:53:52 UTC 2008 > Responsible-Changed-Why: > The patch in the PR is malformed - long lines got wrapped. > Can you resend, making sure the patch arrives intact? > > http://www.freebsd.org/cgi/query-pr.cgi?pr=126786 I'll try my best and sorry for the inconvenience. --- nvclock-0.8.b3.a.patch begins here --- diff -ruN --exclude=CVS /usr/ports/sysutils/nvclock.orig/Makefile /usr/ports/sysutils/nvclock/Makefile --- /usr/ports/sysutils/nvclock.orig/Makefile 2008-09-04 23:51:25.000000000 +0200 +++ /usr/ports/sysutils/nvclock/Makefile 2008-08-24 15:03:55.000000000 +0200 @@ -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 @@ 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 @@ -40,11 +42,6 @@ @${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 - do-install: @${GMAKE} -C ${WRKSRC}/src install @${GMAKE} -C ${WRKSRC} install-man diff -ruN --exclude=CVS /usr/ports/sysutils/nvclock.orig/distinfo /usr/ports/sysutils/nvclock/distinfo --- /usr/ports/sysutils/nvclock.orig/distinfo 2008-09-04 23:51:25.000000000 +0200 +++ /usr/ports/sysutils/nvclock/distinfo 2008-07-31 23:32:17.000000000 +0200 @@ -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 -ruN --exclude=CVS /usr/ports/sysutils/nvclock.orig/files/patch-configure.in /usr/ports/sysutils/nvclock/files/patch-configure.in --- /usr/ports/sysutils/nvclock.orig/files/patch-configure.in 1970-01-01 01:00:00.000000000 +0100 +++ /usr/ports/sysutils/nvclock/files/patch-configure.in 2008-08-16 16:49:54.000000000 +0200 @@ -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 -ruN --exclude=CVS /usr/ports/sysutils/nvclock.orig/files/patch-src-gtk-main.c /usr/ports/sysutils/nvclock/files/patch-src-gtk-main.c --- /usr/ports/sysutils/nvclock.orig/files/patch-src-gtk-main.c 1970-01-01 01:00:00.000000000 +0100 +++ /usr/ports/sysutils/nvclock/files/patch-src-gtk-main.c 2008-08-16 17:41:02.000000000 +0200 @@ -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 -ruN --exclude=CVS /usr/ports/sysutils/nvclock.orig/pkg-plist /usr/ports/sysutils/nvclock/pkg-plist --- /usr/ports/sysutils/nvclock.orig/pkg-plist 2008-09-04 23:51:25.000000000 +0200 +++ /usr/ports/sysutils/nvclock/pkg-plist 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -bin/nvclock -%%GTK%%bin/nvclock_gtk --- nvclock-0.8.b3.a.patch ends here ---
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20080905001259.5a120f01>