Install info & man page now.

3 files changed, 38 insertions, 29 deletions

diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 42ae5010284f..c9938f33c10b 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -3,7 +3,7 @@
 # Date Created:			28 July 1998
 # Whom:				Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.12 1999/01/05 00:56:06 vanilla Exp $
+# $Id: Makefile,v 1.13 1999/01/20 18:30:57 vanilla Exp $
 #
 
 DISTNAME=	glib-1.1.13
@@ -26,7 +26,12 @@ CONFIGURE_ARGS+=	--with-threads=none
 CONFIGURE_ARGS+=	--with-threads=uthread
 .endif
 
+MAN1=		glib-config.1
+
 post-install:
+	@if [ ! -f ${PREFIX}/info/dir ]; then \
+	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
+	 fi
 	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.post.mk>
diff --git a/devel/glib20/files/patch-ab b/devel/glib20/files/patch-ab
index a081d01c420a..6d81325c0f4f 100644
--- a/devel/glib20/files/patch-ab
+++ b/devel/glib20/files/patch-ab
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Mon Jan  4 17:47:12 1999
-+++ Makefile.in	Tue Jan  5 06:37:12 1999
-@@ -87,14 +87,12 @@
+--- Makefile.in.orig	Mon Jan 18 07:30:09 1999
++++ Makefile.in	Thu Jan 21 04:27:54 1999
+@@ -89,14 +89,12 @@
  RANLIB = @RANLIB@
  VERSION = @VERSION@
  
 -SUBDIRS = gmodule gthread docs tests
-+SUBDIRS = gmodule gthread
++SUBDIRS = gmodule gthread docs
  # alpha `automake' supports this better
  #SUBDIRS = . gmodule gthread docs tests
  
@@ -18,7 +18,7 @@
  
  INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@
  
-@@ -109,9 +107,9 @@
+@@ -111,9 +109,9 @@
  	makefile.msc		\
  	glibconfig.h.win32
  
@@ -30,7 +30,7 @@
  	garray.c	\
  	gcache.c	\
  	gcompletion.c	\
-@@ -139,28 +137,25 @@
+@@ -141,28 +139,25 @@
  	gutils.c
  
  include_HEADERS = \
@@ -66,7 +66,7 @@
  LTLIBRARIES =  $(lib_LTLIBRARIES)
  
  
-@@ -168,8 +163,8 @@
+@@ -170,8 +165,8 @@
  CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
  LIBS = @LIBS@
@@ -77,7 +77,7 @@
  gdate.lo gerror.lo ghash.lo ghook.lo giochannel.lo giounix.lo glist.lo \
  gmain.lo gmem.lo gmessages.lo gmutex.lo gnode.lo gprimes.lo grel.lo \
  gscanner.lo gslist.lo gstrfuncs.lo gstring.lo gtimer.lo gtree.lo \
-@@ -178,15 +173,15 @@
+@@ -180,15 +175,15 @@
  
  testglib_SOURCES = testglib.c
  testglib_OBJECTS =  testglib.o
@@ -96,7 +96,7 @@
  testgdateparser_LDFLAGS = 
  SCRIPTS =  $(bin_SCRIPTS)
  
-@@ -194,7 +189,7 @@
+@@ -196,7 +191,7 @@
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
  LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
  LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
@@ -105,7 +105,7 @@
  
  HEADERS =  $(include_HEADERS)
  
-@@ -208,8 +203,8 @@
+@@ -210,8 +205,8 @@
  
  TAR = tar
  GZIP = --best
@@ -116,7 +116,7 @@
  
  all: all-recursive-am all-am
  
-@@ -250,7 +245,10 @@
+@@ -252,7 +247,10 @@
  	-rm -f config.h
  
  maintainer-clean-hdr:
@@ -128,7 +128,7 @@
  	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
  
  mostlyclean-libLTLIBRARIES:
-@@ -316,8 +314,8 @@
+@@ -318,8 +316,8 @@
  
  maintainer-clean-libtool:
  
@@ -139,7 +139,7 @@
  
  mostlyclean-noinstPROGRAMS:
  
-@@ -359,44 +357,6 @@
+@@ -361,44 +359,6 @@
  	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
  	done
  
