pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/xorg-imake Apply patch from Kouichirou Hiratsuka P...
details: https://anonhg.NetBSD.org/pkgsrc/rev/0b3e93e019dd
branches: trunk
changeset: 478831:0b3e93e019dd
user: xtraeme <xtraeme%pkgsrc.org@localhost>
date: Fri Jul 30 22:47:47 2004 +0000
description:
Apply patch from Kouichirou Hiratsuka PR pkg/26480 to not install
the header files properly (previous change broke "update" target).
diffstat:
x11/xorg-imake/Makefile | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diffs (41 lines):
diff -r b97a5983740c -r 0b3e93e019dd x11/xorg-imake/Makefile
--- a/x11/xorg-imake/Makefile Fri Jul 30 22:15:59 2004 +0000
+++ b/x11/xorg-imake/Makefile Fri Jul 30 22:47:47 2004 +0000
@@ -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 @@
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 @@
-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 @@
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"
Home |
Main Index |
Thread Index |
Old Index