cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Don't build libgtop always as static library

Browse Source 
- Don't include bundled gettext headers
- Fix LIB_DEPENDS
- Remove HOMEPAGE that no longer exists
- USE_LIBTOOL
- Bump PKGNAME

ok MAINTAINER
This commit is contained in:
alek 2005-12-04 12:17:47 +00:00
parent 431112ef79
commit 911bdf98c3
3 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
devel/libgtop/Makefile
View File

@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.21 2004/11/23 21:34:27 espie Exp $
# $OpenBSD: Makefile,v 1.22 2005/12/04 12:17:47 alek Exp $
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 <jim@corebsd.or.id>
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgtop/1.0/}
@ -27,9 +26,10 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
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

13
devel/libgtop/patches/patch-configure
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure,v 1.3 2004/10/01 23:54:45 naddy Exp $
$OpenBSD: patch-configure,v 1.4 2005/12/04 12:17:47 alek 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 @@ $OpenBSD: patch-configure,v 1.3 2004/10/01 23:54:45 naddy Exp $
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"

19
devel/libgtop/patches/patch-src_daemon_Makefile_in Normal file
View File

@ -0,0 +1,19 @@
$OpenBSD: patch-src_daemon_Makefile_in,v 1.1 2005/12/04 12:17:47 alek Exp $
--- 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@
-@ENABLE_STATIC_TRUE@libgtop_daemon_LDFLAGS = -static
+@ENABLE_STATIC_TRUE@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
-@ENABLE_STATIC_TRUE@libgtop_server_LDFLAGS = -static
+@ENABLE_STATIC_TRUE@libgtop_server_LDFLAGS =
EXTRA_DIST = server_config.h.in server_config.pl
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs