diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2012-10-04 16:13:00 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2012-10-04 16:13:00 +0000 |
| commit | e2756cb8359659a62a4b5b44143af8d741b3fae2 (patch) | |
| tree | 8db06bea383aeba6a65868bf99a46c3ba12cd8ec /java/sablevm-classpath/files/patch-include-Makefile.in | |
| parent | lower a bit more the minimal version to install it. (diff) | |
- Reset maintainership. See ports/164941.
- Fix conflicts with java/classpath. Note security provider configuration
is moved to ${PREFIX}/lib/security/SableVM.security. This file is always
loaded first because the short vendor name is SableVM. If it does not
exist, then classpath.security is loaded (java/security/Security.java).
- Reduce Makefile headers, add licenses, and convert to optionsNG.
Notes
Notes:
svn path=/head/; revision=305262
Diffstat (limited to 'java/sablevm-classpath/files/patch-include-Makefile.in')
| -rw-r--r-- | java/sablevm-classpath/files/patch-include-Makefile.in | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/java/sablevm-classpath/files/patch-include-Makefile.in b/java/sablevm-classpath/files/patch-include-Makefile.in new file mode 100644 index 000000000000..154d0b3be8a4 --- /dev/null +++ b/java/sablevm-classpath/files/patch-include-Makefile.in @@ -0,0 +1,55 @@ +--- include/Makefile.in.orig 2007-03-30 02:30:43.000000000 -0400 ++++ include/Makefile.in 2012-09-28 12:17:30.000000000 -0400 +@@ -59,7 +59,7 @@ + *) f=$$p;; \ + esac; + am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(includedir)" ++am__installdirs = "$(DESTDIR)$(pkgincludedir)" + includeHEADERS_INSTALL = $(INSTALL_HEADER) + HEADERS = $(include_HEADERS) + ETAGS = etags +@@ -271,7 +271,7 @@ + target_os = @target_os@ + target_vendor = @target_vendor@ + vm_classes = @vm_classes@ +-include_HEADERS = jni.h jni_md.h jawt.h jawt_md.h ++include_HEADERS = jawt.h jawt_md.h + DISTCLEANFILES = jni_md.h + ARG_JNI_JAVAH = -jni + ARG_CLASSPATH_JAVAH = -bootclasspath +@@ -470,20 +470,20 @@ + uninstall-info-am: + install-includeHEADERS: $(include_HEADERS) + @$(NORMAL_INSTALL) +- test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)" ++ test -z "$(pkgincludedir)" || $(mkdir_p) "$(DESTDIR)$(pkgincludedir)" + @list='$(include_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +- echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \ +- $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \ ++ echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \ ++ $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \ + done + + uninstall-includeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(include_HEADERS)'; for p in $$list; do \ + f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \ +- rm -f "$(DESTDIR)$(includedir)/$$f"; \ ++ echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \ + done + + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) +@@ -566,7 +566,7 @@ + @CREATE_JNI_HEADERS_FALSE@all-local: + all-am: Makefile $(HEADERS) config.h all-local + installdirs: +- for dir in "$(DESTDIR)$(includedir)"; do \ ++ for dir in "$(DESTDIR)$(pkgincludedir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done + install: install-am |