freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Reset maintainership. See ports/164941.

Browse Source 
- 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.
This commit is contained in:
Jung-uk Kim
2012-10-04 16:13:00 +00:00
parent e65d0885c0
commit e2756cb835
23 changed files with 375 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/sablevm-classpath/Makefile
+39 -36
View File
@@ -1,61 +1,64 @@
# ex:ts=8
# New ports collection makefile for: sablevm
# Date created: 26 Nov 2007
# Whom: Björn König <bkoenig@alpha-tierchen.de>
#
# Created by: Björn König <bkoenig@alpha-tierchen.de>
# $FreeBSD$
#
PORTNAME= sablevm-classpath
PORTVERSION= 1.13
PORTREVISION= 9
CATEGORIES= java
PORTREVISION= 10
CATEGORIES= java devel
MASTER_SITES= SF/sablevm/sablevm/${PORTVERSION}
MAINTAINER= bkoenig@alpha-tierchen.de
MAINTAINER= java@FreeBSD.org
COMMENT= Classpath of SableVM
LICENSE= GPLv2
BUILD_DEPENDS= jikes:${PORTSDIR}/java/jikes
OPTIONS= ZIP "Compress class library" ON \
GTK2 "Enable Gtk+ AWT peer" ON \
CAIRO "Use Cairo based Graphics2D" OFF
CONFLICTS= classpath-[0-9]*
USE_XORG= x11 ice xtst sm
GNU_CONFIGURE= yes
USE_GNOME= # empty
USE_GMAKE= yes
USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME}
USE_XORG= x11 ice xtst sm
WANT_GNOME= yes
PLIST_SUB+= PORTVERSION=${PORTVERSION}
CFLAGS+= -I${PREFIX}/include -L${PREFIX}/lib -I${LOCALBASE}/include -L${LOCALBASE}/lib
.include <bsd.port.pre.mk>
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS+=--disable-alsa --disable-dssi
.if defined(WITHOUT_ZIP)
CONFIGURE_ARGS+= --with-compressed-classes=no
PLIST_SUB+= WITHOUT_ZIP="" WITH_ZIP="@comment "
OPTIONS_DEFINE= CAIRO GTK2 ZIP
OPTIONS_DEFAULT=GTK2 ZIP
CAIRO_DESC= Use Cairo based Graphics2D
GTK2_DESC= Enable Gtk+ AWT peer
ZIP_DESC= Compress class library
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MGTK2}
USE_GNOME+= gtk20
PLIST_SUB+= GTK2=""
.if ${PORT_OPTIONS:MCAIRO}
CONFIGURE_ARGS+= --enable-gtk-cairo
.endif
.else
CONFIGURE_ARGS+= --disable-gtk-peer
PLIST_SUB+= GTK2="@comment "
.if ${PORT_OPTIONS:MCAIRO}
IGNORE=you need to enable the Gtk+ AWT peer in order to use Cairo based Graphics2D.
.endif
.endif
.if ${PORT_OPTIONS:MZIP}
CONFIGURE_ARGS+= --with-compressed-classes=zip
BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
PLIST_SUB+= WITHOUT_ZIP="@comment " WITH_ZIP=""
.endif
.if defined(WITHOUT_GTK2)
CONFIGURE_ARGS+= --disable-gtk-peer
PLIST_SUB+= GTK2="@comment "
.else
USE_GNOME+= gtk20
PLIST_SUB+= GTK2=""
.if defined(WITH_CAIRO)
CONFIGURE_ARGS+= --enable-gtk-cairo
.endif
CONFIGURE_ARGS+= --with-compressed-classes=no
PLIST_SUB+= WITHOUT_ZIP="" WITH_ZIP="@comment "
.endif
post-extract:
@${REINPLACE_CMD} -e 's,^\(include_HEADERS = \)jni.h jni_md.h \(.*\),\1\2,' \
${WRKSRC}/include/Makefile.in
post-patch:
@${CP} -f ${WRKSRC}/resource/java/security/classpath.security \
${WRKSRC}/resource/java/security/SableVM.security
.include <bsd.port.post.mk>
.include <bsd.port.mk>
java/sablevm-classpath/files/patch-include-Makefile.in
+55
View File
@@ -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
java/sablevm-classpath/files/patch-resource-Makefile.in
+11
View File
@@ -0,0 +1,11 @@
--- resource/Makefile.in.orig 2007-03-30 02:30:09.000000000 -0400
+++ resource/Makefile.in 2012-10-01 17:02:09.000000000 -0400
@@ -268,7 +268,7 @@
target_os = @target_os@
target_vendor = @target_vendor@
vm_classes = @vm_classes@
-security_DATA = java/security/classpath.security
+security_DATA = java/security/SableVM.security
securitydir = $(libdir)/security
all: all-am
java/sablevm-classpath/pkg-plist
+8 -7
View File
@@ -1,5 +1,5 @@
include/jawt.h
include/jawt_md.h
include/sablevm-classpath/jawt.h
include/sablevm-classpath/jawt_md.h
%%WITH_ZIP%%lib/sablevm/lib/libclasspath.jar
%%WITH_ZIP%%lib/sablevm/lib/resources.jar
%%WITH_ZIP%%lib/sablevm/jre/lib/libclasspath.jar
@@ -29,7 +29,7 @@ lib/sablevm-classpath/libjavautil.so
%%GTK2%%lib/sablevm-classpath/libjawtgnu-1.13.so
%%GTK2%%lib/sablevm-classpath/libjawtgnu.la
%%GTK2%%lib/sablevm-classpath/libjawtgnu.so
lib/security/classpath.security
lib/security/SableVM.security
%%WITH_ZIP%%%%DATADIR%%/libclasspath.jar
%%WITH_ZIP%%%%DATADIR%%/resources.jar
%%WITHOUT_ZIP%%%%DATADIR%%/META-INF/services/javax.sound.midi.spi.MidiDeviceProvider
@@ -5607,7 +5607,8 @@ lib/security/classpath.security
@dirrm %%DATADIR%%
@dirrmtry lib/security
@dirrm lib/sablevm-classpath
%%WITH_ZIP%%@dirrm lib/sablevm/lib
%%WITH_ZIP%%@dirrm lib/sablevm/jre/lib
%%WITH_ZIP%%@dirrm lib/sablevm/jre
%%WITH_ZIP%%@dirrm lib/sablevm
%%WITH_ZIP%%@dirrmtry lib/sablevm/lib
%%WITH_ZIP%%@dirrmtry lib/sablevm/jre/lib
%%WITH_ZIP%%@dirrmtry lib/sablevm/jre
%%WITH_ZIP%%@dirrmtry lib/sablevm
@dirrm include/sablevm-classpath