diff options
author | Ade Lovett <ade@FreeBSD.org> | 2001-05-23 00:49:11 +0000 |
---|---|---|
committer | Ade Lovett <ade@FreeBSD.org> | 2001-05-23 00:49:11 +0000 |
commit | ff4f18ab924209c55d3bb210a8fe04b9b350a447 (patch) | |
tree | 5ae62eebdd7b7debbc02193a74df18de0366c6a1 /devel/ORBit2 | |
parent | Add the gtk+ distfile for extraction purposes, rather than depending on (diff) |
Add pkgconfig support to most of the core of GNOME 1.4 and GTK+/GLIB 1.2
to make transitioning to GNOME/GTK+/GLIB a little easier.
Diffstat (limited to 'devel/ORBit2')
-rw-r--r-- | devel/ORBit2/Makefile | 3 | ||||
-rw-r--r-- | devel/ORBit2/files/patch-ab | 34 | ||||
-rw-r--r-- | devel/ORBit2/files/patch-ac | 37 | ||||
-rw-r--r-- | devel/ORBit2/pkg-plist | 2 |
4 files changed, 33 insertions, 43 deletions
diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile index 65b74f62eac1..00d1df496fcf 100644 --- a/devel/ORBit2/Makefile +++ b/devel/ORBit2/Makefile @@ -7,13 +7,16 @@ PORTNAME= ORBit PORTVERSION= 0.5.8 +PORTREVISION= 1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/ORBit MAINTAINER= gnome@FreeBSD.org +BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig USE_GMAKE= yes USE_GLIB= yes diff --git a/devel/ORBit2/files/patch-ab b/devel/ORBit2/files/patch-ab index b690fbea9a83..97ca1f138dc9 100644 --- a/devel/ORBit2/files/patch-ab +++ b/devel/ORBit2/files/patch-ab @@ -1,23 +1,21 @@ ---- Makefile.in.orig Thu Oct 12 11:06:49 2000 -+++ Makefile.in Thu Oct 12 13:28:39 2000 -@@ -97,3 +97,3 @@ +--- Makefile.in.orig Sun May 13 02:20:09 2001 ++++ Makefile.in Mon May 21 22:32:11 2001 +@@ -37,3 +37,3 @@ + pkgdatadir = $(datadir)/@PACKAGE@ +-pkglibdir = $(libdir)/@PACKAGE@ ++pkglibdir = $(prefix)/libdata/pkgconfig + pkgincludedir = $(includedir)/@PACKAGE@ +@@ -93,3 +93,2 @@ + YACC = @YACC@ +-pkglibdir = @pkglibdir@ + +@@ -97,3 +96,3 @@ -SUBDIRS = popt libIDL src test +SUBDIRS = popt libIDL src -@@ -114,3 +114,3 @@ - --DATA = $(m4data_DATA) $(pkgconfig_DATA) -+DATA = $(m4data_DATA) - -@@ -396,3 +396,3 @@ - --install-data-am: install-m4dataDATA install-pkgconfigDATA -+install-data-am: install-m4dataDATA - install-data: install-data-recursive -@@ -411,4 +411,3 @@ - installdirs-am: -- $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(m4datadir) \ -- $(DESTDIR)$(pkgconfigdir) -+ $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(m4datadir) +@@ -106,3 +105,3 @@ +-pkgconfigdir = $(libdir)/pkgconfig ++pkgconfigdir = $(pkglibdir) + pkgconfig_DATA = ORBit.pc diff --git a/devel/ORBit2/files/patch-ac b/devel/ORBit2/files/patch-ac index 8844d91f0bd5..62c710cfd460 100644 --- a/devel/ORBit2/files/patch-ac +++ b/devel/ORBit2/files/patch-ac @@ -39,42 +39,29 @@ -libORBitCosNaming_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) +libORBitCosNaming_la_LDFLAGS = -version-info 2:0:0 ---- libIDL/Makefile.in.orig Thu Oct 12 11:06:54 2000 -+++ libIDL/Makefile.in Thu Oct 12 13:30:30 2000 +--- libIDL/Makefile.in.orig Sun May 13 02:20:15 2001 ++++ libIDL/Makefile.in Mon May 21 22:33:45 2001 +@@ -42,3 +42,3 @@ + pkgdatadir = $(datadir)/@PACKAGE@ +-pkglibdir = $(libdir)/@PACKAGE@ ++pkglibdir = $(prefix)/libdata/pkgconfig + pkgincludedir = $(includedir)/@PACKAGE@ @@ -92,3 +92,3 @@ MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ +MAKEINFO = @MAKEINFO@ --no-split OBJDUMP = @OBJDUMP@ -@@ -122,4 +122,3 @@ +@@ -122,3 +122,3 @@ -libIDL_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) -- +libIDL_la_LDFLAGS = -version-info 2:0:0 -@@ -131,3 +130,3 @@ +@@ -131,6 +131,6 @@ -confexecdir = $(libdir) +confexecdir = $(sysconfdir) confexec_DATA = libIDLConf.sh -@@ -164,3 +163,3 @@ - TEXINFOS = libIDL.texi --DATA = $(confexec_DATA) $(m4data_DATA) $(pkgconfig_DATA) -+DATA = $(confexec_DATA) $(m4data_DATA) - -@@ -596,3 +595,3 @@ - install-data-am: install-info-am install-m4dataDATA \ -- install-pkgconfigDATA install-pkgincludeHEADERS -+ install-pkgincludeHEADERS - install-data: install-data-am -@@ -607,3 +606,3 @@ - uninstall: uninstall-am --all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) \ -+all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(SCRIPTS) \ - $(DATA) $(HEADERS) -@@ -615,4 +614,3 @@ - $(DESTDIR)$(infodir) $(DESTDIR)$(confexecdir) \ -- $(DESTDIR)$(m4datadir) $(DESTDIR)$(pkgconfigdir) \ -- $(DESTDIR)$(pkgincludedir) -+ $(DESTDIR)$(m4datadir) $(DESTDIR)$(pkgincludedir) +-pkgconfigdir = $(libdir)/pkgconfig ++pkgconfigdir = $(pkglibdir) + pkgconfig_DATA = libIDL.pc diff --git a/devel/ORBit2/pkg-plist b/devel/ORBit2/pkg-plist index bf59812aac78..1b03b0a0507e 100644 --- a/devel/ORBit2/pkg-plist +++ b/devel/ORBit2/pkg-plist @@ -93,6 +93,8 @@ lib/libORBitutil.so lib/libORBitutil.so.2 lib/libname-server.a lib/liborbit-c-backend.a +libdata/pkgconfig/ORBit.pc +libdata/pkgconfig/libIDL.pc share/aclocal/ORBit.m4 share/aclocal/libIDL.m4 @dirrm include/IIOP |