Hi,
the 2 patches below allow to swith imake from xenocara to ports.
The first one is to be applied to /usr/port. It does 3 things:
- fix one last reference to /usr/X11R6/lib/X11/config in OpenBSD.cf
- stop installing Motif.{tmp,rules}
- actually switch imake.port.mk to use the imake ports
The 2nd patch to be applied in /usr/xenocara, unlinks imake and imake
cf from xenocara build. To apply this one, you need to remove
/usr/X11R6 before rebuilding xenocara, or just remove the following
files and directory:
rm -rf /usr/X11R6/lib/X11/config/
rm
/usr/X11R6/bin/{ccmakedep,cleanlinks,imake,makeg,mergelib,mkdirhier,mkhtmlindex,revpath}
I've built all ports that matched CONFIGURE_STYLE.*imake with this,
without issues, but if someone could do a real bulk ports build with
that, it willl be even better.
If ok, I'll commit the ports part in 3 steps.
Index: devel/imake-cf/Makefile
===================================================================
RCS file: /cvs/OpenBSD/ports/devel/imake-cf/Makefile,v
retrieving revision 1.3
diff -u -p -u -r1.3 Makefile
--- devel/imake-cf/Makefile 2 Sep 2012 18:01:48 -0000 1.3
+++ devel/imake-cf/Makefile 2 Sep 2012 18:54:04 -0000
@@ -7,7 +7,7 @@ DISTNAME = xorg-cf-files-1.0.4
PKGNAME = imake-cf-1.0.4
MASTER_SITES = http://ftp.x.org/pub/individual/util/
-REVISION = 1
+REVISION = 2
PERMIT_DISTFILES_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
@@ -33,6 +33,8 @@ do-install:
for f in ${WRKSRC}/*.{cf,def,rules,tmpl}; do \
${INSTALL_DATA} $$f ${XCONFDIR}; \
done
+ rm -f ${XCONFIGDIR}/Motif.rules
+ rm -f ${XCONFIGDIR}/Motif.tmpl
touch ${XCONFDIR}/host.def
touch ${XCONFDIR}/date.def
touch ${XCONFDIR}/version.def
Index: devel/imake-cf/patches/patch-OpenBSD_cf
===================================================================
RCS file: /cvs/OpenBSD/ports/devel/imake-cf/patches/patch-OpenBSD_cf,v
retrieving revision 1.2
diff -u -p -u -r1.2 patch-OpenBSD_cf
--- devel/imake-cf/patches/patch-OpenBSD_cf 2 Sep 2012 14:37:49 -0000
1.2
+++ devel/imake-cf/patches/patch-OpenBSD_cf 2 Sep 2012 18:35:01 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-OpenBSD_cf,v 1.2 2012/09/02 14:37:49 ajacoutot Exp $
---- OpenBSD.cf.orig Thu Jan 6 05:31:00 2011
-+++ OpenBSD.cf Mon Aug 6 13:01:09 2012
-@@ -26,6 +26,8 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS
+--- OpenBSD.cf.orig Fri Oct 16 23:45:42 2009
++++ OpenBSD.cf Sun Sep 2 20:30:21 2012
+@@ -26,10 +26,12 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS
#define LibDir /usr/local/lib/X11
#define UsrLibDir /usr/local/lib
#define ManDirectoryRoot /usr/local/man
@@ -10,6 +10,11 @@ $OpenBSD: patch-OpenBSD_cf,v 1.2 2012/09
#define LdPreLib -L/usr/X11R6/lib -L/usr/local/lib
#define XpmLibDir /usr/X11R6/lib
#define XpmIncDir /usr/X11R6/include
+-#define ConfigDir /usr/X11R6/lib/X11/config
++#define ConfigDir ${LOCALBASE}/lib/X11/config
+ #define IncRoot /usr/local/include
+ #define TopXInclude -I/usr/X11R6/include
+ #define ImakeCmd imake -DPorts
@@ -244,9 +246,22 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS
/*
* Documentation formatting
Index: devel/imake-cf/pkg/PLIST
===================================================================
RCS file: /cvs/OpenBSD/ports/devel/imake-cf/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -r1.2 PLIST
--- devel/imake-cf/pkg/PLIST 2 Sep 2012 18:01:48 -0000 1.2
+++ devel/imake-cf/pkg/PLIST 2 Sep 2012 18:54:20 -0000
@@ -9,8 +9,6 @@ lib/X11/config/Imake.rules
lib/X11/config/Imake.tmpl
lib/X11/config/Library.tmpl
lib/X11/config/Mips.cf
-lib/X11/config/Motif.rules
-lib/X11/config/Motif.tmpl
lib/X11/config/NetBSD.cf
lib/X11/config/Oki.cf
lib/X11/config/OpenBSD.cf
Index: infrastructure/mk/imake.port.mk
===================================================================
RCS file: /cvs/OpenBSD/ports/infrastructure/mk/imake.port.mk,v
retrieving revision 1.6
diff -u -p -u -r1.6 imake.port.mk
--- infrastructure/mk/imake.port.mk 23 Oct 2011 22:06:01 -0000 1.6
+++ infrastructure/mk/imake.port.mk 17 Sep 2012 08:33:47 -0000
@@ -15,16 +15,15 @@ XMKMF += -DPorts
IGNORE = "uses imake, but ${X11BASE} not found"
.endif
+MODIMAKE_DEPENDS = \
+ devel/imake \
+ devel/imake-cf
+
+BUILD_DEPENDS += ${MODIMAKE_DEPENDS}
+
MODIMAKE_configure = \
- if [ -e ${X11BASE}/lib/X11/config/ports.cf ] || \
- fgrep >/dev/null 2>/dev/null Ports \
- ${X11BASE}/lib/X11/config/OpenBSD.cf; then \
cd ${WRKSRC} && ${_SYSTRACE_CMD} ${SETENV} ${MAKE_ENV}
${XMKMF}; \
- else \
- echo >&2 "Error: your X installation is incomplete"; \
- echo >&2 "Please install the xshare tarball"; \
- exit 1; \
- fi
+
# Kludge
.if ${CONFIGURE_STYLE:Mimake}
MODIMAKE_pre-install = \
Index: x11/openmotif/Makefile
===================================================================
RCS file: /cvs/OpenBSD/ports/x11/openmotif/Makefile,v
retrieving revision 1.51
diff -u -p -u -r1.51 Makefile
--- x11/openmotif/Makefile 16 Sep 2011 12:29:16 -0000 1.51
+++ x11/openmotif/Makefile 3 Sep 2012 06:39:31 -0000
@@ -8,7 +8,7 @@ DISTNAME= openmotif-${VERSION}
PKGNAME-main= openmotif-${VERSION}
PKGNAME-demos= openmotif-demos-${VERSION}
-REVISION-main= 3
+REVISION-main= 4
REVISION-demos= 2
SHARED_LIBS= Mrm 4.1 \
Index: x11/openmotif/pkg/PLIST-main
===================================================================
RCS file: /cvs/OpenBSD/ports/x11/openmotif/pkg/PLIST-main,v
retrieving revision 1.4
diff -u -p -u -r1.4 PLIST-main
--- x11/openmotif/pkg/PLIST-main 7 Nov 2010 19:52:00 -0000 1.4
+++ x11/openmotif/pkg/PLIST-main 3 Sep 2012 06:39:42 -0000
@@ -282,9 +282,7 @@ lib/X11/bindings/tek
lib/X11/bindings/xmbind.alias
lib/X11/config/
lib/X11/config/Motif.rules
-@sample /usr/X11R6/lib/X11/config/Motif.rules
lib/X11/config/Motif.tmpl
-@sample /usr/X11R6/lib/X11/config/Motif.tmpl
lib/X11/system.mwmrc
lib/libMrm.a
lib/libMrm.la
XXXXXXXXXXXXXXXXXXXXXXXXXXXx
xenocara patch:
Index: util/Makefile
===================================================================
RCS file: /cvs/OpenBSD/xenocara/util/Makefile,v
retrieving revision 1.3
diff -u -p -u -r1.3 Makefile
--- util/Makefile 17 Dec 2006 19:52:56 -0000 1.3
+++ util/Makefile 17 Sep 2012 18:09:54 -0000
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.3 2006/12/17 19:52:56 matthieu Exp $
-SUBDIR= macros cf imake makedepend gccmakedep
+SUBDIR= macros makedepend gccmakedep
.include <bsd.subdir.mk>
--
Matthieu Herrb
