10 files changed, 56 insertions, 14 deletions

diff --git a/x11-toolkits/gtkextra/Makefile b/x11-toolkits/gtkextra/Makefile
index 5faebcff90d3..7adf4fd1561b 100644
--- a/x11-toolkits/gtkextra/Makefile
+++ b/x11-toolkits/gtkextra/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gtkextra
-PORTVERSION= 	0.99.10
+PORTVERSION= 	0.99.11
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://magnet.fsu.edu/~feiguin/gtk/src/
 DISTNAME=	${PORTNAME:S/gtk/gtk+/}-${PORTVERSION}
diff --git a/x11-toolkits/gtkextra/distinfo b/x11-toolkits/gtkextra/distinfo
index 03266d5c4682..6d4b6cb0d02d 100644
--- a/x11-toolkits/gtkextra/distinfo
+++ b/x11-toolkits/gtkextra/distinfo
@@ -1 +1 @@
-MD5 (gtk+extra-0.99.10.tar.gz) = 0f3541330bbf8ef08e5ec137001ed7ec
+MD5 (gtk+extra-0.99.11.tar.gz) = d5a8f94552b751ef48ad4758ebd0da11
diff --git a/x11-toolkits/gtkextra/files/patch-aa b/x11-toolkits/gtkextra/files/patch-aa
index 54fb21ee0c9f..4fd4fa921239 100644
--- a/x11-toolkits/gtkextra/files/patch-aa
+++ b/x11-toolkits/gtkextra/files/patch-aa
@@ -1,11 +1,11 @@
---- src/Makefile.in	2000/08/17 14:28:51	1.1
-+++ src/Makefile.in	2000/08/17 14:29:22
-@@ -122,7 +122,7 @@
+--- gtkextra/Makefile.in	2000/10/18 11:13:56	1.1
++++ gtkextra/Makefile.in	2000/10/18 11:14:01
+@@ -123,7 +123,7 @@
  
  lib_LTLIBRARIES = libgtkextra.la
  libgtkextra_la_SOURCES = $(gtkextra_c_sources)
 -libgtkextra_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE) 	-export-dynamic 	$(shell gtk-config --libs)
-+libgtkextra_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)	-export-dynamic 	$(shell gtk-config --libs)
++libgtkextra_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-export-dynamic 	$(shell gtk-config --libs)
  
  EXTRA_HEADERS =  
- EXTRA_DIST =  $(gtkextra_private_h_sources)
+ EXTRA_DIST =  $(gtkextra_private_h_sources) gtkextra.def makefile.msc
diff --git a/x11-toolkits/gtkextra/files/patch-ac b/x11-toolkits/gtkextra/files/patch-ac
new file mode 100644
index 000000000000..fb938cd224ff
--- /dev/null
+++ b/x11-toolkits/gtkextra/files/patch-ac
@@ -0,0 +1,20 @@
+--- Makefile.in	2000/10/18 11:24:38	1.1
++++ Makefile.in	2000/10/18 11:24:40
+@@ -117,7 +117,7 @@
+ 
+ 
+ m4datadir = $(datadir)/aclocal
+-m4data_DATA = gtk.m4
++m4data_DATA = gtk+extra.m4
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = config.h
+@@ -448,6 +448,8 @@
+ installdirs mostlyclean-generic distclean-generic clean-generic \
+ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+ 
++gtk+extra.m4:
++	cp gtk.m4 gtk+extra.m4
+ 
+ files:
+         @files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \
diff --git a/x11-toolkits/gtkextra/pkg-plist b/x11-toolkits/gtkextra/pkg-plist
index dca330d66778..c1c071643659 100644
--- a/x11-toolkits/gtkextra/pkg-plist
+++ b/x11-toolkits/gtkextra/pkg-plist
@@ -21,4 +21,5 @@ include/gtkextra/gtksheet.h
 lib/libgtkextra.a
 lib/libgtkextra.so
 lib/libgtkextra.so.10
+share/aclocal/gtk+extra.m4
 @dirrm include/gtkextra
