Fri Jul 5 12:42:48 2013 UTC ()
PLIST and generation fixes for various options.


(jperkin)
diff -r1.13 -r1.14 pkgsrc/lang/erlang/PLIST
diff -r1.5 -r1.6 pkgsrc/lang/erlang/options.mk
cvs diff -r1.13 -r1.14 pkgsrc/lang/erlang/PLIST (expand / switch to unified diff)

--- pkgsrc/lang/erlang/PLIST 2013/06/08 06:48:24 1.13
+++ pkgsrc/lang/erlang/PLIST 2013/07/05 12:42:48 1.14
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.13 2013/06/08 06:48:24 asau Exp $ 1@comment $NetBSD: PLIST,v 1.14 2013/07/05 12:42:48 jperkin Exp $
2bin/ct_run 2bin/ct_run
3bin/dialyzer 3bin/dialyzer
4bin/epmd 4bin/epmd
5bin/erl 5bin/erl
6bin/erlc 6bin/erlc
7bin/escript 7bin/escript
8bin/run_erl 8bin/run_erl
9bin/to_erl 9bin/to_erl
10bin/typer 10bin/typer
11lib/erlang/Install 11lib/erlang/Install
12lib/erlang/bin/ct_run 12lib/erlang/bin/ct_run
13lib/erlang/bin/dialyzer 13lib/erlang/bin/dialyzer
14lib/erlang/bin/epmd 14lib/erlang/bin/epmd
@@ -2946,26 +2946,39 @@ lib/erlang/lib/observer-${VERSION.observ @@ -2946,26 +2946,39 @@ lib/erlang/lib/observer-${VERSION.observ
2946lib/erlang/lib/observer-${VERSION.observer}/src/observer_lib.erl 2946lib/erlang/lib/observer-${VERSION.observer}/src/observer_lib.erl
2947lib/erlang/lib/observer-${VERSION.observer}/src/observer_perf_wx.erl 2947lib/erlang/lib/observer-${VERSION.observer}/src/observer_perf_wx.erl
2948lib/erlang/lib/observer-${VERSION.observer}/src/observer_pro_wx.erl 2948lib/erlang/lib/observer-${VERSION.observer}/src/observer_pro_wx.erl
2949lib/erlang/lib/observer-${VERSION.observer}/src/observer_procinfo.erl 2949lib/erlang/lib/observer-${VERSION.observer}/src/observer_procinfo.erl
2950lib/erlang/lib/observer-${VERSION.observer}/src/observer_sys_wx.erl 2950lib/erlang/lib/observer-${VERSION.observer}/src/observer_sys_wx.erl
2951lib/erlang/lib/observer-${VERSION.observer}/src/observer_trace_wx.erl 2951lib/erlang/lib/observer-${VERSION.observer}/src/observer_trace_wx.erl
2952lib/erlang/lib/observer-${VERSION.observer}/src/observer_traceoptions_wx.erl 2952lib/erlang/lib/observer-${VERSION.observer}/src/observer_traceoptions_wx.erl
2953lib/erlang/lib/observer-${VERSION.observer}/src/observer_tv.hrl 2953lib/erlang/lib/observer-${VERSION.observer}/src/observer_tv.hrl
2954lib/erlang/lib/observer-${VERSION.observer}/src/observer_tv_table.erl 2954lib/erlang/lib/observer-${VERSION.observer}/src/observer_tv_table.erl
2955lib/erlang/lib/observer-${VERSION.observer}/src/observer_tv_wx.erl 2955lib/erlang/lib/observer-${VERSION.observer}/src/observer_tv_wx.erl
2956lib/erlang/lib/observer-${VERSION.observer}/src/observer_wx.erl 2956lib/erlang/lib/observer-${VERSION.observer}/src/observer_wx.erl
2957lib/erlang/lib/observer-${VERSION.observer}/src/ttb.erl 2957lib/erlang/lib/observer-${VERSION.observer}/src/ttb.erl
2958lib/erlang/lib/observer-${VERSION.observer}/src/ttb_et.erl 2958lib/erlang/lib/observer-${VERSION.observer}/src/ttb_et.erl
 2959${PLIST.odbc}lib/erlang/lib/odbc-${VERSION.odbc}/c_src/odbcserver.c
 2960${PLIST.odbc}lib/erlang/lib/odbc-${VERSION.odbc}/c_src/odbcserver.h
 2961${PLIST.odbc}lib/erlang/lib/odbc-${VERSION.odbc}/ebin/odbc.app
 2962${PLIST.odbc}lib/erlang/lib/odbc-${VERSION.odbc}/ebin/odbc.appup
 2963${PLIST.odbc}lib/erlang/lib/odbc-${VERSION.odbc}/ebin/odbc.beam
 2964${PLIST.odbc}lib/erlang/lib/odbc-${VERSION.odbc}/ebin/odbc_app.beam
 2965${PLIST.odbc}lib/erlang/lib/odbc-${VERSION.odbc}/ebin/odbc_sup.beam
 2966${PLIST.odbc}lib/erlang/lib/odbc-${VERSION.odbc}/include/odbc.hrl
 2967${PLIST.odbc}lib/erlang/lib/odbc-${VERSION.odbc}/priv/bin/odbcserver
 2968${PLIST.odbc}lib/erlang/lib/odbc-${VERSION.odbc}/src/odbc.erl
 2969${PLIST.odbc}lib/erlang/lib/odbc-${VERSION.odbc}/src/odbc_app.erl
 2970${PLIST.odbc}lib/erlang/lib/odbc-${VERSION.odbc}/src/odbc_internal.hrl
 2971${PLIST.odbc}lib/erlang/lib/odbc-${VERSION.odbc}/src/odbc_sup.erl
2959lib/erlang/lib/orber-${VERSION.orber}/COSS/CosNaming/CosNaming.hrl 2972lib/erlang/lib/orber-${VERSION.orber}/COSS/CosNaming/CosNaming.hrl
2960lib/erlang/lib/orber-${VERSION.orber}/COSS/CosNaming/CosNaming_Binding.erl 2973lib/erlang/lib/orber-${VERSION.orber}/COSS/CosNaming/CosNaming_Binding.erl
2961lib/erlang/lib/orber-${VERSION.orber}/COSS/CosNaming/CosNaming_BindingIterator.erl 2974lib/erlang/lib/orber-${VERSION.orber}/COSS/CosNaming/CosNaming_BindingIterator.erl
2962lib/erlang/lib/orber-${VERSION.orber}/COSS/CosNaming/CosNaming_BindingIterator.hrl 2975lib/erlang/lib/orber-${VERSION.orber}/COSS/CosNaming/CosNaming_BindingIterator.hrl
2963lib/erlang/lib/orber-${VERSION.orber}/COSS/CosNaming/CosNaming_BindingIterator_impl.erl 2976lib/erlang/lib/orber-${VERSION.orber}/COSS/CosNaming/CosNaming_BindingIterator_impl.erl
2964lib/erlang/lib/orber-${VERSION.orber}/COSS/CosNaming/CosNaming_BindingList.erl 2977lib/erlang/lib/orber-${VERSION.orber}/COSS/CosNaming/CosNaming_BindingList.erl
2965lib/erlang/lib/orber-${VERSION.orber}/COSS/CosNaming/CosNaming_Name.erl 2978lib/erlang/lib/orber-${VERSION.orber}/COSS/CosNaming/CosNaming_Name.erl
2966lib/erlang/lib/orber-${VERSION.orber}/COSS/CosNaming/CosNaming_NameComponent.erl 2979lib/erlang/lib/orber-${VERSION.orber}/COSS/CosNaming/CosNaming_NameComponent.erl
2967lib/erlang/lib/orber-${VERSION.orber}/COSS/CosNaming/CosNaming_NamingContext.erl 2980lib/erlang/lib/orber-${VERSION.orber}/COSS/CosNaming/CosNaming_NamingContext.erl
2968lib/erlang/lib/orber-${VERSION.orber}/COSS/CosNaming/CosNaming_NamingContext.hrl 2981lib/erlang/lib/orber-${VERSION.orber}/COSS/CosNaming/CosNaming_NamingContext.hrl
2969lib/erlang/lib/orber-${VERSION.orber}/COSS/CosNaming/CosNaming_NamingContextExt.erl 2982lib/erlang/lib/orber-${VERSION.orber}/COSS/CosNaming/CosNaming_NamingContextExt.erl
2970lib/erlang/lib/orber-${VERSION.orber}/COSS/CosNaming/CosNaming_NamingContextExt.hrl 2983lib/erlang/lib/orber-${VERSION.orber}/COSS/CosNaming/CosNaming_NamingContextExt.hrl
2971lib/erlang/lib/orber-${VERSION.orber}/COSS/CosNaming/CosNaming_NamingContextExt_InvalidAddress.erl 2984lib/erlang/lib/orber-${VERSION.orber}/COSS/CosNaming/CosNaming_NamingContextExt_InvalidAddress.erl
@@ -3391,26 +3404,27 @@ lib/erlang/lib/runtime_tools-${VERSION.r @@ -3391,26 +3404,27 @@ lib/erlang/lib/runtime_tools-${VERSION.r
3391lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/examples/port1.systemtap 3404lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/examples/port1.systemtap
3392lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/examples/process-scheduling.d 3405lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/examples/process-scheduling.d
3393lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/examples/process-scheduling.systemtap 3406lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/examples/process-scheduling.systemtap
3394lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/examples/spawn-exit.d 3407lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/examples/spawn-exit.d
3395lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/examples/spawn-exit.systemtap 3408lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/examples/spawn-exit.systemtap
3396lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/examples/user-probe-n.d 3409lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/examples/user-probe-n.d
3397lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/examples/user-probe-n.systemtap 3410lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/examples/user-probe-n.systemtap
3398lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/examples/user-probe.d 3411lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/examples/user-probe.d
3399lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/examples/user-probe.systemtap 3412lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/examples/user-probe.systemtap
3400lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/include/observer_backend.hrl 3413lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/include/observer_backend.hrl
3401lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/priv/lib/dyntrace.so 3414lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/priv/lib/dyntrace.so
3402lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/priv/lib/trace_file_drv.so 3415lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/priv/lib/trace_file_drv.so
3403lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/priv/lib/trace_ip_drv.so 3416lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/priv/lib/trace_ip_drv.so
 3417${PLIST.dtrace}lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/priv/obj/dtrace_user.o
3404lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/priv/obj/dyntrace.o 3418lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/priv/obj/dyntrace.o
3405lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/src/appmon_info.erl 3419lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/src/appmon_info.erl
3406lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/src/dbg.erl 3420lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/src/dbg.erl
3407lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/src/dyntrace.erl 3421lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/src/dyntrace.erl
3408lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/src/erts_alloc_config.erl 3422lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/src/erts_alloc_config.erl
3409lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/src/observer_backend.erl 3423lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/src/observer_backend.erl
3410lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/src/percept_profile.erl 3424lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/src/percept_profile.erl
3411lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/src/runtime_tools.erl 3425lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/src/runtime_tools.erl
3412lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/src/runtime_tools_sup.erl 3426lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/src/runtime_tools_sup.erl
3413lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/src/ttb_autostart.erl 3427lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/src/ttb_autostart.erl
3414lib/erlang/lib/sasl-${VERSION.sasl}/ebin/alarm_handler.beam 3428lib/erlang/lib/sasl-${VERSION.sasl}/ebin/alarm_handler.beam
3415lib/erlang/lib/sasl-${VERSION.sasl}/ebin/erlsrv.beam 3429lib/erlang/lib/sasl-${VERSION.sasl}/ebin/erlsrv.beam
3416lib/erlang/lib/sasl-${VERSION.sasl}/ebin/format_lib_supp.beam 3430lib/erlang/lib/sasl-${VERSION.sasl}/ebin/format_lib_supp.beam
cvs diff -r1.5 -r1.6 pkgsrc/lang/erlang/options.mk (expand / switch to unified diff)

--- pkgsrc/lang/erlang/options.mk 2012/04/16 07:28:14 1.5
+++ pkgsrc/lang/erlang/options.mk 2013/07/05 12:42:48 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.5 2012/04/16 07:28:14 fhajny Exp $ 1# $NetBSD: options.mk,v 1.6 2013/07/05 12:42:48 jperkin Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.erlang 3PKG_OPTIONS_VAR= PKG_OPTIONS.erlang
4PKG_SUPPORTED_OPTIONS= java erlang-hipe 4PKG_SUPPORTED_OPTIONS= java erlang-hipe
5PKG_OPTIONS_OPTIONAL_GROUPS= odbc 5PKG_OPTIONS_OPTIONAL_GROUPS= odbc
6PKG_OPTIONS_GROUP.odbc= iodbc unixodbc 6PKG_OPTIONS_GROUP.odbc= iodbc unixodbc
7 7
8PKG_SUGGESTED_OPTIONS= # empty 8PKG_SUGGESTED_OPTIONS= # empty
9### 9###
10### Activate HiPE by default on some systems or if the user has 10### Activate HiPE by default on some systems or if the user has
11### defined the erlang-hipe option in mk.conf 11### defined the erlang-hipe option in mk.conf
12### 12###
13.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && \ 13.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && \
14 (${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux" || \ 14 (${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux" || \
@@ -59,15 +59,15 @@ PLIST.odbc= yes @@ -59,15 +59,15 @@ PLIST.odbc= yes
59### 59###
60### DTrace support 60### DTrace support
61### 61###
62.if !empty(PKG_OPTIONS:Mdtrace) 62.if !empty(PKG_OPTIONS:Mdtrace)
63. if ${OPSYS} == "SunOS" || ${OPSYS} == "Darwin" || ${OPSYS} == "FreeBSD" 63. if ${OPSYS} == "SunOS" || ${OPSYS} == "Darwin" || ${OPSYS} == "FreeBSD"
64CONFIGURE_ARGS+= --with-dynamic-trace=dtrace 64CONFIGURE_ARGS+= --with-dynamic-trace=dtrace
65. elif ${OPSYS} == "Linux" 65. elif ${OPSYS} == "Linux"
66CONFIGURE_ARGS+= --with-dynamic-trace=systemtap 66CONFIGURE_ARGS+= --with-dynamic-trace=systemtap
67. endif 67. endif
68PLIST.dtrace= yes 68PLIST.dtrace= yes
69.endif 69.endif
70 70
71# Help generate optional PLIST parts: 71# Help generate optional PLIST parts:
72PRINT_PLIST_AWK+= {if ($$0 ~ /\/erlang\/lib\/hipe-${VERSION.hipe}\//) {$$0 = "$${PLIST.hipe}" $$0;}} 72PRINT_PLIST_AWK+= {if ($$0 ~ /dtrace_user/) {$$0 = "$${PLIST.dtrace}" $$0;}}
73PRINT_PLIST_AWK+= {if ($$0 ~ /\/erlang\/lib\/odbc-${VERSION.odbc}\//) {$$0 = "$${PLIST.odbc}" $$0;}} 73PRINT_PLIST_AWK+= {if ($$0 ~ /\/erlang\/lib\/odbc-${VERSION.odbc}\//) {$$0 = "$${PLIST.odbc}" $$0;}}