summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/glib12/Makefile8
-rw-r--r--devel/glib12/distinfo2
-rw-r--r--devel/glib12/files/patch-ab6
-rw-r--r--devel/glib13/Makefile8
-rw-r--r--devel/glib13/distinfo2
-rw-r--r--devel/glib13/files/patch-ab6
-rw-r--r--devel/glib20/Makefile8
-rw-r--r--devel/glib20/distinfo2
-rw-r--r--devel/glib20/files/patch-ab6
9 files changed, 21 insertions, 27 deletions
diff --git a/devel/glib12/Makefile b/devel/glib12/Makefile
index 7992787f2356..6189f0c6c857 100644
--- a/devel/glib12/Makefile
+++ b/devel/glib12/Makefile
@@ -3,10 +3,10 @@
# Date Created: 28 July 1998
# Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG>
#
-# $Id: Makefile,v 1.17 1999/02/17 18:12:08 vanilla Exp $
+# $Id: Makefile,v 1.18 1999/03/09 01:08:52 nectar Exp $
#
-DISTNAME= glib-1.2.0
+DISTNAME= glib-1.2.1
CATEGORIES= devel
MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.2/ \
ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
@@ -15,14 +15,12 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.2/ \
MAINTAINER= vanilla@FreeBSD.ORG
GNU_CONFIGURE= yes
-
CONFIGURE_ARGS= --includedir=${PREFIX}/include/glib12
-
MAN1= glib12-config.1
post-install:
@if [ ! -f ${PREFIX}/info/dir ]; then \
- ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
+ ${SED} -ne '1,/Menu:/p' ${PREFIX}/info/dir > ${PREFIX}/info/dir; \
fi
@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
diff --git a/devel/glib12/distinfo b/devel/glib12/distinfo
index 3339035c5518..9e63954e8582 100644
--- a/devel/glib12/distinfo
+++ b/devel/glib12/distinfo
@@ -1 +1 @@
-MD5 (glib-1.2.0.tar.gz) = b19f308dbbd393b6199e743cb1c648a1
+MD5 (glib-1.2.1.tar.gz) = 0112ac41fcda09f009982559a382f04d
diff --git a/devel/glib12/files/patch-ab b/devel/glib12/files/patch-ab
index 0ae004d00c11..49afbe61d07b 100644
--- a/devel/glib12/files/patch-ab
+++ b/devel/glib12/files/patch-ab
@@ -45,7 +45,7 @@
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
--CONFIG_CLEAN_FILES = glib.spec glib-config
+-CONFIG_CLEAN_FILES = glib.spec glibconfig.h.win32 glib-config
+CONFIG_CLEAN_FILES = glib12-config
LTLIBRARIES = $(lib_LTLIBRARIES)
@@ -250,8 +250,8 @@
-man_MANS = glib-config.1
+man_MANS = glib12-config.1
--EXTRA_DIST = glib-config.1 glib.html glib_toc.html
-+EXTRA_DIST = glib12-config.1 glib.html glib_toc.html
+-EXTRA_DIST = glib-config.1.in glib.html glib_toc.html
++EXTRA_DIST = glib12-config.1.in glib.html glib_toc.html
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h
diff --git a/devel/glib13/Makefile b/devel/glib13/Makefile
index 7992787f2356..6189f0c6c857 100644
--- a/devel/glib13/Makefile
+++ b/devel/glib13/Makefile
@@ -3,10 +3,10 @@
# Date Created: 28 July 1998
# Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG>
#
-# $Id: Makefile,v 1.17 1999/02/17 18:12:08 vanilla Exp $
+# $Id: Makefile,v 1.18 1999/03/09 01:08:52 nectar Exp $
#
-DISTNAME= glib-1.2.0
+DISTNAME= glib-1.2.1
CATEGORIES= devel
MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.2/ \
ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
@@ -15,14 +15,12 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.2/ \
MAINTAINER= vanilla@FreeBSD.ORG
GNU_CONFIGURE= yes
-
CONFIGURE_ARGS= --includedir=${PREFIX}/include/glib12
-
MAN1= glib12-config.1
post-install:
@if [ ! -f ${PREFIX}/info/dir ]; then \
- ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
+ ${SED} -ne '1,/Menu:/p' ${PREFIX}/info/dir > ${PREFIX}/info/dir; \
fi
@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
diff --git a/devel/glib13/distinfo b/devel/glib13/distinfo
index 3339035c5518..9e63954e8582 100644
--- a/devel/glib13/distinfo
+++ b/devel/glib13/distinfo
@@ -1 +1 @@
-MD5 (glib-1.2.0.tar.gz) = b19f308dbbd393b6199e743cb1c648a1
+MD5 (glib-1.2.1.tar.gz) = 0112ac41fcda09f009982559a382f04d
diff --git a/devel/glib13/files/patch-ab b/devel/glib13/files/patch-ab
index 0ae004d00c11..49afbe61d07b 100644
--- a/devel/glib13/files/patch-ab
+++ b/devel/glib13/files/patch-ab
@@ -45,7 +45,7 @@
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
--CONFIG_CLEAN_FILES = glib.spec glib-config
+-CONFIG_CLEAN_FILES = glib.spec glibconfig.h.win32 glib-config
+CONFIG_CLEAN_FILES = glib12-config
LTLIBRARIES = $(lib_LTLIBRARIES)
@@ -250,8 +250,8 @@
-man_MANS = glib-config.1
+man_MANS = glib12-config.1
--EXTRA_DIST = glib-config.1 glib.html glib_toc.html
-+EXTRA_DIST = glib12-config.1 glib.html glib_toc.html
+-EXTRA_DIST = glib-config.1.in glib.html glib_toc.html
++EXTRA_DIST = glib12-config.1.in glib.html glib_toc.html
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 7992787f2356..6189f0c6c857 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -3,10 +3,10 @@
# Date Created: 28 July 1998
# Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG>
#
-# $Id: Makefile,v 1.17 1999/02/17 18:12:08 vanilla Exp $
+# $Id: Makefile,v 1.18 1999/03/09 01:08:52 nectar Exp $
#
-DISTNAME= glib-1.2.0
+DISTNAME= glib-1.2.1
CATEGORIES= devel
MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.2/ \
ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
@@ -15,14 +15,12 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.2/ \
MAINTAINER= vanilla@FreeBSD.ORG
GNU_CONFIGURE= yes
-
CONFIGURE_ARGS= --includedir=${PREFIX}/include/glib12
-
MAN1= glib12-config.1
post-install:
@if [ ! -f ${PREFIX}/info/dir ]; then \
- ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
+ ${SED} -ne '1,/Menu:/p' ${PREFIX}/info/dir > ${PREFIX}/info/dir; \
fi
@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
index 3339035c5518..9e63954e8582 100644
--- a/devel/glib20/distinfo
+++ b/devel/glib20/distinfo
@@ -1 +1 @@
-MD5 (glib-1.2.0.tar.gz) = b19f308dbbd393b6199e743cb1c648a1
+MD5 (glib-1.2.1.tar.gz) = 0112ac41fcda09f009982559a382f04d
diff --git a/devel/glib20/files/patch-ab b/devel/glib20/files/patch-ab
index 0ae004d00c11..49afbe61d07b 100644
--- a/devel/glib20/files/patch-ab
+++ b/devel/glib20/files/patch-ab
@@ -45,7 +45,7 @@
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
--CONFIG_CLEAN_FILES = glib.spec glib-config
+-CONFIG_CLEAN_FILES = glib.spec glibconfig.h.win32 glib-config
+CONFIG_CLEAN_FILES = glib12-config
LTLIBRARIES = $(lib_LTLIBRARIES)
@@ -250,8 +250,8 @@
-man_MANS = glib-config.1
+man_MANS = glib12-config.1
--EXTRA_DIST = glib-config.1 glib.html glib_toc.html
-+EXTRA_DIST = glib12-config.1 glib.html glib_toc.html
+-EXTRA_DIST = glib-config.1.in glib.html glib_toc.html
++EXTRA_DIST = glib12-config.1.in glib.html glib_toc.html
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h