summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorxtraeme <xtraeme@pkgsrc.org>2004-07-30 22:47:47 +0000
committerxtraeme <xtraeme@pkgsrc.org>2004-07-30 22:47:47 +0000
commita068bec3d2cbffc8ab950f80b8f87aa15c04de46 (patch)
tree3bacc86c2bf9387cfdf4126d49a0998377df66a9 /x11
parentd629af25678e1da2225d72420d97c18dcf20932f (diff)
downloadpkgsrc-a068bec3d2cbffc8ab950f80b8f87aa15c04de46.tar.gz
Apply patch from Kouichirou Hiratsuka PR pkg/26480 to not install
the header files properly (previous change broke "update" target).
Diffstat (limited to 'x11')
-rw-r--r--x11/xorg-imake/Makefile14
1 files changed, 7 insertions, 7 deletions
diff --git a/x11/xorg-imake/Makefile b/x11/xorg-imake/Makefile
index fec57ec772a..0d00e437dbd 100644
--- a/x11/xorg-imake/Makefile
+++ b/x11/xorg-imake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/07/30 08:31:23 xtraeme Exp $
+# $NetBSD: Makefile,v 1.6 2004/07/30 22:47:47 xtraeme Exp $
DISTNAME= ${DISTFILES}
PKGNAME= xorg-imake-${XORG_VER}
@@ -14,7 +14,7 @@ COMMENT= Imake and other utilities from X.org
PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_BUILDLINK3= yes
-USE_DIRS+= xorg-1.0
+USE_DIRS+= xorg-1.1
INSTALL_TARGET= install install.man
NO_XORG_TARGETS= yes
CHECK_X11_TYPE= yes
@@ -46,8 +46,7 @@ pre-configure:
-e "s|@@PKGSRC_CPP@@|${CPP}|g" \
-e "s|@@PKGSRC_CXX@@|${CXX}|g" \
-e "s|@@PKGSRC_CFLAGS@@|${CFLAGS}|g" \
- ${WRKSRC}/config/cf/${F}.cf.in > \
- ${WRKSRC}/config/cf/${F}.cf
+ ${WRKSRC}/config/cf/${F}.cf.in > ${WRKSRC}/config/cf/${F}.cf
.endfor
.undef F
@( \
@@ -67,8 +66,9 @@ do-build:
cd ${WRKSRC} && ${MAKE} Makefile.boot && \
${MAKE_PROGRAM} -f xmakefile VerifyOS version.def Makefiles includes
-# These files are handled by xorg-libs.
-post-install:
- @${RM} -rf ${X11ROOT}/include
+pre-install:
+ @${CP} ${WRKSRC}/xmakefile ${WRKSRC}/xmakefile.bak
+ @${SED} 's/SUBDIRS = include/SUBDIRS =/' ${WRKSRC}/xmakefile.bak > \
+ ${WRKSRC}/xmakefile
.include "../../mk/bsd.pkg.mk"