ports/74194: [ maintainer ] deskutils/hot-babe: update to 0.2.0
Roman Bogorodskiy
bogorodskiy at inbox.ru
Sun Nov 21 11:10:23 UTC 2004
>Number: 74194
>Category: ports
>Synopsis: [ maintainer ] deskutils/hot-babe: update to 0.2.0
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun Nov 21 11:10:23 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Roman Bogorodskiy
>Release: FreeBSD 5.3-RELEASE i386
>Organization:
>Environment:
System: FreeBSD lame.novel.ru 5.3-RELEASE FreeBSD 5.3-RELEASE #0: Sun Nov 7 19:06:32 MSK 2004 root at lame.novel.ru:/usr/obj/usr/src/sys/MIRRORBOX i386
>Description:
Update to 0.2.0. Now this port uses gdk2, so it depends on gtk20 now.
One more issue: hot-babe authors decided to switch to "Artistic
License". Does that mean we should use NO_CDROM?
>How-To-Repeat:
>Fix:
--- port.hot-babe.update begins here ---
diff -ruN hot-babe.orig/Makefile hot-babe/Makefile
--- hot-babe.orig/Makefile Sun Nov 21 10:43:23 2004
+++ hot-babe/Makefile Sun Nov 21 13:44:16 2004
@@ -6,8 +6,7 @@
#
PORTNAME= hot-babe
-PORTVERSION= 0.1.4
-PORTREVISION= 1
+PORTVERSION= 0.2.0
CATEGORIES= deskutils
MASTER_SITES= http://dindinx.net/hotbabe/downloads/
@@ -17,11 +16,13 @@
USE_BZIP2= yes
USE_X_PREFIX= yes
MAKE_ARGS+= PREFIX="${PREFIX}" CC="${CC}"
-USE_GNOME= gdkpixbuf
+USE_GNOME= gtk20
USE_REINPLACE= yes
MAN1= hot-babe.1
+PORTDOCS= ChangeLog NEWS TODO LICENSE CONTRIBUTORS copyright
+
pre-everything::
@${ECHO_MSG}
@${ECHO_MSG} "Warning! This port contains some adults only content."
@@ -34,5 +35,11 @@
post-install:
${INSTALL_MAN} ${WRKSRC}/hot-babe.1 ${PREFIX}/man/man1
+.ifndef (NOPORTDOCS)
+ @${MKDIR} ${DOCSDIR}
+.for i in ${PORTDOCS}
+ @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+.endfor
+.endif
.include <bsd.port.mk>
diff -ruN hot-babe.orig/distinfo hot-babe/distinfo
--- hot-babe.orig/distinfo Sun Nov 21 10:43:23 2004
+++ hot-babe/distinfo Sun Nov 21 10:43:37 2004
@@ -1,2 +1,2 @@
-MD5 (hot-babe-0.1.4.tar.bz2) = 5565012a784802debe38972188506a85
-SIZE (hot-babe-0.1.4.tar.bz2) = 401456
+MD5 (hot-babe-0.2.0.tar.bz2) = e0de887b9ea75dad221830ccfcc3a6da
+SIZE (hot-babe-0.2.0.tar.bz2) = 397541
diff -ruN hot-babe.orig/files/patch-Makefile hot-babe/files/patch-Makefile
--- hot-babe.orig/files/patch-Makefile Sun Nov 21 10:43:23 2004
+++ hot-babe/files/patch-Makefile Sun Nov 21 13:40:22 2004
@@ -1,16 +1,24 @@
---- Makefile.orig Wed Aug 25 17:55:52 2004
-+++ Makefile Sat Nov 6 20:24:29 2004
+--- Makefile.orig Sun Nov 14 16:12:47 2004
++++ Makefile Sun Nov 21 13:39:35 2004
@@ -3,11 +3,11 @@
DESTDIR = ${PREFIX}
# optimization cflags
--CFLAGS = -O2 -Wall -g `gtk-config --cflags` `gdk-pixbuf-config --cflags` -DDESTDIR=\"$(DESTDIR)\"
-+CFLAGS += `gtk-config --cflags` `gdk-pixbuf-config --cflags` -DDESTDIR=\"$(DESTDIR)\"
+-CFLAGS = -O2 -Wall -g `pkg-config gdk-2.0 gdk-pixbuf-2.0 --cflags` -DDESTDIR=\"$(DESTDIR)\"
++CFLAGS += `pkg-config --cflags gtk+-2.0` -DDESTDIR=\"$(DESTDIR)\"
OBJS = hot-babe.o loader.o
CC = gcc
--LIBS = `gtk-config --libs | sed "s/-lgtk//g"` `gdk-pixbuf-config --libs`
-+LIBS = `gtk-config --libs` `gdk-pixbuf-config --libs`
+-LIBS = `pkg-config gdk-2.0 gdk-pixbuf-2.0 --libs`
++LIBS = `pkg-config --libs gtk+-2.0`
INSTALL = -m 755
- all: hot-babe
+ DOC = ChangeLog NEWS TODO LICENSE CONTRIBUTORS copyright
+@@ -26,7 +26,6 @@
+ install -d $(DESTDIR)/share/hot-babe/hb01
+ install $(INSTALL) hb01/* $(DESTDIR)/share/hot-babe/hb01
+ install -d $(DESTDIR)/share/doc/hot-babe
+- install $(INSTALL) $(DOC) $(DESTDIR)/share/doc/hot-babe
+
+ uninstall:
+ rm -f $(DESTDIR)/bin/hot-babe
diff -ruN hot-babe.orig/files/patch-hot-babe.c hot-babe/files/patch-hot-babe.c
--- hot-babe.orig/files/patch-hot-babe.c Sun Nov 21 10:43:23 2004
+++ hot-babe/files/patch-hot-babe.c Sun Nov 21 13:37:23 2004
@@ -1,61 +1,10 @@
---- hot-babe.c.orig Wed Aug 25 16:20:50 2004
-+++ hot-babe.c Sat Nov 6 19:41:41 2004
-@@ -26,6 +26,13 @@
- #include <unistd.h>
- #include <stdlib.h>
- #include <string.h>
-+#ifdef __FreeBSD__
-+#include <sys/time.h>
-+#include <sys/resource.h>
-+#include <sys/types.h>
-+#include <sys/sysctl.h>
+--- hot-babe.c.orig Sun Nov 21 13:33:18 2004
++++ hot-babe.c Sun Nov 21 13:34:42 2004
+@@ -23,6 +23,7 @@
+ #include <sys/resource.h>
+ #include <sys/types.h>
+ #include <sys/sysctl.h>
+#include <sys/dkstat.h>
-+#endif
+ #endif
/* x11 includes */
- #include <gdk/gdk.h>
-@@ -69,14 +76,34 @@
- static int system_cpu(void)
- {
- unsigned int cpuload;
-+ int i;
-+#ifdef __linux__
- u_int64_t load, total, oload, ototal;
- u_int64_t ab, ac, ad, ae;
-- int i;
- FILE *stat;
-+#endif
-+#ifdef __FreeBSD__
-+ long load, total, oload, ototal;
-+ long ab, ac, ad, ae;
-+ long cp_time[CPUSTATES];
-+ size_t len = sizeof(cp_time);
-+#endif
-
-+#ifdef __linux__
- stat = fopen("/proc/stat", "r");
- fscanf(stat, "%*s %Ld %Ld %Ld %Ld", &ab, &ac, &ad, &ae);
- fclose(stat);
-+#endif
-+#ifdef __FreeBSD__
-+ if (sysctlbyname("kern.cp_time", &cp_time, &len, NULL, 0) < 0)
-+ (void)fprintf(stderr, "Cannot get kern.cp_time");
-+
-+ ab = cp_time[CP_USER];
-+ ac = cp_time[CP_NICE];
-+ ad = cp_time[CP_SYS];
-+ ae = cp_time[CP_IDLE];
-+#endif
-+
-
- /* Find out the CPU load */
- /* user + sys = load
-@@ -103,7 +130,7 @@
- cpuload = 0;
- else
- cpuload = (256 * (load - oload)) / (total - ototal);
--
-+
- return cpuload;
- }
-
--- port.hot-babe.update ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list