Update to 0.15.0

This update itself doesn't change anything that effects OpenBSD but I wanted to sync the port with the current version (that has been out for quite some time). This port once again builds and statically links against its own internal glib sources rather than pull in glib-1.2 from ports. It seemed kinda silly to build glib-1.2 to build glib-2.0 apps.
2003-09-23 05:59:34 +00:00 · 2003-09-23 05:59:34 +00:00 · 76c569d7a1
commit 76c569d7a1
parent f8cdd6d972
7 changed files with 34 additions and 107 deletions
--- a/devel/pkgconfig/Makefile
+++ b/devel/pkgconfig/Makefile
@ -1,15 +1,14 @@
-# $OpenBSD: Makefile,v 1.12 2003/01/11 05:53:03 marcm Exp $
+# $OpenBSD: Makefile,v 1.13 2003/09/23 05:59:34 marcm Exp $

 COMMENT=		"tool for managing library compile/link flags"

-VERSION=		0.14.0
+VERSION=		0.15.0
 DISTNAME=		pkgconfig-${VERSION}
-PKGNAME=		pkgconfig-${VERSION}p1
 CATEGORIES=		devel

 HOMEPAGE=		http://www.freedesktop.org/software/pkgconfig/
 MASTER_SITES=		${HOMEPAGE}releases/ \
-			${MASTER_SITE_GNOME:=sources/pkgconfig/0.14/}
+			${MASTER_SITE_GNOME:=sources/pkgconfig/0.15/}

 MAINTAINER=		Marc Matteo <marcm@openbsd.org>

@ -19,10 +18,6 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-BUILD_DEPENDS=		:glib->=1.2.8:devel/glib
-
-CONFIGURE_STYLE=	autoconf
-CONFIGURE_ARGS+=	--with-installed-glib
-CONFIGURE_ARGS+=	--no-recursion
+CONFIGURE_STYLE=	gnu

 .include <bsd.port.mk>
--- a/devel/pkgconfig/distinfo
+++ b/devel/pkgconfig/distinfo
@ -1,3 +1,3 @@
-MD5 (pkgconfig-0.14.0.tar.gz) = 317a7c4003536cb64f4c64ff64f51dc8
-RMD160 (pkgconfig-0.14.0.tar.gz) = e4c8b23b5249c009cd14e992d3e7493651201d41
-SHA1 (pkgconfig-0.14.0.tar.gz) = 1d2d7eb9ea8c2f230a97fb6399232e5585a57090
+MD5 (pkgconfig-0.15.0.tar.gz) = a7e4f60a6657dbc434334deb594cc242
+RMD160 (pkgconfig-0.15.0.tar.gz) = a005e54718dd5de5655aacc111520b13ba18bbb4
+SHA1 (pkgconfig-0.15.0.tar.gz) = 1019c8027c0cf94bca680886f4e2ae4e629a2a97
--- a/devel/pkgconfig/patches/patch-Makefile_in
+++ b/devel/pkgconfig/patches/patch-Makefile_in
@ -1,6 +1,6 @@
-$OpenBSD: patch-Makefile_in,v 1.2 2003/01/11 05:53:03 marcm Exp $
--- Makefile.in.orig	Thu Oct 10 14:19:02 2002
-+++ Makefile.in	Fri Jan 10 13:10:25 2003
+$OpenBSD: patch-Makefile_in,v 1.3 2003/09/23 05:59:34 marcm Exp $
+--- Makefile.in.orig	2003-09-05 11:18:51.000000000 -0700
+++ Makefile.in	2003-09-05 11:19:15.000000000 -0700
@@ -117,7 +117,7 @@ bin_PROGRAMS =  pkg-config$(EXEEXT)
 PROGRAMS =  $(bin_PROGRAMS)
 
