--c3bfwLpm8qysLVxt
Content-Type: multipart/mixed; boundary="E39vaYmALEf/7YXx"
Content-Disposition: inline


--E39vaYmALEf/7YXx
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

* Jeremy C. Reed writes:
> On Mon, 31 Jan 2005, Lasse Kliemann wrote:
>=20
> > I had to make the changes reflected by the attached patch
> > meta-pkgs_xorg.diff to meta-pkgs/xorg in order to make a binary package
> > of x11/xorg-server on Linux. Maybe the other KERNMAN_SUFFIXs should be
> > changed as well (see the patch)?
>=20
> This doesn't work, because the Imake rules are different on different
> Linux systems.
>=20
> Please see my email at
> http://mail-index.netbsd.org/tech-pkg/2005/01/07/0003.html
>=20
> The patch won't apply directly now, but can yo uapply it manually and
> test?

It worked for me. I attach an equivalent patch which was taken against=20
-current.

> > There are still some extra files (i.e., not covered by the PLISTs) after
> > the build.  They do not look as if I needed them urgently, so I did not
> > bother sorting them into the PLISTs. I guess someone else can do this
> > faster than me (and without making mistakes). A list of these files is
> > attached as well.
>=20
> I didn't check yet to see why these are there.
>=20
> /usr/pkg/xorg/bin/Xdmx
> /usr/pkg/xorg/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh
> /usr/pkg/xorg/etc/X11/Xsession.d/92xprint-xpserverlist.sh
> /usr/pkg/xorg/etc/rc.d/rc2.d/K21xprint
> /usr/pkg/xorg/etc/rc.d/rc2.d/S21xprint
> /usr/pkg/xorg/etc/rc.d/rc3.d/K21xprint
> /usr/pkg/xorg/etc/rc.d/rc3.d/S21xprint
> /usr/pkg/xorg/etc/rc.d/rc5.d/K21xprint
> /usr/pkg/xorg/etc/rc.d/rc5.d/S21xprint
> /usr/pkg/xorg/etc/profile.d/xprint.csh
> /usr/pkg/xorg/etc/profile.d/xprint.sh
> /usr/pkg/xorg/man/man1/Xdmx.1x
> /usr/pkg/xorg/man/man4/fbdev.4
>=20
> I also have these files installed. Can you send-pr this second problem of
> these extra files?

Done.

--=20
Lasse Kliemann
      private homepage: http://plastictree.net
   NO software patents: http://swpat.ffii.org
do NOT use M$ products: http://plastictree.net/articles/noms

--E39vaYmALEf/7YXx
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="xorg.patch"

Index: meta-pkgs/xorg/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/meta-pkgs/xorg/Makefile.common,v
retrieving revision 1.17
diff -u -r1.17 Makefile.common
--- meta-pkgs/xorg/Makefile.common	31 Jan 2005 20:14:11 -0000	1.17
+++ meta-pkgs/xorg/Makefile.common	3 Feb 2005 12:36:30 -0000
@@ -203,6 +203,10 @@
 		-e "s|@COMPILER_RPATH_FLAG@|${COMPILER_RPATH_FLAG}|g" \
 		-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" \
 		-e "s|@EGDIR@|${EGDIR}|g" \
+		-e "s|@KERNMAN_SUFFIX@|${KERNMAN_SUFFIX}|g" \
+		-e "s|@MISCMAN_SUFFIX@|${MISCMAN_SUFFIX}|g" \
+		-e "s|@KERNMAN_DIR@|${KERNMAN_DIR}|g" \
+		-e "s|@MISCMAN_DIR@|${MISCMAN_DIR}|g" \
 		-e "s|@CARDDRIVERS@|${CARDDRIVERS}|g" \
 		${FILESDIR}/host.def > ${WRKSRC}/config/cf/host.def
 	@${LN} -sf ${X11ROOT}/bin/gccmakedep ${WRKSRC}/config/util

--E39vaYmALEf/7YXx
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="xorg-server.patch"
Content-Transfer-Encoding: quoted-printable

Index: x11/xorg-server/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/x11/xorg-server/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- x11/xorg-server/Makefile	24 Jan 2005 17:24:08 -0000	1.15
+++ x11/xorg-server/Makefile	3 Feb 2005 12:34:28 -0000
@@ -2,7 +2,7 @@
=20
 DISTNAME=3D		${DISTFILES}
 PKGNAME=3D		xorg-server-${XORG_VER}
-PKGREVISION=3D		2
+PKGREVISION=3D		3
 CATEGORIES=3D		x11
 MASTER_SITES=3D		${MASTER_SITE_XORG}
 DISTFILES=3D		X11R${XORG_VER}-src1.tar.gz \
Index: x11/xorg-server/files/host.def
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/x11/xorg-server/files/host.def,v
retrieving revision 1.7
diff -u -r1.7 host.def
--- x11/xorg-server/files/host.def	24 Jan 2005 10:57:27 -0000	1.7
+++ x11/xorg-server/files/host.def	3 Feb 2005 12:34:28 -0000
@@ -58,4 +58,9 @@
 #define HasFontconfig YES
 #define FontconfigDir @BLNK@
=20
+#define DriverManSuffix @KERNMAN_SUFFIX@
+#define MiscManSuffix @MISCMAN_SUFFIX@
+#define MiscManDir @PREFIX@/@MISCMAN_DIR@
+#define DriverManDir @PREFIX@/@KERNMAN_DIR@
+
 #define	XF86CardDrivers	@CARDDRIVERS@

--E39vaYmALEf/7YXx--

--c3bfwLpm8qysLVxt
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (NetBSD)

iD8DBQFCAhz11gObwed86AkRAslVAJ9h1rOByV02ymnS2/N/FPUmRDt8hgCgz2+t
rAjAqz7gW9I8PbthdSfNCLk=
=l0so
-----END PGP SIGNATURE-----

--c3bfwLpm8qysLVxt--