diff --git a/devel/atlas/Makefile b/devel/atlas/Makefile index e8f831a7569..2af7f54056a 100644 --- a/devel/atlas/Makefile +++ b/devel/atlas/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.13 2007/09/16 02:52:57 merdely Exp $ +# $OpenBSD: Makefile,v 1.14 2009/01/09 17:43:38 naddy Exp $ COMMENT= C++ reference implementation of the Atlas protocol VERSION= 0.4.3.1 DISTNAME= Atlas-C++-${VERSION} -PKGNAME= ${DISTNAME:S/C++-//:L}p1 +PKGNAME= ${DISTNAME:S/C++-//:L}p2 SHARED_LIBS += Atlas 2.0 # .1.1 SHARED_LIBS += AtlasObjects 2.0 # .1.1 SHARED_LIBS += AtlasObjectsEntity 2.0 # .1.1 diff --git a/devel/atlas/patches/patch-atlas_m4 b/devel/atlas/patches/patch-atlas_m4 new file mode 100644 index 00000000000..15710b64f46 --- /dev/null +++ b/devel/atlas/patches/patch-atlas_m4 @@ -0,0 +1,12 @@ +$OpenBSD: patch-atlas_m4,v 1.1 2009/01/09 17:43:38 naddy Exp $ +--- atlas.m4.orig Fri Jan 9 17:04:25 2009 ++++ atlas.m4 Fri Jan 9 17:04:42 2009 +@@ -9,7 +9,7 @@ + dnl AM_PATH_ATLAS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) + dnl Test for Atlas, and define ATLAS_CFLAGS and ATLAS_LIBS + dnl +-AC_DEFUN(AM_PATH_ATLAS, ++AC_DEFUN([AM_PATH_ATLAS], + [dnl + dnl Get the cflags and libraries from the atlas-config script + dnl diff --git a/devel/libsigc++/Makefile b/devel/libsigc++/Makefile index 31f2320401a..6cb93069e0d 100644 --- a/devel/libsigc++/Makefile +++ b/devel/libsigc++/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2007/09/16 02:53:00 merdely Exp $ +# $OpenBSD: Makefile,v 1.19 2009/01/09 17:43:38 naddy Exp $ .if ${MACHINE_ARCH} == "hppa" BROKEN= signal-related bug? any program linked with this hangs @@ -7,7 +7,7 @@ BROKEN= signal-related bug? any program linked with this hangs COMMENT= callback framework for C++ DISTNAME= libsigc++-1.0.4 -PKGNAME= ${DISTNAME}p2 +PKGNAME= ${DISTNAME}p3 SHARED_LIBS= sigc 1.0 MODGNU_SHARED_LIBS= sigc '-no-undefined' diff --git a/devel/libsigc++/patches/patch-sigc++_Makefile_am b/devel/libsigc++/patches/patch-sigc++_Makefile_am index 103a8f01c29..5408804ca16 100644 --- a/devel/libsigc++/patches/patch-sigc++_Makefile_am +++ b/devel/libsigc++/patches/patch-sigc++_Makefile_am @@ -1,7 +1,7 @@ -$OpenBSD: patch-sigc++_Makefile_am,v 1.2 2001/10/24 12:54:37 shell Exp $ ---- sigc++/Makefile.am.orig Wed Oct 24 18:32:01 2001 -+++ sigc++/Makefile.am Wed Oct 24 18:32:11 2001 -@@ -14,7 +14,7 @@ +$OpenBSD: patch-sigc++_Makefile_am,v 1.3 2009/01/09 17:43:38 naddy Exp $ +--- sigc++/Makefile.am.orig Thu Oct 18 22:55:08 2001 ++++ sigc++/Makefile.am Fri Jan 9 18:29:19 2009 +@@ -14,7 +14,7 @@ libsigc_la_SOURCES= \ EXTRA_libsigc_la_SOURCES = sigc_res.rc libsigc_la_LDFLAGS = -version-info $(LIBSIGC_SO_VERSION) \ diff --git a/devel/libsigc++/patches/patch-sigc++_Makefile_in b/devel/libsigc++/patches/patch-sigc++_Makefile_in index 7cc644de925..92674683da6 100644 --- a/devel/libsigc++/patches/patch-sigc++_Makefile_in +++ b/devel/libsigc++/patches/patch-sigc++_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-sigc++_Makefile_in,v 1.2 2001/10/24 12:54:37 shell Exp $ ---- sigc++/Makefile.in.orig Wed Oct 24 18:32:52 2001 -+++ sigc++/Makefile.in Wed Oct 24 18:33:04 2001 -@@ -94,7 +94,7 @@ +$OpenBSD: patch-sigc++_Makefile_in,v 1.3 2009/01/09 17:43:38 naddy Exp $ +--- sigc++/Makefile.in.orig Tue Oct 23 13:40:58 2001 ++++ sigc++/Makefile.in Fri Jan 9 18:29:19 2009 +@@ -94,7 +94,7 @@ libsigc_la_SOURCES = object.cc scope.cc marsha EXTRA_libsigc_la_SOURCES = sigc_res.rc diff --git a/devel/libsigc++/patches/patch-sigc++_m4 b/devel/libsigc++/patches/patch-sigc++_m4 new file mode 100644 index 00000000000..175f91a6c87 --- /dev/null +++ b/devel/libsigc++/patches/patch-sigc++_m4 @@ -0,0 +1,12 @@ +$OpenBSD: patch-sigc++_m4,v 1.1 2009/01/09 17:43:38 naddy Exp $ +--- sigc++.m4.orig Fri Jan 9 18:30:18 2009 ++++ sigc++.m4 Fri Jan 9 18:30:34 2009 +@@ -5,7 +5,7 @@ dnl Test for Libsigc++, and define SIGC_CFLAGS and SIG + dnl to be used as follows: + dnl AM_PATH_SIGC(MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) + dnl +-AC_DEFUN(AM_PATH_SIGC, ++AC_DEFUN([AM_PATH_SIGC], + [dnl + dnl Get the cflags and libraries from the sigc-config script + dnl diff --git a/devel/smpeg/Makefile b/devel/smpeg/Makefile index 5b1fe72b082..b2a8a211905 100644 --- a/devel/smpeg/Makefile +++ b/devel/smpeg/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.27 2008/11/07 00:39:16 sthen Exp $ +# $OpenBSD: Makefile,v 1.28 2009/01/09 17:43:38 naddy Exp $ COMMENT= mpeg video player library with sound support DISTNAME= smpeg-0.4.4 -PKGNAME= ${DISTNAME}p6 +PKGNAME= ${DISTNAME}p7 SHARED_LIBS= smpeg 2.0 CATEGORIES= devel graphics diff --git a/devel/smpeg/patches/patch-configure b/devel/smpeg/patches/patch-configure index 2447b7c550e..57b4a5fdc31 100644 --- a/devel/smpeg/patches/patch-configure +++ b/devel/smpeg/patches/patch-configure @@ -1,6 +1,6 @@ -$OpenBSD: patch-configure,v 1.1 2001/06/28 00:56:58 pvalchev Exp $ ---- configure.orig Tue Apr 24 13:25:46 2001 -+++ configure Wed Jun 27 18:30:06 2001 +$OpenBSD: patch-configure,v 1.2 2009/01/09 17:43:38 naddy Exp $ +--- configure.orig Tue Apr 24 21:25:46 2001 ++++ configure Fri Jan 9 18:32:40 2009 @@ -2001,12 +2001,13 @@ else cat > conftest.$ac_ext <= $m echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext <= $m echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext <&6 diff --git a/devel/smpeg/patches/patch-smpeg_m4 b/devel/smpeg/patches/patch-smpeg_m4 new file mode 100644 index 00000000000..5288405d7e4 --- /dev/null +++ b/devel/smpeg/patches/patch-smpeg_m4 @@ -0,0 +1,12 @@ +$OpenBSD: patch-smpeg_m4,v 1.1 2009/01/09 17:43:38 naddy Exp $ +--- smpeg.m4.orig Fri Jan 9 18:35:03 2009 ++++ smpeg.m4 Fri Jan 9 18:35:50 2009 +@@ -10,7 +10,7 @@ dnl AM_PATH_SMPEG([MINIMUM-VERSION, [ACTION-IF-FOUND [ + ACTION-IF-NOT-FOUND]]]) + dnl Test for SMPEG, and define SMPEG_CFLAGS and SMPEG_LIBS + dnl +-AC_DEFUN(AM_PATH_SMPEG, ++AC_DEFUN([AM_PATH_SMPEG], + [dnl + dnl Get the cflags and libraries from the smpeg-config script + dnl diff --git a/graphics/aalib/Makefile b/graphics/aalib/Makefile index b6f55855c39..09f89d7a5cd 100644 --- a/graphics/aalib/Makefile +++ b/graphics/aalib/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.30 2008/04/03 12:42:45 jasper Exp $ +# $OpenBSD: Makefile,v 1.31 2009/01/09 17:43:38 naddy Exp $ COMMENT= ascii art library DISTNAME= aalib-1.4rc5 -PKGNAME= aalib-1.4 +PKGNAME= aalib-1.4p0 SHARED_LIBS= aa 2.0 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=aa-project/} diff --git a/graphics/aalib/patches/patch-aalib_m4 b/graphics/aalib/patches/patch-aalib_m4 new file mode 100644 index 00000000000..279b9cee811 --- /dev/null +++ b/graphics/aalib/patches/patch-aalib_m4 @@ -0,0 +1,12 @@ +$OpenBSD: patch-aalib_m4,v 1.1 2009/01/09 17:43:38 naddy Exp $ +--- aalib.m4.orig Fri Jan 9 16:59:17 2009 ++++ aalib.m4 Fri Jan 9 17:00:10 2009 +@@ -9,7 +9,7 @@ + dnl AM_PATH_AALIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) + dnl Test for AALIB, and define AALIB_CFLAGS and AALIB_LIBS + dnl +-AC_DEFUN(AM_PATH_AALIB, ++AC_DEFUN([AM_PATH_AALIB], + [dnl + dnl Get the cflags and libraries from the aalib-config script + dnl diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile index e70176b02f5..911c7878106 100644 --- a/graphics/gdk-pixbuf/Makefile +++ b/graphics/gdk-pixbuf/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.43 2007/11/28 21:36:26 naddy Exp $ +# $OpenBSD: Makefile,v 1.44 2009/01/09 17:43:39 naddy Exp $ COMMENT= GdkPixbuf graphics library DISTNAME= gdk-pixbuf-0.22.0 -PKGNAME= ${DISTNAME}p7 +PKGNAME= ${DISTNAME}p8 SHARED_LIBS= gdk_pixbuf 2.0 \ gdk_pixbuf_xlib 2.0 CATEGORIES= graphics diff --git a/graphics/gdk-pixbuf/patches/patch-gdk-pixbuf_m4 b/graphics/gdk-pixbuf/patches/patch-gdk-pixbuf_m4 new file mode 100644 index 00000000000..bedaa14e136 --- /dev/null +++ b/graphics/gdk-pixbuf/patches/patch-gdk-pixbuf_m4 @@ -0,0 +1,12 @@ +$OpenBSD: patch-gdk-pixbuf_m4,v 1.1 2009/01/09 17:43:39 naddy Exp $ +--- gdk-pixbuf.m4.orig Fri Jan 9 17:09:58 2009 ++++ gdk-pixbuf.m4 Fri Jan 9 17:10:13 2009 +@@ -9,7 +9,7 @@ + dnl AM_PATH_GDK_PIXBUF([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) + dnl Test for GDK_PIXBUF, and define GDK_PIXBUF_CFLAGS and GDK_PIXBUF_LIBS + dnl +-AC_DEFUN(AM_PATH_GDK_PIXBUF, ++AC_DEFUN([AM_PATH_GDK_PIXBUF], + [dnl + dnl Get the cflags and libraries from the gdk-pixbuf-config script + dnl diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile index 78c3dd0b64e..a4d628ab7e4 100644 --- a/graphics/imlib/Makefile +++ b/graphics/imlib/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.56 2007/12/19 21:30:53 bernd Exp $ +# $OpenBSD: Makefile,v 1.57 2009/01/09 17:43:39 naddy Exp $ # $FreeBSD: Makefile,v 1.45 1999/03/09 01:08:57 nectar Exp $ COMMENT= image manipulation library for X11 V= 1.9.14 DISTNAME= imlib-${V} -PKGNAME= imlib-${V}p6 +PKGNAME= imlib-${V}p7 SHARED_LIBS= Imlib 19.14 \ gdk_imlib 19.14 CATEGORIES= graphics devel diff --git a/graphics/imlib/patches/patch-imlib_m4 b/graphics/imlib/patches/patch-imlib_m4 new file mode 100644 index 00000000000..d7ab9e0af33 --- /dev/null +++ b/graphics/imlib/patches/patch-imlib_m4 @@ -0,0 +1,21 @@ +$OpenBSD: patch-imlib_m4,v 1.1 2009/01/09 17:43:39 naddy Exp $ +--- imlib.m4.orig Fri Jan 9 17:23:31 2009 ++++ imlib.m4 Fri Jan 9 17:23:57 2009 +@@ -6,7 +6,7 @@ + dnl AM_PATH_IMLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) + dnl Test for IMLIB, and define IMLIB_CFLAGS and IMLIB_LIBS + dnl +-AC_DEFUN(AM_PATH_IMLIB, ++AC_DEFUN([AM_PATH_IMLIB], + [dnl + dnl Get the cflags and libraries from the imlib-config script + dnl +@@ -164,7 +164,7 @@ int main () + ]) + + # Check for gdk-imlib +-AC_DEFUN(AM_PATH_GDK_IMLIB, ++AC_DEFUN([AM_PATH_GDK_IMLIB], + [dnl + dnl Get the cflags and libraries from the imlib-config script + dnl diff --git a/lang/librep/Makefile b/lang/librep/Makefile index 285cb3f75ae..ccb7bf0544e 100644 --- a/lang/librep/Makefile +++ b/lang/librep/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.30 2008/07/04 16:25:45 naddy Exp $ +# $OpenBSD: Makefile,v 1.31 2009/01/09 17:43:39 naddy Exp $ COMMENT= Emacs Lisp-like runtime library @@ -6,7 +6,7 @@ SHARED_ONLY= Yes VERSION= 0.16.2 DISTNAME= librep-${VERSION} -PKGNAME= ${DISTNAME}p7 +PKGNAME= ${DISTNAME}p8 SHARED_LIBS= rep 12.0 CATEGORIES= lang diff --git a/lang/librep/patches/patch-configure b/lang/librep/patches/patch-configure index edbdb8c9b47..d0f7ee09f45 100644 --- a/lang/librep/patches/patch-configure +++ b/lang/librep/patches/patch-configure @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure,v 1.3 2005/02/22 13:53:16 alek Exp $ ---- configure.orig Tue Feb 22 14:30:05 2005 -+++ configure Tue Feb 22 14:30:16 2005 -@@ -8896,6 +8896,7 @@ echo "configure:8896: checking for _nl_m +$OpenBSD: patch-configure,v 1.4 2009/01/09 17:43:39 naddy Exp $ +--- configure.orig Wed Feb 26 06:24:11 2003 ++++ configure Fri Jan 9 17:38:46 2009 +@@ -8896,6 +8896,7 @@ echo "configure:8896: checking for _nl_msg_cat_cntr" > if eval "test \"`echo '$''{'ac_cv_func__nl_msg_cat_cntr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else diff --git a/lang/librep/patches/patch-rep_m4 b/lang/librep/patches/patch-rep_m4 new file mode 100644 index 00000000000..38497e38d36 --- /dev/null +++ b/lang/librep/patches/patch-rep_m4 @@ -0,0 +1,12 @@ +$OpenBSD: patch-rep_m4,v 1.1 2009/01/09 17:43:39 naddy Exp $ +--- rep.m4.orig Fri Jan 9 17:39:49 2009 ++++ rep.m4 Fri Jan 9 17:40:01 2009 +@@ -4,7 +4,7 @@ dnl + dnl AM_PATH_REP([MINIMUM_VERSION]) + dnl Test for librep, define REP_VERSION, REP_CFLAGS, REP_LIBS and REP_EXECDIR + dnl +-AC_DEFUN(AM_PATH_REP, ++AC_DEFUN([AM_PATH_REP], + [dnl + AC_ARG_WITH(rep_prefix,[ --with-rep-prefix=PFX Prefix where rep is installed (optional)], + [rep_prefix="$withval"], [rep_prefix=""]) diff --git a/lang/librep/patches/patch-src_Makefile_in b/lang/librep/patches/patch-src_Makefile_in index c5826d4d18c..6628b12c0fd 100644 --- a/lang/librep/patches/patch-src_Makefile_in +++ b/lang/librep/patches/patch-src_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_Makefile_in,v 1.1 2006/01/03 22:19:26 alek Exp $ ---- src/Makefile.in.orig Mon Jan 2 23:32:03 2006 -+++ src/Makefile.in Mon Jan 2 23:32:21 2006 -@@ -57,7 +57,7 @@ all : librep.la $(DL_OBJS) check-dl rep +$OpenBSD: patch-src_Makefile_in,v 1.2 2009/01/09 17:43:39 naddy Exp $ +--- src/Makefile.in.orig Tue Dec 18 05:23:55 2001 ++++ src/Makefile.in Fri Jan 9 17:38:46 2009 +@@ -57,7 +57,7 @@ all : librep.la $(DL_OBJS) check-dl rep rep-config rep librep.la : $(OBJS) $(LIBOBJS) $(ALLOCA) $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) \ diff --git a/security/libmcrypt/Makefile b/security/libmcrypt/Makefile index 61eb4f6286f..f12ee4cb2ec 100644 --- a/security/libmcrypt/Makefile +++ b/security/libmcrypt/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.19 2007/09/15 23:29:58 merdely Exp $ +# $OpenBSD: Makefile,v 1.20 2009/01/09 17:43:39 naddy Exp $ COMMENT= interface to access block/stream encryption algorithms DISTNAME= libmcrypt-2.5.7 -PKGNAME= ${DISTNAME}p1 +PKGNAME= ${DISTNAME}p2 CATEGORIES= security SHARED_LIBS= mcrypt 8.7 MODGNU_SHARED_LIBS=mcrypt '' diff --git a/security/libmcrypt/patches/patch-lib_Makefile_in b/security/libmcrypt/patches/patch-lib_Makefile_in index 9a1ed77c55d..72942785cef 100644 --- a/security/libmcrypt/patches/patch-lib_Makefile_in +++ b/security/libmcrypt/patches/patch-lib_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-lib_Makefile_in,v 1.1 2005/12/24 22:32:53 sturm Exp $ ---- lib/Makefile.in.orig Sat Dec 24 23:05:02 2005 -+++ lib/Makefile.in Sat Dec 24 23:05:21 2005 -@@ -157,8 +157,7 @@ libmcrypt_la_SOURCES = mcrypt_extra.c mc +$OpenBSD: patch-lib_Makefile_in,v 1.2 2009/01/09 17:43:39 naddy Exp $ +--- lib/Makefile.in.orig Sat Mar 8 18:59:39 2003 ++++ lib/Makefile.in Fri Jan 9 17:30:15 2009 +@@ -157,8 +157,7 @@ libmcrypt_la_SOURCES = mcrypt_extra.c mcrypt.c bzero.c libmcrypt_la_LDFLAGS = \ diff --git a/security/libmcrypt/patches/patch-lib_libmcrypt_m4 b/security/libmcrypt/patches/patch-lib_libmcrypt_m4 new file mode 100644 index 00000000000..0d7430de929 --- /dev/null +++ b/security/libmcrypt/patches/patch-lib_libmcrypt_m4 @@ -0,0 +1,12 @@ +$OpenBSD: patch-lib_libmcrypt_m4,v 1.1 2009/01/09 17:43:39 naddy Exp $ +--- lib/libmcrypt.m4.orig Fri Jan 9 17:32:15 2009 ++++ lib/libmcrypt.m4 Fri Jan 9 17:32:32 2009 +@@ -14,7 +14,7 @@ dnl $id$ + dnl AM_PATH_LIBMCRYPT([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) + dnl Test for libmcrypt, and define LIBMCRYPT_CFLAGS and LIBMCRYPT_LIBS + dnl +-AC_DEFUN(AM_PATH_LIBMCRYPT, ++AC_DEFUN([AM_PATH_LIBMCRYPT], + [dnl + dnl Get the cflags and libraries from the libmcrypt-config script + dnl diff --git a/x11/gtkglarea/Makefile b/x11/gtkglarea/Makefile index d31e4b24b19..29750b7ef65 100644 --- a/x11/gtkglarea/Makefile +++ b/x11/gtkglarea/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.29 2008/09/16 21:15:53 jasper Exp $ +# $OpenBSD: Makefile,v 1.30 2009/01/09 17:43:39 naddy Exp $ COMMENT= OpenGL widget for GTK+ GUI toolkit DISTNAME= gtkglarea-1.2.2 -PKGNAME= ${DISTNAME}p3 +PKGNAME= ${DISTNAME}p4 SHARED_LIBS= gtkgl 1.2 CATEGORIES= x11 graphics MASTER_SITES= http://humppa.nl/distfiles/ diff --git a/x11/gtkglarea/patches/patch-Makefile.in b/x11/gtkglarea/patches/patch-Makefile.in index aed75621e6a..7a9fc5f29c7 100644 --- a/x11/gtkglarea/patches/patch-Makefile.in +++ b/x11/gtkglarea/patches/patch-Makefile.in @@ -1,6 +1,7 @@ ---- Makefile.in.orig Tue Feb 22 13:34:06 2000 -+++ Makefile.in Wed Mar 15 09:39:20 2000 -@@ -80,7 +80,7 @@ +$OpenBSD: patch-Makefile.in,v 1.2 2009/01/09 17:43:39 naddy Exp $ +--- Makefile.in.orig Tue Feb 22 19:34:06 2000 ++++ Makefile.in Fri Jan 9 17:17:02 2009 +@@ -80,7 +80,7 @@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ VERSION = @VERSION@ diff --git a/x11/gtkglarea/patches/patch-gtkgl_m4 b/x11/gtkglarea/patches/patch-gtkgl_m4 new file mode 100644 index 00000000000..54f037c7a98 --- /dev/null +++ b/x11/gtkglarea/patches/patch-gtkgl_m4 @@ -0,0 +1,12 @@ +$OpenBSD: patch-gtkgl_m4,v 1.1 2009/01/09 17:43:39 naddy Exp $ +--- gtkgl.m4.orig Fri Jan 9 17:18:57 2009 ++++ gtkgl.m4 Fri Jan 9 17:19:20 2009 +@@ -3,7 +3,7 @@ + + + # AM_PATH_GTKGL([ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]) +-AC_DEFUN(AM_PATH_GTKGL, ++AC_DEFUN([AM_PATH_GTKGL], + [ + AC_REQUIRE([AM_PATH_GTK]) + AC_PROVIDE([AM_PATH_GTKGL]) diff --git a/x11/xosd/Makefile b/x11/xosd/Makefile index 2d6d53151cd..877ceab4bb7 100644 --- a/x11/xosd/Makefile +++ b/x11/xosd/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.8 2007/09/15 20:04:28 merdely Exp $ +# $OpenBSD: Makefile,v 1.9 2009/01/09 17:43:39 naddy Exp $ COMMENT= displays text on your screen DISTNAME= xosd-2.2.12 -PKGNAME= ${DISTNAME}p2 +PKGNAME= ${DISTNAME}p3 SHARED_LIBS= xosd 4.12 CATEGORIES= x11 graphics HOMEPAGE= http://www.ignavus.net/software.html diff --git a/x11/xosd/patches/patch-configure b/x11/xosd/patches/patch-configure index 65b895db421..940b2c4176b 100644 --- a/x11/xosd/patches/patch-configure +++ b/x11/xosd/patches/patch-configure @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure,v 1.1.1.1 2004/11/11 05:16:29 jcs Exp $ ---- configure.orig Mon Sep 13 20:05:56 2004 -+++ configure Wed Nov 10 23:09:18 2004 -@@ -20708,7 +20708,7 @@ +$OpenBSD: patch-configure,v 1.2 2009/01/09 17:43:39 naddy Exp $ +--- configure.orig Tue Sep 14 03:05:56 2004 ++++ configure Fri Jan 9 17:36:13 2009 +@@ -20708,7 +20708,7 @@ done ;; esac fi @@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.1.1.1 2004/11/11 05:16:29 jcs Exp $ if test -n "$GTK_CONFIG"; then echo "$as_me:$LINENO: result: $GTK_CONFIG" >&5 -@@ -22143,7 +22143,7 @@ +@@ -22143,7 +22143,7 @@ done ;; esac fi @@ -19,7 +19,7 @@ $OpenBSD: patch-configure,v 1.1.1.1 2004/11/11 05:16:29 jcs Exp $ if test -n "$XMMS_CONFIG"; then echo "$as_me:$LINENO: result: $XMMS_CONFIG" >&5 -@@ -22380,7 +22380,7 @@ +@@ -22380,7 +22380,7 @@ done ;; esac fi diff --git a/x11/xosd/patches/patch-libxosd_m4 b/x11/xosd/patches/patch-libxosd_m4 new file mode 100644 index 00000000000..d0796440643 --- /dev/null +++ b/x11/xosd/patches/patch-libxosd_m4 @@ -0,0 +1,12 @@ +$OpenBSD: patch-libxosd_m4,v 1.1 2009/01/09 17:43:39 naddy Exp $ +--- libxosd.m4.orig Fri Jan 9 17:37:13 2009 ++++ libxosd.m4 Fri Jan 9 17:37:27 2009 +@@ -6,7 +6,7 @@ + dnl AM_PATH_LIBXOSD([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) + dnl Test to see if libxosd is installed, and define LIBXOSD_CFLAGS, LIBXOSDLIBS + dnl +-AC_DEFUN(AM_PATH_LIBXOSD, ++AC_DEFUN([AM_PATH_LIBXOSD], + [dnl + dnl Get the cflags and libraries from the xosd-config script + dnl