diff options
| author | Alexander Nedotsukov <bland@FreeBSD.org> | 2005-04-20 05:49:12 +0000 |
|---|---|---|
| committer | Alexander Nedotsukov <bland@FreeBSD.org> | 2005-04-20 05:49:12 +0000 |
| commit | b408b864424e3438910e746c203ca36d5b365321 (patch) | |
| tree | ee8133638d0419d7b951cff3e1256f454e15cf5c /x11-toolkits | |
| parent | - Bump PORTEPOCH as we had a rollback (diff) | |
Fix inter-library dependency on libgdk.
Reported by: krismail
Notes
Notes:
svn path=/head/; revision=133723
Diffstat (limited to 'x11-toolkits')
| -rw-r--r-- | x11-toolkits/gtk12/Makefile | 2 | ||||
| -rw-r--r-- | x11-toolkits/gtk12/files/patch-ag | 20 |
2 files changed, 13 insertions, 9 deletions
diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile index 143475a8f476..2467d239240c 100644 --- a/x11-toolkits/gtk12/Makefile +++ b/x11-toolkits/gtk12/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtk PORTVERSION= 1.2.10 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gtk+/1.2 diff --git a/x11-toolkits/gtk12/files/patch-ag b/x11-toolkits/gtk12/files/patch-ag index ad39358c9e18..ce3ac1f0c307 100644 --- a/x11-toolkits/gtk12/files/patch-ag +++ b/x11-toolkits/gtk12/files/patch-ag @@ -1,5 +1,5 @@ ---- gtk/Makefile.in.orig Fri Mar 2 19:49:26 2001 -+++ gtk/Makefile.in Tue Mar 6 11:04:35 2001 +--- gtk/Makefile.in.orig Mon Apr 2 12:14:13 2001 ++++ gtk/Makefile.in Wed Apr 20 14:32:17 2005 @@ -125,7 +125,7 @@ x_libs = @x_libs@ xinput_progs = @xinput_progs@ @@ -9,16 +9,20 @@ # -@@ -134,7 +134,7 @@ +@@ -134,10 +134,8 @@ lib_LTLIBRARIES = libgtk.la # libtool stuff: set version and export symbols for resolving -libgtkincludedir = $(includedir)/gtk-1.2/gtk +-libgtk_la_LDFLAGS = @STRIP_BEGIN@ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) -export-dynamic @GLIB_DEPLIBS@ @x_ldflags@ @x_libs@ -lm @STRIP_END@ +- +-# $(top_builddir)/gdk/libgdk.la +libgtkincludedir = $(includedir)/gtk - libgtk_la_LDFLAGS = @STRIP_BEGIN@ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) -export-dynamic @GLIB_DEPLIBS@ @x_ldflags@ @x_libs@ -lm @STRIP_END@ ++libgtk_la_LDFLAGS = @STRIP_BEGIN@ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) -export-dynamic @GLIB_DEPLIBS@ @x_ldflags@ @x_libs@ -lm $(top_builddir)/gdk/libgdk.la @STRIP_END@ - # $(top_builddir)/gdk/libgdk.la -@@ -190,8 +190,8 @@ + # + # setup source file variables +@@ -190,8 +188,8 @@ gen_sources = xgen-gdef xgen-gtbh xgen-gtbvc xgen-gtbic xgen-gtbec xgen-gmh xgen-gmc CLEANFILES = $(gen_sources) @@ -29,7 +33,7 @@ # -@@ -415,6 +415,7 @@ +@@ -415,6 +413,7 @@ $(INSTALL_DATA) $$p $(DESTDIR)$(gtkconfdir)/$$p; \ fi; fi; \ done @@ -37,7 +41,7 @@ uninstall-gtkconfDATA: @$(NORMAL_UNINSTALL) -@@ -1362,7 +1363,7 @@ +@@ -1362,7 +1361,7 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-gtkconfDATA \ uninstall-libgtkincludeHEADERS uninstall-local uninstall: uninstall-am |