diff options
| author | Kirill Ponomarev <krion@FreeBSD.org> | 2004-04-08 07:55:00 +0000 |
|---|---|---|
| committer | Kirill Ponomarev <krion@FreeBSD.org> | 2004-04-08 07:55:00 +0000 |
| commit | 3605419cb67f5249789f2ad60afa1cdb6b86637e (patch) | |
| tree | 9accf54202c5203dea5b0f78bd99d9202dc44f6a /x11-toolkits | |
| parent | Update to 0.7.0, and unbreak. (diff) | |
- Resolve conflict with vim
PR: ports/65307
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=106475
Diffstat (limited to 'x11-toolkits')
| -rw-r--r-- | x11-toolkits/9libs/Makefile | 3 | ||||
| -rw-r--r-- | x11-toolkits/9libs/files/patch-include::Makefile.in | 17 | ||||
| -rw-r--r-- | x11-toolkits/9libs/pkg-message | 8 | ||||
| -rw-r--r-- | x11-toolkits/9libs/pkg-plist | 11 |
4 files changed, 34 insertions, 5 deletions
diff --git a/x11-toolkits/9libs/Makefile b/x11-toolkits/9libs/Makefile index fa7e42d13aab..f4304cb52b8b 100644 --- a/x11-toolkits/9libs/Makefile +++ b/x11-toolkits/9libs/Makefile @@ -26,4 +26,7 @@ MAN6= bitmap.6 regexp.6 BROKEN= "Does not compile on alpha or amd64" .endif +post-install: + @${SED} -e 's,%%PREFIX%%,${PREFIX},' ${PKGMESSAGE} + .include <bsd.port.post.mk> diff --git a/x11-toolkits/9libs/files/patch-include::Makefile.in b/x11-toolkits/9libs/files/patch-include::Makefile.in new file mode 100644 index 000000000000..f9a512601ead --- /dev/null +++ b/x11-toolkits/9libs/files/patch-include::Makefile.in @@ -0,0 +1,17 @@ +--- include/Makefile.in.orig Thu Apr 8 15:29:00 1999 ++++ include/Makefile.in Thu Apr 8 00:20:24 2004 +@@ -152,11 +152,11 @@ + + install-includeHEADERS: $(include_HEADERS) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(includedir) ++ $(mkinstalldirs) $(DESTDIR)$(includedir)/9libs + @list='$(include_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ +- echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p"; \ +- $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p; \ ++ echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/9libs/$$p"; \ ++ $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/9libs/$$p; \ + done + + uninstall-includeHEADERS: diff --git a/x11-toolkits/9libs/pkg-message b/x11-toolkits/9libs/pkg-message new file mode 100644 index 000000000000..0cf2ec7db374 --- /dev/null +++ b/x11-toolkits/9libs/pkg-message @@ -0,0 +1,8 @@ +The following headers files have been installed to: + +%%PREFIX%%/9libs + +frame.h libc.h libg.h regexp.h u.h + +Don't forget to include (-I%%PREFIX%%/9libs) when you +compile with this toolkit. diff --git a/x11-toolkits/9libs/pkg-plist b/x11-toolkits/9libs/pkg-plist index 9752ecdab4de..50f40589730b 100644 --- a/x11-toolkits/9libs/pkg-plist +++ b/x11-toolkits/9libs/pkg-plist @@ -1,8 +1,8 @@ -include/frame.h -include/libc.h -include/libg.h -include/regexp.h -include/u.h +include/9libs/frame.h +include/9libs/libc.h +include/9libs/libg.h +include/9libs/regexp.h +include/9libs/u.h lib/9libs/include/conf9libs.h lib/libXg.a lib/libXg.la @@ -12,3 +12,4 @@ lib/libplan9c.a lib/libplan9c.la @dirrm lib/9libs/include @dirrm lib/9libs +@dirrm include/9libs |