diff options
| -rw-r--r-- | x11/xorg-clients/Makefile | 36 | ||||
| -rw-r--r-- | x11/xorg-clients/PLIST | 4 | ||||
| -rw-r--r-- | x11/xorg-clients/PLIST.dga | 2 |
3 files changed, 24 insertions, 18 deletions
diff --git a/x11/xorg-clients/Makefile b/x11/xorg-clients/Makefile index 982f6d4a8d9..8db9ab8497f 100644 --- a/x11/xorg-clients/Makefile +++ b/x11/xorg-clients/Makefile @@ -1,20 +1,20 @@ -# $NetBSD: Makefile,v 1.11 2005/03/01 19:00:11 xtraeme Exp $ +# $NetBSD: Makefile,v 1.12 2005/03/22 09:51:04 adam Exp $ -DISTNAME= ${DISTFILES} -PKGNAME= xorg-clients-${XORG_VER} -CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_XORG} -DISTFILES= X11R${XORG_VER}-src1.tar.gz \ - X11R${XORG_VER}-src2.tar.gz \ - X11R${XORG_VER}-src3.tar.gz +DISTNAME= ${DISTFILES} +PKGNAME= xorg-clients-${XORG_VER} +CATEGORIES= x11 +MASTER_SITES= ${MASTER_SITE_XORG} +DISTFILES= X11R${XORG_VER}-src1.tar.gz \ + X11R${XORG_VER}-src2.tar.gz \ + X11R${XORG_VER}-src3.tar.gz -MAINTAINER= xtraeme@NetBSD.org -HOMEPAGE= http://www.x.org/ -COMMENT= X.org client programs and related files +MAINTAINER= xtraeme@NetBSD.org +HOMEPAGE= http://www.x.org/ +COMMENT= X.org client programs and related files -USE_X11= yes USE_BUILDLINK3= yes USE_PKGINSTALL= yes +USE_X11= yes DISTINFO_FILE= ${.CURDIR}/../../x11/xorg-libs/distinfo PATCHDIR= ${.CURDIR}/../../x11/xorg-libs/patches @@ -49,11 +49,11 @@ CONF_FILES_PERMS+= ${EGDIR}/Xwilling ${PKG_SYSCONFDIR}/Xwilling \ post-wrapper: @${MKDIR} ${WRKSRC}/exports/include - @${CP} ${X11ROOT}/include/X11/fonts/*.h ${BUILDLINK_DIR}/include + @${CP} -p ${X11ROOT}/include/X11/fonts/*.h ${BUILDLINK_DIR}/include post-configure: @${MKDIR} ${WRKSRC}/exports/lib - @${CP} ${X11ROOT}/lib/lib* ${WRKSRC}/exports/lib + @${CP} -p ${X11ROOT}/lib/lib* ${WRKSRC}/exports/lib post-install: @${CHMOD} a+r ${X11ROOT}/bin/xterm @@ -64,10 +64,16 @@ post-install: . include "../../security/PAM/buildlink3.mk" .endif +PLIST_SRC+= PLIST +.if ${OPSYS} != "Darwin" +PLIST_SRC+= PLIST.dga +.endif + +.include "../../meta-pkgs/xorg/Makefile.common" + .include "../../fonts/Xft2/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" -.include "../../meta-pkgs/xorg/Makefile.common" .include "../../x11/Xrandr/buildlink3.mk" .include "../../x11/xcursor/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xorg-clients/PLIST b/x11/xorg-clients/PLIST index 9633cad40ae..4e977ba6df7 100644 --- a/x11/xorg-clients/PLIST +++ b/x11/xorg-clients/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2005/03/01 19:00:11 xtraeme Exp $ +@comment $NetBSD: PLIST,v 1.6 2005/03/22 09:51:04 adam Exp $ ${X11ROOT_PREFIX}/bin/Xmark ${X11ROOT_PREFIX}/bin/appres ${X11ROOT_PREFIX}/bin/atobm @@ -9,7 +9,6 @@ ${X11ROOT_PREFIX}/bin/bitmap ${X11ROOT_PREFIX}/bin/bmtoa ${X11ROOT_PREFIX}/bin/chooser ${X11ROOT_PREFIX}/bin/cxpm -${X11ROOT_PREFIX}/bin/dga ${X11ROOT_PREFIX}/bin/dpsexec ${X11ROOT_PREFIX}/bin/dpsinfo ${X11ROOT_PREFIX}/bin/editres @@ -752,7 +751,6 @@ ${X11ROOT_PREFIX}/${MAN_DIR}/beforelight.${MAN_SUFFIX} ${X11ROOT_PREFIX}/${MAN_DIR}/bitmap.${MAN_SUFFIX} ${X11ROOT_PREFIX}/${MAN_DIR}/bmtoa.${MAN_SUFFIX} ${X11ROOT_PREFIX}/${MAN_DIR}/cxpm.${MAN_SUFFIX} -${X11ROOT_PREFIX}/${MAN_DIR}/dga.${MAN_SUFFIX} ${X11ROOT_PREFIX}/${MAN_DIR}/dpsexec.${MAN_SUFFIX} ${X11ROOT_PREFIX}/${MAN_DIR}/dpsinfo.${MAN_SUFFIX} ${X11ROOT_PREFIX}/${MAN_DIR}/editres.${MAN_SUFFIX} diff --git a/x11/xorg-clients/PLIST.dga b/x11/xorg-clients/PLIST.dga new file mode 100644 index 00000000000..ef4284f7655 --- /dev/null +++ b/x11/xorg-clients/PLIST.dga @@ -0,0 +1,2 @@ +${X11ROOT_PREFIX}/bin/dga +${X11ROOT_PREFIX}/${MAN_DIR}/dga.${MAN_SUFFIX} |