diff --git a/devel/glib/Makefile b/devel/glib/Makefile index ba26c78b588..f3c394b5d82 100644 --- a/devel/glib/Makefile +++ b/devel/glib/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.8 1999/03/26 01:55:53 marc Exp $ +# $OpenBSD: Makefile,v 1.9 1999/03/26 04:40:01 brad Exp $ -DISTNAME= glib-1.2.0 +DISTNAME= glib-1.2.1 CATEGORIES= devel NEED_VERSION= 1.73 diff --git a/devel/glib/files/md5 b/devel/glib/files/md5 index d7b0da73983..c759aac6fd6 100644 --- a/devel/glib/files/md5 +++ b/devel/glib/files/md5 @@ -1,3 +1,3 @@ -MD5 (glib-1.2.0.tar.gz) = b19f308dbbd393b6199e743cb1c648a1 -RMD160 (glib-1.2.0.tar.gz) = 07a3add3bb429bf6070a28fc1c69081ce382186f -SHA1 (glib-1.2.0.tar.gz) = b279a5b09e064fd4d9e8799fa702fe9ce24fc012 +MD5 (glib-1.2.1.tar.gz) = 0112ac41fcda09f009982559a382f04d +RMD160 (glib-1.2.1.tar.gz) = bd4da90878a323a6b1c0b4fa430653684e2f84e7 +SHA1 (glib-1.2.1.tar.gz) = 27e5b2134ba81d2037a3c5f1241fc7042ae0869e diff --git a/devel/glib/patches/patch-aa b/devel/glib/patches/patch-aa index 7fced1ffda3..695f00899b0 100644 --- a/devel/glib/patches/patch-aa +++ b/devel/glib/patches/patch-aa @@ -1,6 +1,6 @@ ---- Makefile.in.orig Tue Mar 16 15:30:56 1999 -+++ Makefile.in Tue Mar 16 15:31:14 1999 -@@ -113,7 +113,7 @@ +--- Makefile.in.orig Thu Mar 25 21:49:17 1999 ++++ Makefile.in Thu Mar 25 21:49:48 1999 +@@ -117,7 +117,7 @@ configinclude_DATA = glibconfig.h diff --git a/devel/glib/patches/patch-ab b/devel/glib/patches/patch-ab index 4b54fd75385..1c949e5c023 100644 --- a/devel/glib/patches/patch-ab +++ b/devel/glib/patches/patch-ab @@ -1,6 +1,6 @@ ---- gmodule/Makefile.in.orig Tue Mar 16 15:29:01 1999 -+++ gmodule/Makefile.in Tue Mar 16 15:29:33 1999 -@@ -103,7 +103,7 @@ +--- gmodule/Makefile.in.orig Thu Mar 25 21:50:33 1999 ++++ gmodule/Makefile.in Thu Mar 25 21:50:58 1999 +@@ -107,7 +107,7 @@ lib_LTLIBRARIES = libgmodule.la libgplugin_a.la libgplugin_b.la libgmodule_la_SOURCES = gmodule.c diff --git a/devel/glib/patches/patch-ac b/devel/glib/patches/patch-ac index 314e6ca0b96..e7271a41aeb 100644 --- a/devel/glib/patches/patch-ac +++ b/devel/glib/patches/patch-ac @@ -1,6 +1,6 @@ ---- gthread/Makefile.in.orig Tue Mar 16 15:29:59 1999 -+++ gthread/Makefile.in Tue Mar 16 15:30:23 1999 -@@ -97,7 +97,7 @@ +--- gthread/Makefile.in.orig Thu Mar 25 21:51:41 1999 ++++ gthread/Makefile.in Thu Mar 25 21:51:52 1999 +@@ -101,7 +101,7 @@ lib_LTLIBRARIES = libgthread.la libgthread_la_SOURCES = gthread.c diff --git a/devel/glib/patches/patch-ad b/devel/glib/patches/patch-ad index 6615efd889c..c60cdb2f82f 100644 --- a/devel/glib/patches/patch-ad +++ b/devel/glib/patches/patch-ad @@ -1,6 +1,6 @@ ---- docs/Makefile.in.orig Tue Mar 16 15:31:39 1999 -+++ docs/Makefile.in Tue Mar 16 15:31:48 1999 -@@ -81,7 +81,7 @@ +--- docs/Makefile.in.orig Thu Mar 25 21:53:28 1999 ++++ docs/Makefile.in Thu Mar 25 21:53:41 1999 +@@ -84,7 +84,7 @@ LT_RELEASE = @LT_RELEASE@ LT_REVISION = @LT_REVISION@ MAINT = @MAINT@ diff --git a/devel/glib/patches/patch-ae b/devel/glib/patches/patch-ae index 664cc8fc2d0..46f34614a4c 100644 --- a/devel/glib/patches/patch-ae +++ b/devel/glib/patches/patch-ae @@ -1,6 +1,6 @@ ---- ltmain.sh.orig Tue Mar 16 15:54:50 1999 -+++ ltmain.sh Tue Mar 16 15:58:10 1999 -@@ -2633,40 +2633,6 @@ +--- ltmain.sh.orig Thu Mar 25 21:54:47 1999 ++++ ltmain.sh Thu Mar 25 21:55:03 1999 +@@ -3326,40 +3326,6 @@ # Exit here if they wanted silent mode. test "$show" = : && exit 0 @@ -10,10 +10,10 @@ - echo " $libdir" - done - echo -- echo "To link against installed libraries in a given directory, LIBDIR," -- echo "you must use the \`-LLIBDIR' flag during linking." -- echo -- echo " You will also need to do at least one of the following:" +- 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 \`-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" diff --git a/devel/glib/pkg/PLIST b/devel/glib/pkg/PLIST index a0233697126..a1b38bc60fd 100644 --- a/devel/glib/pkg/PLIST +++ b/devel/glib/pkg/PLIST @@ -19,4 +19,4 @@ include/glib.h include/gmodule.h @dirrm lib/glib/include @dirrm lib/glib -@exec [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -m /usr/local/lib +@exec /sbin/ldconfig -m %B