aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/glib12/Makefile7
-rw-r--r--devel/glib12/files/patch-ab81
-rw-r--r--devel/glib12/pkg-plist1
-rw-r--r--x11-toolkits/gtk12/Makefile5
-rw-r--r--x11-toolkits/gtk12/files/patch-aa35
-rw-r--r--x11-toolkits/gtk12/files/patch-ab9
-rw-r--r--x11-toolkits/gtk12/files/patch-ah28
-rw-r--r--x11-toolkits/gtk12/files/patch-gtk.m411
-rw-r--r--x11-toolkits/gtk12/pkg-plist1
9 files changed, 56 insertions, 122 deletions
diff --git a/devel/glib12/Makefile b/devel/glib12/Makefile
index e460a19bbc6f..0f6806b5aa53 100644
--- a/devel/glib12/Makefile
+++ b/devel/glib12/Makefile
@@ -7,7 +7,7 @@
PORTNAME= glib
PORTVERSION= 1.2.10
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/glib/1.2
@@ -24,6 +24,9 @@ CONFIGURE_ARGS= --includedir=${PREFIX}/include/glib12
CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
-MAN1= glib12-config.1
+MAN1= glib-config.1
+
+post-install:
+ ${LN} -sf ${PREFIX}/bin/glib-config ${PREFIX}/bin/glib12-config
.include <bsd.port.mk>
diff --git a/devel/glib12/files/patch-ab b/devel/glib12/files/patch-ab
index 774c38934d1a..4d8702c68a86 100644
--- a/devel/glib12/files/patch-ab
+++ b/devel/glib12/files/patch-ab
@@ -1,11 +1,17 @@
---- Makefile.in.orig Thu Mar 15 09:48:50 2001
-+++ Makefile.in Mon May 21 21:23:16 2001
-@@ -39,3 +39,3 @@
+--- Makefile.in.orig Thu Mar 15 10:48:50 2001
++++ Makefile.in Wed Nov 20 14:39:44 2002
+@@ -37,7 +37,7 @@
+ DESTDIR =
+
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(prefix)/libdata/pkgconfig
pkgincludedir = $(includedir)/@PACKAGE@
-@@ -98,7 +98,7 @@
+
+ top_builddir = .
+@@ -96,9 +96,9 @@
+
+ AUTOMAKE_OPTIONS = 1.4
-SUBDIRS = . gmodule gthread docs tests
+SUBDIRS = . gmodule gthread docs
@@ -13,46 +19,44 @@
-configincludedir = $(pkglibdir)/include
+configincludedir = $(includedir)
--bin_SCRIPTS = glib-config
-+bin_SCRIPTS = glib@LT_RELEASE@-config
+ bin_SCRIPTS = glib-config
+
+@@ -114,7 +114,7 @@
+ libglib_la_SOURCES = garray.c gcache.c gcompletion.c gdataset.c gdate.c gerror.c ghash.c ghook.c giochannel.c giounix.c glist.c gmain.c gmem.c gmessages.c gmutex.c gnode.c gprimes.c grel.c gscanner.c gslist.c gstrfuncs.c gstring.c gtimer.c gtree.c gutils.c
-@@ -116,3 +116,3 @@
-glibincludedir = $(includedir)/glib-1.2
+glibincludedir = $(includedir)
glibinclude_HEADERS = glib.h
-@@ -136,3 +136,3 @@
+
+
+@@ -134,7 +134,7 @@
+ m4datadir = $(datadir)/aclocal
+ m4data_DATA = glib.m4
-pkgconfigdir = $(libdir)/pkgconfig
+pkgconfigdir = $(pkglibdir)
pkgconfig_DATA = glib.pc gmodule.pc gthread.pc
-@@ -141,3 +141,3 @@
- CONFIG_HEADER = config.h
--CONFIG_CLEAN_FILES = glib.spec glib-config glib.pc gmodule.pc \
-+CONFIG_CLEAN_FILES = glib.spec glib@LT_RELEASE@-config glib.pc gmodule.pc \
- gthread.pc
-@@ -242,3 +242,3 @@
- cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
--glib-config: $(top_builddir)/config.status glib-config.in
-+glib@LT_RELEASE@-config: $(top_builddir)/config.status glib@LT_RELEASE@-config.in
- cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-@@ -576,3 +576,3 @@
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -574,7 +574,7 @@
+ || exit 1; \
+ fi; \
done
- $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
+
garray.lo garray.o : garray.c glib.h glibconfig.h
-@@ -631,3 +631,3 @@
+ gcache.lo gcache.o : gcache.c glib.h glibconfig.h
+ gcompletion.lo gcompletion.o : gcompletion.c glib.h glibconfig.h
+@@ -629,7 +629,7 @@
+ uninstall-configincludeDATA uninstall-m4dataDATA \
+ uninstall-pkgconfigDATA uninstall-glibincludeHEADERS
uninstall: uninstall-recursive
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) \
+all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(DATA) \
$(HEADERS) config.h
-@@ -710,3 +710,5 @@
-
--glib-config: glib-config.in
-+glib@LT_RELEASE@-config.in: glib-config.in
-+ cp glib-config.in glib@LT_RELEASE@-config.in
-+
- glibconfig.h: stamp-gc-h
+ all-redirect: all-recursive-am
+ install-strip:
--- gmodule/Makefile.in.orig Fri Mar 2 17:37:21 2001
+++ gmodule/Makefile.in Tue Mar 6 09:24:01 2001
@@ -100,7 +100,7 @@
@@ -93,26 +97,3 @@
all-redirect: all-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
---- docs/Makefile.in.orig Tue Mar 6 09:13:07 2001
-+++ docs/Makefile.in Tue Mar 6 09:14:01 2001
-@@ -94,9 +94,9 @@
-
- info_TEXINFOS = glib.texi
-
--man_MANS = glib-config.1
-+man_MANS = glib@LT_RELEASE@-config.1
-
--EXTRA_DIST = glib-config.1.in glib.html glib_toc.html
-+EXTRA_DIST = glib@LT_RELEASE@-config.1.in glib.html glib_toc.html
-
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
-@@ -132,6 +132,8 @@
- glib.info: glib.texi
- glib.dvi: glib.texi
-
-+glib@LT_RELEASE@-config.1: glib-config.1
-+ cp glib-config.1 glib@LT_RELEASE@-config.1
-
- DVIPS = dvips
-
diff --git a/devel/glib12/pkg-plist b/devel/glib12/pkg-plist
index ec9d428aa6d9..c3b19a67d23a 100644
--- a/devel/glib12/pkg-plist
+++ b/devel/glib12/pkg-plist
@@ -1,3 +1,4 @@
+bin/glib-config
bin/glib12-config
include/glib12/glib.h
include/glib12/glibconfig.h
diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile
index 9badc1c9eb7d..dbfa68617322 100644
--- a/x11-toolkits/gtk12/Makefile
+++ b/x11-toolkits/gtk12/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtk
PORTVERSION= 1.2.10
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gtk+/1.2
@@ -30,12 +30,13 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
X_CFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
-MAN1= gtk12-config.1
+MAN1= gtk-config.1
pre-build:
${RM} -rf ${WRKSRC}/docs/gtk.info*
post-install:
@${MKDIR} ${PREFIX}/lib/gtk/themes/engines
+ @${LN} -sf ${PREFIX}/bin/gtk-config ${PREFIX}/bin/gtk12-config
.include <bsd.port.mk>
diff --git a/x11-toolkits/gtk12/files/patch-aa b/x11-toolkits/gtk12/files/patch-aa
index d88fd757f7ce..258db13435f7 100644
--- a/x11-toolkits/gtk12/files/patch-aa
+++ b/x11-toolkits/gtk12/files/patch-aa
@@ -1,33 +1,28 @@
---- Makefile.in.orig Sun Apr 1 22:14:07 2001
-+++ Makefile.in Mon May 21 20:01:41 2001
-@@ -37,3 +37,3 @@
+--- Makefile.in.orig Sun Apr 1 23:14:07 2001
++++ Makefile.in Wed Nov 20 14:56:58 2002
+@@ -35,7 +35,7 @@
+ DESTDIR =
+
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(prefix)/libdata/pkgconfig
pkgincludedir = $(includedir)/@PACKAGE@
-@@ -130,3 +130,3 @@
--bin_SCRIPTS = gtk-config
-+bin_SCRIPTS = gtk@LT_RELEASE@-config
+ top_builddir = .
+@@ -136,7 +136,7 @@
+ EXTRA_DIST = HACKING gtk+.spec.in gtk.m4 makecopyright TODO NEWS.pre-1-0 ChangeLog.pre-1-0 README.cvs-commits intl/libgettext.h intl/po2tbl.sed.in examples/aspectframe/Makefile examples/aspectframe/aspectframe.c examples/Makefile examples/README.1ST examples/extract.awk examples/extract.sh examples/base/Makefile examples/base/base.c examples/buttons/Makefile examples/buttons/buttons.c examples/buttons/info.xpm examples/calendar/Makefile examples/calendar/calendar.c examples/clist/Makefile examples/clist/clist.c examples/entry/Makefile examples/entry/entry.c examples/eventbox/Makefile examples/eventbox/eventbox.c examples/filesel/Makefile examples/filesel/filesel.c examples/gtkdial/Makefile examples/gtkdial/dial_test.c examples/gtkdial/gtkdial.c examples/gtkdial/gtkdial.h examples/helloworld/Makefile examples/helloworld/helloworld.c examples/helloworld2/Makefile examples/helloworld2/helloworld2.c examples/list/Makefile examples/list/list.c examples/menu/Makefile examples/menu/menu.c examples/menu/itemfactory.c examples/notebook/Makefile examples/notebook/notebook.c examples/packbox/Makefile examples/packbox/packbox.c examples/packer/Makefile examples/packer/pack.c examples/paned/Makefile examples/paned/paned.c examples/pixmap/Makefile examples/pixmap/pixmap.c examples/progressbar/Makefile examples/progressbar/progressbar.c examples/radiobuttons/Makefile examples/radiobuttons/radiobuttons.c examples/rangewidgets/Makefile examples/rangewidgets/rangewidgets.c examples/rulers/Makefile examples/rulers/rulers.c examples/scribble-simple/Makefile examples/scribble-simple/scribble-simple.c examples/scrolledwin/Makefile examples/scrolledwin/scrolledwin.c examples/selection/Makefile examples/selection/gettargets.c examples/selection/setselection.c examples/statusbar/Makefile examples/statusbar/statusbar.c examples/table/Makefile examples/table/table.c examples/text/Makefile examples/text/text.c examples/tictactoe/Makefile examples/tictactoe/tictactoe.c examples/tictactoe/tictactoe.h examples/tictactoe/ttt_test.c examples/tree/Makefile examples/tree/tree.c examples/wheelbarrow/Makefile examples/wheelbarrow/wheelbarrow.c examples/fixed/fixed.c examples/fixed/Makefile examples/frame/frame.c examples/frame/Makefile examples/spinbutton/spinbutton.c examples/spinbutton/Makefile examples/find-examples.sh gdk.pc.in gtk+.pc.in
-@@ -138,3 +138,3 @@
-pkgconfigdir = $(libdir)/pkgconfig
+pkgconfigdir = $(pkglibdir)
pkgconfig_DATA = gdk.pc gtk+.pc
-@@ -146,3 +146,3 @@
- CONFIG_HEADER = config.h
--CONFIG_CLEAN_FILES = gtk+.spec gtk-config gdk.pc gtk+.pc
-+CONFIG_CLEAN_FILES = gtk+.spec gtk@LT_RELEASE@-config gdk.pc gtk+.pc
- SCRIPTS = $(bin_SCRIPTS)
-@@ -208,3 +208,5 @@
- cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
--gtk-config: $(top_builddir)/config.status gtk-config.in
-+gtk@LT_RELEASE@-config.in: gtk-config.in
-+ cp gtk-config.in gtk@LT_RELEASE@-config.in
-+gtk@LT_RELEASE@-config: $(top_builddir)/config.status gtk@LT_RELEASE@-config.in
- cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-@@ -440,3 +442,2 @@
+
+ m4datadir = $(datadir)/aclocal
+@@ -438,7 +438,6 @@
+ || exit 1; \
+ fi; \
done
- $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
info-am:
+ info: info-recursive
+ dvi-am:
diff --git a/x11-toolkits/gtk12/files/patch-ab b/x11-toolkits/gtk12/files/patch-ab
index ffdba095a18b..620f9437519a 100644
--- a/x11-toolkits/gtk12/files/patch-ab
+++ b/x11-toolkits/gtk12/files/patch-ab
@@ -1,14 +1,5 @@
--- gtk-config.in.orig Sat Oct 21 18:20:40 2000
+++ gtk-config.in Tue Mar 6 10:11:59 2001
-@@ -12,7 +12,7 @@
- usage()
- {
- cat <<EOF
--Usage: gtk-config [OPTIONS] [LIBRARIES]
-+Usage: gtk@LT_RELEASE@-config [OPTIONS] [LIBRARIES]
- Options:
- [--prefix[=DIR]]
- [--exec-prefix[=DIR]]
@@ -91,7 +91,7 @@
fi
diff --git a/x11-toolkits/gtk12/files/patch-ah b/x11-toolkits/gtk12/files/patch-ah
index b0b87b71e8bc..fe8134b8f217 100644
--- a/x11-toolkits/gtk12/files/patch-ah
+++ b/x11-toolkits/gtk12/files/patch-ah
@@ -9,31 +9,3 @@
MKINSTALLDIRS = @MKINSTALLDIRS@
NM = @NM@
OBJDUMP = @OBJDUMP@
-@@ -128,7 +128,7 @@
-
- info_TEXINFOS = gdk.texi gtk.texi
-
--man_MANS = gtk-config.1
-+man_MANS = gtk@LT_RELEASE@-config.1
-
- TUTORIAL_FR_FILES = html/gtk_tut_fr-1.html html/gtk_tut_fr-2.html html/gtk_tut_fr-3.html html/gtk_tut_fr-4.html html/gtk_tut_fr-5.html html/gtk_tut_fr-6.html html/gtk_tut_fr-7.html html/gtk_tut_fr-8.html html/gtk_tut_fr-9.html html/gtk_tut_fr-10.html html/gtk_tut_fr-11.html html/gtk_tut_fr-12.html html/gtk_tut_fr-13.html html/gtk_tut_fr-14.html html/gtk_tut_fr-15.html html/gtk_tut_fr-16.html html/gtk_tut_fr-17.html html/gtk_tut_fr-18.html html/gtk_tut_fr-19.html html/gtk_tut_fr-20.html html/gtk_tut_fr-21.html html/gtk_tut_fr-22.html html/gtk_tut_fr-23.html html/gtk_tut_fr-24.html html/gtk_tut_fr.html text/gtk_tut_fr.txt
-
-@@ -146,7 +146,7 @@
-
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
--CONFIG_CLEAN_FILES = gtk-config.1
-+CONFIG_CLEAN_FILES = gtk@LT_RELEASE@-config.1
- TEXI2DVI = texi2dvi
- INFO_DEPS = gdk.info gtk.info
- DVIS = gdk.dvi gtk.dvi
-@@ -174,6 +174,9 @@
-
- gtk-config.1: $(top_builddir)/config.status gtk-config.1.in
- cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-+
-+gtk@LT_RELEASE@-config.1: gtk-config.1
-+ cp gtk-config.1 gtk@LT_RELEASE@-config.1
-
- gdk.info: gdk.texi
- gdk.dvi: gdk.texi
diff --git a/x11-toolkits/gtk12/files/patch-gtk.m4 b/x11-toolkits/gtk12/files/patch-gtk.m4
deleted file mode 100644
index 75c7b9213b8e..000000000000
--- a/x11-toolkits/gtk12/files/patch-gtk.m4
+++ /dev/null
@@ -1,11 +0,0 @@
---- gtk.m4.orig Fri Feb 9 22:56:43 2001
-+++ gtk.m4 Fri Feb 9 22:57:20 2001
-@@ -37,7 +37,7 @@
- fi
- fi
-
-- AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
-+ AC_PATH_PROG(GTK_CONFIG, gtk-config, gtk12-config, no)
- min_gtk_version=ifelse([$1], ,0.99.7,$1)
- AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
- no_gtk=""
diff --git a/x11-toolkits/gtk12/pkg-plist b/x11-toolkits/gtk12/pkg-plist
index d500e0da9953..6839e7b0c029 100644
--- a/x11-toolkits/gtk12/pkg-plist
+++ b/x11-toolkits/gtk12/pkg-plist
@@ -1,3 +1,4 @@
+bin/gtk-config
bin/gtk12-config
include/gtk12/gdk/gdk.h
include/gtk12/gdk/gdkcursors.h