Christian Weisgerber <[EMAIL PROTECTED]> wrote:
> ===> devel/libgtop
> /usr/ports/packages/amd64/all/libgtop-1.0.13p1.tgz:
> Extra: intl.3
> Extra: iconv.4
> ===> devel/libgtop,gnome
> /usr/ports/packages/amd64/all/libgtop-1.0.13p1-gnome.tgz:
> Extra: intl.3
> Extra: gnomesupport.0
> Extra: iconv.4
> Extra: gnome.36
Looks like libgtop_daemon was built as static binary. Also LIB_DEPENDS
wasn't correct. I'm not using libgtop so please test and OK that diff.
diff -urN -xCVS devel/libgtop.orig/Makefile devel/libgtop/Makefile
--- devel/libgtop.orig/Makefile Tue Nov 23 22:34:27 2004
+++ devel/libgtop/Makefile Fri Nov 18 23:45:11 2005
@@ -3,10 +3,9 @@
COMMENT= "portable library for obtaining system information"
DISTNAME= libgtop-1.0.13
-PKGNAME= ${DISTNAME}p1
+PKGNAME= ${DISTNAME}p2
CATEGORIES= devel
-HOMEPAGE= http://www.gnome.org/softwaremap/projects/libgtop/
MAINTAINER= Jim Geovedi <[EMAIL PROTECTED]>
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgtop/1.0/}
@@ -27,9 +26,10 @@
MODULES= devel/gettext
LIB_DEPENDS= glib.1.2::devel/glib
+USE_LIBTOOL= Yes
.if ${FLAVOR:L:Mgnome}
-LIB_DEPENDS+= gnome.36,gnomesupport::x11/gnome/libs
+LIB_DEPENDS+= gnomesupport::x11/gnome/libs
WANTLIB+= m z
.else
CONFIGURE_ARGS+= --without-gnome
diff -urN -xCVS devel/libgtop.orig/patches/patch-configure
devel/libgtop/patches/patch-configure
--- devel/libgtop.orig/patches/patch-configure Sat Oct 2 01:54:45 2004
+++ devel/libgtop/patches/patch-configure Fri Nov 18 23:07:30 2005
@@ -1,6 +1,6 @@
$OpenBSD: patch-configure,v 1.3 2004/10/01 23:54:45 naddy Exp $
--- configure.orig Mon Nov 26 23:50:58 2001
-+++ configure Thu Sep 30 22:55:40 2004
++++ configure Fri Nov 18 23:06:25 2005
@@ -15,6 +15,7 @@ if test "X${PATH_SEPARATOR+set}" != Xset
*-DOS) lt_cv_sys_path_separator=';' ;;
*) lt_cv_sys_path_separator=':' ;;
@@ -149,3 +149,12 @@
LIBS=`echo $LIBS | sed -e 's/-lintl//'`
fi
+@@ -18288,7 +18335,7 @@ else
+ guile_def=""
+ fi
+
+-INCLUDES="-D_IN_LIBGTOP -D_GNU_SOURCE -DGLIBTOP_NAMES -I\$(top_builddir)
-I\$(top_srcdir) -I\$(top_srcdir)/sysdeps/$sysdeps_dir -I\$(top_srcdir)/include
-I\$(top_srcdir)/intl $SUPPORTINCS $GLIB_CFLAGS $CFLAGS $X_CFLAGS $guile_def
"'-DGTOPLOCALEDIR=\"$(datadir)/locale\"
-DLIBGTOP_VERSION=\"'"$LIBGTOP_VERSION"'\"
-DLIBGTOP_SERVER_VERSION=\"'"$LIBGTOP_SERVER_VERSION"'\"
-DLIBGTOP_VERSION_CODE='$LIBGTOP_VERSION_CODE'
-DLIBGTOP_SERVER=\"'"$LIBGTOP_SERVER"'\"'
++INCLUDES="-D_IN_LIBGTOP -D_GNU_SOURCE -DGLIBTOP_NAMES -I\$(top_builddir)
-I\$(top_srcdir) -I\$(top_srcdir)/sysdeps/$sysdeps_dir -I\$(top_srcdir)/include
$SUPPORTINCS $GLIB_CFLAGS $CFLAGS $X_CFLAGS $guile_def
"'-DGTOPLOCALEDIR=\"$(datadir)/locale\"
-DLIBGTOP_VERSION=\"'"$LIBGTOP_VERSION"'\"
-DLIBGTOP_SERVER_VERSION=\"'"$LIBGTOP_SERVER_VERSION"'\"
-DLIBGTOP_VERSION_CODE='$LIBGTOP_VERSION_CODE'
-DLIBGTOP_SERVER=\"'"$LIBGTOP_SERVER"'\"'
+
+ if test x$libgtop_need_server = xyes ; then
+
sysdeps_suid_lib="\$(top_builddir)/sysdeps/\$(sysdeps_dir)/libgtop_sysdeps_suid.la"
diff -urN -xCVS devel/libgtop.orig/patches/patch-src_daemon_Makefile_in
devel/libgtop/patches/patch-src_daemon_Makefile_in
--- devel/libgtop.orig/patches/patch-src_daemon_Makefile_in Thu Jan 1
01:00:00 1970
+++ devel/libgtop/patches/patch-src_daemon_Makefile_in Fri Nov 18 23:07:23 2005
@@ -0,0 +1,19 @@
+$OpenBSD$
+--- src/daemon/Makefile.in.orig Fri Nov 18 23:06:42 2005
++++ src/daemon/Makefile.in Fri Nov 18 23:07:02 2005
+@@ -197,13 +197,13 @@ libgtop_daemon_SOURCES = gnuserv.c slave
+ libgtop_daemon_LDADD = $(top_builddir)/lib/libgtop.la
$(top_builddir)/sysdeps/common/libgtop_common.la
$(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la
@sysdeps_suid_lib@
$(suid_sysdeps) $(suid_common) $(GLIB_LIBS)
@LIBSUPPORT@ @INTLLIBS@ @libs_xauth@
+
+
[EMAIL PROTECTED]@libgtop_daemon_LDFLAGS = -static
[EMAIL PROTECTED]@libgtop_daemon_LDFLAGS =
+
+ libgtop_server_SOURCES = server.c slave.c io.c version.c daemon.h
+ libgtop_server_LDADD =
$(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid.la
$(top_builddir)/sysdeps/common/libgtop_suid_common.la
+
+
[EMAIL PROTECTED]@libgtop_server_LDFLAGS = -static
[EMAIL PROTECTED]@libgtop_server_LDFLAGS =
+
+ EXTRA_DIST = server_config.h.in server_config.pl
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
