diff options
| author | jlam <jlam@pkgsrc.org> | 2008-04-12 22:42:57 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2008-04-12 22:42:57 +0000 |
| commit | 841dfa0e7aaa6a0f0cce2901291d1d938dd0fc0a (patch) | |
| tree | fdd67c81079412bf94013749a954125434a9baca /x11 | |
| parent | 6874584eae20f517f70816571f6d4ac696db16b3 (diff) | |
| download | pkgsrc-841dfa0e7aaa6a0f0cce2901291d1d938dd0fc0a.tar.gz | |
Convert to use PLIST_VARS instead of manually passing "@comment "
through PLIST_SUBST to the plist module.
Diffstat (limited to 'x11')
39 files changed, 411 insertions, 424 deletions
diff --git a/x11/efltk/PLIST b/x11/efltk/PLIST index a9e01ac5818..5a304d6499e 100644 --- a/x11/efltk/PLIST +++ b/x11/efltk/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2006/04/17 07:07:38 jlam Exp $ +@comment $NetBSD: PLIST,v 1.4 2008/04/12 22:43:14 jlam Exp $ bin/efltk-config include/efltk/Enumerations.h include/efltk/Fl.h @@ -208,9 +208,9 @@ lib/fltk/eblue.theme.la lib/fltk/essai.theme.la lib/fltk/motif.theme.la lib/libefltk.la -${OPENGL}lib/libefltk_gl.la +${PLIST.opengl}lib/libefltk_gl.la lib/libefltk_images.la -${MYSQL}lib/libefltk_mysql.la +${PLIST.mysql}lib/libefltk_mysql.la lib/libefltk_net.la lib/libefltk_xml.la share/locale/fi/LC_MESSAGES/efltk.mo diff --git a/x11/efltk/options.mk b/x11/efltk/options.mk index 1e49702af10..4c530e203a6 100644 --- a/x11/efltk/options.mk +++ b/x11/efltk/options.mk @@ -1,26 +1,26 @@ -# $NetBSD: options.mk,v 1.2 2006/02/18 14:07:54 joerg Exp $ +# $NetBSD: options.mk,v 1.3 2008/04/12 22:43:14 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.efltk PKG_SUPPORTED_OPTIONS= opengl mysql .include "../../mk/bsd.options.mk" +PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS} + .if !empty(PKG_OPTIONS:Mopengl) -PLIST_SUBST+= OPENGL= +PLIST.opengl= yes CONFIGURE_ARGS+= --enable-opengl MAKE_ENV+= HAVE_OPENGL=yes . include "../../graphics/MesaLib/buildlink3.mk" .else -PLIST_SUBST+= OPENGL="@comment " CONFIGURE_ARGS+= --disable-opengl MAKE_ENV+= HAVE_OPENGL=no .endif .if !empty(PKG_OPTIONS:Mmysql) -PLIST_SUBST+= MYSQL= +PLIST.mysql= yes CONFIGURE_ARGS+= --enable-mysql . include "../../mk/mysql.buildlink3.mk" .else -PLIST_SUBST+= MYSQL="@comment " CONFIGURE_ARGS+= --disable-mysql .endif diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile index acb993d0698..cc60036b422 100644 --- a/x11/fltk/Makefile +++ b/x11/fltk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.63 2007/03/16 21:40:33 joerg Exp $ +# $NetBSD: Makefile,v 1.64 2008/04/12 22:43:14 jlam Exp $ DISTNAME= fltk-1.1.7-source PKGNAME= ${DISTNAME:S/-source//} @@ -31,11 +31,11 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-libtool=${LIBTOOL:Q} CONFIGURE_ARGS+= --enable-threads CONFIGURE_ARGS+= ac_cv_have_overlay=yes -.if exists(./descr) -PLIST_SUBST+= WITH_LINKS="@comment " -.else + +PLIST_VARS+= cs # case-sensitive +.if !exists(./descr) CONFIGURE_ARGS+= --with-links -PLIST_SUBST+= WITH_LINKS="" +PLIST.cs= yes .endif BUILDLINK_DEPMETHOD.libXt?= build diff --git a/x11/fltk/PLIST b/x11/fltk/PLIST index 90b9fdb9069..18be1f385ac 100644 --- a/x11/fltk/PLIST +++ b/x11/fltk/PLIST @@ -1,250 +1,250 @@ -@comment $NetBSD: PLIST,v 1.11 2006/06/01 13:14:18 joerg Exp $ +@comment $NetBSD: PLIST,v 1.12 2008/04/12 22:43:14 jlam Exp $ bin/fltk-config bin/fluid include/FL/Enumerations.H -${WITH_LINKS}include/FL/Enumerations.h +${PLIST.cs}include/FL/Enumerations.h include/FL/Fl.H -${WITH_LINKS}include/FL/Fl.h +${PLIST.cs}include/FL/Fl.h include/FL/Fl_Adjuster.H -${WITH_LINKS}include/FL/Fl_Adjuster.h +${PLIST.cs}include/FL/Fl_Adjuster.h include/FL/Fl_BMP_Image.H -${WITH_LINKS}include/FL/Fl_BMP_Image.h +${PLIST.cs}include/FL/Fl_BMP_Image.h include/FL/Fl_Bitmap.H -${WITH_LINKS}include/FL/Fl_Bitmap.h +${PLIST.cs}include/FL/Fl_Bitmap.h include/FL/Fl_Box.H -${WITH_LINKS}include/FL/Fl_Box.h +${PLIST.cs}include/FL/Fl_Box.h include/FL/Fl_Browser.H -${WITH_LINKS}include/FL/Fl_Browser.h +${PLIST.cs}include/FL/Fl_Browser.h include/FL/Fl_Browser_.H -${WITH_LINKS}include/FL/Fl_Browser_.h +${PLIST.cs}include/FL/Fl_Browser_.h include/FL/Fl_Button.H -${WITH_LINKS}include/FL/Fl_Button.h +${PLIST.cs}include/FL/Fl_Button.h include/FL/Fl_Chart.H -${WITH_LINKS}include/FL/Fl_Chart.h +${PLIST.cs}include/FL/Fl_Chart.h include/FL/Fl_Check_Browser.H -${WITH_LINKS}include/FL/Fl_Check_Browser.h +${PLIST.cs}include/FL/Fl_Check_Browser.h include/FL/Fl_Check_Button.H -${WITH_LINKS}include/FL/Fl_Check_Button.h +${PLIST.cs}include/FL/Fl_Check_Button.h include/FL/Fl_Choice.H -${WITH_LINKS}include/FL/Fl_Choice.h +${PLIST.cs}include/FL/Fl_Choice.h include/FL/Fl_Clock.H -${WITH_LINKS}include/FL/Fl_Clock.h +${PLIST.cs}include/FL/Fl_Clock.h include/FL/Fl_Color_Chooser.H -${WITH_LINKS}include/FL/Fl_Color_Chooser.h +${PLIST.cs}include/FL/Fl_Color_Chooser.h include/FL/Fl_Counter.H -${WITH_LINKS}include/FL/Fl_Counter.h +${PLIST.cs}include/FL/Fl_Counter.h include/FL/Fl_Dial.H -${WITH_LINKS}include/FL/Fl_Dial.h +${PLIST.cs}include/FL/Fl_Dial.h include/FL/Fl_Double_Window.H -${WITH_LINKS}include/FL/Fl_Double_Window.h +${PLIST.cs}include/FL/Fl_Double_Window.h include/FL/Fl_Export.H -${WITH_LINKS}include/FL/Fl_Export.h +${PLIST.cs}include/FL/Fl_Export.h include/FL/Fl_File_Browser.H -${WITH_LINKS}include/FL/Fl_File_Browser.h +${PLIST.cs}include/FL/Fl_File_Browser.h include/FL/Fl_File_Chooser.H -${WITH_LINKS}include/FL/Fl_File_Chooser.h +${PLIST.cs}include/FL/Fl_File_Chooser.h include/FL/Fl_File_Icon.H -${WITH_LINKS}include/FL/Fl_File_Icon.h +${PLIST.cs}include/FL/Fl_File_Icon.h include/FL/Fl_File_Input.H -${WITH_LINKS}include/FL/Fl_File_Input.h +${PLIST.cs}include/FL/Fl_File_Input.h include/FL/Fl_Fill_Dial.H -${WITH_LINKS}include/FL/Fl_Fill_Dial.h +${PLIST.cs}include/FL/Fl_Fill_Dial.h include/FL/Fl_Fill_Slider.H -${WITH_LINKS}include/FL/Fl_Fill_Slider.h +${PLIST.cs}include/FL/Fl_Fill_Slider.h include/FL/Fl_Float_Input.H -${WITH_LINKS}include/FL/Fl_Float_Input.h +${PLIST.cs}include/FL/Fl_Float_Input.h include/FL/Fl_FormsBitmap.H -${WITH_LINKS}include/FL/Fl_FormsBitmap.h +${PLIST.cs}include/FL/Fl_FormsBitmap.h include/FL/Fl_FormsPixmap.H -${WITH_LINKS}include/FL/Fl_FormsPixmap.h +${PLIST.cs}include/FL/Fl_FormsPixmap.h include/FL/Fl_Free.H -${WITH_LINKS}include/FL/Fl_Free.h +${PLIST.cs}include/FL/Fl_Free.h include/FL/Fl_GIF_Image.H -${WITH_LINKS}include/FL/Fl_GIF_Image.h +${PLIST.cs}include/FL/Fl_GIF_Image.h include/FL/Fl_Gl_Window.H -${WITH_LINKS}include/FL/Fl_Gl_Window.h +${PLIST.cs}include/FL/Fl_Gl_Window.h include/FL/Fl_Group.H -${WITH_LINKS}include/FL/Fl_Group.h +${PLIST.cs}include/FL/Fl_Group.h include/FL/Fl_Help_Dialog.H -${WITH_LINKS}include/FL/Fl_Help_Dialog.h +${PLIST.cs}include/FL/Fl_Help_Dialog.h include/FL/Fl_Help_View.H -${WITH_LINKS}include/FL/Fl_Help_View.h +${PLIST.cs}include/FL/Fl_Help_View.h include/FL/Fl_Hold_Browser.H -${WITH_LINKS}include/FL/Fl_Hold_Browser.h +${PLIST.cs}include/FL/Fl_Hold_Browser.h include/FL/Fl_Hor_Fill_Slider.H -${WITH_LINKS}include/FL/Fl_Hor_Fill_Slider.h +${PLIST.cs}include/FL/Fl_Hor_Fill_Slider.h include/FL/Fl_Hor_Nice_Slider.H -${WITH_LINKS}include/FL/Fl_Hor_Nice_Slider.h +${PLIST.cs}include/FL/Fl_Hor_Nice_Slider.h include/FL/Fl_Hor_Slider.H -${WITH_LINKS}include/FL/Fl_Hor_Slider.h +${PLIST.cs}include/FL/Fl_Hor_Slider.h include/FL/Fl_Hor_Value_Slider.H -${WITH_LINKS}include/FL/Fl_Hor_Value_Slider.h +${PLIST.cs}include/FL/Fl_Hor_Value_Slider.h include/FL/Fl_Image.H -${WITH_LINKS}include/FL/Fl_Image.h +${PLIST.cs}include/FL/Fl_Image.h include/FL/Fl_Input.H -${WITH_LINKS}include/FL/Fl_Input.h +${PLIST.cs}include/FL/Fl_Input.h include/FL/Fl_Input_.H -${WITH_LINKS}include/FL/Fl_Input_.h +${PLIST.cs}include/FL/Fl_Input_.h include/FL/Fl_Input_Choice.H -${WITH_LINKS}include/FL/Fl_Input_Choice.h +${PLIST.cs}include/FL/Fl_Input_Choice.h include/FL/Fl_Int_Input.H -${WITH_LINKS}include/FL/Fl_Int_Input.h +${PLIST.cs}include/FL/Fl_Int_Input.h include/FL/Fl_JPEG_Image.H -${WITH_LINKS}include/FL/Fl_JPEG_Image.h +${PLIST.cs}include/FL/Fl_JPEG_Image.h include/FL/Fl_Light_Button.H -${WITH_LINKS}include/FL/Fl_Light_Button.h +${PLIST.cs}include/FL/Fl_Light_Button.h include/FL/Fl_Line_Dial.H -${WITH_LINKS}include/FL/Fl_Line_Dial.h +${PLIST.cs}include/FL/Fl_Line_Dial.h include/FL/Fl_Menu.H -${WITH_LINKS}include/FL/Fl_Menu.h +${PLIST.cs}include/FL/Fl_Menu.h include/FL/Fl_Menu_.H -${WITH_LINKS}include/FL/Fl_Menu_.h +${PLIST.cs}include/FL/Fl_Menu_.h include/FL/Fl_Menu_Bar.H -${WITH_LINKS}include/FL/Fl_Menu_Bar.h +${PLIST.cs}include/FL/Fl_Menu_Bar.h include/FL/Fl_Menu_Button.H -${WITH_LINKS}include/FL/Fl_Menu_Button.h +${PLIST.cs}include/FL/Fl_Menu_Button.h include/FL/Fl_Menu_Item.H -${WITH_LINKS}include/FL/Fl_Menu_Item.h +${PLIST.cs}include/FL/Fl_Menu_Item.h include/FL/Fl_Menu_Window.H -${WITH_LINKS}include/FL/Fl_Menu_Window.h +${PLIST.cs}include/FL/Fl_Menu_Window.h include/FL/Fl_Multi_Browser.H -${WITH_LINKS}include/FL/Fl_Multi_Browser.h +${PLIST.cs}include/FL/Fl_Multi_Browser.h include/FL/Fl_Multi_Label.H -${WITH_LINKS}include/FL/Fl_Multi_Label.h +${PLIST.cs}include/FL/Fl_Multi_Label.h include/FL/Fl_Multiline_Input.H -${WITH_LINKS}include/FL/Fl_Multiline_Input.h +${PLIST.cs}include/FL/Fl_Multiline_Input.h include/FL/Fl_Multiline_Output.H -${WITH_LINKS}include/FL/Fl_Multiline_Output.h +${PLIST.cs}include/FL/Fl_Multiline_Output.h include/FL/Fl_Nice_Slider.H -${WITH_LINKS}include/FL/Fl_Nice_Slider.h +${PLIST.cs}include/FL/Fl_Nice_Slider.h include/FL/Fl_Object.H -${WITH_LINKS}include/FL/Fl_Object.h +${PLIST.cs}include/FL/Fl_Object.h include/FL/Fl_Output.H -${WITH_LINKS}include/FL/Fl_Output.h +${PLIST.cs}include/FL/Fl_Output.h include/FL/Fl_Overlay_Window.H -${WITH_LINKS}include/FL/Fl_Overlay_Window.h +${PLIST.cs}include/FL/Fl_Overlay_Window.h include/FL/Fl_PNG_Image.H -${WITH_LINKS}include/FL/Fl_PNG_Image.h +${PLIST.cs}include/FL/Fl_PNG_Image.h include/FL/Fl_PNM_Image.H -${WITH_LINKS}include/FL/Fl_PNM_Image.h +${PLIST.cs}include/FL/Fl_PNM_Image.h include/FL/Fl_Pack.H -${WITH_LINKS}include/FL/Fl_Pack.h +${PLIST.cs}include/FL/Fl_Pack.h include/FL/Fl_Pixmap.H -${WITH_LINKS}include/FL/Fl_Pixmap.h +${PLIST.cs}include/FL/Fl_Pixmap.h include/FL/Fl_Positioner.H -${WITH_LINKS}include/FL/Fl_Positioner.h +${PLIST.cs}include/FL/Fl_Positioner.h include/FL/Fl_Preferences.H -${WITH_LINKS}include/FL/Fl_Preferences.h +${PLIST.cs}include/FL/Fl_Preferences.h include/FL/Fl_Progress.H -${WITH_LINKS}include/FL/Fl_Progress.h +${PLIST.cs}include/FL/Fl_Progress.h include/FL/Fl_Radio_Button.H -${WITH_LINKS}include/FL/Fl_Radio_Button.h +${PLIST.cs}include/FL/Fl_Radio_Button.h include/FL/Fl_Radio_Light_Button.H -${WITH_LINKS}include/FL/Fl_Radio_Light_Button.h +${PLIST.cs}include/FL/Fl_Radio_Light_Button.h include/FL/Fl_Radio_Round_Button.H -${WITH_LINKS}include/FL/Fl_Radio_Round_Button.h +${PLIST.cs}include/FL/Fl_Radio_Round_Button.h include/FL/Fl_Repeat_Button.H -${WITH_LINKS}include/FL/Fl_Repeat_Button.h +${PLIST.cs}include/FL/Fl_Repeat_Button.h include/FL/Fl_Return_Button.H -${WITH_LINKS}include/FL/Fl_Return_Button.h +${PLIST.cs}include/FL/Fl_Return_Button.h include/FL/Fl_Roller.H -${WITH_LINKS}include/FL/Fl_Roller.h +${PLIST.cs}include/FL/Fl_Roller.h include/FL/Fl_Round_Button.H -${WITH_LINKS}include/FL/Fl_Round_Button.h +${PLIST.cs}include/FL/Fl_Round_Button.h include/FL/Fl_Round_Clock.H -${WITH_LINKS}include/FL/Fl_Round_Clock.h +${PLIST.cs}include/FL/Fl_Round_Clock.h include/FL/Fl_Scroll.H -${WITH_LINKS}include/FL/Fl_Scroll.h +${PLIST.cs}include/FL/Fl_Scroll.h include/FL/Fl_Scrollbar.H -${WITH_LINKS}include/FL/Fl_Scrollbar.h +${PLIST.cs}include/FL/Fl_Scrollbar.h include/FL/Fl_Secret_Input.H -${WITH_LINKS}include/FL/Fl_Secret_Input.h +${PLIST.cs}include/FL/Fl_Secret_Input.h include/FL/Fl_Select_Browser.H -${WITH_LINKS}include/FL/Fl_Select_Browser.h +${PLIST.cs}include/FL/Fl_Select_Browser.h include/FL/Fl_Shared_Image.H -${WITH_LINKS}include/FL/Fl_Shared_Image.h +${PLIST.cs}include/FL/Fl_Shared_Image.h include/FL/Fl_Simple_Counter.H -${WITH_LINKS}include/FL/Fl_Simple_Counter.h +${PLIST.cs}include/FL/Fl_Simple_Counter.h include/FL/Fl_Single_Window.H -${WITH_LINKS}include/FL/Fl_Single_Window.h +${PLIST.cs}include/FL/Fl_Single_Window.h include/FL/Fl_Slider.H -${WITH_LINKS}include/FL/Fl_Slider.h +${PLIST.cs}include/FL/Fl_Slider.h include/FL/Fl_Spinner.H -${WITH_LINKS}include/FL/Fl_Spinner.h +${PLIST.cs}include/FL/Fl_Spinner.h include/FL/Fl_Sys_Menu_Bar.H -${WITH_LINKS}include/FL/Fl_Sys_Menu_Bar.h +${PLIST.cs}include/FL/Fl_Sys_Menu_Bar.h include/FL/Fl_Tabs.H -${WITH_LINKS}include/FL/Fl_Tabs.h +${PLIST.cs}include/FL/Fl_Tabs.h include/FL/Fl_Text_Buffer.H -${WITH_LINKS}include/FL/Fl_Text_Buffer.h +${PLIST.cs}include/FL/Fl_Text_Buffer.h include/FL/Fl_Text_Display.H -${WITH_LINKS}include/FL/Fl_Text_Display.h +${PLIST.cs}include/FL/Fl_Text_Display.h include/FL/Fl_Text_Editor.H -${WITH_LINKS}include/FL/Fl_Text_Editor.h +${PLIST.cs}include/FL/Fl_Text_Editor.h include/FL/Fl_Tile.H -${WITH_LINKS}include/FL/Fl_Tile.h +${PLIST.cs}include/FL/Fl_Tile.h include/FL/Fl_Tiled_Image.H -${WITH_LINKS}include/FL/Fl_Tiled_Image.h +${PLIST.cs}include/FL/Fl_Tiled_Image.h include/FL/Fl_Timer.H -${WITH_LINKS}include/FL/Fl_Timer.h +${PLIST.cs}include/FL/Fl_Timer.h include/FL/Fl_Toggle_Button.H -${WITH_LINKS}include/FL/Fl_Toggle_Button.h +${PLIST.cs}include/FL/Fl_Toggle_Button.h include/FL/Fl_Toggle_Light_Button.H -${WITH_LINKS}include/FL/Fl_Toggle_Light_Button.h +${PLIST.cs}include/FL/Fl_Toggle_Light_Button.h include/FL/Fl_Toggle_Round_Button.H -${WITH_LINKS}include/FL/Fl_Toggle_Round_Button.h +${PLIST.cs}include/FL/Fl_Toggle_Round_Button.h include/FL/Fl_Tooltip.H -${WITH_LINKS}include/FL/Fl_Tooltip.h +${PLIST.cs}include/FL/Fl_Tooltip.h include/FL/Fl_Valuator.H -${WITH_LINKS}include/FL/Fl_Valuator.h +${PLIST.cs}include/FL/Fl_Valuator.h include/FL/Fl_Value_Input.H -${WITH_LINKS}include/FL/Fl_Value_Input.h +${PLIST.cs}include/FL/Fl_Value_Input.h include/FL/Fl_Value_Output.H -${WITH_LINKS}include/FL/Fl_Value_Output.h +${PLIST.cs}include/FL/Fl_Value_Output.h include/FL/Fl_Value_Slider.H -${WITH_LINKS}include/FL/Fl_Value_Slider.h +${PLIST.cs}include/FL/Fl_Value_Slider.h include/FL/Fl_Widget.H -${WITH_LINKS}include/FL/Fl_Widget.h +${PLIST.cs}include/FL/Fl_Widget.h include/FL/Fl_Window.H -${WITH_LINKS}include/FL/Fl_Window.h +${PLIST.cs}include/FL/Fl_Window.h include/FL/Fl_Wizard.H -${WITH_LINKS}include/FL/Fl_Wizard.h +${PLIST.cs}include/FL/Fl_Wizard.h include/FL/Fl_XBM_Image.H -${WITH_LINKS}include/FL/Fl_XBM_Image.h +${PLIST.cs}include/FL/Fl_XBM_Image.h include/FL/Fl_XPM_Image.H -${WITH_LINKS}include/FL/Fl_XPM_Image.h +${PLIST.cs}include/FL/Fl_XPM_Image.h include/FL/dirent.h include/FL/filename.H -${WITH_LINKS}include/FL/filename.h +${PLIST.cs}include/FL/filename.h include/FL/fl_ask.H -${WITH_LINKS}include/FL/fl_ask.h +${PLIST.cs}include/FL/fl_ask.h include/FL/fl_draw.H -${WITH_LINKS}include/FL/fl_draw.h -${WITH_LINKS}include/FL/fl_file_chooser.H -${WITH_LINKS}include/FL/fl_file_chooser.h +${PLIST.cs}include/FL/fl_draw.h +${PLIST.cs}include/FL/fl_file_chooser.H +${PLIST.cs}include/FL/fl_file_chooser.h include/FL/fl_message.H -${WITH_LINKS}include/FL/fl_message.h +${PLIST.cs}include/FL/fl_message.h include/FL/fl_show_colormap.H -${WITH_LINKS}include/FL/fl_show_colormap.h +${PLIST.cs}include/FL/fl_show_colormap.h include/FL/fl_show_input.H -${WITH_LINKS}include/FL/fl_show_input.h +${PLIST.cs}include/FL/fl_show_input.h include/FL/forms.H -${WITH_LINKS}include/FL/forms.h +${PLIST.cs}include/FL/forms.h include/FL/gl.h include/FL/gl2opengl.h include/FL/gl_draw.H -${WITH_LINKS}include/FL/gl_draw.h +${PLIST.cs}include/FL/gl_draw.h include/FL/glut.H -${WITH_LINKS}include/FL/glut.h +${PLIST.cs}include/FL/glut.h include/FL/mac.H -${WITH_LINKS}include/FL/mac.h +${PLIST.cs}include/FL/mac.h include/FL/mac.r include/FL/math.h include/FL/win32.H -${WITH_LINKS}include/FL/win32.h +${PLIST.cs}include/FL/win32.h include/FL/x.H -${WITH_LINKS}include/FL/x.h -${WITH_LINKS}include/Fl +${PLIST.cs}include/FL/x.h +${PLIST.cs}include/Fl lib/libfltk.la lib/libfltk_forms.la lib/libfltk_gl.la diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index c3aa8d5a1c8..3e7ebb18beb 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.138 2008/03/12 21:41:21 drochner Exp $ +# $NetBSD: Makefile,v 1.139 2008/04/12 22:43:14 jlam Exp $ # DISTNAME= gdm-2.20.4 @@ -112,33 +112,28 @@ CONFIGURE_ARGS+= --disable-ipv6 CONFIGURE_ARGS+= X_SERVER_ARGS="vt05" .endif +PLIST_VARS+= pam .if !empty(PKG_OPTIONS:Mpam) . include "../../mk/pam.buildlink3.mk" CONFIGURE_ARGS+= --enable-authentication-scheme=pam . if ${PAM_TYPE} == "linux-pam" -PLIST_SUBST+= PAM_MISC="" -. else -PLIST_SUBST+= PAM_MISC="@comment " +PLIST.pam= yes . endif .elif exists(/etc/shadow) CONFIGURE_ARGS+= --enable-authentication-scheme=shadow -PLIST_SUBST+= PAM_MISC="@comment " .else CONFIGURE_ARGS+= --enable-authentication-scheme=crypt -PLIST_SUBST+= PAM_MISC="@comment " .endif +PLIST_VARS+= dmx .if exists(${X11BASE}/include/X11/extensions/dmxext.h) -PLIST_SUBST+= DMX="" -.else -PLIST_SUBST+= DMX="@comment " +PLIST.dmx= yes .endif PRINT_PLIST_AWK+= /dmx/ { print "$${DMX}" $$0; next } +PLIST_VARS+= gdmopen .if exists(/usr/include/linux/vt.h) -PLIST_SUBST+= GDMOPEN="" -.else -PLIST_SUBST+= GDMOPEN="@comment " +PLIST.gdmopen= yes .endif PRINT_PLIST_AWK+= /gdmopen/ { print "$${GDMOPEN}" $$0; next } diff --git a/x11/gdm/PLIST b/x11/gdm/PLIST index b7247e5226a..c15e465b259 100644 --- a/x11/gdm/PLIST +++ b/x11/gdm/PLIST @@ -1,5 +1,5 @@ -@comment $NetBSD: PLIST,v 1.36 2007/12/16 22:19:43 drochner Exp $ -${DMX}bin/gdm-dmx-reconnect-proxy +@comment $NetBSD: PLIST,v 1.37 2008/04/12 22:43:14 jlam Exp $ +${PLIST.dmx}bin/gdm-dmx-reconnect-proxy bin/gdmXnest bin/gdmXnestchooser bin/gdmdynamic @@ -8,11 +8,11 @@ bin/gdmphotosetup bin/gdmthemetester lib/gtk-2.0/modules/libdwellmouselistener.la lib/gtk-2.0/modules/libkeymouselistener.la -${PAM_MISC}libexec/gdmaskpass +${PLIST.pam}libexec/gdmaskpass libexec/gdmchooser libexec/gdmgreeter libexec/gdmlogin -${GDMOPEN}libexec/gdmopen +${PLIST.gdmopen}libexec/gdmopen libexec/gdmtranslate man/man1/gdm.1 sbin/gdm diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile index 7d211105163..17f458bbe0e 100644 --- a/x11/gnome-applets/Makefile +++ b/x11/gnome-applets/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.55 2008/03/06 14:53:56 wiz Exp $ +# $NetBSD: Makefile,v 1.56 2008/04/12 22:43:14 jlam Exp $ # DISTNAME= gnome-applets-2.20.1 @@ -48,25 +48,25 @@ CONFIGURE_ARGS+= --enable-ipv6 CONFIGURE_ARGS+= --disable-ipv6 .endif +PLIST_VARS+= battstat .if ${OPSYS} == "Linux" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD" || \ (${OPSYS} == "NetBSD" && exists(/usr/include/machine/apmvar.h)) GCONF_SCHEMAS+= battstat.schemas -PLIST_SUBST+= BATTSTAT= +PLIST.battstat= yes CONF_FILES+= ${EGDIR}/sound/events/battstat_applet.soundlist \ ${PKG_SYSCONFDIR}/sound/events/battstat_applet.soundlist .else -PLIST_SUBST+= BATTSTAT="@comment " CONFIGURE_ARGS+= --disable-battstat .endif PRINT_PLIST_AWK+= /[Bb]attstat/ { print "$${BATTSTAT}"$$0; next; } PRINT_PLIST_AWK+= /examples/ { print "$${BATTSTAT}"$$0; next; } +PLIST_VARS+= cpufreq .if ${OPSYS} == "Linux" && exists(/usr/include/cpufreq.h) GCONF_SCHEMAS+= cpufreq-applet.schemas -PLIST_SUBST+= CPUFREQ= +PLIST.cpufreq= yes .else -PLIST_SUBST+= CPUFREQ="@comment " CONFIGURE_ARGS+= --disable-cpufreq .endif diff --git a/x11/gnome-applets/PLIST b/x11/gnome-applets/PLIST index 4a2258e15a3..10e612a6e94 100644 --- a/x11/gnome-applets/PLIST +++ b/x11/gnome-applets/PLIST @@ -1,10 +1,10 @@ -@comment $NetBSD: PLIST,v 1.12 2008/01/11 13:34:16 drochner Exp $ +@comment $NetBSD: PLIST,v 1.13 2008/04/12 22:43:14 jlam Exp $ bin/invest-chart include/libgweather/gweather-gconf.h include/libgweather/gweather-prefs.h include/libgweather/weather.h lib/bonobo/servers/GNOME_AccessxStatusApplet.server -${BATTSTAT}lib/bonobo/servers/GNOME_BattstatApplet.server +${PLIST.battstat}lib/bonobo/servers/GNOME_BattstatApplet.server lib/bonobo/servers/GNOME_CDPlayerApplet.server lib/bonobo/servers/GNOME_CharpickerApplet.server lib/bonobo/servers/GNOME_DriveMountApplet.server @@ -47,7 +47,7 @@ ${PYSITELIB}/invest/widgets.py ${PYSITELIB}/invest/widgets.pyc ${PYSITELIB}/invest/widgets.pyo libexec/accessx-status-applet -${BATTSTAT}libexec/battstat-applet-2 +${PLIST.battstat}libexec/battstat-applet-2 libexec/charpick_applet2 libexec/drivemount_applet2 libexec/geyes_applet2 @@ -58,8 +58,8 @@ libexec/multiload-applet-2 libexec/null_applet libexec/stickynotes_applet libexec/trashapplet -${BATTSTAT}share/examples/gnome-applets/sound/events/battstat_applet.soundlist -${BATTSTAT}share/gconf/schemas/battstat.schemas +${PLIST.battstat}share/examples/gnome-applets/sound/events/battstat_applet.soundlist +${PLIST.battstat}share/gconf/schemas/battstat.schemas share/gconf/schemas/charpick.schemas share/gconf/schemas/drivemount.schemas share/gconf/schemas/geyes.schemas @@ -68,7 +68,7 @@ share/gconf/schemas/mixer.schemas share/gconf/schemas/multiload.schemas share/gconf/schemas/stickynotes.schemas share/gnome-2.0/ui/GNOME_AccessxApplet.xml -${BATTSTAT}share/gnome-2.0/ui/GNOME_BattstatApplet.xml +${PLIST.battstat}share/gnome-2.0/ui/GNOME_BattstatApplet.xml share/gnome-2.0/ui/GNOME_CharpickerApplet.xml share/gnome-2.0/ui/GNOME_DriveMountApplet.xml share/gnome-2.0/ui/GNOME_GWeatherApplet.xml @@ -96,7 +96,7 @@ share/gnome-applets/geyes/Horrid/horrid_pupil.png share/gnome-applets/geyes/Tango/config share/gnome-applets/geyes/Tango/tango-eye.png share/gnome-applets/geyes/Tango/tango-pupil.png -${BATTSTAT}share/gnome-applets/glade/battstat_applet.glade +${PLIST.battstat}share/gnome-applets/glade/battstat_applet.glade share/gnome-applets/glade/financialchart.glade share/gnome-applets/glade/prefs-dialog.glade share/gnome-applets/glade/stickynotes.glade @@ -239,67 +239,67 @@ share/gnome/help/accessx-status/uk/figures/accessx_sticky-keys.png share/gnome/help/accessx-status/uk/figures/accessx_sticky-meta-key.png share/gnome/help/accessx-status/uk/figures/accessx_sticky-shift-key.png share/gnome/help/accessx-status/uk/figures/accessx_sticky-windows-key.png -${BATTSTAT}share/gnome/help/battstat/C/battstat.xml -${BATTSTAT}share/gnome/help/battstat/C/figures/battstat-applet-expanded.png -${BATTSTAT}share/gnome/help/battstat/C/figures/battstat-applet.png -${BATTSTAT}share/gnome/help/battstat/C/figures/battstat-credits-hal.png -${BATTSTAT}share/gnome/help/battstat/C/figures/battstat-preferences.png -${BATTSTAT}share/gnome/help/battstat/C/figures/context-menu.png -${BATTSTAT}share/gnome/help/battstat/C/legal.xml -${BATTSTAT}share/gnome/help/battstat/bg/battstat.xml -${BATTSTAT}share/gnome/help/battstat/bg/figures/battstat-applet-expanded.png -${BATTSTAT}share/gnome/help/battstat/bg/figures/battstat-applet.png -${BATTSTAT}share/gnome/help/battstat/bg/figures/battstat-credits-hal.png -${BATTSTAT}share/gnome/help/battstat/bg/figures/battstat-preferences.png -${BATTSTAT}share/gnome/help/battstat/bg/figures/context-menu.png -${BATTSTAT}share/gnome/help/battstat/en_GB/battstat.xml -${BATTSTAT}share/gnome/help/battstat/en_GB/figures/battstat-applet-expanded.png -${BATTSTAT}share/gnome/help/battstat/en_GB/figures/battstat-applet.png -${BATTSTAT}share/gnome/help/battstat/en_GB/figures/battstat-credits-hal.png -${BATTSTAT}share/gnome/help/battstat/en_GB/figures/battstat-preferences.png -${BATTSTAT}share/gnome/help/battstat/en_GB/figures/context-menu.png -${BATTSTAT}share/gnome/help/battstat/es/battstat.xml -${BATTSTAT}share/gnome/help/battstat/es/figures/battstat-applet-expanded.png -${BATTSTAT}share/gnome/help/battstat/es/figures/battstat-applet.png -${BATTSTAT}share/gnome/help/battstat/es/figures/battstat-credits-hal.png -${BATTSTAT}share/gnome/help/battstat/es/figures/battstat-preferences.png -${BATTSTAT}share/gnome/help/battstat/es/figures/context-menu.png -${BATTSTAT}share/gnome/help/battstat/fr/battstat.xml -${BATTSTAT}share/gnome/help/battstat/fr/figures/battstat-applet-expanded.png -${BATTSTAT}share/gnome/help/battstat/fr/figures/battstat-applet.png -${BATTSTAT}share/gnome/help/battstat/fr/figures/battstat-credits-hal.png -${BATTSTAT}share/gnome/help/battstat/fr/figures/battstat-preferences.png -${BATTSTAT}share/gnome/help/battstat/fr/figures/context-menu.png -${BATTSTAT}share/gnome/help/battstat/ko/battstat.xml -${BATTSTAT}share/gnome/help/battstat/ko/figures/battstat-applet-expanded.png -${BATTSTAT}share/gnome/help/battstat/ko/figures/battstat-applet.png -${BATTSTAT}share/gnome/help/battstat/ko/figures/battstat-credits-hal.png -${BATTSTAT}share/gnome/help/battstat/ko/figures/battstat-preferences.png -${BATTSTAT}share/gnome/help/battstat/ko/figures/context-menu.png -${BATTSTAT}share/gnome/help/battstat/oc/battstat.xml -${BATTSTAT}share/gnome/help/battstat/oc/figures/battstat-applet-expanded.png -${BATTSTAT}share/gnome/help/battstat/oc/figures/battstat-applet.png -${BATTSTAT}share/gnome/help/battstat/oc/figures/battstat-credits-hal.png -${BATTSTAT}share/gnome/help/battstat/oc/figures/battstat-preferences.png -${BATTSTAT}share/gnome/help/battstat/oc/figures/context-menu.png -${BATTSTAT}share/gnome/help/battstat/pa/battstat.xml -${BATTSTAT}share/gnome/help/battstat/pa/figures/battstat-applet-expanded.png -${BATTSTAT}share/gnome/help/battstat/pa/figures/battstat-applet.png -${BATTSTAT}share/gnome/help/battstat/pa/figures/battstat-credits-hal.png -${BATTSTAT}share/gnome/help/battstat/pa/figures/battstat-preferences.png -${BATTSTAT}share/gnome/help/battstat/pa/figures/context-menu.png -${BATTSTAT}share/gnome/help/battstat/sv/battstat.xml -${BATTSTAT}share/gnome/help/battstat/sv/figures/battstat-applet-expanded.png -${BATTSTAT}share/gnome/help/battstat/sv/figures/battstat-applet.png -${BATTSTAT}share/gnome/help/battstat/sv/figures/battstat-credits-hal.png -${BATTSTAT}share/gnome/help/battstat/sv/figures/battstat-preferences.png -${BATTSTAT}share/gnome/help/battstat/sv/figures/context-menu.png -${BATTSTAT}share/gnome/help/battstat/uk/battstat.xml -${BATTSTAT}share/gnome/help/battstat/uk/figures/battstat-applet-expanded.png -${BATTSTAT}share/gnome/help/battstat/uk/figures/battstat-applet.png -${BATTSTAT}share/gnome/help/battstat/uk/figures/battstat-credits-hal.png -${BATTSTAT}share/gnome/help/battstat/uk/figures/battstat-preferences.png -${BATTSTAT}share/gnome/help/battstat/uk/figures/context-menu.png +${PLIST.battstat}share/gnome/help/battstat/C/battstat.xml +${PLIST.battstat}share/gnome/help/battstat/C/figures/battstat-applet-expanded.png +${PLIST.battstat}share/gnome/help/battstat/C/figures/battstat-applet.png +${PLIST.battstat}share/gnome/help/battstat/C/figures/battstat-credits-hal.png +${PLIST.battstat}share/gnome/help/battstat/C/figures/battstat-preferences.png +${PLIST.battstat}share/gnome/help/battstat/C/figures/context-menu.png +${PLIST.battstat}share/gnome/help/battstat/C/legal.xml +${PLIST.battstat}share/gnome/help/battstat/bg/battstat.xml +${PLIST.battstat}share/gnome/help/battstat/bg/figures/battstat-applet-expanded.png +${PLIST.battstat}share/gnome/help/battstat/bg/figures/battstat-applet.png +${PLIST.battstat}share/gnome/help/battstat/bg/figures/battstat-credits-hal.png +${PLIST.battstat}share/gnome/help/battstat/bg/figures/battstat-preferences.png +${PLIST.battstat}share/gnome/help/battstat/bg/figures/context-menu.png +${PLIST.battstat}share/gnome/help/battstat/en_GB/battstat.xml +${PLIST.battstat}share/gnome/help/battstat/en_GB/figures/battstat-applet-expanded.png +${PLIST.battstat}share/gnome/help/battstat/en_GB/figures/battstat-applet.png +${PLIST.battstat}share/gnome/help/battstat/en_GB/figures/battstat-credits-hal.png +${PLIST.battstat}share/gnome/help/battstat/en_GB/figures/battstat-preferences.png +${PLIST.battstat}share/gnome/help/battstat/en_GB/figures/context-menu.png +${PLIST.battstat}share/gnome/help/battstat/es/battstat.xml +${PLIST.battstat}share/gnome/help/battstat/es/figures/battstat-applet-expanded.png +${PLIST.battstat}share/gnome/help/battstat/es/figures/battstat-applet.png +${PLIST.battstat}share/gnome/help/battstat/es/figures/battstat-credits-hal.png +${PLIST.battstat}share/gnome/help/battstat/es/figures/battstat-preferences.png +${PLIST.battstat}share/gnome/help/battstat/es/figures/context-menu.png +${PLIST.battstat}share/gnome/help/battstat/fr/battstat.xml +${PLIST.battstat}share/gnome/help/battstat/fr/figures/battstat-applet-expanded.png +${PLIST.battstat}share/gnome/help/battstat/fr/figures/battstat-applet.png +${PLIST.battstat}share/gnome/help/battstat/fr/figures/battstat-credits-hal.png +${PLIST.battstat}share/gnome/help/battstat/fr/figures/battstat-preferences.png +${PLIST.battstat}share/gnome/help/battstat/fr/figures/context-menu.png +${PLIST.battstat}share/gnome/help/battstat/ko/battstat.xml +${PLIST.battstat}share/gnome/help/battstat/ko/figures/battstat-applet-expanded.png +${PLIST.battstat}share/gnome/help/battstat/ko/figures/battstat-applet.png +${PLIST.battstat}share/gnome/help/battstat/ko/figures/battstat-credits-hal.png +${PLIST.battstat}share/gnome/help/battstat/ko/figures/battstat-preferences.png +${PLIST.battstat}share/gnome/help/battstat/ko/figures/context-menu.png +${PLIST.battstat}share/gnome/help/battstat/oc/battstat.xml +${PLIST.battstat}share/gnome/help/battstat/oc/figures/battstat-applet-expanded.png +${PLIST.battstat}share/gnome/help/battstat/oc/figures/battstat-applet.png +${PLIST.battstat}share/gnome/help/battstat/oc/figures/battstat-credits-hal.png +${PLIST.battstat}share/gnome/help/battstat/oc/figures/battstat-preferences.png +${PLIST.battstat}share/gnome/help/battstat/oc/figures/context-menu.png +${PLIST.battstat}share/gnome/help/battstat/pa/battstat.xml +${PLIST.battstat}share/gnome/help/battstat/pa/figures/battstat-applet-expanded.png +${PLIST.battstat}share/gnome/help/battstat/pa/figures/battstat-applet.png +${PLIST.battstat}share/gnome/help/battstat/pa/figures/battstat-credits-hal.png +${PLIST.battstat}share/gnome/help/battstat/pa/figures/battstat-preferences.png +${PLIST.battstat}share/gnome/help/battstat/pa/figures/context-menu.png +${PLIST.battstat}share/gnome/help/battstat/sv/battstat.xml +${PLIST.battstat}share/gnome/help/battstat/sv/figures/battstat-applet-expanded.png +${PLIST.battstat}share/gnome/help/battstat/sv/figures/battstat-applet.png +${PLIST.battstat}share/gnome/help/battstat/sv/figures/battstat-credits-hal.png +${PLIST.battstat}share/gnome/help/battstat/sv/figures/battstat-preferences.png +${PLIST.battstat}share/gnome/help/battstat/sv/figures/context-menu.png +${PLIST.battstat}share/gnome/help/battstat/uk/battstat.xml +${PLIST.battstat}share/gnome/help/battstat/uk/figures/battstat-applet-expanded.png +${PLIST.battstat}share/gnome/help/battstat/uk/figures/battstat-applet.png +${PLIST.battstat}share/gnome/help/battstat/uk/figures/battstat-credits-hal.png +${PLIST.battstat}share/gnome/help/battstat/uk/figures/battstat-preferences.png +${PLIST.battstat}share/gnome/help/battstat/uk/figures/context-menu.png share/gnome/help/char-palette/C/char-palette.xml share/gnome/help/char-palette/C/figures/charpalette_applet.png share/gnome/help/char-palette/C/figures/charpalette_chargroup.png @@ -891,16 +891,16 @@ share/omf/accessx-status/accessx-status-nl.omf share/omf/accessx-status/accessx-status-oc.omf share/omf/accessx-status/accessx-status-sv.omf share/omf/accessx-status/accessx-status-uk.omf -${BATTSTAT}share/omf/battstat/battstat-C.omf -${BATTSTAT}share/omf/battstat/battstat-bg.omf -${BATTSTAT}share/omf/battstat/battstat-en_GB.omf -${BATTSTAT}share/omf/battstat/battstat-es.omf -${BATTSTAT}share/omf/battstat/battstat-fr.omf -${BATTSTAT}share/omf/battstat/battstat-ko.omf -${BATTSTAT}share/omf/battstat/battstat-oc.omf -${BATTSTAT}share/omf/battstat/battstat-pa.omf -${BATTSTAT}share/omf/battstat/battstat-sv.omf -${BATTSTAT}share/omf/battstat/battstat-uk.omf +${PLIST.battstat}share/omf/battstat/battstat-C.omf +${PLIST.battstat}share/omf/battstat/battstat-bg.omf +${PLIST.battstat}share/omf/battstat/battstat-en_GB.omf +${PLIST.battstat}share/omf/battstat/battstat-es.omf +${PLIST.battstat}share/omf/battstat/battstat-fr.omf +${PLIST.battstat}share/omf/battstat/battstat-ko.omf +${PLIST.battstat}share/omf/battstat/battstat-oc.omf +${PLIST.battstat}share/omf/battstat/battstat-pa.omf +${PLIST.battstat}share/omf/battstat/battstat-sv.omf +${PLIST.battstat}share/omf/battstat/battstat-uk.omf share/omf/char-palette/char-palette-C.omf share/omf/char-palette/char-palette-bg.omf share/omf/char-palette/char-palette-en_GB.omf @@ -1134,7 +1134,7 @@ share/xmodmap/xmodmap.yu @dirrm share/omf/geyes @dirrm share/omf/drivemount @dirrm share/omf/char-palette -${BATTSTAT}@dirrm share/omf/battstat +${PLIST.battstat}@dirrm share/omf/battstat @dirrm share/omf/accessx-status @comment in rarian: @dirrm share/omf @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps @@ -1338,27 +1338,27 @@ ${BATTSTAT}@dirrm share/omf/battstat @dirrm share/gnome/help/char-palette/C/figures @dirrm share/gnome/help/char-palette/C @dirrm share/gnome/help/char-palette -${BATTSTAT}@dirrm share/gnome/help/battstat/uk/figures -${BATTSTAT}@dirrm share/gnome/help/battstat/uk -${BATTSTAT}@dirrm share/gnome/help/battstat/sv/figures -${BATTSTAT}@dirrm share/gnome/help/battstat/sv -${BATTSTAT}@dirrm share/gnome/help/battstat/pa/figures -${BATTSTAT}@dirrm share/gnome/help/battstat/pa -${BATTSTAT}@dirrm share/gnome/help/battstat/oc/figures -${BATTSTAT}@dirrm share/gnome/help/battstat/oc -${BATTSTAT}@dirrm share/gnome/help/battstat/ko/figures -${BATTSTAT}@dirrm share/gnome/help/battstat/ko -${BATTSTAT}@dirrm share/gnome/help/battstat/fr/figures -${BATTSTAT}@dirrm share/gnome/help/battstat/fr -${BATTSTAT}@dirrm share/gnome/help/battstat/es/figures -${BATTSTAT}@dirrm share/gnome/help/battstat/es -${BATTSTAT}@dirrm share/gnome/help/battstat/en_GB/figures -${BATTSTAT}@dirrm share/gnome/help/battstat/en_GB -${BATTSTAT}@dirrm share/gnome/help/battstat/bg/figures -${BATTSTAT}@dirrm share/gnome/help/battstat/bg -${BATTSTAT}@dirrm share/gnome/help/battstat/C/figures -${BATTSTAT}@dirrm share/gnome/help/battstat/C -${BATTSTAT}@dirrm share/gnome/help/battstat +${PLIST.battstat}@dirrm share/gnome/help/battstat/uk/figures +${PLIST.battstat}@dirrm share/gnome/help/battstat/uk +${PLIST.battstat}@dirrm share/gnome/help/battstat/sv/figures +${PLIST.battstat}@dirrm share/gnome/help/battstat/sv +${PLIST.battstat}@dirrm share/gnome/help/battstat/pa/figures +${PLIST.battstat}@dirrm share/gnome/help/battstat/pa +${PLIST.battstat}@dirrm share/gnome/help/battstat/oc/figures +${PLIST.battstat}@dirrm share/gnome/help/battstat/oc +${PLIST.battstat}@dirrm share/gnome/help/battstat/ko/figures +${PLIST.battstat}@dirrm share/gnome/help/battstat/ko +${PLIST.battstat}@dirrm share/gnome/help/battstat/fr/figures +${PLIST.battstat}@dirrm share/gnome/help/battstat/fr +${PLIST.battstat}@dirrm share/gnome/help/battstat/es/figures +${PLIST.battstat}@dirrm share/gnome/help/battstat/es +${PLIST.battstat}@dirrm share/gnome/help/battstat/en_GB/figures +${PLIST.battstat}@dirrm share/gnome/help/battstat/en_GB +${PLIST.battstat}@dirrm share/gnome/help/battstat/bg/figures +${PLIST.battstat}@dirrm share/gnome/help/battstat/bg +${PLIST.battstat}@dirrm share/gnome/help/battstat/C/figures +${PLIST.battstat}@dirrm share/gnome/help/battstat/C +${PLIST.battstat}@dirrm share/gnome/help/battstat @dirrm share/gnome/help/accessx-status/uk/figures @dirrm share/gnome/help/accessx-status/uk @dirrm share/gnome/help/accessx-status/sv/figures @@ -1396,9 +1396,9 @@ ${BATTSTAT}@dirrm share/gnome/help/battstat @dirrm share/gnome-applets @comment in gnome2-dirs: @dirrm share/gnome-2.0/ui @comment in GConf: @dirrm share/gconf/schemas -${BATTSTAT}@dirrm share/examples/gnome-applets/sound/events -${BATTSTAT}@dirrm share/examples/gnome-applets/sound -${BATTSTAT}@dirrm share/examples/gnome-applets +${PLIST.battstat}@dirrm share/examples/gnome-applets/sound/events +${PLIST.battstat}@dirrm share/examples/gnome-applets/sound +${PLIST.battstat}@dirrm share/examples/gnome-applets @dirrm ${PYSITELIB}/invest @comment in libbonobo: @dirrm lib/bonobo/servers @dirrm include/libgweather diff --git a/x11/gnome-control-center/Makefile b/x11/gnome-control-center/Makefile index f3f4eb10cb1..9092a220b28 100644 --- a/x11/gnome-control-center/Makefile +++ b/x11/gnome-control-center/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2008/03/06 14:53:56 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2008/04/12 22:43:14 jlam Exp $ # DISTNAME= gnome-control-center-2.20.3 @@ -58,11 +58,10 @@ PKG_OPTIONS_VAR= PKG_OPTIONS.gnome-control-center PKG_SUPPORTED_OPTIONS= evolution PKG_SUGGESTED_OPTIONS= evolution .include "../../mk/bsd.options.mk" +PLIST_VARS+= evolution .if !empty(PKG_OPTIONS:Mevolution) CONFIGURE_ARGS+= --enable-aboutme -PLIST_SUBST+= EVOLUTION="" -.else -PLIST_SUBST+= EVOLUTION="@comment " +PLIST.evolution= yes .endif .include "../../audio/esound/buildlink3.mk" diff --git a/x11/gnome-control-center/PLIST b/x11/gnome-control-center/PLIST index 4d9b265e3bb..2d8731f7003 100644 --- a/x11/gnome-control-center/PLIST +++ b/x11/gnome-control-center/PLIST @@ -1,5 +1,5 @@ -@comment $NetBSD: PLIST,v 1.4 2008/01/11 13:31:18 drochner Exp $ -${EVOLUTION}bin/gnome-about-me +@comment $NetBSD: PLIST,v 1.5 2008/04/12 22:43:14 jlam Exp $ +${PLIST.evolution}bin/gnome-about-me bin/gnome-accessibility-keyboard-properties bin/gnome-appearance-properties bin/gnome-at-mobility @@ -35,7 +35,7 @@ share/applications/accessibility-keyboard.desktop share/applications/at-properties.desktop share/applications/default-applications.desktop share/applications/display-properties.desktop -${EVOLUTION}share/applications/gnome-about-me.desktop +${PLIST.evolution}share/applications/gnome-about-me.desktop share/applications/gnome-appearance-properties.desktop share/applications/gnome-font-viewer.desktop share/applications/gnome-network-preferences.desktop @@ -65,7 +65,7 @@ share/gnome-control-center/glade/acme.glade share/gnome-control-center/glade/appearance.glade share/gnome-control-center/glade/apply-font.glade share/gnome-control-center/glade/at-enable-dialog.glade -${EVOLUTION}share/gnome-control-center/glade/gnome-about-me.glade +${PLIST.evolution}share/gnome-control-center/glade/gnome-about-me.glade share/gnome-control-center/glade/gnome-accessibility-keyboard-properties.glade share/gnome-control-center/glade/gnome-default-applications-properties.glade share/gnome-control-center/glade/gnome-keybinding-properties.glade @@ -93,8 +93,8 @@ share/gnome-control-center/pixmaps/bar.png share/gnome-control-center/pixmaps/double-click-maybe.png share/gnome-control-center/pixmaps/double-click-off.png share/gnome-control-center/pixmaps/double-click-on.png -${EVOLUTION}share/gnome-control-center/pixmaps/gnome-about-me-lock-open.png -${EVOLUTION}share/gnome-control-center/pixmaps/gnome-about-me-lock.png +${PLIST.evolution}share/gnome-control-center/pixmaps/gnome-about-me-lock-open.png +${PLIST.evolution}share/gnome-control-center/pixmaps/gnome-about-me-lock.png share/gnome-control-center/pixmaps/gtk-theme-thumbnailing.png share/gnome-control-center/pixmaps/icon-theme-thumbnailing.png share/gnome-control-center/pixmaps/keyboard-bell.png diff --git a/x11/gtk2/PLIST b/x11/gtk2/PLIST index aec50ecdbeb..595474b6d6f 100644 --- a/x11/gtk2/PLIST +++ b/x11/gtk2/PLIST @@ -1,12 +1,12 @@ -@comment $NetBSD: PLIST,v 1.56 2008/02/03 11:20:21 drochner Exp $ +@comment $NetBSD: PLIST,v 1.57 2008/04/12 22:43:14 jlam Exp $ bin/gdk-pixbuf-csource bin/gdk-pixbuf-query-loaders bin/gtk-builder-convert bin/gtk-demo bin/gtk-query-immodules-2.0 bin/gtk-update-icon-cache -${X11}include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h -${X11}include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h +${PLIST.x11}include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h +${PLIST.x11}include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-animation.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-core.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h @@ -49,7 +49,7 @@ include/gtk-2.0/gdk/gdkspawn.h include/gtk-2.0/gdk/gdktypes.h include/gtk-2.0/gdk/gdkvisual.h include/gtk-2.0/gdk/gdkwindow.h -${X11}include/gtk-2.0/gdk/gdkx.h +${PLIST.x11}include/gtk-2.0/gdk/gdkx.h include/gtk-2.0/gtk/gtk.h include/gtk-2.0/gtk/gtkaboutdialog.h include/gtk-2.0/gtk/gtkaccelgroup.h @@ -266,7 +266,7 @@ lib/gtk-2.0/2.10.0/immodules/im-thai.la lib/gtk-2.0/2.10.0/immodules/im-ti-er.la lib/gtk-2.0/2.10.0/immodules/im-ti-et.la lib/gtk-2.0/2.10.0/immodules/im-viqr.la -${X11}lib/gtk-2.0/2.10.0/immodules/im-xim.la +${PLIST.x11}lib/gtk-2.0/2.10.0/immodules/im-xim.la lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.la lib/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.la lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.la @@ -281,25 +281,25 @@ lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.la lib/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.la lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.la lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.la -${CUPS}lib/gtk-2.0/2.10.0/printbackends/libprintbackend-cups.la +${PLIST.cups}lib/gtk-2.0/2.10.0/printbackends/libprintbackend-cups.la lib/gtk-2.0/2.10.0/printbackends/libprintbackend-file.la lib/gtk-2.0/2.10.0/printbackends/libprintbackend-lpr.la lib/gtk-2.0/include/gdkconfig.h -${QUARTZ}lib/libgdk-quartz-2.0.la -${X11}lib/libgdk-x11-2.0.la +${PLIST.quartz}lib/libgdk-quartz-2.0.la +${PLIST.x11}lib/libgdk-x11-2.0.la lib/libgdk_pixbuf-2.0.la -${X11}lib/libgdk_pixbuf_xlib-2.0.la -${QUARTZ}lib/libgtk-quartz-2.0.la -${X11}lib/libgtk-x11-2.0.la +${PLIST.x11}lib/libgdk_pixbuf_xlib-2.0.la +${PLIST.quartz}lib/libgtk-quartz-2.0.la +${PLIST.x11}lib/libgtk-x11-2.0.la lib/pkgconfig/gdk-2.0.pc lib/pkgconfig/gdk-pixbuf-2.0.pc -${X11}lib/pkgconfig/gdk-pixbuf-xlib-2.0.pc -${QUARTZ}lib/pkgconfig/gdk-quartz-2.0.pc -${X11}lib/pkgconfig/gdk-x11-2.0.pc +${PLIST.x11}lib/pkgconfig/gdk-pixbuf-xlib-2.0.pc +${PLIST.quartz}lib/pkgconfig/gdk-quartz-2.0.pc +${PLIST.x11}lib/pkgconfig/gdk-x11-2.0.pc lib/pkgconfig/gtk+-2.0.pc -${QUARTZ}lib/pkgconfig/gtk+-quartz-2.0.pc +${PLIST.quartz}lib/pkgconfig/gtk+-quartz-2.0.pc lib/pkgconfig/gtk+-unix-print-2.0.pc -${X11}lib/pkgconfig/gtk+-x11-2.0.pc +${PLIST.x11}lib/pkgconfig/gtk+-x11-2.0.pc libdata/gtk-2.0/im-multipress.conf man/man1/gdk-pixbuf-csource.1 man/man1/gdk-pixbuf-query-loaders.1 @@ -1177,7 +1177,7 @@ share/themes/Raleigh/gtk-2.0/gtkrc @dirrm include/gtk-unix-print-2.0/gtk @dirrm include/gtk-unix-print-2.0 @dirrm include/gtk-2.0/gtk -${X11}@dirrm include/gtk-2.0/gdk-pixbuf-xlib +${PLIST.x11}@dirrm include/gtk-2.0/gdk-pixbuf-xlib @dirrm include/gtk-2.0/gdk-pixbuf @dirrm include/gtk-2.0/gdk @dirrm include/gtk-2.0 diff --git a/x11/gtk2/options.mk b/x11/gtk2/options.mk index 5d70b29452c..9863516d4ac 100644 --- a/x11/gtk2/options.mk +++ b/x11/gtk2/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.7 2007/10/21 01:18:36 obache Exp $ +# $NetBSD: options.mk,v 1.8 2008/04/12 22:43:14 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gtk2 PKG_SUPPORTED_OPTIONS= cups debug @@ -11,11 +11,11 @@ PKG_SUGGESTED_OPTIONS= x11 .include "../../mk/bsd.options.mk" +PLIST_VARS+= cups .if !empty(PKG_OPTIONS:Mcups) .include "../../print/cups/buildlink3.mk" -PLIST_SUBST+= CUPS= +PLIST.cups= yes .else -PLIST_SUBST+= CUPS="@comment " CONFIGURE_ENV+= ac_cv_path_CUPS_CONFIG=no .endif @@ -26,17 +26,16 @@ CONFIGURE_ARGS+= --enable-debug=yes ### ### GDK target ### +PLIST_VARS+= quartz x11 .if !empty(PKG_OPTIONS:Mquartz) CONFIGURE_ARGS+= --without-x CONFIGURE_ARGS+= --with-gdktarget=quartz -PLIST_SUBST+= QUARTZ="" -PLIST_SUBST+= X11="@comment " +PLIST.quartz= yes .else CONFIGURE_ARGS+= --with-xinput=xfree CONFIGURE_ENV+= ac_cv_header_X11_extensions_Xinerama_h=no CONFIGURE_ENV+= ac_cv_lib_Xinerama_XineramaQueryExtension=no -PLIST_SUBST+= QUARTZ="@comment " -PLIST_SUBST+= X11="" +PLIST.x11= yes BUILDLINK_API_DEPENDS.Xft2+= Xft2>=2.1.2nb2 diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index cef9bd5b56c..67ad97b7319 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.143 2008/02/20 09:53:03 markd Exp $ +# $NetBSD: Makefile,v 1.144 2008/04/12 22:43:14 jlam Exp $ DISTNAME= kdebase-${_KDE_VERSION} CATEGORIES= x11 @@ -93,16 +93,14 @@ DEPENDS+= htdig>=3.2.0:../../www/htdig-devel CONFIGURE_ARGS+= --without-libusb .endif +PLIST_VARS+= usbview .if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux" -PLIST_SUBST+= HAVE_USBVIEW="" -.else -PLIST_SUBST+= HAVE_USBVIEW="@comment " +PLIST.usbview= yes .endif +PLIST_VARS+= joystick .if ${OPSYS} == "Linux" -PLIST_SUBST+= HAVE_JOYSTICK="" -.else -PLIST_SUBST+= HAVE_JOYSTICK="@comment " +PLIST.joystick= yes .endif ICONDIR= share/icons diff --git a/x11/kdebase3/PLIST b/x11/kdebase3/PLIST index 0ed72213c52..0817ebf5076 100644 --- a/x11/kdebase3/PLIST +++ b/x11/kdebase3/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.49 2008/01/04 21:05:56 markd Exp $ +@comment $NetBSD: PLIST,v 1.50 2008/04/12 22:43:14 jlam Exp $ bin/appletproxy bin/drkonqi bin/extensionproxy @@ -53,7 +53,7 @@ bin/klipper bin/klocaldomainurifilterhelper bin/kmenuedit bin/knetattach -${HAVE_COMPOSITE}bin/kompmgr +${PLIST.composite}bin/kompmgr bin/konqueror bin/konsole bin/kpager @@ -181,7 +181,7 @@ lib/kde3/kcm_icons.la lib/kde3/kcm_info.la lib/kde3/kcm_input.la lib/kde3/kcm_ioslaveinfo.la -${HAVE_JOYSTICK}lib/kde3/kcm_joystick.la +${PLIST.joystick}lib/kde3/kcm_joystick.la lib/kde3/kcm_kded.la lib/kde3/kcm_kdm.la lib/kde3/kcm_kdnssd.la @@ -216,7 +216,7 @@ lib/kde3/kcm_smserver.la lib/kde3/kcm_spellchecking.la lib/kde3/kcm_style.la lib/kde3/kcm_taskbar.la -${HAVE_USBVIEW}lib/kde3/kcm_usb.la +${PLIST.usbview}lib/kde3/kcm_usb.la lib/kde3/kcm_useraccount.la lib/kde3/kcm_xinerama.la lib/kde3/kcminit.la @@ -273,7 +273,7 @@ lib/kde3/kio_print.la lib/kde3/kio_remote.la lib/kde3/kio_settings.la lib/kde3/kio_sftp.la -${HAVE_SMB}lib/kde3/kio_smb.la +${PLIST.smb}lib/kde3/kio_smb.la lib/kde3/kio_smtp.la lib/kde3/kio_system.la lib/kde3/kio_tar.la @@ -414,7 +414,7 @@ share/applications/kde/installktheme.desktop share/applications/kde/interrupts.desktop share/applications/kde/ioports.desktop share/applications/kde/ioslaveinfo.desktop -${HAVE_JOYSTICK}share/applications/kde/joystick.desktop +${PLIST.joystick}share/applications/kde/joystick.desktop share/applications/kde/kappfinder.desktop share/applications/kde/kate.desktop share/applications/kde/kcm_kdnssd.desktop @@ -431,7 +431,7 @@ share/applications/kde/kcmnotify.desktop share/applications/kde/kcmperformance.desktop share/applications/kde/kcmsmserver.desktop share/applications/kde/kcmtaskbar.desktop -${HAVE_USBVIEW}share/applications/kde/kcmusb.desktop +${PLIST.usbview}share/applications/kde/kcmusb.desktop share/applications/kde/kdepasswd.desktop share/applications/kde/kdeprintfax.desktop share/applications/kde/kdm.desktop @@ -2257,7 +2257,7 @@ share/kde/apps/kcmkeys/win3.kksrc share/kde/apps/kcmkeys/win4.kksrc share/kde/apps/kcmkeys/wm3.kksrc share/kde/apps/kcmlocale/pics/background.png -${HAVE_USBVIEW}share/kde/apps/kcmusb/usb.ids +${PLIST.usbview}share/kde/apps/kcmusb/usb.ids share/kde/apps/kconf_update/convertShortcuts.pl share/kde/apps/kconf_update/favicons.upd share/kde/apps/kconf_update/kaccel.upd @@ -2800,7 +2800,7 @@ share/kde/apps/konqueror/about/plugins_rtl.html share/kde/apps/konqueror/about/specs.html share/kde/apps/konqueror/about/tips.html share/kde/apps/konqueror/about/top-right-konqueror.png -${HAVE_SMB}share/kde/apps/konqueror/dirtree/remote/smb-network.desktop +${PLIST.smb}share/kde/apps/konqueror/dirtree/remote/smb-network.desktop share/kde/apps/konqueror/icons/crystalsvg/16x16/actions/kde1.png share/kde/apps/konqueror/icons/crystalsvg/16x16/actions/kde2.png share/kde/apps/konqueror/icons/crystalsvg/16x16/actions/kde3.png @@ -3015,7 +3015,7 @@ share/kde/apps/kwrite/kwriteui.rc share/kde/apps/naughtyapplet/pics/naughty-happy.png share/kde/apps/naughtyapplet/pics/naughty-sad.png share/kde/apps/plugin/nspluginpart.rc -${HAVE_SMB}share/kde/apps/remoteview/smb-network.desktop +${PLIST.smb}share/kde/apps/remoteview/smb-network.desktop share/kde/apps/systemview/documents.desktop share/kde/apps/systemview/home.desktop share/kde/apps/systemview/media.desktop @@ -3062,8 +3062,8 @@ share/kde/doc/kdm/README share/kde/mimelnk/application/x-konsole.desktop share/kde/mimelnk/application/x-ksysguard.desktop share/kde/mimelnk/application/x-ktheme.desktop -${HAVE_SMB}share/kde/mimelnk/application/x-smb-server.desktop -${HAVE_SMB}share/kde/mimelnk/application/x-smb-workgroup.desktop +${PLIST.smb}share/kde/mimelnk/application/x-smb-server.desktop +${PLIST.smb}share/kde/mimelnk/application/x-smb-workgroup.desktop share/kde/mimelnk/fonts/folder.desktop share/kde/mimelnk/fonts/package.desktop share/kde/mimelnk/fonts/system-folder.desktop @@ -3266,7 +3266,7 @@ share/kde/services/searchproviders/wiktionary.desktop share/kde/services/searchproviders/wordref.desktop share/kde/services/settings.protocol share/kde/services/sftp.protocol -${HAVE_SMB}share/kde/services/smb.protocol +${PLIST.smb}share/kde/services/smb.protocol share/kde/services/smtp.protocol share/kde/services/smtps.protocol share/kde/services/system.protocol @@ -4397,7 +4397,7 @@ share/locale/l10n/zw/flag.png @dirrm share/kde/apps/kcontrol/about @comment in kde: @dirrm share/kde/apps/kcontrol @comment in kde: @dirrm share/kde/apps/kconf_update -${HAVE_USBVIEW}@dirrm share/kde/apps/kcmusb +${PLIST.usbview}@dirrm share/kde/apps/kcmusb @dirrm share/kde/apps/kcmlocale/pics @dirrm share/kde/apps/kcmlocale @dirrm share/kde/apps/kcmkeys diff --git a/x11/kdebase3/options.mk b/x11/kdebase3/options.mk index 102faa7875c..3b9e552dc0e 100644 --- a/x11/kdebase3/options.mk +++ b/x11/kdebase3/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2008/01/04 21:05:56 markd Exp $ +# $NetBSD: options.mk,v 1.4 2008/04/12 22:43:14 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.kdebase PKG_SUPPORTED_OPTIONS= inet6 sasl samba debug pam composite @@ -6,20 +6,19 @@ PKG_SUGGESTED_OPTIONS= sasl .include "../../mk/bsd.options.mk" +PLIST_VARS+= composite .if !empty(PKG_OPTIONS:Mcomposite) CONFIGURE_ARGS+= --with-composite -PLIST_SUBST+= HAVE_COMPOSITE="" +PLIST.composite= yes .else CONFIGURE_ARGS+= --without-composite -PLIST_SUBST+= HAVE_COMPOSITE="@comment " .endif +PLIST_VARS+= smb .if !empty(PKG_OPTIONS:Msamba) .include "../../net/samba/buildlink3.mk" LIBS+= -L${BUILDLINK_PREFIX.samba}/lib/samba ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.samba}/lib/samba -PLIST_SUBST+= HAVE_SMB="" -.else -PLIST_SUBST+= HAVE_SMB="@comment " +PLIST.smb= yes .endif .if !empty(PKG_OPTIONS:Mdebug) diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index 2711907c96d..51e99d4a46e 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.135 2008/02/20 09:49:56 markd Exp $ +# $NetBSD: Makefile,v 1.136 2008/04/12 22:43:14 jlam Exp $ DISTNAME= kdelibs-${_KDE_VERSION} CATEGORIES= x11 @@ -63,16 +63,17 @@ SPECIAL_PERMS+= ${PREFIX}/bin/kpac_dhcp_helper ${SETUID_ROOT_PERMS} .include "options.mk" +PLIST_VARS+= kded .if ${OPSYS} == "NetBSD" . if ${OS_VERSION:M1.5.[12]*} || ${OS_VERSION:M1.[0-4]*} -PLIST_SUBST+= KDED_WORKAROUND="@comment " +# nothing . else -PLIST_SUBST+= KDED_WORKAROUND="" +PLIST.kded= yes . endif # make sure zone.tab is installed DEPENDS+= zonetab-[0-9]*:../../time/zonetab .else -PLIST_SUBST+= KDED_WORKAROUND="" +PLIST.kded= yes .endif .include "../../mk/krb5.buildlink3.mk" diff --git a/x11/kdelibs3/PLIST b/x11/kdelibs3/PLIST index a2274924c73..c6e94d5f3cd 100644 --- a/x11/kdelibs3/PLIST +++ b/x11/kdelibs3/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.41 2007/11/13 11:19:18 markd Exp $ +@comment $NetBSD: PLIST,v 1.42 2008/04/12 22:43:14 jlam Exp $ bin/artsmessage bin/checkXML -${CUPS}bin/cupsdconf -${CUPS}bin/cupsdoprint +${PLIST.cups}bin/cupsdconf +${PLIST.cups}bin/cupsdoprint bin/dcop bin/dcopclient bin/dcopfind @@ -55,7 +55,7 @@ bin/ktradertest bin/kunittestmodrunner bin/kwrapper bin/lnusertemp -${CUPS}bin/make_driver_db_cups +${PLIST.cups}bin/make_driver_db_cups bin/make_driver_db_lpr bin/makekdewidgets bin/meinproc @@ -757,7 +757,7 @@ include/renamedlgplugin.h include/scriptclientinterface.h include/scriptinterface.h include/scriptmanager.h -${CUPS}lib/kde3/cupsdconf.la +${PLIST.cups}lib/kde3/cupsdconf.la lib/kde3/dcopserver.la lib/kde3/kabc_dir.la lib/kde3/kabc_file.la @@ -770,7 +770,7 @@ lib/kde3/kcm_kresources.la lib/kde3/kcmshell.la lib/kde3/kconf_update.la lib/kde3/kcookiejar.la -${KDED_WORKAROUND}lib/kde3/kded.la +${PLIST.kded}lib/kde3/kded.la lib/kde3/kded_kcookiejar.la lib/kde3/kded_kdeprintd.la lib/kde3/kded_kdetrayproxy.la @@ -778,7 +778,7 @@ lib/kde3/kded_kpasswdserver.la lib/kde3/kded_kssld.la lib/kde3/kded_kwalletd.la lib/kde3/kded_proxyscout.la -${CUPS}lib/kde3/kdeprint_cups.la +${PLIST.cups}lib/kde3/kdeprint_cups.la lib/kde3/kdeprint_ext.la lib/kde3/kdeprint_lpdunix.la lib/kde3/kdeprint_lpr.la @@ -843,7 +843,7 @@ lib/libkdecore.la lib/libkdefakes.la lib/libkdefakes_nonpic.a lib/libkdefx.la -${CUPS}lib/libkdeinit_cupsdconf.la +${PLIST.cups}lib/libkdeinit_cupsdconf.la lib/libkdeinit_dcopserver.la lib/libkdeinit_kaddprinterwizard.la lib/libkdeinit_kbuildsycoca.la @@ -3057,8 +3057,8 @@ share/kde/apps/kconf_update/proxytype.pl share/kde/apps/kconf_update/useragent.pl share/kde/apps/kdeprint/apsdriver1 share/kde/apps/kdeprint/apsdriver2 -${CUPS}share/kde/apps/kdeprint/cups_logo.png -${CUPS}share/kde/apps/kdeprint/cupsd.conf.template +${PLIST.cups}share/kde/apps/kdeprint/cups_logo.png +${PLIST.cups}share/kde/apps/kdeprint/cupsd.conf.template share/kde/apps/kdeprint/filters/enscript.desktop share/kde/apps/kdeprint/filters/enscript.xml share/kde/apps/kdeprint/filters/imagetops.desktop @@ -3136,7 +3136,7 @@ share/kde/apps/kdeprint/icons/crystalsvg/48x48/apps/kdeprint_printer.png share/kde/apps/kdeprint/icons/crystalsvg/48x48/apps/kdeprint_printer_class.png share/kde/apps/kdeprint/icons/crystalsvg/64x64/apps/kdeprint_printer.png share/kde/apps/kdeprint/icons/crystalsvg/64x64/apps/kdeprint_printer_class.png -${CUPS}share/kde/apps/kdeprint/kde_logo.png +${PLIST.cups}share/kde/apps/kdeprint/kde_logo.png share/kde/apps/kdeprint/lprngtooldriver1 share/kde/apps/kdeprint/pics/kdeprint_collate.png share/kde/apps/kdeprint/pics/kdeprint_collate_reverse.png @@ -3156,13 +3156,13 @@ share/kde/apps/kdeprint/pics/kdeprint_revlandscape.png share/kde/apps/kdeprint/pics/kdeprint_revportrait.png share/kde/apps/kdeprint/pics/kdeprint_uncollate.png share/kde/apps/kdeprint/pics/kdeprint_uncollate_reverse.png -${CUPS}share/kde/apps/kdeprint/plugins/cups.print +${PLIST.cups}share/kde/apps/kdeprint/plugins/cups.print share/kde/apps/kdeprint/plugins/ext.print share/kde/apps/kdeprint/plugins/lpdunix.print share/kde/apps/kdeprint/plugins/lpr.print share/kde/apps/kdeprint/plugins/rlpr.print -${CUPS}share/kde/apps/kdeprint/preview-mini.png -${CUPS}share/kde/apps/kdeprint/preview.png +${PLIST.cups}share/kde/apps/kdeprint/preview-mini.png +${PLIST.cups}share/kde/apps/kdeprint/preview.png share/kde/apps/kdeprint/side.png share/kde/apps/kdeprint/specials.desktop share/kde/apps/kdeprint/testprint.ps diff --git a/x11/kdelibs3/options.mk b/x11/kdelibs3/options.mk index 705ca358a64..bc65baa73f9 100644 --- a/x11/kdelibs3/options.mk +++ b/x11/kdelibs3/options.mk @@ -1,16 +1,16 @@ -# $NetBSD: options.mk,v 1.1 2007/01/26 02:44:28 markd Exp $ +# $NetBSD: options.mk,v 1.2 2008/04/12 22:43:14 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.kdelibs PKG_SUPPORTED_OPTIONS= cups debug .include "../../mk/bsd.options.mk" +PLIST_VARS+= cups .if !empty(PKG_OPTIONS:Mcups) .include "../../print/cups/buildlink3.mk" -PLIST_SUBST+= CUPS= +PLIST.cups= yes .else CONFIGURE_ARGS+= --disable-cups -PLIST_SUBST+= CUPS="@comment " .endif .if !empty(PKG_OPTIONS:Mdebug) diff --git a/x11/lablgtk/Makefile b/x11/lablgtk/Makefile index 32097704803..b7f11d17c96 100644 --- a/x11/lablgtk/Makefile +++ b/x11/lablgtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2008/03/04 14:47:29 wiz Exp $ +# $NetBSD: Makefile,v 1.30 2008/04/12 22:43:14 jlam Exp $ # DISTNAME= lablgtk-2.10.1 @@ -21,12 +21,11 @@ CONFLICTS= lablgtk2-2.* .include "../../mk/bsd.prefs.mk" # Stub libraries for functions missing from base system. +PLIST_VARS+= stubs .if !empty(MACHINE_PLATFORM:MDarwin-*-powerpc) || \ ${OPSYS} == "DragonFly" || ${OPSYS} == "NetBSD" || \ ${OPSYS} == "FreeBSD" || ${OPSYS} == "SunOS" -PLIST_SUBST+= HAVE_STUBS="" -.else -PLIST_SUBST+= HAVE_STUBS="@comment " +PLIST.stubs= yes .endif .include "options.mk" diff --git a/x11/lablgtk/PLIST b/x11/lablgtk/PLIST index eda14a7a00e..a287adb0a17 100644 --- a/x11/lablgtk/PLIST +++ b/x11/lablgtk/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2007/10/27 13:29:38 wiz Exp $ +@comment $NetBSD: PLIST,v 1.8 2008/04/12 22:43:14 jlam Exp $ bin/gdk-pixbuf-mlsource bin/lablgtk2 lib/ocaml/lablgtk2/gAction.cmi @@ -254,8 +254,8 @@ lib/ocaml/lablgtk2/varcc lib/ocaml/lablgtk2/win32.h lib/ocaml/lablgtk2/wrappers.h lib/ocaml/lablgtk2/xml_lexer.mli -${HAVE_STUBS}lib/ocaml/stublibs/dlllablgtk2.so -${HAVE_STUBS}lib/ocaml/stublibs/dlllablgtkspell.so +${PLIST.stubs}lib/ocaml/stublibs/dlllablgtk2.so +${PLIST.stubs}lib/ocaml/stublibs/dlllablgtkspell.so @comment in ocaml: lib/ocaml/stublibs @dirrm lib/ocaml/lablgtk2 @comment in ocaml: lib/ocaml diff --git a/x11/lablgtk/PLIST.glade b/x11/lablgtk/PLIST.glade index d8ebf475808..a2786e73835 100644 --- a/x11/lablgtk/PLIST.glade +++ b/x11/lablgtk/PLIST.glade @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.glade,v 1.1 2007/09/21 13:00:51 wiz Exp $ +@comment $NetBSD: PLIST.glade,v 1.2 2008/04/12 22:43:14 jlam Exp $ bin/lablgladecc2 lib/ocaml/lablgtk2/glade.cmi lib/ocaml/lablgtk2/glade.cmx @@ -7,4 +7,4 @@ lib/ocaml/lablgtk2/lablglade.a lib/ocaml/lablgtk2/lablglade.cma lib/ocaml/lablgtk2/lablglade.cmxa lib/ocaml/lablgtk2/liblablglade2.a -${HAVE_STUBS}lib/ocaml/stublibs/dlllablglade2.so +${PLIST.stubs}lib/ocaml/stublibs/dlllablglade2.so diff --git a/x11/lablgtk/PLIST.gnome b/x11/lablgtk/PLIST.gnome index 3cf92d20514..6a62ef7af08 100644 --- a/x11/lablgtk/PLIST.gnome +++ b/x11/lablgtk/PLIST.gnome @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.gnome,v 1.1 2007/09/21 13:00:51 wiz Exp $ +@comment $NetBSD: PLIST.gnome,v 1.2 2008/04/12 22:43:14 jlam Exp $ lib/ocaml/lablgtk2/gnoDruid.cmi lib/ocaml/lablgtk2/gnoDruid.cmx lib/ocaml/lablgtk2/gnoDruid.ml @@ -10,4 +10,4 @@ lib/ocaml/lablgtk2/lablgnomeui.a lib/ocaml/lablgtk2/lablgnomeui.cma lib/ocaml/lablgtk2/lablgnomeui.cmxa lib/ocaml/lablgtk2/liblablgnomeui.a -${HAVE_STUBS}lib/ocaml/stublibs/dlllablgnomeui.so +${PLIST.stubs}lib/ocaml/stublibs/dlllablgnomeui.so diff --git a/x11/lablgtk/PLIST.gnomecanvas b/x11/lablgtk/PLIST.gnomecanvas index dd629b9e7d0..48a1d3eaa47 100644 --- a/x11/lablgtk/PLIST.gnomecanvas +++ b/x11/lablgtk/PLIST.gnomecanvas @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.gnomecanvas,v 1.1 2007/09/21 13:00:52 wiz Exp $ +@comment $NetBSD: PLIST.gnomecanvas,v 1.2 2008/04/12 22:43:14 jlam Exp $ lib/ocaml/lablgtk2/gnoCanvas.cmi lib/ocaml/lablgtk2/gnoCanvas.cmx lib/ocaml/lablgtk2/gnoCanvas.ml @@ -17,5 +17,5 @@ lib/ocaml/lablgtk2/panel.cmi lib/ocaml/lablgtk2/panel.cmx lib/ocaml/lablgtk2/panel.ml lib/ocaml/lablgtk2/panel_tags.h -${HAVE_STUBS}lib/ocaml/stublibs/dlllablgnomecanvas.so -${HAVE_STUBS}lib/ocaml/stublibs/dlllablpanel.so +${PLIST.stubs}lib/ocaml/stublibs/dlllablgnomecanvas.so +${PLIST.stubs}lib/ocaml/stublibs/dlllablpanel.so diff --git a/x11/lablgtk/PLIST.gtksourceview b/x11/lablgtk/PLIST.gtksourceview index ed5621df5a2..19d512690a5 100644 --- a/x11/lablgtk/PLIST.gtksourceview +++ b/x11/lablgtk/PLIST.gtksourceview @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.gtksourceview,v 1.1 2007/10/27 13:29:38 wiz Exp $ +@comment $NetBSD: PLIST.gtksourceview,v 1.2 2008/04/12 22:43:14 jlam Exp $ lib/ocaml/lablgtk2/gSourceView.cmi lib/ocaml/lablgtk2/gSourceView.cmx lib/ocaml/lablgtk2/gSourceView.ml @@ -13,4 +13,4 @@ lib/ocaml/lablgtk2/sourceViewEnums.cmi lib/ocaml/lablgtk2/sourceViewEnums.cmx lib/ocaml/lablgtk2/sourceViewEnums.ml lib/ocaml/lablgtk2/sourceView_tags.h -${HAVE_STUBS}lib/ocaml/stublibs/dlllablgtksourceview.so +${PLIST.stubs}lib/ocaml/stublibs/dlllablgtksourceview.so diff --git a/x11/lablgtk/PLIST.svg b/x11/lablgtk/PLIST.svg index 4fe38479743..8ac969e1aae 100644 --- a/x11/lablgtk/PLIST.svg +++ b/x11/lablgtk/PLIST.svg @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.svg,v 1.1 2007/09/21 13:00:53 wiz Exp $ +@comment $NetBSD: PLIST.svg,v 1.2 2008/04/12 22:43:14 jlam Exp $ lib/ocaml/lablgtk2/gnoDruid.cmi lib/ocaml/lablgtk2/gnoDruid.cmx lib/ocaml/lablgtk2/gnoDruid.ml @@ -17,5 +17,5 @@ lib/ocaml/lablgtk2/liblablrsvg.a lib/ocaml/lablgtk2/rsvg.cmi lib/ocaml/lablgtk2/rsvg.cmx lib/ocaml/lablgtk2/rsvg.ml -${HAVE_STUBS}lib/ocaml/stublibs/dlllablgnomeui.so -${HAVE_STUBS}lib/ocaml/stublibs/dlllablrsvg.so +${PLIST.stubs}lib/ocaml/stublibs/dlllablgnomeui.so +${PLIST.stubs}lib/ocaml/stublibs/dlllablrsvg.so diff --git a/x11/matchbox-panel/Makefile b/x11/matchbox-panel/Makefile index 33d1ca83d2f..df9afb62bda 100644 --- a/x11/matchbox-panel/Makefile +++ b/x11/matchbox-panel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2007/01/26 23:47:33 joerg Exp $ +# $NetBSD: Makefile,v 1.15 2008/04/12 22:43:14 jlam Exp $ # DISTNAME= matchbox-panel-0.9.2 @@ -24,10 +24,9 @@ CONFIGURE_ARGS+= --enable-nls .include "../../mk/bsd.prefs.mk" -.if ${OPSYS} == "DragonFly" -PLIST_SUBST+= COND_APM="@comment " -.else -PLIST_SUBST+= COND_APM="" +PLIST_VARS= apm +.if ${OPSYS} != "DragonFly" +PLIST.apm= yes .endif .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/x11/matchbox-panel/PLIST b/x11/matchbox-panel/PLIST index 729dd9ad4e1..136b2100dc6 100644 --- a/x11/matchbox-panel/PLIST +++ b/x11/matchbox-panel/PLIST @@ -1,12 +1,12 @@ -@comment $NetBSD: PLIST,v 1.3 2006/06/21 22:05:02 joerg Exp $ +@comment $NetBSD: PLIST,v 1.4 2008/04/12 22:43:14 jlam Exp $ bin/matchbox-panel -${COND_APM}bin/mb-applet-battery +${PLIST.apm}bin/mb-applet-battery bin/mb-applet-clock bin/mb-applet-launcher bin/mb-applet-menu-launcher bin/mb-applet-system-monitor bin/mb-applet-xterm-wrapper.sh -${COND_APM}share/applications/mb-applet-battery.desktop +${PLIST.apm}share/applications/mb-applet-battery.desktop share/applications/mb-applet-clock.desktop share/applications/mb-applet-menu-launcher.desktop share/applications/mb-applet-system-monitor.desktop diff --git a/x11/mlterm/PLIST b/x11/mlterm/PLIST index ef99d9e6bc0..ed5c37de1ae 100644 --- a/x11/mlterm/PLIST +++ b/x11/mlterm/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.18 2006/12/19 07:53:57 wiz Exp $ +@comment $NetBSD: PLIST,v 1.19 2008/04/12 22:43:14 jlam Exp $ bin/mlcc bin/mlclient bin/mlterm @@ -6,7 +6,7 @@ lib/libkik.la lib/libmkf.la lib/mlterm/libathena.la lib/mlterm/libim-kbd.la -${UIM}lib/mlterm/libim-uim.la +${PLIST.uim}lib/mlterm/libim-uim.la lib/mlterm/libmotif.la lib/mlterm/libmozmodern.la lib/mlterm/libnext.la diff --git a/x11/mlterm/options.mk b/x11/mlterm/options.mk index 17c9311e275..1786a6ded5a 100644 --- a/x11/mlterm/options.mk +++ b/x11/mlterm/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2007/01/13 12:11:13 hira Exp $ +# $NetBSD: options.mk,v 1.3 2008/04/12 22:43:14 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.mlterm PKG_SUPPORTED_OPTIONS= uim xft2 @@ -6,12 +6,11 @@ PKG_SUGGESTED_OPTIONS= .include "../../mk/bsd.options.mk" +PLIST_VARS+= uim .if !empty(PKG_OPTIONS:Muim) .include "../../inputmethod/uim/buildlink3.mk" CONFIGURE_ARGS+= --enable-uim -PLIST_SUBST+= UIM= -.else -PLIST_SUBST+= UIM="@comment " +PLIST.uim= yes .endif .if !empty(PKG_OPTIONS:Mxft2) diff --git a/x11/modular-xorg-server/PLIST b/x11/modular-xorg-server/PLIST index 71b30975fb7..1e24e46034b 100644 --- a/x11/modular-xorg-server/PLIST +++ b/x11/modular-xorg-server/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2008/03/29 17:54:40 wiz Exp $ +@comment $NetBSD: PLIST,v 1.7 2008/04/12 22:43:15 jlam Exp $ bin/X bin/Xnest bin/Xorg @@ -1084,11 +1084,11 @@ lib/X11/xserver/zh_TW.big5 lib/X11/xserver/zh_TW.euctw lib/X11/xserver/zh_TW.utf8 lib/pkgconfig/xorg-server.pc -${USE_DRI}lib/xorg/modules/extensions/libGLcore.la +${PLIST.dri}lib/xorg/modules/extensions/libGLcore.la lib/xorg/modules/extensions/libdbe.la lib/xorg/modules/extensions/libdri.la lib/xorg/modules/extensions/libextmod.la -${USE_DRI}lib/xorg/modules/extensions/libglx.la +${PLIST.dri}lib/xorg/modules/extensions/libglx.la lib/xorg/modules/extensions/librecord.la lib/xorg/modules/extensions/libxtrap.la lib/xorg/modules/fonts/libfreetype.la diff --git a/x11/modular-xorg-server/options.mk b/x11/modular-xorg-server/options.mk index 274128551a1..726e23e8955 100644 --- a/x11/modular-xorg-server/options.mk +++ b/x11/modular-xorg-server/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2007/12/08 09:23:16 wiz Exp $ +# $NetBSD: options.mk,v 1.3 2008/04/12 22:43:15 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.modular-xorg-server PKG_SUPPORTED_OPTIONS= dri inet6 @@ -11,6 +11,7 @@ PKG_OPTIONS_DEPRECATED_WARNINGS+="Deprecated variable PKG_OPTIONS.xorg-server us .include "../../mk/bsd.options.mk" +PLIST_VARS+= dri .if !empty(PKG_OPTIONS:Mdri) DISTFILES= ${DISTNAME}${EXTRACT_SUFX} DISTFILES+= MesaLib-6.5.2.tar.bz2 @@ -28,14 +29,13 @@ CONFIGURE_ENV+= GLX_DEFINES=${GLX_DEFINES:M*:Q} # the newer ones. #BUILDLINK_API_DEPENDS.glproto+= glproto>=1.4.8nb1 #BUILDLINK_API_DEPENDS.xf86driproto+= xf86driproto>=2.0.3nb1 -PLIST_SUBST+= USE_DRI="" +PLIST.dri= yes dri-post-extract: ${LN} -s ${MESA_SRC:Q}/include/GL ${WRKSRC:Q}/GL/glx/GL .else CONFIGURE_ARGS+= --disable-glx -PLIST_SUBST+= USE_DRI="@comment " dri-post-extract: @${DO_NADA} diff --git a/x11/ocaml-graphics/Makefile b/x11/ocaml-graphics/Makefile index 83bea67b872..a982c1b91a5 100644 --- a/x11/ocaml-graphics/Makefile +++ b/x11/ocaml-graphics/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2007/01/30 20:56:13 joerg Exp $ +# $NetBSD: Makefile,v 1.8 2008/04/12 22:43:15 jlam Exp $ .include "../../lang/ocaml/Makefile.common" @@ -14,13 +14,13 @@ CONFIGURE_ARGS+= -no-tk BUILD_DIRS= ${WRKSRC}/otherlibs/graph BUILD_TARGET= all INSTALL_TARGET= install + +PLIST_VARS+= opt .if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \ (${MACHINE_ARCH} == "sparc") BUILD_TARGET+= allopt INSTALL_TARGET+= installopt -PLIST_SUBST+= OPT= -.else -PLIST_SUBST+= OPT='@comment ' +PLIST.opt= yes .endif PLIST_SRC= ${WRKDIR}/.PLIST_SRC diff --git a/x11/ocaml-graphics/PLIST b/x11/ocaml-graphics/PLIST index 1213e3639b3..5ca64236310 100644 --- a/x11/ocaml-graphics/PLIST +++ b/x11/ocaml-graphics/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.2 2006/02/22 21:00:32 wiz Exp $ +@comment $NetBSD: PLIST,v 1.3 2008/04/12 22:43:15 jlam Exp $ lib/ocaml/graphics.a lib/ocaml/graphics.cma lib/ocaml/graphics.cmi -${OPT}lib/ocaml/graphics.cmxa +${PLIST.opt}lib/ocaml/graphics.cmxa lib/ocaml/graphics.mli lib/ocaml/graphicsX11.cmi lib/ocaml/graphicsX11.mli diff --git a/x11/py-gnome2-desktop/Makefile b/x11/py-gnome2-desktop/Makefile index 6369a278b74..25178be9319 100644 --- a/x11/py-gnome2-desktop/Makefile +++ b/x11/py-gnome2-desktop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2008/03/06 14:53:57 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2008/04/12 22:43:15 jlam Exp $ # DISTNAME= gnome-python-desktop-2.20.0 @@ -24,7 +24,7 @@ PKGCONFIG_OVERRIDE+= gnome-python-desktop-2.0.pc.in PYTHON_VERSIONS_ACCEPTED= 24 # XXX not yet, needs hal -PLIST_SUBST+= NAUTILUSBURN="@comment " +PLIST_VARS+= nautilusburn #.include "../../sysutils/nautilus-cd-burner/buildlink3.mk" .include "../../graphics/py-cairo/buildlink3.mk" diff --git a/x11/py-gnome2-desktop/PLIST b/x11/py-gnome2-desktop/PLIST index de42ce38b5c..4a0fe9a8dfc 100644 --- a/x11/py-gnome2-desktop/PLIST +++ b/x11/py-gnome2-desktop/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2007/04/11 18:12:15 drochner Exp $ +@comment $NetBSD: PLIST,v 1.3 2008/04/12 22:43:15 jlam Exp $ lib/pkgconfig/gnome-python-desktop-2.0.pc ${PYSITELIB}/gtk-2.0/bugbuddy.py ${PYSITELIB}/gtk-2.0/bugbuddy.pyc @@ -20,7 +20,7 @@ ${PYSITELIB}/gtk-2.0/gnomeprint/ui.la ${PYSITELIB}/gtk-2.0/gtksourceview.la ${PYSITELIB}/gtk-2.0/gtop.la ${PYSITELIB}/gtk-2.0/mediaprofiles.la -${NAUTILUSBURN}${PYSITELIB}/gtk-2.0/nautilusburn.la +${PLIST.nautilusburn}${PYSITELIB}/gtk-2.0/nautilusburn.la ${PYSITELIB}/gtk-2.0/rsvg.la ${PYSITELIB}/gtk-2.0/totem/__init__.py ${PYSITELIB}/gtk-2.0/totem/__init__.pyc @@ -68,7 +68,7 @@ share/pygtk/2.0/defs/art.defs share/pygtk/2.0/defs/gnomekeyring.defs share/pygtk/2.0/defs/gtksourceview.defs share/pygtk/2.0/defs/mediaprofiles.defs -${NAUTILUSBURN}share/pygtk/2.0/defs/nautilus_burn.defs +${PLIST.nautilusburn}share/pygtk/2.0/defs/nautilus_burn.defs share/pygtk/2.0/defs/print.defs share/pygtk/2.0/defs/printui.defs share/pygtk/2.0/defs/wnck.defs diff --git a/x11/rxvt-unicode/PLIST b/x11/rxvt-unicode/PLIST index 0c65060af3a..f812a4e172d 100644 --- a/x11/rxvt-unicode/PLIST +++ b/x11/rxvt-unicode/PLIST @@ -1,35 +1,35 @@ -@comment $NetBSD: PLIST,v 1.7 2007/10/20 06:11:25 obache Exp $ +@comment $NetBSD: PLIST,v 1.8 2008/04/12 22:43:15 jlam Exp $ bin/urxvt bin/urxvtc bin/urxvtd -${PERL}lib/urxvt/perl/automove-background -${PERL}lib/urxvt/perl/block-graphics-to-ascii -${PERL}lib/urxvt/perl/digital-clock -${PERL}lib/urxvt/perl/example-refresh-hooks -${PERL}lib/urxvt/perl/kuake -${PERL}lib/urxvt/perl/macosx-clipboard -${PERL}lib/urxvt/perl/matcher -${PERL}lib/urxvt/perl/option-popup -${PERL}lib/urxvt/perl/readline -${PERL}lib/urxvt/perl/remote-clipboard -${PERL}lib/urxvt/perl/searchable-scrollback -${PERL}lib/urxvt/perl/selection -${PERL}lib/urxvt/perl/selection-autotransform -${PERL}lib/urxvt/perl/selection-pastebin -${PERL}lib/urxvt/perl/selection-popup -${PERL}lib/urxvt/perl/tabbed -${PERL}lib/urxvt/perl/urxvt-popup -${PERL}lib/urxvt/perl/xim-onthespot -${PERL}lib/urxvt/urxvt.pm +${PLIST.perl}lib/urxvt/perl/automove-background +${PLIST.perl}lib/urxvt/perl/block-graphics-to-ascii +${PLIST.perl}lib/urxvt/perl/digital-clock +${PLIST.perl}lib/urxvt/perl/example-refresh-hooks +${PLIST.perl}lib/urxvt/perl/kuake +${PLIST.perl}lib/urxvt/perl/macosx-clipboard +${PLIST.perl}lib/urxvt/perl/matcher +${PLIST.perl}lib/urxvt/perl/option-popup +${PLIST.perl}lib/urxvt/perl/readline +${PLIST.perl}lib/urxvt/perl/remote-clipboard +${PLIST.perl}lib/urxvt/perl/searchable-scrollback +${PLIST.perl}lib/urxvt/perl/selection +${PLIST.perl}lib/urxvt/perl/selection-autotransform +${PLIST.perl}lib/urxvt/perl/selection-pastebin +${PLIST.perl}lib/urxvt/perl/selection-popup +${PLIST.perl}lib/urxvt/perl/tabbed +${PLIST.perl}lib/urxvt/perl/urxvt-popup +${PLIST.perl}lib/urxvt/perl/xim-onthespot +${PLIST.perl}lib/urxvt/urxvt.pm man/man1/urxvt.1 man/man1/urxvtc.1 man/man1/urxvtd.1 -${PERL}man/man3/urxvtperl.3 +${PLIST.perl}man/man3/urxvtperl.3 man/man7/urxvt.7 share/doc/rxvt-unicode/README.FAQ share/examples/rxvt-unicode/rxvt-unicode.termcap share/examples/rxvt-unicode/rxvt-unicode.terminfo @dirrm share/doc/rxvt-unicode @dirrm share/examples/rxvt-unicode -${PERL}@dirrm lib/urxvt/perl -${PERL}@dirrm lib/urxvt +${PLIST.perl}@dirrm lib/urxvt/perl +${PLIST.perl}@dirrm lib/urxvt diff --git a/x11/rxvt-unicode/options.mk b/x11/rxvt-unicode/options.mk index 0e308ba5da9..59a0b9577e3 100644 --- a/x11/rxvt-unicode/options.mk +++ b/x11/rxvt-unicode/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.5 2007/11/22 11:59:06 obache Exp $ +# $NetBSD: options.mk,v 1.6 2008/04/12 22:43:15 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.rxvt-unicode PKG_SUPPORTED_OPTIONS= perl unicode3 xft2 rxvt-term @@ -10,14 +10,14 @@ PKG_SUGGESTED_OPTIONS= perl unicode3 xft2 CONFIGURE_ARGS+= --with-term=rxvt .endif +PLIST_VARS+= perl .if !empty(PKG_OPTIONS:Mperl) CONFIGURE_ARGS+= --enable-perl -PLIST_SUBST+= PERL= +PLIST.perl= yes .include "../../lang/perl5/buildlink3.mk" USE_TOOLS+= perl .else CONFIGURE_ARGS+= --disable-perl -PLIST_SUBST+= PERL='@comment ' .endif # use 21 instead of 16 bits to represent unicode characters diff --git a/x11/xf86-video-via/Makefile b/x11/xf86-video-via/Makefile index e36fca94571..62346df30c5 100644 --- a/x11/xf86-video-via/Makefile +++ b/x11/xf86-video-via/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2007/10/09 19:19:17 martti Exp $ +# $NetBSD: Makefile,v 1.6 2008/04/12 22:43:15 jlam Exp $ # DISTNAME= xf86-video-via-0.2.2 @@ -19,10 +19,9 @@ USE_TOOLS+= pkg-config .include "../../mk/bsd.prefs.mk" +PLIST_VARS+= XvMC .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" -PLIST_SUBST+= XVMC_SUPPORT="" -.else -PLIST_SUBST+= XVMC_SUPPORT="@comment " +PLIST.XvMC= yes .endif .include "../../x11/modular-xorg-server/buildlink3.mk" diff --git a/x11/xf86-video-via/PLIST b/x11/xf86-video-via/PLIST index e0de500601f..43cf62d71a2 100644 --- a/x11/xf86-video-via/PLIST +++ b/x11/xf86-video-via/PLIST @@ -1,6 +1,6 @@ -@comment $NetBSD: PLIST,v 1.2 2007/08/16 14:17:09 joerg Exp $ -${XVMC_SUPPORT}lib/libviaXvMC.la -${XVMC_SUPPORT}lib/libviaXvMCPro.la +@comment $NetBSD: PLIST,v 1.3 2008/04/12 22:43:15 jlam Exp $ +${PLIST.XvMC}lib/libviaXvMC.la +${PLIST.XvMC}lib/libviaXvMCPro.la lib/xorg/modules/drivers/via_drv.la man/man4/via.4 @comment @dirrm lib/xorg/modules/drivers |