@ -10,19 +10,3 @@ $OpenBSD: patch-Makefile_in,v 1.2 2003/01/11 05:53:03 marcm Exp $
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
-@@ -479,12 +479,12 @@ distdir: $(DISTFILES)
- 	done
- findme.o: findme.c config.h findme.h
- main.o: main.c config.h pkg.h partial-glib.h glib-1.2.8/glib.h \
-	glib-1.2.8/glibconfig.h parse.h popt.h
-+	parse.h popt.h
- parse.o: parse.c config.h parse.h pkg.h partial-glib.h glib-1.2.8/glib.h \
-	glib-1.2.8/glibconfig.h popt.h
-+	popt.h
- partial-glib.o: partial-glib.c
- pkg.o: pkg.c config.h pkg.h partial-glib.h glib-1.2.8/glib.h \
-	glib-1.2.8/glibconfig.h parse.h
-+	parse.h
- popt.o: popt.c config.h findme.h popt.h poptint.h
- poptconfig.o: poptconfig.c config.h popt.h poptint.h
- popthelp.o: popthelp.c config.h popt.h poptint.h
--- a/devel/pkgconfig/patches/patch-aclocal_m4
+++ b/devel/pkgconfig/patches/patch-aclocal_m4
@ -1,25 +0,0 @@
-$OpenBSD: patch-aclocal_m4,v 1.1 2002/12/11 17:17:08 marcm Exp $
--- aclocal.m4.orig	Fri Dec  6 09:42:50 2002
-+++ aclocal.m4	Fri Dec  6 09:43:34 2002
-@@ -1808,8 +1808,8 @@ else
-     hardcode_direct=yes
-     hardcode_shlibpath_var=no
-     if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+      hardcode_libdir_flag_spec='${wl}-R$libdir'
-       export_dynamic_flag_spec='${wl}-E'
-     else
-       case "$host_os" in
-@@ -1818,8 +1818,8 @@ else
- 	hardcode_libdir_flag_spec='-R$libdir'
-         ;;
-       *)
-        archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
-        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+        archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+        hardcode_libdir_flag_spec='${wl}-R$libdir'
-         ;;
-       esac
-     fi
--- a/devel/pkgconfig/patches/patch-configure
+++ b/devel/pkgconfig/patches/patch-configure
@ -0,0 +1,19 @@
+$OpenBSD: patch-configure,v 1.1 2003/09/23 05:59:34 marcm Exp $
+--- configure.orig	2003-09-05 11:24:10.000000000 -0700
+++ configure	2003-09-05 11:24:38.000000000 -0700
+@@ -3479,13 +3479,13 @@ else
+     hardcode_direct=yes
+     hardcode_shlibpath_var=no
+     if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
+      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+       hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+       export_dynamic_flag_spec='${wl}-E'
+     else
+       case "$host_os" in
+       openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+-	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $compiler_flags'
+ 	hardcode_libdir_flag_spec='-R$libdir'
+         ;;
+       *)
--- a/devel/pkgconfig/patches/patch-configure_in
+++ b/devel/pkgconfig/patches/patch-configure_in
@ -1,46 +0,0 @@
-$OpenBSD: patch-configure_in,v 1.2 2003/01/03 05:28:59 marcm Exp $
--- configure.in.orig	Thu Oct 10 14:17:08 2002
-+++ configure.in	Thu Jan  2 21:17:33 2003
-@@ -6,6 +6,9 @@ AM_MAINTAINER_MODE
- 
- AM_CONFIG_HEADER(config.h)
- 
-+AC_ARG_WITH(installed-glib,
-+  [  --with-installed-glib   Use an installed glib])
-+
- AC_MSG_CHECKING([for Win32])
- case "$host" in
-   *-*-mingw*)
-@@ -14,11 +17,14 @@ case "$host" in
-   ;;
-   *)
-     native_win32=no
-+    if test x$with_installed_glib = xyes; then
-+      AC_DEFINE(USE_INSTALLED_GLIB, 1, [We are using an installed GLib])
-+    fi
-   ;;
- esac
- AC_MSG_RESULT([$native_win32])
- 
-AM_CONDITIONAL(USE_INSTALLED_GLIB, test x$native_win32 = xyes)
-+AM_CONDITIONAL(USE_INSTALLED_GLIB, test x$native_win32 = xyes || test x$with_installed_glib = xyes)
- 
- if test x$native_win32 = xyes; then
-   # On Win32, use the normal installed GLib.  Yes, this is a circular
-@@ -36,7 +42,15 @@ if test x$native_win32 = xyes; then
- 
-   AC_CONFIG_AUX_DIR(.)
- else
-  AC_CONFIG_SUBDIRS(glib-1.2.8)
-+  if test x$with_installed_glib = xyes; then
-+    GLIB_CFLAGS="-I$includedir/glib-1.2"
-+    GLIB_LIBS="-L$libdir -lglib -static"
-+
-+    AC_SUBST(GLIB_LIBS)
-+    AC_SUBST(GLIB_CFLAGS)
-+  else
-+    AC_CONFIG_SUBDIRS(glib-1.2.8)
-+  fi
- fi # !native_win32
- 
- AM_PROG_LIBTOOL
--- a/devel/pkgconfig/patches/patch-pkg_c
+++ b/devel/pkgconfig/patches/patch-pkg_c
@ -1,7 +1,7 @@
-$OpenBSD: patch-pkg_c,v 1.3 2003/01/02 19:23:05 marcm Exp $
--- pkg.c.orig	Thu Oct 10 14:14:59 2002
-+++ pkg.c	Wed Jan  1 19:07:15 2003
-@@ -334,6 +334,54 @@ get_package (const char *name)
+$OpenBSD: patch-pkg_c,v 1.4 2003/09/23 05:59:34 marcm Exp $
+--- pkg.c.orig	2003-01-16 13:07:09.000000000 -0800
+++ pkg.c	2003-09-05 11:19:25.000000000 -0700
+@@ -339,6 +339,54 @@ get_package (const char *name)
   return internal_get_package (name, TRUE, TRUE);
 }
 
@ -56,7 +56,7 @@ $OpenBSD: patch-pkg_c,v 1.3 2003/01/02 19:23:05 marcm Exp $
 static GSList*
 string_list_strip_duplicates (GSList *list)
 {
-@@ -923,6 +971,8 @@ get_multi_merged (GSList *pkgs, GetListF
+@@ -929,6 +977,8 @@ get_multi_merged (GSList *pkgs, GetListF
 
   g_slist_free (dups_list);