diff options
63 files changed, 240 insertions, 240 deletions
diff --git a/x11/Xaw-Xpm/buildlink3.mk b/x11/Xaw-Xpm/buildlink3.mk index 2b8f415ccad..3e58ba2863f 100644 --- a/x11/Xaw-Xpm/buildlink3.mk +++ b/x11/Xaw-Xpm/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.16 2012/05/07 01:54:06 dholland Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2012/06/15 23:06:02 dholland Exp $ BUILDLINK_TREE+= Xaw-Xpm @@ -11,14 +11,14 @@ BUILDLINK_PKGSRCDIR.Xaw-Xpm?= ../../x11/Xaw-Xpm .include "../../mk/bsd.fast.prefs.mk" -. if ${X11_TYPE} == "modular" +.if ${X11_TYPE} == "modular" buildlink-Xaw-Xpm-cookie: .PHONY buildlink-Xaw-Xpm-inc-hack buildlink-Xaw-Xpm-inc-hack: .PHONY buildlink-directories [ ! -h ${BUILDLINK_DIR}/include/X11/Xaw ] && \ ${MKDIR} ${BUILDLINK_DIR}/include/X11 && \ ${LN} -s Xaw3d ${BUILDLINK_DIR}/include/X11/Xaw -. endif +.endif LIBXAW?= -L${BUILDLINK_PREFIX.Xaw-Xpm}/lib \ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.Xaw-Xpm}/lib \ diff --git a/x11/blt/Makefile b/x11/blt/Makefile index 5163cfedbdb..6d7607e8e75 100644 --- a/x11/blt/Makefile +++ b/x11/blt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2009/08/03 12:46:26 joerg Exp $ +# $NetBSD: Makefile,v 1.22 2012/06/15 23:06:02 dholland Exp $ # DISTNAME= BLT2.4z @@ -31,9 +31,9 @@ INSTALL_MAKE_FLAGS+= INSTALL_ROOT=${DESTDIR} .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "NetBSD" -.if empty(OS_VERSION:M1.[56]*) +. if empty(OS_VERSION:M1.[56]*) .include "../../mk/pthread.buildlink3.mk" -.endif +. endif .endif .include "../../lang/tcl/buildlink3.mk" diff --git a/x11/driconf/Makefile b/x11/driconf/Makefile index 42bf6f233d7..32a4376380d 100644 --- a/x11/driconf/Makefile +++ b/x11/driconf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2012/04/08 19:09:17 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2012/06/15 23:06:02 dholland Exp $ # DISTNAME= driconf-0.9.1 @@ -11,20 +11,20 @@ HOMEPAGE= http://dri.freedesktop.org/wiki/DriConf COMMENT= Configuration applet for DRI drivers LICENSE= gnu-gpl-v2 # or later -DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat -DEPENDS+= ${PYPKGPREFIX}-gtk2>=2.4:../../x11/py-gtk2 -DEPENDS+= xdriinfo>=1.0.2:../../x11/xdriinfo +DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat +DEPENDS+= ${PYPKGPREFIX}-gtk2>=2.4:../../x11/py-gtk2 +DEPENDS+= xdriinfo>=1.0.2:../../x11/xdriinfo PKG_DESTDIR_SUPPORT= user-destdir -USE_PKGLOCALEDIR= yes +USE_PKGLOCALEDIR= yes USE_TOOLS+= msgfmt msgmerge xgettext CONFIGURE_ARGS+= --prefix=${PREFIX:Q} -PYDISTUTILSPKG= yes -REPLACE_PYTHON= *.py +PYDISTUTILSPKG= yes +REPLACE_PYTHON= *.py -SUBST_CLASSES+= fix-paths +SUBST_CLASSES+= fix-paths SUBST_FILES.fix-paths= driconf driconf.desktop SUBST_FILES.fix-paths+= driconf.py driconf_com*ui.py SUBST_FILES.fix-paths+= setup.cfg setup.py diff --git a/x11/fltk13/Makefile b/x11/fltk13/Makefile index 4213d8e8ca1..953a508c75f 100644 --- a/x11/fltk13/Makefile +++ b/x11/fltk13/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2011/12/01 16:35:12 is Exp $ +# $NetBSD: Makefile,v 1.2 2012/06/15 23:06:02 dholland Exp $ DISTNAME= fltk-1.3.0-source PKGNAME= ${DISTNAME:S/-source//} @@ -16,7 +16,7 @@ COMMENT= Fast Light Tool Kit for graphical user interfaces LICENSE= gnu-lgpl-v2 PKG_DESTDIR_SUPPORT= user-destdir -CONFLICTS= fltk-1.[012].* +CONFLICTS= fltk-1.[012].* WRKSRC= ${WRKDIR}/${DISTNAME:S/-source//} USE_LANGUAGES= c c++ diff --git a/x11/fltk2/options.mk b/x11/fltk2/options.mk index d785cd2871e..6fd5f031492 100644 --- a/x11/fltk2/options.mk +++ b/x11/fltk2/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2009/03/18 11:09:33 abs Exp $ +# $NetBSD: options.mk,v 1.4 2012/06/15 23:06:02 dholland Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.fltk2 PKG_SUPPORTED_OPTIONS= opengl @@ -12,7 +12,7 @@ PKG_SUGGESTED_OPTIONS+= opengl .include "../../mk/bsd.options.mk" -PLIST_VARS+= opengl +PLIST_VARS+= opengl .if !empty(PKG_OPTIONS:Mopengl) PLIST.opengl= yes .include "../../graphics/MesaLib/buildlink3.mk" diff --git a/x11/fvwm-wharf/Makefile b/x11/fvwm-wharf/Makefile index 24fbaa28987..7688abe26ed 100644 --- a/x11/fvwm-wharf/Makefile +++ b/x11/fvwm-wharf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2009/12/17 18:28:07 abs Exp $ +# $NetBSD: Makefile,v 1.19 2012/06/15 23:06:02 dholland Exp $ DISTNAME= AfterStep-1.0 PKGNAME= fvwm-wharf-1.0 @@ -13,7 +13,7 @@ COMMENT= Copy of AfterStep's Wharf compatible with fvwm2 USE_IMAKE= YES INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 -PKG_DESTDIR_SUPPORT= user-destdir +PKG_DESTDIR_SUPPORT= user-destdir post-configure: cd ${WRKSRC}; ${MAKE} Makefiles diff --git a/x11/gnome-sharp/Makefile b/x11/gnome-sharp/Makefile index 84aabc33e05..521c11ac733 100644 --- a/x11/gnome-sharp/Makefile +++ b/x11/gnome-sharp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2012/06/14 07:43:28 sbd Exp $ +# $NetBSD: Makefile,v 1.33 2012/06/15 23:06:02 dholland Exp $ # DISTNAME= gnome-sharp-2.24.2 @@ -21,11 +21,11 @@ MAKE_JOBS_SAFE= no .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == NetBSD -.if !empty(OS_VERSION:M5.99.*) || !empty(OS_VERSION:M[6789].*) +. if !empty(OS_VERSION:M5.99.*) || !empty(OS_VERSION:M[6789].*) CONFIGURE_ENV+= EXTRACSDEFINES=-define:TIMET_IS_64BITS -.else +. else CONFIGURE_ENV+= EXTRACSDEFINES=-define:TIMET_IS_32BITS -.endif +. endif .endif PKGCONFIG_OVERRIDE+= art/art-sharp-2.0.pc.in diff --git a/x11/gnome-themes/Makefile b/x11/gnome-themes/Makefile index ae9143f09ff..099d275fd9f 100644 --- a/x11/gnome-themes/Makefile +++ b/x11/gnome-themes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.85 2012/03/03 00:14:09 wiz Exp $ +# $NetBSD: Makefile,v 1.86 2012/06/15 23:06:02 dholland Exp $ # DISTNAME= gnome-themes-2.32.1 @@ -25,6 +25,6 @@ GNU_CONFIGURE= yes BUILDLINK_API_DEPENDS.icon-naming-utils+= icon-naming-utils>=0.8.90 .include "../../graphics/icon-naming-utils/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" -BUILDLINK_API_DEPENDS.gtk2-engines+= gtk2-engines>=2.15.3 +BUILDLINK_API_DEPENDS.gtk2-engines+= gtk2-engines>=2.15.3 .include "../../x11/gtk2-engines/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gnustep-preferences/buildlink3.mk b/x11/gnustep-preferences/buildlink3.mk index 4c8752332e7..f55ffa132db 100644 --- a/x11/gnustep-preferences/buildlink3.mk +++ b/x11/gnustep-preferences/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.15 2009/06/14 22:58:11 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2012/06/15 23:06:03 dholland Exp $ BUILDLINK_TREE+= gnustep-preferences @@ -10,7 +10,7 @@ BUILDLINK_PKGSRCDIR.gnustep-preferences?= ../../x11/gnustep-preferences BUILDLINK_INCDIRS.gnustep-preferences+= lib/GNUstep/Frameworks/PrefsModule.framework/Headers BUILDLINK_FILES.gnustep-preferences+= lib/GNUstep/Frameworks/PrefsModule.framework/Headers/*.h -BUILDLINK_FILES.gnustep-preferences+= include/PrefsModule/PrefsModule.h +BUILDLINK_FILES.gnustep-preferences+= include/PrefsModule/PrefsModule.h #.include "../../x11/gnustep-back/buildlink3.mk" .endif # GNUSTEP_PREFERENCES_BUILDLINK3_MK diff --git a/x11/gtk3/Makefile b/x11/gtk3/Makefile index 824563b4ab7..9a6fcf0fda1 100644 --- a/x11/gtk3/Makefile +++ b/x11/gtk3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2012/05/29 22:23:27 cheusov Exp $ +# $NetBSD: Makefile,v 1.23 2012/06/15 23:06:03 dholland Exp $ DISTNAME= gtk+-3.4.3 PKGNAME= ${DISTNAME:S/gtk/gtk3/} @@ -59,8 +59,8 @@ TOOLS_PATH.grep= ${LOCALBASE}/bin/ggrep # isnan and isinf are part of libc, not libm on DragonFly # conf tests fail detection due to conflicting definitions, just skip them .if ${OPSYS} == "DragonFly" -CONFIGURE_ENV+= ac_cv_func_isnan=yes -CONFIGURE_ENV+= ac_cv_func_isinf=yes +CONFIGURE_ENV+= ac_cv_func_isnan=yes +CONFIGURE_ENV+= ac_cv_func_isinf=yes .endif CFLAGS.SunOS+= -std=gnu99 -D_XOPEN_SOURCE=600 diff --git a/x11/inputproto/builtin.mk b/x11/inputproto/builtin.mk index d7aa050ae8b..d5c18d409c2 100644 --- a/x11/inputproto/builtin.mk +++ b/x11/inputproto/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.3 2008/10/05 21:36:33 cube Exp $ +# $NetBSD: builtin.mk,v 1.4 2012/06/15 23:06:03 dholland Exp $ BUILTIN_PKG:= inputproto @@ -31,7 +31,7 @@ MAKEVARS+= IS_BUILTIN.inputproto BUILTIN_VERSION.inputproto!= ${SED} -n -e 's/Version: //p' ${PC_INPUTPROTO} BUILTIN_PKG.inputproto= inputproto-${BUILTIN_VERSION.inputproto} .endif -MAKEVARS+= BUILTIN_PKG.inputproto +MAKEVARS+= BUILTIN_PKG.inputproto ### ### Determine whether we should use the built-in implementation if it diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index c852b77d4c8..50b55ddecc0 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.168 2012/06/14 07:43:41 sbd Exp $ +# $NetBSD: Makefile,v 1.169 2012/06/15 23:06:03 dholland Exp $ DISTNAME= kdebase-${_KDE_VERSION} PKGREVISION= 21 @@ -92,7 +92,7 @@ DEPENDS+= htdig>=3.2.0:../../www/htdig # Solaris 10 has libusb only for 32 bit ABI (see PR 33727). .if ${OPSYS} == "SunOS" && ${MACHINE_ARCH} == "x86_64" -CONFIGURE_ARGS+= --without-libusb +CONFIGURE_ARGS+= --without-libusb .endif PLIST_VARS+= usbview @@ -116,11 +116,11 @@ SUBST_CLASSES+= varlock SUBST_STAGE.varlock= post-patch SUBST_MESSAGE.varlock= Fix lock directory path. SUBST_FILES.varlock= kcheckpass/kcheckpass.c -.if ${OPSYS} == "SunOS" +. if ${OPSYS} == "SunOS" SUBST_SED.varlock= -e s:/var/lock:/var/spool/locks: -.else +. else SUBST_SED.varlock= -e s:/var/lock:/var/spool/lock: -.endif +. endif .endif SUBST_CLASSES+= htdig diff --git a/x11/kkbswitch/Makefile b/x11/kkbswitch/Makefile index eac205495d5..08cd08b3869 100644 --- a/x11/kkbswitch/Makefile +++ b/x11/kkbswitch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2012/06/14 07:45:01 sbd Exp $ +# $NetBSD: Makefile,v 1.29 2012/06/15 23:06:03 dholland Exp $ # DISTNAME= kkbswitch-1.4.3 @@ -16,7 +16,7 @@ USE_LIBTOOL= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --disable-ru-ua-layout -PKG_DESTDIR_SUPPORT= user-destdir +PKG_DESTDIR_SUPPORT= user-destdir .include "../../meta-pkgs/kde3/kde3.mk" .include "../../x11/kdelibs3/buildlink3.mk" diff --git a/x11/libdrm/Makefile b/x11/libdrm/Makefile index 4f0e26e5d59..e5a5220f193 100644 --- a/x11/libdrm/Makefile +++ b/x11/libdrm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2012/06/10 16:32:13 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2012/06/15 23:06:03 dholland Exp $ # DISTNAME= libdrm-2.4.35 @@ -31,12 +31,12 @@ SUBST_VARS.atomic= ATOMIC_OPS_CHECK ATOMIC_OPS_CHECK= 0 .if ${OPSYS} == "NetBSD" -. if exists(/usr/include/sys/atomic.h) +. if exists(/usr/include/sys/atomic.h) ATOMIC_OPS_CHECK= 1 -. else -. include "../../devel/libatomic_ops/buildlink3.mk" +. else +. include "../../devel/libatomic_ops/buildlink3.mk" CONFIGURE_ENV+= drm_cv_atomic_primitives=libatomic-ops -. endif +. endif .endif CONFIGURE_ARGS+= PTHREADSTUBS_CFLAGS=-I${PREFIX}/include \ diff --git a/x11/matchbox-panel/Makefile b/x11/matchbox-panel/Makefile index 15a96e181f5..0270119f88c 100644 --- a/x11/matchbox-panel/Makefile +++ b/x11/matchbox-panel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2011/11/01 06:03:03 sbd Exp $ +# $NetBSD: Makefile,v 1.24 2012/06/15 23:06:03 dholland Exp $ # DISTNAME= matchbox-panel-0.9.2 @@ -21,7 +21,7 @@ CONFIGURE_ARGS+= --enable-small-icons CONFIGURE_ARGS+= --enable-startup-notification CONFIGURE_ARGS+= --enable-nls -PKG_DESTDIR_SUPPORT= user-destdir +PKG_DESTDIR_SUPPORT= user-destdir .include "../../mk/bsd.prefs.mk" diff --git a/x11/neXtaw/buildlink3.mk b/x11/neXtaw/buildlink3.mk index 1cfc5ac406f..3b7563b5af1 100644 --- a/x11/neXtaw/buildlink3.mk +++ b/x11/neXtaw/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:25:48 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2012/06/15 23:06:03 dholland Exp $ BUILDLINK_TREE+= neXtaw @@ -11,7 +11,7 @@ BUILDLINK_PKGSRCDIR.neXtaw?= ../../x11/neXtaw .include "../../mk/bsd.fast.prefs.mk" -. if ${X11_TYPE} == "modular" +.if ${X11_TYPE} == "modular" .PHONY: buildlink-neXtaw-inc-hack buildlink-neXtaw-cookie: buildlink-neXtaw-inc-hack @@ -19,7 +19,7 @@ buildlink-neXtaw-inc-hack: buildlink-directories [ ! -h ${BUILDLINK_DIR}/include/X11/Xaw ] && \ ${MKDIR} ${BUILDLINK_DIR}/include/X11 && \ ${LN} -s neXtaw ${BUILDLINK_DIR}/include/X11/Xaw -. endif +.endif LIBXAW?= -L${BUILDLINK_PREFIX.neXtaw}/lib \ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.neXtaw}/lib \ diff --git a/x11/pixman/hacks.mk b/x11/pixman/hacks.mk index c8b3bfaa00c..21cb59a19d2 100644 --- a/x11/pixman/hacks.mk +++ b/x11/pixman/hacks.mk @@ -1,4 +1,4 @@ -# $NetBSD: hacks.mk,v 1.7 2011/12/31 15:37:55 bsiegert Exp $ +# $NetBSD: hacks.mk,v 1.8 2012/06/15 23:06:03 dholland Exp $ # .if !defined(PIXMAN_HACKS_MK) PIXMAN_HACKS_MK= # empty @@ -11,7 +11,7 @@ PIXMAN_HACKS_MK= # empty empty(CC_VERSION:Mgcc-[5-9].*) && \ empty(CC_VERSION:Mgcc-[1-9][0-9]*) CONFIGURE_ARGS+= --disable-sse2 -. endif +.endif .endif .if !empty(PKGSRC_COMPILER:Msunpro) diff --git a/x11/py-kde4/Makefile b/x11/py-kde4/Makefile index 1f156f18443..489abdab6d4 100644 --- a/x11/py-kde4/Makefile +++ b/x11/py-kde4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2012/06/14 22:09:30 sbd Exp $ +# $NetBSD: Makefile,v 1.7 2012/06/15 23:06:04 dholland Exp $ PKGNAME= ${PYPKGPREFIX}-kde4-${_KDE_VERSION} PKGREVISION= 3 @@ -37,7 +37,7 @@ SUBST_SED.pykdeuic4= 's:/usr/bin/env python$$:${PYTHONBIN}:' .include "../../misc/kdepimlibs4/buildlink3.mk" .include "../../security/polkit-qt/buildlink3.mk" .include "../../x11/kdelibs4/buildlink3.mk" -BUILDLINK_API_DEPENDS.py-sip+= ${PYPKGPREFIX}-sip>=4.10 +BUILDLINK_API_DEPENDS.py-sip+= ${PYPKGPREFIX}-sip>=4.10 .include "../../x11/py-sip/buildlink3.mk" .include "../../x11/py-qt4/buildlink3.mk" BUILDLINK_DEPMETHOD.qt4-tools= full diff --git a/x11/qwt/files/Makefile.common b/x11/qwt/files/Makefile.common index d0bf172edbf..8f85badb057 100644 --- a/x11/qwt/files/Makefile.common +++ b/x11/qwt/files/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.3 2000/03/28 00:09:23 dmcmahill Exp $ +# $NetBSD: Makefile.common,v 1.4 2012/06/15 23:06:04 dholland Exp $ # # Paths for Qt headers and library # @@ -19,7 +19,7 @@ QWTLIB = $(QWTDIR)/lib # Library Names # LIBSTATIC = libqwt.a -LIBSHARED = libqwt.so +LIBSHARED = libqwt.so LIBSHARED_0 = libqwt.so.0 LIBSHARED_1 = libqwt.so.0.2 diff --git a/x11/ruby-gnome2-vte/Makefile b/x11/ruby-gnome2-vte/Makefile index da7162edc8a..cf82bb53c5f 100644 --- a/x11/ruby-gnome2-vte/Makefile +++ b/x11/ruby-gnome2-vte/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2012/04/14 04:27:50 obache Exp $ +# $NetBSD: Makefile,v 1.25 2012/06/15 23:06:04 dholland Exp $ # PKGNAME= ${RUBY_PKGPREFIX}-gnome2-vte-${VERSION} @@ -11,7 +11,7 @@ PKG_DESTDIR_SUPPORT= user-destdir RUBY_EXTCONF_SUBDIRS= vte -DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gtk>=${VERSION}:../../x11/ruby-gnome2-gtk +DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gtk>=${VERSION}:../../x11/ruby-gnome2-gtk BUILDLINK_API_DEPENDS.ruby-gnome2-glib+= ${RUBY_PKGPREFIX}-gnome2-glib-${VERSION}{,nb*} BUILDLINK_DEPMETHOD.ruby-gnome2-glib= build diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile index a7026274f9f..70ae3d2e426 100644 --- a/x11/rxvt-unicode/Makefile +++ b/x11/rxvt-unicode/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2012/03/01 23:06:30 morr Exp $ +# $NetBSD: Makefile,v 1.36 2012/06/15 23:06:04 dholland Exp $ DISTNAME= rxvt-unicode-9.15 PKGREVISION= 1 @@ -19,10 +19,10 @@ USE_FEATURES+= snprintf CONFIGURE_ENV+= ac_cv_path_TIC=no -CONFIGURE_ARGS+= --enable-256-color +CONFIGURE_ARGS+= --enable-256-color PKG_DESTDIR_SUPPORT= user-destdir -INSTALLATION_DIRS+= share/doc/rxvt-unicode share/examples/rxvt-unicode +INSTALLATION_DIRS+= share/doc/rxvt-unicode share/examples/rxvt-unicode post-install: ${INSTALL_DATA} ${WRKSRC}/README.FAQ \ diff --git a/x11/rxvt-unicode/options.mk b/x11/rxvt-unicode/options.mk index 2f5bea9e4ae..d1df60f186f 100644 --- a/x11/rxvt-unicode/options.mk +++ b/x11/rxvt-unicode/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.9 2012/02/29 18:49:40 morr Exp $ +# $NetBSD: options.mk,v 1.10 2012/06/15 23:06:04 dholland Exp $ -PKG_OPTIONS_VAR= PKG_OPTIONS.rxvt-unicode -PKG_SUPPORTED_OPTIONS= perl unicode3 xft2 rxvt-term -PKG_SUGGESTED_OPTIONS= perl unicode3 xft2 +PKG_OPTIONS_VAR= PKG_OPTIONS.rxvt-unicode +PKG_SUPPORTED_OPTIONS= perl unicode3 xft2 rxvt-term +PKG_SUGGESTED_OPTIONS= perl unicode3 xft2 .include "../../mk/bsd.options.mk" @@ -12,12 +12,12 @@ CONFIGURE_ARGS+= --with-term=rxvt PLIST_VARS+= perl .if !empty(PKG_OPTIONS:Mperl) -USE_TOOLS+= perl:run +USE_TOOLS+= perl:run CONFIGURE_ARGS+= --enable-perl PLIST.perl= yes .include "../../lang/perl5/buildlink3.mk" USE_TOOLS+= perl -REPLACE_PERL+= src/perl/* +REPLACE_PERL+= src/perl/* .else CONFIGURE_ARGS+= --disable-perl .endif diff --git a/x11/startup-notification/buildlink3.mk b/x11/startup-notification/buildlink3.mk index 4a866603b77..1da4c4b3a61 100644 --- a/x11/startup-notification/buildlink3.mk +++ b/x11/startup-notification/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.14 2012/03/11 10:37:51 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2012/06/15 23:06:04 dholland Exp $ BUILDLINK_TREE+= startup-notification @@ -11,19 +11,19 @@ BUILDLINK_PKGSRCDIR.startup-notification?= ../../x11/startup-notification BUILDLINK_API_DEPENDS.startup-notification+= startup-notification>=0.5 BUILDLINK_ABI_DEPENDS.startup-notification+= startup-notification>=0.8nb1 .else -.if ${OPSYS} == "NetBSD" -.if !empty(OS_VERSION:M5.99.*) || !empty(OS_VERSION:M[6789].*) +. if ${OPSYS} == "NetBSD" +. if !empty(OS_VERSION:M5.99.*) || !empty(OS_VERSION:M[6789].*) BUILDLINK_PKGSRCDIR.startup-notification?= ../../x11/startup-notification BUILDLINK_API_DEPENDS.startup-notification+= startup-notification>=0.5 BUILDLINK_ABI_DEPENDS.startup-notification+= startup-notification>=0.8nb1 -.else +. else BUILDLINK_PKGSRCDIR.startup-notification?= ../../x11/startup-notification010 BUILDLINK_API_DEPENDS.startup-notification+= startup-notification>=0.5<0.12 BUILDLINK_ABI_DEPENDS.startup-notification+= startup-notification>=0.8nb1<0.12 -.endif -.else #!NetBSD +. endif +. else #!NetBSD BUILDLINK_PKGSRCDIR.startup-notification?= ../../x11/startup-notification -.endif +. endif .endif .include "../../x11/libSM/buildlink3.mk" diff --git a/x11/videoproto/Makefile b/x11/videoproto/Makefile index c073d63e777..b032e1990b8 100644 --- a/x11/videoproto/Makefile +++ b/x11/videoproto/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2010/09/10 19:19:06 joerg Exp $ +# $NetBSD: Makefile,v 1.5 2012/06/15 23:06:04 dholland Exp $ # DISTNAME= videoproto-2.3.1 @@ -16,7 +16,7 @@ PKG_DESTDIR_SUPPORT= user-destdir PKGCONFIG_OVERRIDE+= videoproto.pc.in GNU_CONFIGURE= yes -BUILDLINK_DEPMETHOD.libX11?= build # uses headers +BUILDLINK_DEPMETHOD.libX11?= build # uses headers .include "../../x11/libX11/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/wmweather/Makefile b/x11/wmweather/Makefile index 349fc4e4fc4..330ffcd0271 100644 --- a/x11/wmweather/Makefile +++ b/x11/wmweather/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2011/04/22 13:45:15 obache Exp $ +# $NetBSD: Makefile,v 1.36 2012/06/15 23:06:04 dholland Exp $ # DISTNAME= wmweather-2.4.2 @@ -14,7 +14,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/src GNU_CONFIGURE= yes USE_TOOLS+= gmake xmessage:run -PKG_DESTDIR_SUPPORT= user-destdir +PKG_DESTDIR_SUPPORT= user-destdir CONFIGURE_ARGS+= --with-sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --with-xmessage=${TOOLS_PATH.xmessage} diff --git a/x11/wterm/Makefile b/x11/wterm/Makefile index e659eaaaeae..5f4f4ddc876 100644 --- a/x11/wterm/Makefile +++ b/x11/wterm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2012/02/06 12:42:27 wiz Exp $ +# $NetBSD: Makefile,v 1.46 2012/06/15 23:06:04 dholland Exp $ DISTNAME= wterm-6.2.9 PKGREVISION= 16 @@ -21,7 +21,7 @@ CONFIGURE_ARGS+= --enable-menubar --enable-graphics --enable-next-scroll CONFIGURE_ARGS+= --enable-half-shadow CONFIGURE_ARGS+= --with-xpm-library=${BUILDLINK_PREFIX.libXpm} -INSTALLATION_DIRS+= share/WindowMaker/Icons +INSTALLATION_DIRS+= share/WindowMaker/Icons post-install: ${INSTALL_DATA} ${WRKSRC}/wterm.tiff \ diff --git a/x11/wxGTK26/hacks.mk b/x11/wxGTK26/hacks.mk index 86a82b8fa31..424536a0c1d 100644 --- a/x11/wxGTK26/hacks.mk +++ b/x11/wxGTK26/hacks.mk @@ -1,4 +1,4 @@ -# $NetBSD: hacks.mk,v 1.1.1.1 2008/09/22 19:44:05 joerg Exp $ +# $NetBSD: hacks.mk,v 1.2 2012/06/15 23:06:05 dholland Exp $ # # Disable the precompiled headers on NetBSD mipseb and sparc64 # machines, otherwise wxGTK will not compile there. @@ -13,7 +13,7 @@ WXGTK_HACKS_MK= # defined (${MACHINE_ARCH} == "mipseb" || \ ${MACHINE_ARCH} == "sparc64") PKG_HACKS+= disable-precomp-headers -CONFIGURE_ARGS+= --disable-precomp-headers +CONFIGURE_ARGS+= --disable-precomp-headers .endif .endif # WXGTK_HACKS_MK diff --git a/x11/xf86-video-apm/Makefile b/x11/xf86-video-apm/Makefile index 7854f9faea6..c2001ce77f8 100644 --- a/x11/xf86-video-apm/Makefile +++ b/x11/xf86-video-apm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2010/09/14 11:03:12 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2012/06/15 23:06:05 dholland Exp $ # DISTNAME= xf86-video-apm-1.2.2 @@ -11,11 +11,11 @@ MAINTAINER= joerg@NetBSD.org HOMEPAGE= http://xorg.freedesktop.org/ COMMENT= Modular Xorg Alliance ProtMotion video driver -PKG_DESTDIR_SUPPORT= user-destdir +PKG_DESTDIR_SUPPORT= user-destdir -USE_LIBTOOL= yes -GNU_CONFIGURE= yes -USE_TOOLS+= pkg-config +USE_LIBTOOL= yes +GNU_CONFIGURE= yes +USE_TOOLS+= pkg-config .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../x11/randrproto/buildlink3.mk" diff --git a/x11/xf86-video-ark/Makefile b/x11/xf86-video-ark/Makefile index f90dea78cdf..ce42d67f038 100644 --- a/x11/xf86-video-ark/Makefile +++ b/x11/xf86-video-ark/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2010/09/14 11:03:12 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2012/06/15 23:06:05 dholland Exp $ # DISTNAME= xf86-video-ark-0.7.1 @@ -11,11 +11,11 @@ MAINTAINER= joerg@NetBSD.org HOMEPAGE= http://xorg.freedesktop.org/ COMMENT= Modular Xorg ARK Logic video driver -PKG_DESTDIR_SUPPORT= user-destdir +PKG_DESTDIR_SUPPORT= user-destdir -USE_LIBTOOL= yes -GNU_CONFIGURE= yes -USE_TOOLS+= pkg-config +USE_LIBTOOL= yes +GNU_CONFIGURE= yes +USE_TOOLS+= pkg-config .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../x11/randrproto/buildlink3.mk" diff --git a/x11/xf86-video-ast/Makefile b/x11/xf86-video-ast/Makefile index a62ae28eb9c..afbe3115fb2 100644 --- a/x11/xf86-video-ast/Makefile +++ b/x11/xf86-video-ast/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2010/09/14 11:03:12 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2012/06/15 23:06:05 dholland Exp $ # DISTNAME= xf86-video-ast-0.89.9 @@ -11,11 +11,11 @@ MAINTAINER= joerg@NetBSD.org HOMEPAGE= http://xorg.freedesktop.org/ COMMENT= Modular Xorg AST2000 video driver -PKG_DESTDIR_SUPPORT= user-destdir +PKG_DESTDIR_SUPPORT= user-destdir -USE_LIBTOOL= yes -GNU_CONFIGURE= yes -USE_TOOLS+= pkg-config +USE_LIBTOOL= yes +GNU_CONFIGURE= yes +USE_TOOLS+= pkg-config .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../x11/randrproto/buildlink3.mk" diff --git a/x11/xf86-video-cirrus/Makefile b/x11/xf86-video-cirrus/Makefile index f3201901d5a..70a62702f03 100644 --- a/x11/xf86-video-cirrus/Makefile +++ b/x11/xf86-video-cirrus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2010/09/14 11:03:12 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2012/06/15 23:06:05 dholland Exp $ # DISTNAME= xf86-video-cirrus-1.3.2 @@ -11,11 +11,11 @@ MAINTAINER= joerg@NetBSD.org HOMEPAGE= http://xorg.freedesktop.org/ COMMENT= Modular Xorg Cirrus Logic video driver -PKG_DESTDIR_SUPPORT= user-destdir +PKG_DESTDIR_SUPPORT= user-destdir -USE_LIBTOOL= yes -GNU_CONFIGURE= yes -USE_TOOLS+= pkg-config +USE_LIBTOOL= yes +GNU_CONFIGURE= yes +USE_TOOLS+= pkg-config .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../x11/randrproto/buildlink3.mk" diff --git a/x11/xf86-video-cyrix/Makefile b/x11/xf86-video-cyrix/Makefile index b9c96fe7404..0c85ff98ce8 100644 --- a/x11/xf86-video-cyrix/Makefile +++ b/x11/xf86-video-cyrix/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2010/09/14 11:03:13 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2012/06/15 23:06:05 dholland Exp $ # DISTNAME= xf86-video-cyrix-1.1.0 @@ -13,11 +13,11 @@ COMMENT= Modular Xorg Cyrix MediaGX video driver BROKEN= Broken with xserver 1.6 and up -PKG_DESTDIR_SUPPORT= user-destdir +PKG_DESTDIR_SUPPORT= user-destdir -USE_LIBTOOL= yes -GNU_CONFIGURE= yes -USE_TOOLS+= pkg-config +USE_LIBTOOL= yes +GNU_CONFIGURE= yes +USE_TOOLS+= pkg-config .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../x11/randrproto/buildlink3.mk" diff --git a/x11/xf86-video-glint/Makefile b/x11/xf86-video-glint/Makefile index 02828e62704..9e590456802 100644 --- a/x11/xf86-video-glint/Makefile +++ b/x11/xf86-video-glint/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2010/09/14 11:03:13 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2012/06/15 23:06:05 dholland Exp $ # DISTNAME= xf86-video-glint-1.2.4 @@ -11,13 +11,13 @@ MAINTAINER= joerg@NetBSD.org HOMEPAGE= http://xorg.freedesktop.org/ COMMENT= Modular Xorg GLINT/Permedia video driver -PKG_DESTDIR_SUPPORT= user-destdir +PKG_DESTDIR_SUPPORT= user-destdir CONFIGURE_ARGS+= --enable-dri -USE_LIBTOOL= yes -GNU_CONFIGURE= yes -USE_TOOLS+= pkg-config +USE_LIBTOOL= yes +GNU_CONFIGURE= yes +USE_TOOLS+= pkg-config .include "../../graphics/MesaLib/buildlink3.mk" .include "../../x11/modular-xorg-server/buildlink3.mk" diff --git a/x11/xf86-video-i128/Makefile b/x11/xf86-video-i128/Makefile index 2289bb53cb9..a849354e6b1 100644 --- a/x11/xf86-video-i128/Makefile +++ b/x11/xf86-video-i128/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2010/09/14 11:03:13 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2012/06/15 23:06:05 dholland Exp $ # DISTNAME= xf86-video-i128-1.3.3 @@ -11,11 +11,11 @@ MAINTAINER= joerg@NetBSD.org HOMEPAGE= http://xorg.freedesktop.org/ COMMENT= Modular Xorg Number 9 I128 video driver -PKG_DESTDIR_SUPPORT= user-destdir +PKG_DESTDIR_SUPPORT= user-destdir -USE_LIBTOOL= yes -GNU_CONFIGURE= yes -USE_TOOLS+= pkg-config +USE_LIBTOOL= yes +GNU_CONFIGURE= yes +USE_TOOLS+= pkg-config .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../x11/randrproto/buildlink3.mk" diff --git a/x11/xf86-video-i740/Makefile b/x11/xf86-video-i740/Makefile index 27e67c1a404..bd314993b10 100644 --- a/x11/xf86-video-i740/Makefile +++ b/x11/xf86-video-i740/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2010/09/14 11:03:13 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2012/06/15 23:06:05 dholland Exp $ # DISTNAME= xf86-video-i740-1.3.2 @@ -11,11 +11,11 @@ MAINTAINER= joerg@NetBSD.org HOMEPAGE= http://xorg.freedesktop.org/ COMMENT= Modular Xorg Intel i740 video driver -PKG_DESTDIR_SUPPORT= user-destdir +PKG_DESTDIR_SUPPORT= user-destdir -USE_LIBTOOL= yes -GNU_CONFIGURE= yes -USE_TOOLS+= pkg-config +USE_LIBTOOL= yes +GNU_CONFIGURE= yes +USE_TOOLS+= pkg-config .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../x11/randrproto/buildlink3.mk" diff --git a/x11/xf86-video-imstt/Makefile b/x11/xf86-video-imstt/Makefile index d9a754fbe34..bb9c2f567d2 100644 --- a/x11/xf86-video-imstt/Makefile +++ b/x11/xf86-video-imstt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2010/09/14 11:03:13 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2012/06/15 23:06:06 dholland Exp $ # DISTNAME= xf86-video-imstt-1.1.0 @@ -13,11 +13,11 @@ COMMENT= Modular Xorg IMS Twin Turbo 128 video driver BROKEN= Broken with xserver 1.6 and up -PKG_DESTDIR_SUPPORT= user-destdir +PKG_DESTDIR_SUPPORT= user-destdir -USE_LIBTOOL= yes -GNU_CONFIGURE= yes -USE_TOOLS+= pkg-config +USE_LIBTOOL= yes +GNU_CONFIGURE= yes +USE_TOOLS+= pkg-config .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../x11/randrproto/buildlink3.mk" diff --git a/x11/xf86-video-mga/Makefile b/x11/xf86-video-mga/Makefile index 92dd89788cf..79fc8f316be 100644 --- a/x11/xf86-video-mga/Makefile +++ b/x11/xf86-video-mga/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2010/09/14 11:03:14 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2012/06/15 23:06:06 dholland Exp $ # DISTNAME= xf86-video-mga-1.4.11 @@ -11,13 +11,13 @@ MAINTAINER= joerg@NetBSD.org HOMEPAGE= http://xorg.freedesktop.org/ COMMENT= Modular Xorg Matrox video driver -PKG_DESTDIR_SUPPORT= user-destdir +PKG_DESTDIR_SUPPORT= user-destdir CONFIGURE_ARGS+= --enable-dri -USE_LIBTOOL= yes -GNU_CONFIGURE= yes -USE_TOOLS+= pkg-config +USE_LIBTOOL= yes +GNU_CONFIGURE= yes +USE_TOOLS+= pkg-config .include "../../graphics/MesaLib/buildlink3.mk" .include "../../x11/modular-xorg-server/buildlink3.mk" diff --git a/x11/xf86-video-neomagic/Makefile b/x11/xf86-video-neomagic/Makefile index 8743660b02b..fc2b886ed3a 100644 --- a/x11/xf86-video-neomagic/Makefile +++ b/x11/xf86-video-neomagic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2010/09/14 11:03:14 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2012/06/15 23:06:06 dholland Exp $ # DISTNAME= xf86-video-neomagic-1.2.4 @@ -11,11 +11,11 @@ MAINTAINER= joerg@NetBSD.org HOMEPAGE= http://xorg.freedesktop.org/ COMMENT= Modular Xorg Neomagic video driver -PKG_DESTDIR_SUPPORT= user-destdir +PKG_DESTDIR_SUPPORT= user-destdir -USE_LIBTOOL= yes -GNU_CONFIGURE= yes -USE_TOOLS+= pkg-config +USE_LIBTOOL= yes +GNU_CONFIGURE= yes +USE_TOOLS+= pkg-config .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../x11/randrproto/buildlink3.mk" diff --git a/x11/xf86-video-nsc/Makefile b/x11/xf86-video-nsc/Makefile index 804216957a8..e2468b8caf3 100644 --- a/x11/xf86-video-nsc/Makefile +++ b/x11/xf86-video-nsc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2010/09/14 11:03:14 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2012/06/15 23:06:06 dholland Exp $ # DISTNAME= xf86-video-nsc-2.8.3 @@ -11,11 +11,11 @@ MAINTAINER= joerg@NetBSD.org HOMEPAGE= http://xorg.freedesktop.org/ COMMENT= Modular Xorg NSC Geode video driver -PKG_DESTDIR_SUPPORT= user-destdir +PKG_DESTDIR_SUPPORT= user-destdir -USE_LIBTOOL= yes -GNU_CONFIGURE= yes -USE_TOOLS+= autoconf autoheader automake autoreconf pkg-config +USE_LIBTOOL= yes +GNU_CONFIGURE= yes +USE_TOOLS+= autoconf autoheader automake autoreconf pkg-config BUILD_DEPENDS+= xorg-util-macros>=1.2.0:../../devel/xorg-util-macros diff --git a/x11/xf86-video-nvxbox/Makefile b/x11/xf86-video-nvxbox/Makefile index 6e490d72cbd..ac93dd0fc08 100644 --- a/x11/xf86-video-nvxbox/Makefile +++ b/x11/xf86-video-nvxbox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2010/09/14 11:03:14 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2012/06/15 23:06:06 dholland Exp $ # DISTNAME= xf86-video-nvxbox-${VER} @@ -9,15 +9,15 @@ MASTER_SITES= ${MASTER_SITE_BACKUP} MAINTAINER= joerg@NetBSD.org COMMENT= Modular Xorg NVidia Xbox video driver -PKG_DESTDIR_SUPPORT= user-destdir +PKG_DESTDIR_SUPPORT= user-destdir BROKEN= Doesn't build with modular Xorg server 1.7.x VER= 20070409 WRKSRC= ${WRKDIR}/${DISTNAME:S/-${VER}//} -USE_LIBTOOL= yes -GNU_CONFIGURE= yes -USE_TOOLS+= pkg-config +USE_LIBTOOL= yes +GNU_CONFIGURE= yes +USE_TOOLS+= pkg-config .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../x11/randrproto/buildlink3.mk" diff --git a/x11/xf86-video-openchrome/Makefile b/x11/xf86-video-openchrome/Makefile index f05005b2ee3..49825f3027a 100644 --- a/x11/xf86-video-openchrome/Makefile +++ b/x11/xf86-video-openchrome/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2011/01/19 18:12:21 tron Exp $ +# $NetBSD: Makefile,v 1.6 2012/06/15 23:06:06 dholland Exp $ # DISTNAME= xf86-video-openchrome-0.2.904 @@ -11,14 +11,14 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.openchrome.org/ COMMENT= Modular Xorg OpenChrome driver for VIA UniChrome video chipsets -PKG_DESTDIR_SUPPORT= user-destdir +PKG_DESTDIR_SUPPORT= user-destdir -USE_LIBTOOL= yes -GNU_CONFIGURE= yes -USE_TOOLS+= pkg-config +USE_LIBTOOL= yes +GNU_CONFIGURE= yes +USE_TOOLS+= pkg-config -CONFIGURE_ARGS+= --enable-maintainer-mode -CONFIGURE_ARGS+= --enable-dri +CONFIGURE_ARGS+= --enable-maintainer-mode +CONFIGURE_ARGS+= --enable-dri .include "../../mk/bsd.prefs.mk" diff --git a/x11/xf86-video-radeonhd/Makefile b/x11/xf86-video-radeonhd/Makefile index e336072c5e7..acb45b1167c 100644 --- a/x11/xf86-video-radeonhd/Makefile +++ b/x11/xf86-video-radeonhd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2010/09/14 11:03:15 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2012/06/15 23:06:06 dholland Exp $ DISTNAME= xf86-video-radeonhd-1.3.0 PKGREVISION= 2 @@ -10,11 +10,11 @@ MAINTAINER= joerg@NetBSD.org HOMEPAGE= http://wiki.x.org/wiki/radeonhd COMMENT= Modular X.org driver for Radeon HD series -PKG_DESTDIR_SUPPORT= user-destdir +PKG_DESTDIR_SUPPORT= user-destdir USE_LIBTOOL= yes GNU_CONFIGURE= yes -USE_TOOLS+= gmake pkg-config +USE_TOOLS+= gmake pkg-config CONFIGURE_ENV+= ac_cv_file___src_AtomBios_includes_atombios_h=yes CONFIGURE_ENV+= ac_cv_file___src_AtomBios_includes_Decoder_h=yes diff --git a/x11/xf86-video-rendition/Makefile b/x11/xf86-video-rendition/Makefile index 6eafefa7cb3..830f174449c 100644 --- a/x11/xf86-video-rendition/Makefile +++ b/x11/xf86-video-rendition/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2010/09/14 11:03:15 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2012/06/15 23:06:06 dholland Exp $ # DISTNAME= xf86-video-rendition-4.2.2 @@ -11,11 +11,11 @@ MAINTAINER= joerg@NetBSD.org HOMEPAGE= http://xorg.freedesktop.org/ COMMENT= Modular Xorg Rendition video driver -PKG_DESTDIR_SUPPORT= user-destdir +PKG_DESTDIR_SUPPORT= user-destdir -USE_LIBTOOL= yes -GNU_CONFIGURE= yes -USE_TOOLS+= pkg-config +USE_LIBTOOL= yes +GNU_CONFIGURE= yes +USE_TOOLS+= pkg-config .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../x11/randrproto/buildlink3.mk" diff --git a/x11/xf86-video-s3/Makefile b/x11/xf86-video-s3/Makefile index cba21825f9a..8446757f999 100644 --- a/x11/xf86-video-s3/Makefile +++ b/x11/xf86-video-s3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2010/09/14 11:03:15 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2012/06/15 23:06:07 dholland Exp $ # DISTNAME= xf86-video-s3-0.6.3 @@ -11,11 +11,11 @@ MAINTAINER= joerg@NetBSD.org HOMEPAGE= http://xorg.freedesktop.org/ COMMENT= Modular Xorg S3 video driver -PKG_DESTDIR_SUPPORT= user-destdir +PKG_DESTDIR_SUPPORT= user-destdir -USE_LIBTOOL= yes -GNU_CONFIGURE= yes -USE_TOOLS+= pkg-config +USE_LIBTOOL= yes +GNU_CONFIGURE= yes +USE_TOOLS+= pkg-config .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../x11/randrproto/buildlink3.mk" diff --git a/x11/xf86-video-s3virge/Makefile b/x11/xf86-video-s3virge/Makefile index 3bfbb6a6464..c3e9c062ae9 100644 --- a/x11/xf86-video-s3virge/Makefile +++ b/x11/xf86-video-s3virge/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2010/09/14 11:03:16 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2012/06/15 23:06:07 dholland Exp $ # DISTNAME= xf86-video-s3virge-1.10.4 @@ -11,11 +11,11 @@ MAINTAINER= joerg@NetBSD.org HOMEPAGE= http://xorg.freedesktop.org/ COMMENT= Modular Xorg S3 ViRGE video driver -PKG_DESTDIR_SUPPORT= user-destdir +PKG_DESTDIR_SUPPORT= user-destdir -USE_LIBTOOL= yes -GNU_CONFIGURE= yes -USE_TOOLS+= pkg-config +USE_LIBTOOL= yes +GNU_CONFIGURE= yes +USE_TOOLS+= pkg-config .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../x11/randrproto/buildlink3.mk" diff --git a/x11/xf86-video-savage/Makefile b/x11/xf86-video-savage/Makefile index 37682954c7c..0c2583768e8 100644 --- a/x11/xf86-video-savage/Makefile +++ b/x11/xf86-video-savage/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2010/09/14 11:03:16 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2012/06/15 23:06:07 dholland Exp $ # DISTNAME= xf86-video-savage-2.3.1 @@ -11,13 +11,13 @@ MAINTAINER= joerg@NetBSD.org HOMEPAGE= http://xorg.freedesktop.org/ COMMENT= Modular Xorg S3 Savage video driver -PKG_DESTDIR_SUPPORT= user-destdir +PKG_DESTDIR_SUPPORT= user-destdir CONFIGURE_ARGS+= --enable-dri -USE_LIBTOOL= yes -GNU_CONFIGURE= yes -USE_TOOLS+= pkg-config +USE_LIBTOOL= yes +GNU_CONFIGURE= yes +USE_TOOLS+= pkg-config .include "../../graphics/MesaLib/buildlink3.mk" .include "../../x11/modular-xorg-server/buildlink3.mk" diff --git a/x11/xf86-video-siliconmotion/Makefile b/x11/xf86-video-siliconmotion/Makefile index 1d49ad01f53..cb6965964b1 100644 --- a/x11/xf86-video-siliconmotion/Makefile +++ b/x11/xf86-video-siliconmotion/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2010/09/14 11:03:16 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2012/06/15 23:06:07 dholland Exp $ # DISTNAME= xf86-video-siliconmotion-1.7.3 @@ -11,11 +11,11 @@ MAINTAINER= joerg@NetBSD.org HOMEPAGE= http://xorg.freedesktop.org/ COMMENT= Modular Xorg Silicon Motion video driver -PKG_DESTDIR_SUPPORT= user-destdir +PKG_DESTDIR_SUPPORT= user-destdir -USE_LIBTOOL= yes -GNU_CONFIGURE= yes -USE_TOOLS+= pkg-config +USE_LIBTOOL= yes +GNU_CONFIGURE= yes +USE_TOOLS+= pkg-config .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../x11/randrproto/buildlink3.mk" diff --git a/x11/xf86-video-sis/Makefile b/x11/xf86-video-sis/Makefile index 2b12976bfb0..fd5d782a18d 100644 --- a/x11/xf86-video-sis/Makefile +++ b/x11/xf86-video-sis/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2012/04/17 17:52:53 joerg Exp $ +# $NetBSD: Makefile,v 1.12 2012/06/15 23:06:07 dholland Exp $ # DISTNAME= xf86-video-sis-0.10.2 @@ -11,13 +11,13 @@ MAINTAINER= joerg@NetBSD.org HOMEPAGE= http://xorg.freedesktop.org/ COMMENT= Modular Xorg SiS and XGI video driver -PKG_DESTDIR_SUPPORT= user-destdir +PKG_DESTDIR_SUPPORT= user-destdir CONFIGURE_ARGS+= --enable-dri -USE_LIBTOOL= yes -GNU_CONFIGURE= yes -USE_TOOLS+= pkg-config +USE_LIBTOOL= yes +GNU_CONFIGURE= yes +USE_TOOLS+= pkg-config .include "../../mk/compiler.mk" .if !empty(PKGSRC_COMPILER:Mclang) diff --git a/x11/xf86-video-tdfx/Makefile b/x11/xf86-video-tdfx/Makefile index eda9ad6bcdf..e279ebc04e8 100644 --- a/x11/xf86-video-tdfx/Makefile +++ b/x11/xf86-video-tdfx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2010/09/14 11:03:16 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2012/06/15 23:06:07 dholland Exp $ # DISTNAME= xf86-video-tdfx-1.4.3 @@ -11,13 +11,13 @@ MAINTAINER= joerg@NetBSD.org HOMEPAGE= http://xorg.freedesktop.org/ COMMENT= Modular Xorg 3Dfx video driver -PKG_DESTDIR_SUPPORT= user-destdir +PKG_DESTDIR_SUPPORT= user-destdir CONFIGURE_ARGS+= --enable-dri -USE_LIBTOOL= yes -GNU_CONFIGURE= yes -USE_TOOLS+= pkg-config +USE_LIBTOOL= yes +GNU_CONFIGURE= yes +USE_TOOLS+= pkg-config .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../x11/randrproto/buildlink3.mk" diff --git a/x11/xf86-video-tga/Makefile b/x11/xf86-video-tga/Makefile index bbae00a5e5d..f0b60991468 100644 --- a/x11/xf86-video-tga/Makefile +++ b/x11/xf86-video-tga/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2010/09/14 11:03:16 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2012/06/15 23:06:07 dholland Exp $ # DISTNAME= xf86-video-tga-1.2.0 @@ -11,11 +11,11 @@ MAINTAINER= joerg@NetBSD.org HOMEPAGE= http://xorg.freedesktop.org/ COMMENT= Modular Xorg TGA video driver -PKG_DESTDIR_SUPPORT= user-destdir +PKG_DESTDIR_SUPPORT= user-destdir -USE_LIBTOOL= yes -GNU_CONFIGURE= yes -USE_TOOLS+= pkg-config +USE_LIBTOOL= yes +GNU_CONFIGURE= yes +USE_TOOLS+= pkg-config .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../x11/randrproto/buildlink3.mk" diff --git a/x11/xf86-video-trident/Makefile b/x11/xf86-video-trident/Makefile index 5dfbbd2984b..b788454c133 100644 --- a/x11/xf86-video-trident/Makefile +++ b/x11/xf86-video-trident/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2010/09/14 11:03:17 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2012/06/15 23:06:07 dholland Exp $ # DISTNAME= xf86-video-trident-1.3.3 @@ -11,11 +11,11 @@ MAINTAINER= joerg@NetBSD.org HOMEPAGE= http://xorg.freedesktop.org/ COMMENT= Modular Xorg Trident video driver -PKG_DESTDIR_SUPPORT= user-destdir +PKG_DESTDIR_SUPPORT= user-destdir -USE_LIBTOOL= yes -GNU_CONFIGURE= yes -USE_TOOLS+= pkg-config +USE_LIBTOOL= yes +GNU_CONFIGURE= yes +USE_TOOLS+= pkg-config .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../x11/randrproto/buildlink3.mk" diff --git a/x11/xf86-video-tseng/Makefile b/x11/xf86-video-tseng/Makefile index 29c93312583..c4c64f74c1f 100644 --- a/x11/xf86-video-tseng/Makefile +++ b/x11/xf86-video-tseng/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2010/09/14 11:03:17 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2012/06/15 23:06:07 dholland Exp $ # DISTNAME= xf86-video-tseng-1.2.2 @@ -11,11 +11,11 @@ MAINTAINER= joerg@NetBSD.org HOMEPAGE= http://xorg.freedesktop.org/ COMMENT= Modular Xorg Tseng Labs video driver -PKG_DESTDIR_SUPPORT= user-destdir +PKG_DESTDIR_SUPPORT= user-destdir -USE_LIBTOOL= yes -GNU_CONFIGURE= yes -USE_TOOLS+= pkg-config +USE_LIBTOOL= yes +GNU_CONFIGURE= yes +USE_TOOLS+= pkg-config .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../x11/randrproto/buildlink3.mk" diff --git a/x11/xf86-video-vesa/Makefile b/x11/xf86-video-vesa/Makefile index a30c6e6135e..173109604e8 100644 --- a/x11/xf86-video-vesa/Makefile +++ b/x11/xf86-video-vesa/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2010/09/14 11:03:17 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2012/06/15 23:06:08 dholland Exp $ # DISTNAME= xf86-video-vesa-2.3.0 @@ -11,11 +11,11 @@ MAINTAINER= joerg@NetBSD.org HOMEPAGE= http://xorg.freedesktop.org/ COMMENT= Modular Xorg VESA video driver -PKG_DESTDIR_SUPPORT= user-destdir +PKG_DESTDIR_SUPPORT= user-destdir -USE_LIBTOOL= yes -GNU_CONFIGURE= yes -USE_TOOLS+= pkg-config +USE_LIBTOOL= yes +GNU_CONFIGURE= yes +USE_TOOLS+= pkg-config .include "../../x11/modular-xorg-server/buildlink3.mk" BUILDLINK_DEPMETHOD.libXext?= build diff --git a/x11/xf86-video-vga/Makefile b/x11/xf86-video-vga/Makefile index f07d01333b6..7603945469f 100644 --- a/x11/xf86-video-vga/Makefile +++ b/x11/xf86-video-vga/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2010/09/14 11:03:17 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2012/06/15 23:06:08 dholland Exp $ # DISTNAME= xf86-video-vga-4.1.0 @@ -11,11 +11,11 @@ MAINTAINER= joerg@NetBSD.org HOMEPAGE= http://xorg.freedesktop.org/ COMMENT= Modular Xorg generic VGA video driver -PKG_DESTDIR_SUPPORT= user-destdir +PKG_DESTDIR_SUPPORT= user-destdir -USE_LIBTOOL= yes -GNU_CONFIGURE= yes -USE_TOOLS+= autoconf autoheader automake autoreconf pkg-config +USE_LIBTOOL= yes +GNU_CONFIGURE= yes +USE_TOOLS+= autoconf autoheader automake autoreconf pkg-config BUILD_DEPENDS+= xorg-util-macros>=1.2.0:../../devel/xorg-util-macros diff --git a/x11/xineramaproto/builtin.mk b/x11/xineramaproto/builtin.mk index 9841c4f4cb5..87a161e2368 100644 --- a/x11/xineramaproto/builtin.mk +++ b/x11/xineramaproto/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.3 2008/10/05 21:36:34 cube Exp $ +# $NetBSD: builtin.mk,v 1.4 2012/06/15 23:06:08 dholland Exp $ BUILTIN_PKG:= xineramaproto @@ -31,7 +31,7 @@ MAKEVARS+= IS_BUILTIN.xineramaproto BUILTIN_VERSION.xineramaproto!= ${SED} -n -e 's/Version: //p' ${PC_XINERAMAPROTO} BUILTIN_PKG.xineramaproto= xineramaproto-${BUILTIN_VERSION.xineramaproto} .endif -MAKEVARS+= BUILTIN_PKG.xineramaproto +MAKEVARS+= BUILTIN_PKG.xineramaproto ### ### Determine whether we should use the built-in implementation if it diff --git a/x11/xinput/Makefile b/x11/xinput/Makefile index e86c9a6554e..63677790ec3 100644 --- a/x11/xinput/Makefile +++ b/x11/xinput/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2011/02/28 14:53:09 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2012/06/15 23:06:08 dholland Exp $ # DISTNAME= xinput-1.5.2 @@ -10,12 +10,12 @@ HOMEPAGE= http://xorg.freedesktop.org/ COMMENT= Xinput diagnostic utility for modular X.org LICENSE= mit -PKG_DESTDIR_SUPPORT= user-destdir +PKG_DESTDIR_SUPPORT= user-destdir GNU_CONFIGURE= yes USE_TOOLS+= pkg-config -BUILDLINK_API_DEPENDS.inputproto+= inputproto>=1.5 +BUILDLINK_API_DEPENDS.inputproto+= inputproto>=1.5 .include "../../x11/inputproto/buildlink3.mk" BUILDLINK_API_DEPENDS.libXi+= libXi>=1.2.0 .include "../../x11/libXi/buildlink3.mk" diff --git a/x11/xlockmore-lite/Makefile b/x11/xlockmore-lite/Makefile index 52dbe4d7836..509ebf8b483 100644 --- a/x11/xlockmore-lite/Makefile +++ b/x11/xlockmore-lite/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2012/02/18 23:50:33 elric Exp $ +# $NetBSD: Makefile,v 1.15 2012/06/15 23:06:08 dholland Exp $ .include "../../x11/xlockmore/Makefile.common" @@ -18,6 +18,6 @@ CONFIGURE_ARGS+= --without-esound CONFIGURE_ARGS+= --without-gtk2 CONFIGURE_ARGS+= --without-gtk -PLIST_SUBST+= LITE="@comment Not in lite version: " +PLIST_SUBST+= LITE="@comment Not in lite version: " .include "../../mk/bsd.pkg.mk" diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile index 2dd4c49d22a..3e07287cf8d 100644 --- a/x11/xlockmore/Makefile +++ b/x11/xlockmore/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.95 2012/06/14 07:45:10 sbd Exp $ +# $NetBSD: Makefile,v 1.96 2012/06/15 23:06:08 dholland Exp $ .include "Makefile.common" PKGREVISION=2 @@ -10,16 +10,16 @@ CONFIGURE_ARGS+= --with-mesa CONFIGURE_ARGS+= --without-ttf XPM_ENV= no_xpm= xpm_includes=${BUILDLINK_PREFIX.libXpm}/include xpm_libraries=${BUILDLINK_PREFIX.libXpm}/lib CONFIGURE_ENV+= ac_cv_path_xpm=${XPM_ENV:Q} -OPENGL_ENV= no_opengl= ac_opengl_includes=${BUILDLINK_PREFIX.MesaLib}/include ac_opengl_libraries=${BUILDLINK_PREFIX.MesaLib}/lib +OPENGL_ENV= no_opengl= ac_opengl_includes=${BUILDLINK_PREFIX.MesaLib}/include ac_opengl_libraries=${BUILDLINK_PREFIX.MesaLib}/lib CONFIGURE_ENV+= ac_cv_path_opengl=${OPENGL_ENV:Q} -MESA_ENV= no_mesa= ac_mesa_includes=${BUILDLINK_PREFIX.MesaLib}/include ac_mesa_libraries=${BUILDLINK_PREFIX.MesaLib}/lib +MESA_ENV= no_mesa= ac_mesa_includes=${BUILDLINK_PREFIX.MesaLib}/include ac_mesa_libraries=${BUILDLINK_PREFIX.MesaLib}/lib CONFIGURE_ENV+= ac_cv_path_mesa=${MESA_ENV:Q} #BUILDLINK_TRANSFORM+= l:MesaGL:GL #BUILDLINK_TRANSFORM+= l:MesaGLU:GLU XEXT_ENV= no_ext= ac_ext_includes=${BUILDLINK_PREFIX.xextproto}/include ac_ext_libraries=${BUILDLINK_PREFIX.libXext}/lib CONFIGURE_ENV+= ac_cv_path_ext=${XEXT_ENV:Q} -PLIST_SUBST+= LITE="" +PLIST_SUBST+= LITE="" USE_TOOLS+= pkg-config diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common index eac5cf1198d..e4ec36e6953 100644 --- a/x11/xscreensaver/Makefile.common +++ b/x11/xscreensaver/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.108 2012/01/30 06:24:04 sbd Exp $ +# $NetBSD: Makefile.common,v 1.109 2012/06/15 23:06:08 dholland Exp $ # # used by x11/xscreensaver/Makefile # used by x11/xscreensaver-demo/Makefile @@ -63,7 +63,7 @@ GCC_REQD+= 2.95.3 .endif .if !exists(/usr/bin/bc) -BUILD_DEPENDS+= bc>=[0-9]*:../../math/bc +BUILD_DEPENDS+= bc>=[0-9]*:../../math/bc .endif INSTALL_MAKE_FLAGS= install_prefix=${DESTDIR} diff --git a/x11/xscreensaver/options.mk b/x11/xscreensaver/options.mk index a167c70c704..c320dc151cb 100644 --- a/x11/xscreensaver/options.mk +++ b/x11/xscreensaver/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.7 2011/03/06 16:04:33 wiz Exp $ +# $NetBSD: options.mk,v 1.8 2012/06/15 23:06:08 dholland Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.xscreensaver PKG_SUPPORTED_OPTIONS= pam webcollage opengl @@ -10,10 +10,10 @@ PKG_SUGGESTED_OPTIONS= opengl . include "../../mk/pam.buildlink3.mk" CONFIGURE_ARGS+= --with-pam CONFIGURE_ARGS+= --without-shadow -.if ${OPSYS} == "NetBSD" +. if ${OPSYS} == "NetBSD" # needed to read shadow passwords DEPENDS+= pam-pwauth_suid-*:../../security/pam-pwauth_suid -.endif +. endif .else CONFIGURE_ARGS+= --without-pam # configure should figure out diff --git a/x11/xterm/options.mk b/x11/xterm/options.mk index 6c1c94a36cf..545259e9601 100644 --- a/x11/xterm/options.mk +++ b/x11/xterm/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.11 2010/06/16 16:27:47 drochner Exp $ +# $NetBSD: options.mk,v 1.12 2012/06/15 23:06:08 dholland Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.xterm PKG_SUPPORTED_OPTIONS= debug pcre freetype luit @@ -26,8 +26,8 @@ CONFIGURE_ARGS+= --disable-freetype ### within libc's namespace, so we should have no problems. ### .if !empty(PKG_OPTIONS:Mpcre) -CONFIGURE_ARGS+= --with-pcre -CONFIGURE_ENV+= ac_cv_lib_pcreposix_pcreposix_regcomp=yes +CONFIGURE_ARGS+= --with-pcre +CONFIGURE_ENV+= ac_cv_lib_pcreposix_pcreposix_regcomp=yes . include "../../devel/pcre/buildlink3.mk" .endif diff --git a/x11/xview-clients/Makefile b/x11/xview-clients/Makefile index ee2bf0395cf..22fa3a623e6 100644 --- a/x11/xview-clients/Makefile +++ b/x11/xview-clients/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2010/04/27 22:08:42 dholland Exp $ +# $NetBSD: Makefile,v 1.35 2012/06/15 23:06:09 dholland Exp $ DISTNAME= xview3.2p1-X11R6 PKGNAME= xview-clients-3.2.1 @@ -21,7 +21,7 @@ EXTRACT_ELEMENTS= ${DISTNAME}/clients ${DISTNAME}/images WRKSRC= ${WRKDIR}/${DISTNAME}/clients USE_IMAKE= yes -PKG_DESTDIR_SUPPORT= user-destdir +PKG_DESTDIR_SUPPORT= user-destdir SUBST_CLASSES+= xvc SUBST_STAGE.xvc= pre-configure diff --git a/x11/xview-lib/Makefile b/x11/xview-lib/Makefile index 1115a874c86..46c9e7a4408 100644 --- a/x11/xview-lib/Makefile +++ b/x11/xview-lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2011/09/29 07:47:56 dholland Exp $ +# $NetBSD: Makefile,v 1.39 2012/06/15 23:06:09 dholland Exp $ DISTNAME= xview3.2p1-X11R6 PKGNAME= xview-lib-3.2.1 @@ -20,7 +20,7 @@ NOT_FOR_PLATFORM= *-*-alpha USE_IMAKE= yes -PKG_DESTDIR_SUPPORT= user-destdir +PKG_DESTDIR_SUPPORT= user-destdir post-install: cd ${DESTDIR}${PREFIX}/lib && ${LN} -fs libolgx.so.3.2 libolgx.so.3 && \ |