9 files changed, 255 insertions, 0 deletions
diff --git a/devel/glib/Makefile b/devel/glib/Makefile
new file mode 100644
index 00000000000..4a9c4193910
--- /dev/null
+++ b/devel/glib/Makefile
@@ -0,0 +1,18 @@
+# $NetBSD: Makefile,v 1.1.1.1 1998/08/19 09:29:25 agc Exp $
+# FreeBSD Id: Makefile,v 1.2 1998/08/06 14:55:12 vanilla Exp
+#
+
+DISTNAME=	glib-1.1.2
+CATEGORIES=	devel
+MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.1/ \
+		ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.1/ \
+		http://www.ameth.org/gimp/pub/gtk/v1.1/
+
+MAINTAINER=	packages@netbsd.org
+
+GNU_CONFIGURE=	yes
+
+CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/glib
+CONFIGURE_ENV+=		LIBTOOL="${LOCALBASE}/bin/libtool --install-la"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/glib/files/md5 b/devel/glib/files/md5
new file mode 100644
index 00000000000..0b6090e71e0
--- /dev/null
+++ b/devel/glib/files/md5
@@ -0,0 +1,3 @@
+$NetBSD: md5,v 1.1.1.1 1998/08/19 09:29:25 agc Exp $
+
+MD5 (glib-1.1.2.tar.gz) = 077a3789b3305e89b493571e07700e2c
diff --git a/devel/glib/patches/patch-aa b/devel/glib/patches/patch-aa
new file mode 100644
index 00000000000..5d2fda4cc93
--- /dev/null
+++ b/devel/glib/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1.1.1 1998/08/19 09:29:26 agc Exp $
+
+--- ltconfig.orig	Tue Jul 28 22:17:11 1998
++++ ltconfig	Tue Jul 28 22:17:28 1998
+@@ -798,7 +798,7 @@
+ 
+   # FreeBSD 3, at last, uses gcc -shared to do shared libraries.
+   freebsd3*)
+-    archive_cmds='$CC -shared -o $lib$libobjs'
++    archive_cmds='$LD -Bshareable -o $lib$libobjs /usr/lib/aout/c++rt0.o'
+     hardcode_libdir_flag_spec='-R$libdir'
+     hardcode_direct=yes
+     hardcode_minus_L=yes
diff --git a/devel/glib/patches/patch-ab b/devel/glib/patches/patch-ab
new file mode 100644
index 00000000000..43c22672eea
--- /dev/null
+++ b/devel/glib/patches/patch-ab
@@ -0,0 +1,157 @@
+$NetBSD: patch-ab,v 1.1.1.1 1998/08/19 09:29:26 agc Exp $
+
+Various Makefile.in mods
+
+--- Makefile.in.orig	Wed Aug  5 18:16:42 1998
++++ Makefile.in	Wed Aug 19 11:08:31 1998
+@@ -48,7 +48,7 @@
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
++INSTALL_SCRIPT = ${BSD_INSTALL_SCRIPT}
+ transform = @program_transform_name@
+ 
+ NORMAL_INSTALL = :
+@@ -77,17 +77,15 @@
+ RANLIB = @RANLIB@
+ VERSION = @VERSION@
+ 
+-configincludedir = $(pkglibdir)/include
+-
+ bin_SCRIPTS=glib-config
+ 
+ EXTRA_DIST =	\
+ 		glib.m4 \
+ 		glib.spec
+ 
+-lib_LTLIBRARIES = libglib-1.1.la
++lib_LTLIBRARIES = libglib11.la
+ 
+-libglib_1_1_la_SOURCES = \
++libglib11_la_SOURCES = \
+ 		garray.c	\
+ 		gcache.c	\
+ 		gcompletion.c	\
+@@ -109,17 +107,15 @@
+ 		gutils.c
+ 
+ include_HEADERS = \
+-		glib.h
+-
+-configinclude_DATA = \
++		glib.h \
+ 		glibconfig.h
+ 
+-libglib_1_1_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
++libglib11_la_LDFLAGS = -version-info 0:2:0
+ 
+ INCLUDES = -I$(top_srcdir)
+ 
+ noinst_PROGRAMS = testglib
+-testglib_LDADD = libglib-@LT_RELEASE@.la
++testglib_LDADD = libglib11.la
+ 
+ m4datadir = $(datadir)/aclocal
+ m4data_DATA = glib.m4
+@@ -134,8 +130,8 @@
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+ LIBS = @LIBS@
+-libglib_1_1_la_LIBADD = 
+-libglib_1_1_la_OBJECTS =  garray.lo gcache.lo gcompletion.lo gdataset.lo \
++libglib11_la_LIBADD = 
++libglib11_la_OBJECTS =  garray.lo gcache.lo gcompletion.lo gdataset.lo \
+ gerror.lo ghash.lo glist.lo gmem.lo gmessages.lo gnode.lo gprimes.lo \
+ gslist.lo gtimer.lo gtree.lo grel.lo gstring.lo gstrfuncs.lo \
+ gscanner.lo gutils.lo
+@@ -143,7 +139,7 @@
+ 
+ testglib_SOURCES = testglib.c
+ testglib_OBJECTS =  testglib.o
+-testglib_DEPENDENCIES =  libglib-@LT_RELEASE@.la
++testglib_DEPENDENCIES =  libglib11.la
+ testglib_LDFLAGS = 
+ SCRIPTS =  $(bin_SCRIPTS)
+ 
+@@ -151,7 +147,7 @@
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
+ LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
+-DATA =  $(configinclude_DATA) $(m4data_DATA)
++DATA =  $(m4data_DATA)
+ 
+ HEADERS =  $(include_HEADERS)
+ 
+@@ -165,8 +161,8 @@
+ 
+ TAR = tar
+ GZIP = --best
+-SOURCES = $(libglib_1_1_la_SOURCES) testglib.c
+-OBJECTS = $(libglib_1_1_la_OBJECTS) testglib.o
++SOURCES = $(libglib11_la_SOURCES) testglib.c
++OBJECTS = $(libglib11_la_OBJECTS) testglib.o
+ 
+ all: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) $(HEADERS) glibconfig.h
+ 
+@@ -273,8 +269,8 @@
+ 
+ maintainer-clean-libtool:
+ 
+-libglib-1.1.la: $(libglib_1_1_la_OBJECTS) $(libglib_1_1_la_DEPENDENCIES)
+-	$(LINK) -rpath $(libdir) $(libglib_1_1_la_LDFLAGS) $(libglib_1_1_la_OBJECTS) $(libglib_1_1_la_LIBADD) $(LIBS)
++libglib11.la: $(libglib11_la_OBJECTS) $(libglib11_la_DEPENDENCIES)
++	$(LINK) -rpath $(libdir) $(libglib11_la_LDFLAGS) $(libglib11_la_OBJECTS) $(libglib11_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-noinstPROGRAMS:
+ 
+@@ -308,25 +304,6 @@
+ 	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
+ 	done
+ 
+-install-configincludeDATA: $(configinclude_DATA)
+-	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(configincludedir)
+-	@list='$(configinclude_DATA)'; for p in $$list; do \
+-	  if test -f $(srcdir)/$$p; then \
+-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(configincludedir)/$$p"; \
+-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(configincludedir)/$$p; \
+-	  else if test -f $$p; then \
+-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(configincludedir)/$$p"; \
+-	    $(INSTALL_DATA) $$p $(DESTDIR)$(configincludedir)/$$p; \
+-	  fi; fi; \
+-	done
+-
+-uninstall-configincludeDATA:
+-	@$(NORMAL_UNINSTALL)
+-	list='$(configinclude_DATA)'; for p in $$list; do \
+-	  rm -f $(DESTDIR)$(configincludedir)/$$p; \
+-	done
+-
+ install-m4dataDATA: $(m4data_DATA)
+ 	@$(NORMAL_INSTALL)
+ 	$(mkinstalldirs) $(DESTDIR)$(m4datadir)
+@@ -457,13 +434,13 @@
+ install-exec: install-libLTLIBRARIES install-binSCRIPTS
+ 	@$(NORMAL_INSTALL)
+ 
+-install-data: install-configincludeDATA install-m4dataDATA install-includeHEADERS
++install-data: install-m4dataDATA install-includeHEADERS
+ 	@$(NORMAL_INSTALL)
+ 
+ install: install-exec install-data all
+ 	@:
+ 
+-uninstall: uninstall-libLTLIBRARIES uninstall-binSCRIPTS uninstall-configincludeDATA uninstall-m4dataDATA uninstall-includeHEADERS
++uninstall: uninstall-libLTLIBRARIES uninstall-binSCRIPTS uninstall-m4dataDATA uninstall-includeHEADERS
+ 
+ install-strip:
+ 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
+@@ -519,7 +496,6 @@
+ maintainer-clean-libtool mostlyclean-noinstPROGRAMS \
+ distclean-noinstPROGRAMS clean-noinstPROGRAMS \
+ maintainer-clean-noinstPROGRAMS uninstall-binSCRIPTS install-binSCRIPTS \
+-uninstall-configincludeDATA install-configincludeDATA \
+ uninstall-m4dataDATA install-m4dataDATA uninstall-includeHEADERS \
+ install-includeHEADERS tags mostlyclean-tags distclean-tags clean-tags \
+ maintainer-clean-tags distdir info dvi installcheck install-exec \
diff --git a/devel/glib/patches/patch-ac b/devel/glib/patches/patch-ac
new file mode 100644
index 00000000000..bfcfcbd1d61
--- /dev/null
+++ b/devel/glib/patches/patch-ac
@@ -0,0 +1,17 @@
+$NetBSD: patch-ac,v 1.1.1.1 1998/08/19 09:29:26 agc Exp $
+
+--- glib-config.in.orig	Thu Jun 11 07:21:14 1998
++++ glib-config.in	Thu Aug 13 17:46:26 1998
+@@ -42,10 +42,10 @@
+       if test @includedir@ != /usr/include ; then
+         includes=-I@includedir@
+       fi
+-      echo -I@libdir@/glib/include $includes
++      echo $includes
+       ;;
+     --libs)
+-      echo -L@libdir@ -lglib-@LT_RELEASE@
++      echo -L@libdir@ -lglib11
+       ;;
+     *)
+       echo "${usage}" 1>&2
diff --git a/devel/glib/patches/patch-ad b/devel/glib/patches/patch-ad
new file mode 100644
index 00000000000..361c3ce122b
--- /dev/null
+++ b/devel/glib/patches/patch-ad
@@ -0,0 +1,23 @@
+$NetBSD: patch-ad,v 1.1.1.1 1998/08/19 09:29:26 agc Exp $
+
+Use NetBSD's libtool pkg
+
+--- configure	1998/08/19 09:46:33	1.1
++++ configure	1998/08/19 09:47:07
+@@ -1258,6 +1258,7 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ 
++if false; then
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ 
+@@ -1303,6 +1304,8 @@
+ ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \
+ $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
+ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
++
++fi
+ 
+ 
+ echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
diff --git a/devel/glib/pkg/COMMENT b/devel/glib/pkg/COMMENT
new file mode 100644
index 00000000000..decf836a46f
--- /dev/null
+++ b/devel/glib/pkg/COMMENT
@@ -0,0 +1 @@
+Some useful routines for C programming.
diff --git a/devel/glib/pkg/DESCR b/devel/glib/pkg/DESCR
new file mode 100644
index 00000000000..e9d81338613
--- /dev/null
+++ b/devel/glib/pkg/DESCR
@@ -0,0 +1,14 @@
+GLib is a library which includes routines for C, providing lists,
+trees, hashes, memory allocation functionality and many other things.
+
+Versions of GLib prior to 1.1.0 are distributed with GTK+ versions 1.1.0
+and earlier.
+
+The official ftp site is:
+  ftp://ftp.gtk.org/pub/gtk
+
+The official web site is:
+  http://www.gtk.org/
+
+A mailing list is located at:
+  gtk-list@redhat.com
diff --git a/devel/glib/pkg/PLIST b/devel/glib/pkg/PLIST
new file mode 100644
index 00000000000..e19b4c02dfb
--- /dev/null
+++ b/devel/glib/pkg/PLIST
@@ -0,0 +1,9 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 1998/08/19 09:29:26 agc Exp $
+bin/glib-config
+include/glib/glib.h
+include/glib/glibconfig.h
+lib/libglib11.a
+lib/libglib11.la
+lib/libglib11.so.0.2
+share/aclocal/glib.m4
+@dirrm include/glib