@@ -184,7 +184,7 @@
  install-includeHEADERS: $(include_HEADERS)
  	@$(NORMAL_INSTALL)
  	$(mkinstalldirs) $(DESTDIR)$(includedir)
-@@ -536,13 +496,13 @@
+@@ -538,13 +498,13 @@
  all-recursive-am: config.h
  	$(MAKE) all-recursive
  
@@ -201,7 +201,7 @@
  
  install-exec: install-exec-recursive install-exec-am
  	@$(NORMAL_INSTALL)
-@@ -618,8 +578,7 @@
+@@ -620,8 +580,7 @@
  maintainer-clean-libtool mostlyclean-noinstPROGRAMS \
  distclean-noinstPROGRAMS clean-noinstPROGRAMS \
  maintainer-clean-noinstPROGRAMS uninstall-binSCRIPTS install-binSCRIPTS \
@@ -211,9 +211,9 @@
  install-includeHEADERS install-data-recursive uninstall-data-recursive \
  install-exec-recursive uninstall-exec-recursive installdirs-recursive \
  uninstalldirs-recursive all-recursive check-recursive \
---- gmodule/Makefile.in.orig	Mon Jan  4 17:47:13 1999
-+++ gmodule/Makefile.in	Tue Jan  5 06:37:37 1999
-@@ -101,30 +101,29 @@
+--- gmodule/Makefile.in.orig	Mon Jan 18 07:30:13 1999
++++ gmodule/Makefile.in	Thu Jan 21 04:27:34 1999
+@@ -103,30 +103,29 @@
  include_HEADERS = \
  		gmodule.h
  
@@ -258,7 +258,7 @@
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../config.h
  CONFIG_CLEAN_FILES =  gmoduleconf.h
-@@ -135,17 +134,17 @@
+@@ -137,17 +136,17 @@
  CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
  LIBS = @LIBS@
@@ -283,7 +283,7 @@
  testgmodule_LDFLAGS = 
  CFLAGS = @CFLAGS@
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-@@ -161,10 +160,10 @@
+@@ -163,10 +162,10 @@
  
  TAR = tar
  GZIP = --best
@@ -297,7 +297,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .S .c .lo .o .s
-@@ -231,14 +230,14 @@
+@@ -233,14 +232,14 @@
  
  maintainer-clean-libtool:
  
@@ -318,7 +318,7 @@
  
  mostlyclean-noinstPROGRAMS:
  
-@@ -386,10 +385,10 @@
+@@ -388,10 +387,10 @@
  	  echo $$p; \
  	done
  
@@ -331,9 +331,9 @@
  	 if test -f $$p; then \
  	  echo "$(LIBTOOL)  --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \
  	  $(LIBTOOL)  --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \
---- gthread/Makefile.in.orig	Mon Jan  4 17:47:15 1999
-+++ gthread/Makefile.in	Tue Jan  5 06:37:46 1999
-@@ -93,19 +93,18 @@
+--- gthread/Makefile.in.orig	Mon Jan 18 07:30:16 1999
++++ gthread/Makefile.in	Thu Jan 21 04:27:34 1999
+@@ -95,19 +95,18 @@
  		gthread-nspr.c		\
  		gthread-none.c
  
@@ -360,7 +360,7 @@
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../config.h
  CONFIG_CLEAN_FILES = 
-@@ -116,13 +115,13 @@
+@@ -118,13 +117,13 @@
  CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
  LIBS = @LIBS@
@@ -377,7 +377,7 @@
  testgthread_LDFLAGS = 
  CFLAGS = @CFLAGS@
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-@@ -135,10 +134,10 @@
+@@ -137,10 +136,10 @@
  
  TAR = tar
  GZIP = --best
@@ -391,7 +391,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .S .c .lo .o .s
-@@ -213,8 +212,8 @@
+@@ -215,8 +214,8 @@
  
  maintainer-clean-libtool:
  
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index 776275ad31a7..623c216b34f1 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -2,6 +2,10 @@ bin/glib11d-config
 include/glib11d/glib.h
 include/glib11d/glibconfig.h
 include/glib11d/gmodule.h
+@unexec install-info --delete %D/info/glib.info %D/info/dir
+info/glib.info
+@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
+@exec install-info %D/info/glib.info %D/info/dir
 lib/libglib11d.a
 lib/libglib11d.la
 lib/libglib11d.so