Update to 2.10.1. WANTLIBS, USE_LIBTOOL.
This commit is contained in:
marcm
parent
13742ab04d
commit
2d956b4b38
@ -1,10 +1,10 @@
|
||||
# $OpenBSD: Makefile,v 1.12 2005/09/08 20:33:36 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.13 2005/11/13 16:53:48 marcm Exp $
|
||||
|
||||
COMMENT= "configuration database system for GNOME"
|
||||
|
||||
VERSION= 2.10.0
|
||||
VERSION= 2.10.1
|
||||
DISTNAME= GConf-${VERSION}
|
||||
PKGNAME= gconf2-${VERSION}p1
|
||||
PKGNAME= gconf2-${VERSION}
|
||||
CATEGORIES= devel
|
||||
|
||||
HOMEPAGE= http://www.gnome.org/projects/gconf/
|
||||
@ -24,18 +24,17 @@ PERMIT_PACKAGE_CDROM= Yes
|
||||
PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
WANTLIB= X11 Xft Xrender atk-1.0.0.0 c \
|
||||
WANTLIB= X11 Xrender Xext atk-1.0.0.0 c cairo glitz \
|
||||
fontconfig freetype glib-2.0.0.0 gmodule-2.0.0.0 \
|
||||
gobject-2.0.0.0 gthread-2.0.0.0 m pango-1.0.0.0 \
|
||||
pangoft2-1.0.0.0 pangox-1.0.0.0 pangoxft-1.0.0.0 \
|
||||
popt pthread z
|
||||
|
||||
SEPARATE_BUILD= concurrent
|
||||
pangoft2-1.0.0.0 pangocairo-1.0.1000.0 \
|
||||
popt pthread png z
|
||||
|
||||
DEFAULT_GCONF_SOURCE= xml::/var/db/gconf/gconf.xml.defaults
|
||||
|
||||
USE_X11= Yes
|
||||
USE_GMAKE= Yes
|
||||
USE_LIBTOOL= Yes
|
||||
CONFIGURE_STYLE= gnu
|
||||
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
|
||||
CONFIGURE_ARGS+= --disable-gtk-conf
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
MD5 (GConf-2.10.0.tar.bz2) = a7cd37be4e317195a6668a086fc72033
|
||||
RMD160 (GConf-2.10.0.tar.bz2) = 5464159cba1bd55bec976bcb1cbda7d663298e4b
|
||||
SHA1 (GConf-2.10.0.tar.bz2) = 9590cfc310e05c540feeab352199062922b8f4be
|
||||
SIZE (GConf-2.10.0.tar.bz2) = 1734260
|
||||
MD5 (GConf-2.10.1.tar.bz2) = c411bd6e9e25362ea613bb9a084be904
|
||||
RMD160 (GConf-2.10.1.tar.bz2) = 5f13846cda3f4e13268de51f3c467057aad012be
|
||||
SHA1 (GConf-2.10.1.tar.bz2) = a28f95b9162e71083386ea13f5a4c9bc42c4fdf3
|
||||
SIZE (GConf-2.10.1.tar.bz2) = 1797862
|
||||
|
||||
@ -1,69 +0,0 @@
|
||||
--- ltmain.sh.orig Mon Mar 7 03:25:17 2005
|
||||
+++ ltmain.sh Mon Apr 4 22:28:19 2005
|
||||
@@ -1975,9 +1975,12 @@ EOF
|
||||
if test "$linkmode,$pass" = "prog,link"; then
|
||||
compile_deplibs="$deplib $compile_deplibs"
|
||||
finalize_deplibs="$deplib $finalize_deplibs"
|
||||
- else
|
||||
- deplibs="$deplib $deplibs"
|
||||
+ continue
|
||||
fi
|
||||
+ if test "$linkmode" = "lib"; then
|
||||
+ newdependency_libs="$deplib $newdependency_libs"
|
||||
+ fi
|
||||
+ deplibs="$deplib $deplibs"
|
||||
continue
|
||||
;;
|
||||
-l*)
|
||||
@@ -2410,10 +2413,6 @@ EOF
|
||||
link_static=no # Whether the deplib will be linked statically
|
||||
if test -n "$library_names" &&
|
||||
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then
|
||||
- if test "$installed" = no; then
|
||||
- notinst_deplibs="$notinst_deplibs $lib"
|
||||
- need_relink=yes
|
||||
- fi
|
||||
# This is a shared library
|
||||
|
||||
# Warn about portability, can't link against -module's on
|
||||
@@ -5800,40 +5799,6 @@ relink_command=\"$relink_command\""
|
||||
# Exit here if they wanted silent mode.
|
||||
test "$show" = : && exit $EXIT_SUCCESS
|
||||
|
||||
- $echo "----------------------------------------------------------------------"
|
||||
- $echo "Libraries have been installed in:"
|
||||
- for libdir in $libdirs; do
|
||||
- $echo " $libdir"
|
||||
- done
|
||||
- $echo
|
||||
- $echo "If you ever happen to want to link against installed libraries"
|
||||
- $echo "in a given directory, LIBDIR, you must either use libtool, and"
|
||||
- $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
|
||||
- $echo "flag during linking and do at least one of the following:"
|
||||
- if test -n "$shlibpath_var"; then
|
||||
- $echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
|
||||
- $echo " during execution"
|
||||
- fi
|
||||
- if test -n "$runpath_var"; then
|
||||
- $echo " - add LIBDIR to the \`$runpath_var' environment variable"
|
||||
- $echo " during linking"
|
||||
- fi
|
||||
- if test -n "$hardcode_libdir_flag_spec"; then
|
||||
- libdir=LIBDIR
|
||||
- eval flag=\"$hardcode_libdir_flag_spec\"
|
||||
-
|
||||
- $echo " - use the \`$flag' linker flag"
|
||||
- fi
|
||||
- if test -n "$admincmds"; then
|
||||
- $echo " - have your system administrator run these commands:$admincmds"
|
||||
- fi
|
||||
- if test -f /etc/ld.so.conf; then
|
||||
- $echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
|
||||
- fi
|
||||
- $echo
|
||||
- $echo "See any operating system documentation about shared libraries for"
|
||||
- $echo "more information, such as the ld(1) and ld.so(8) manual pages."
|
||||
- $echo "----------------------------------------------------------------------"
|
||||
exit $EXIT_SUCCESS
|
||||
;;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.13 2005/09/08 15:43:34 marcm Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.14 2005/11/13 16:53:48 marcm Exp $
|
||||
bin/gconf-merge-tree
|
||||
bin/gconftool-2
|
||||
include/gconf/
|
||||
@ -36,10 +36,10 @@ share/examples/gconf2/gconf/2/
|
||||
share/examples/gconf2/gconf/2/path
|
||||
@sample ${SYSCONFDIR}/gconf/2/path
|
||||
@sample /var/db/gconf/
|
||||
@comment share/examples/gconf2/gconf/gconf.xml.defaults/
|
||||
@sample /var/db/gconf/gconf.xml.defaults/
|
||||
@comment share/examples/gconf2/gconf/gconf.xml.mandatory/
|
||||
@sample /var/db/gconf/gconf.xml.mandatory/
|
||||
@comment share/examples/gconf2/gconf/gconf.xml.defaults/
|
||||
@comment share/examples/gconf2/gconf/gconf.xml.mandatory/
|
||||
share/gtk-doc/
|
||||
share/gtk-doc/html/
|
||||
share/gtk-doc/html/gconf/
|
||||
@ -156,6 +156,9 @@ share/locale/pt/LC_MESSAGES/GConf2.mo
|
||||
share/locale/pt_BR/LC_MESSAGES/GConf2.mo
|
||||
share/locale/ro/LC_MESSAGES/GConf2.mo
|
||||
share/locale/ru/LC_MESSAGES/GConf2.mo
|
||||
share/locale/rw/
|
||||
share/locale/rw/LC_MESSAGES/
|
||||
share/locale/rw/LC_MESSAGES/GConf2.mo
|
||||
share/locale/sk/LC_MESSAGES/GConf2.mo
|
||||
share/locale/sl/LC_MESSAGES/GConf2.mo
|
||||
share/locale/sq/
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user