diff --git a/x11-toolkits/gtkextra2/Makefile b/x11-toolkits/gtkextra2/Makefile
index 5faebcff90d3..7adf4fd1561b 100644
--- a/x11-toolkits/gtkextra2/Makefile
+++ b/x11-toolkits/gtkextra2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gtkextra
-PORTVERSION= 	0.99.10
+PORTVERSION= 	0.99.11
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://magnet.fsu.edu/~feiguin/gtk/src/
 DISTNAME=	${PORTNAME:S/gtk/gtk+/}-${PORTVERSION}
diff --git a/x11-toolkits/gtkextra2/distinfo b/x11-toolkits/gtkextra2/distinfo
index 03266d5c4682..6d4b6cb0d02d 100644
--- a/x11-toolkits/gtkextra2/distinfo
+++ b/x11-toolkits/gtkextra2/distinfo
@@ -1 +1 @@
-MD5 (gtk+extra-0.99.10.tar.gz) = 0f3541330bbf8ef08e5ec137001ed7ec
+MD5 (gtk+extra-0.99.11.tar.gz) = d5a8f94552b751ef48ad4758ebd0da11
diff --git a/x11-toolkits/gtkextra2/files/patch-aa b/x11-toolkits/gtkextra2/files/patch-aa
index 54fb21ee0c9f..4fd4fa921239 100644
--- a/x11-toolkits/gtkextra2/files/patch-aa
+++ b/x11-toolkits/gtkextra2/files/patch-aa
@@ -1,11 +1,11 @@
---- src/Makefile.in	2000/08/17 14:28:51	1.1
-+++ src/Makefile.in	2000/08/17 14:29:22
-@@ -122,7 +122,7 @@
+--- gtkextra/Makefile.in	2000/10/18 11:13:56	1.1
++++ gtkextra/Makefile.in	2000/10/18 11:14:01
+@@ -123,7 +123,7 @@
  
  lib_LTLIBRARIES = libgtkextra.la
  libgtkextra_la_SOURCES = $(gtkextra_c_sources)
 -libgtkextra_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE) 	-export-dynamic 	$(shell gtk-config --libs)
-+libgtkextra_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)	-export-dynamic 	$(shell gtk-config --libs)
++libgtkextra_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-export-dynamic 	$(shell gtk-config --libs)
  
  EXTRA_HEADERS =  
- EXTRA_DIST =  $(gtkextra_private_h_sources)
+ EXTRA_DIST =  $(gtkextra_private_h_sources) gtkextra.def makefile.msc
diff --git a/x11-toolkits/gtkextra2/files/patch-ac b/x11-toolkits/gtkextra2/files/patch-ac
new file mode 100644
index 000000000000..fb938cd224ff
--- /dev/null
+++ b/x11-toolkits/gtkextra2/files/patch-ac
@@ -0,0 +1,20 @@
+--- Makefile.in	2000/10/18 11:24:38	1.1
++++ Makefile.in	2000/10/18 11:24:40
+@@ -117,7 +117,7 @@
+ 
+ 
+ m4datadir = $(datadir)/aclocal
+-m4data_DATA = gtk.m4
++m4data_DATA = gtk+extra.m4
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = config.h
+@@ -448,6 +448,8 @@
+ installdirs mostlyclean-generic distclean-generic clean-generic \
+ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+ 
++gtk+extra.m4:
++	cp gtk.m4 gtk+extra.m4
+ 
+ files:
+         @files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \
diff --git a/x11-toolkits/gtkextra2/pkg-plist b/x11-toolkits/gtkextra2/pkg-plist
index dca330d66778..c1c071643659 100644
--- a/x11-toolkits/gtkextra2/pkg-plist
+++ b/x11-toolkits/gtkextra2/pkg-plist
@@ -21,4 +21,5 @@ include/gtkextra/gtksheet.h
 lib/libgtkextra.a
 lib/libgtkextra.so
 lib/libgtkextra.so.10
+share/aclocal/gtk+extra.m4
 @dirrm include/gtkextra