tech-pkg archive
[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index][
Old Index]
Removing xpkgwedge
Hi all,
attached is a first iteration of a patch to remove xpkgwedge and always
use imake and xorg-cf-files from pkgsrc. The goal is to get consistent
rules on all platforms and to eliminate the PLIST mangling required.
This has been tested on netbsd-6 with X11_TYPE=native. Testing on other
platforms would be welcome, especially for the associated removal of the
imake check magic. Short version is that the various components like
Mesa, Freetype etc should be detectable only by the hedaer files and/or
libraries without running (system) imake. This should not change the
dependency list of packages before and after the patch, except the now
obsolete xpkgwedge.
Joerg
Index: fonts/Xft2/builtin.mk
==================================================================
--- fonts/Xft2/builtin.mk
+++ fonts/Xft2/builtin.mk
@@ -10,15 +10,14 @@
###
### Determine if there is a built-in implementation of the package and
### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
###
.if !defined(IS_BUILTIN.Xft2)
-IS_BUILTIN.Xft2= no
. if empty(H_XFT2:M__nonexistent__)
-BUILTIN_IMAKE_CHECK:= Xft2:BuildXftLibrary
-. include "../../mk/buildlink3/imake-check.mk"
-IS_BUILTIN.Xft2= ${BUILTIN_IMAKE_CHECK.Xft2}
+IS_BUILTIN.Xft2= yes
+. else
+IS_BUILTIN.Xft2= no
. endif
.endif
MAKEVARS+= IS_BUILTIN.Xft2
###
Index: fonts/fontconfig/builtin.mk
==================================================================
--- fonts/fontconfig/builtin.mk
+++ fonts/fontconfig/builtin.mk
@@ -11,15 +11,14 @@
###
### Determine if there is a built-in implementation of the package and
### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
###
.if !defined(IS_BUILTIN.fontconfig)
-IS_BUILTIN.fontconfig= no
. if empty(H_FONTCONFIG:M__nonexistent__)
-BUILTIN_IMAKE_CHECK:= fontconfig:BuildFontconfigLibrary
-. include "../../mk/buildlink3/imake-check.mk"
-IS_BUILTIN.fontconfig= ${BUILTIN_IMAKE_CHECK.fontconfig}
+IS_BUILTIN.fontconfig= yes
+. else
+IS_BUILTIN.fontconfig= no
. endif
.endif
MAKEVARS+= IS_BUILTIN.fontconfig
###
Index: graphics/MesaLib/builtin.mk
==================================================================
--- graphics/MesaLib/builtin.mk
+++ graphics/MesaLib/builtin.mk
@@ -10,15 +10,14 @@
###
### Determine if there is a built-in implementation of the package and
### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
###
.if !defined(IS_BUILTIN.MesaLib)
-IS_BUILTIN.MesaLib= no
. if empty(H_MESALIB:M__nonexistent__)
-BUILTIN_IMAKE_CHECK:= MesaLib:BuildGLXLibrary
-. include "../../mk/buildlink3/imake-check.mk"
-IS_BUILTIN.MesaLib= ${BUILTIN_IMAKE_CHECK.MesaLib}
+IS_BUILTIN.MesaLib= yes
+. else
+IS_BUILTIN.MesaLib= no
. endif
.endif
MAKEVARS+= IS_BUILTIN.MesaLib
###
Index: graphics/freetype2/builtin.mk
==================================================================
--- graphics/freetype2/builtin.mk
+++ graphics/freetype2/builtin.mk
@@ -10,15 +10,14 @@
###
### Determine if there is a built-in implementation of the package and
### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
###
.if !defined(IS_BUILTIN.freetype2)
-IS_BUILTIN.freetype2= no
. if empty(H_FREETYPE2:M__nonexistent__)
-BUILTIN_IMAKE_CHECK:= freetype2:BuildFreetype2Library
-. include "../../mk/buildlink3/imake-check.mk"
-IS_BUILTIN.freetype2= ${BUILTIN_IMAKE_CHECK.freetype2}
+IS_BUILTIN.freetype2= yes
+. else
+IS_BUILTIN.freetype2= no
. endif
.endif
MAKEVARS+= IS_BUILTIN.freetype2
###
Index: graphics/glu/builtin.mk
==================================================================
--- graphics/glu/builtin.mk
+++ graphics/glu/builtin.mk
@@ -10,15 +10,14 @@
###
### Determine if there is a built-in implementation of the package and
### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
###
.if !defined(IS_BUILTIN.glu)
-IS_BUILTIN.glu= no
. if empty(H_GLU:M__nonexistent__)
-BUILTIN_IMAKE_CHECK:= glu:BuildGLULibrary
-. include "../../mk/buildlink3/imake-check.mk"
-IS_BUILTIN.glu= ${BUILTIN_IMAKE_CHECK.glu}
+IS_BUILTIN.glu= yes
+. else
+IS_BUILTIN.glu= no
. endif
.endif
MAKEVARS+= IS_BUILTIN.glu
###
Index: mk/bsd.pkg.use.mk
==================================================================
--- mk/bsd.pkg.use.mk
+++ mk/bsd.pkg.use.mk
@@ -99,17 +99,6 @@
.if defined(USE_LIBTOOL)
LIBTOOL_REQD?= 2.2.6bnb3
BUILD_DEPENDS+=
libtool-base>=${_OPSYS_LIBTOOL_REQD:U${LIBTOOL_REQD}}:../../devel/libtool-base
CONFIGURE_ENV+= LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}"
MAKE_ENV+= LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}"
-.endif
-
-### USE_XPKGWEDGE
-
-.if (defined(USE_X11BASE) || \
- defined(USE_IMAKE) || !empty(USE_TOOLS:Mimake) || \
- !empty(USE_TOOLS:Mimake\:*:Nimake\:pkgsrc)) && \
- empty(USE_TOOLS:Mitools) && \
- empty(PKGPATH:Mpkgtools/xpkgwedge) && \
- !empty(USE_XPKGWEDGE:M[yY][eE][sS])
-BUILD_DEPENDS+=
xpkgwedge>=${_XPKGWEDGE_REQD:U1.15}:../../pkgtools/xpkgwedge
.endif
Index: mk/bsd.prefs.mk
==================================================================
--- mk/bsd.prefs.mk
+++ mk/bsd.prefs.mk
@@ -550,22 +550,10 @@
X11BASE?= /usr/X11R6
. endif
.endif
CROSSBASE?= ${LOCALBASE}/cross
-# If xpkgwedge.def is found, then clearly we're using xpkgwedge.
-.if exists(${LOCALBASE}/lib/X11/config/xpkgwedge.def) || \
- exists(${X11BASE}/lib/X11/config/xpkgwedge.def)
-USE_XPKGWEDGE= yes
-.elif ${PKG_INSTALLATION_TYPE} == "pkgviews"
-USE_XPKGWEDGE= yes
-.elif ${X11_TYPE} == "modular"
-USE_XPKGWEDGE= no
-.else
-USE_XPKGWEDGE?= yes
-.endif
-
.if defined(FIX_SYSTEM_HEADERS) && ${FIX_SYSTEM_HEADERS} == "yes" && \
!defined(BOOTSTRAP_PKG) && \
exists(../../pkgtools/compat_headers/buildlink3.mk)
. include "../../pkgtools/compat_headers/buildlink3.mk"
.endif
@@ -572,18 +560,30 @@
.if ${X11_TYPE} == "modular"
X11BASE= ${LOCALBASE}
.endif
-.if !empty(USE_XPKGWEDGE:M[Yy][Ee][Ss])
X11PREFIX= ${LOCALBASE}
-.else
-X11PREFIX= ${X11BASE}
-.endif
# Default directory for font encodings
X11_ENCODINGSDIR?= ${X11BASE}/lib/X11/fonts/encodings
+
+IMAKE_MAN_SOURCE_PATH= man/man
+IMAKE_MAN_SUFFIX= 1
+IMAKE_LIBMAN_SUFFIX= 3
+IMAKE_KERNMAN_SUFFIX= 4
+IMAKE_FILEMAN_SUFFIX= 5
+IMAKE_GAMEMAN_SUFFIX= 6
+IMAKE_MISCMAN_SUFFIX= 7
+IMAKE_MAN_DIR= ${IMAKE_MAN_SOURCE_PATH}1
+IMAKE_LIBMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}3
+IMAKE_KERNMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}4
+IMAKE_FILEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}5
+IMAKE_GAMEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}6
+IMAKE_MISCMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}7
+IMAKE_MANNEWSUFFIX= ${IMAKE_MAN_SUFFIX}
+IMAKE_MANINSTALL?= maninstall
DEPOT_SUBDIR?= packages
DEPOTBASE= ${LOCALBASE}/${DEPOT_SUBDIR}
# LINK_RPATH_FLAG publicly exports the linker flag used to set the
Index: mk/defaults/mk.conf
==================================================================
--- mk/defaults/mk.conf
+++ mk/defaults/mk.conf
@@ -298,18 +298,10 @@
#
# Note: the support for custom setting (not "man") is not complete.
#
# See also: PKGINFODIR
-# USE_XPKGWEDGE?= yes
-# Whether we should use xpkgwedge or not to install all packages into
-# ${LOCALBASE}.
-# Possible: yes, no
-# This is not set here as X11_TYPE=modular does not use USE_XPKGWEDGE
-# at all and the existence of xpkgwedge in the system overrides the
-# user setting.
-
BSDSRCDIR?= /usr/src
# Where the NetBSD src module source tree is located
# used in the emulators/plex86, emulators/vmware-module{,3}, net/arla,
# sysutils/aperture, and sysutils/fdgw packages
# Possible: any path
@@ -693,13 +685,12 @@
# Default: named
#BULK_PREREQ=
# Used during bulk package builds. Packages listed in this variable are
# assumed to be required to build all packages. Only a very limited number
-# of packages belong in this variable. An example of an appropriate package
-# is pkgtools/xpkgwedge. Currently pkgtools/digest is always added to this
-# list.
+# of packages belong in this variable.
+# Currently pkgtools/digest is always added to this list.
# Possible: category/pkg
# Default: not defined
CACTI_GROUP?= cacti
# System group to run the cacti collection cron jobs as. Used by the
Index: mk/platform/AIX.mk
==================================================================
--- mk/platform/AIX.mk
+++ mk/platform/AIX.mk
@@ -26,24 +26,10 @@
ROOT_USER?= root
ROOT_GROUP?= system
ULIMIT_CMD_datasize?= ulimit -d `ulimit -H -d`
ULIMIT_CMD_stacksize?= ulimit -s `ulimit -H -s`
ULIMIT_CMD_memorysize?= ulimit -m `ulimit -H -m`
-
-# imake installs manpages in weird places
-# these values from /usr/X11R6/lib/X11/config/NetBSD.cf
-IMAKE_MAN_SOURCE_PATH= man/cat
-IMAKE_MAN_SUFFIX= 1
-IMAKE_LIBMAN_SUFFIX= 3
-IMAKE_FILEMAN_SUFFIX= 5
-IMAKE_GAMEMAN_SUFFIX= 6
-IMAKE_MAN_DIR= ${IMAKE_MAN_SOURCE_PATH}1
-IMAKE_LIBMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}3
-IMAKE_FILEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}5
-IMAKE_GAMEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}6
-IMAKE_MANNEWSUFFIX= 0
-IMAKE_MANINSTALL?= maninstall catinstall
.if exists(/usr/include/netinet6)
_OPSYS_HAS_INET6= yes # IPv6 is standard
.else
_OPSYS_HAS_INET6= no # IPv6 is not standard
Index: mk/platform/BSDOS.mk
==================================================================
--- mk/platform/BSDOS.mk
+++ mk/platform/BSDOS.mk
@@ -31,24 +31,10 @@
ROOT_USER?= root
ROOT_GROUP?= wheel
ULIMIT_CMD_datasize?= ulimit -d `ulimit -H -d`
ULIMIT_CMD_stacksize?= ulimit -s `ulimit -H -s`
ULIMIT_CMD_memorysize?= ulimit -m `ulimit -H -m`
-
-# imake installs manpages in weird places
-# XXX: assume NetBSD defaults until somebody determines correct values
-IMAKE_MAN_SOURCE_PATH= man/cat
-IMAKE_MANNEWSUFFIX= 0
-IMAKE_MAN_SUFFIX= ${IMAKE_MANNEWSUFFIX}
-IMAKE_LIBMAN_SUFFIX= ${IMAKE_MANNEWSUFFIX}
-IMAKE_FILEMAN_SUFFIX= ${IMAKE_MANNEWSUFFIX}
-IMAKE_GAMEMAN_SUFFIX= ${IMAKE_MANNEWSUFFIX}
-IMAKE_MAN_DIR= ${IMAKE_MAN_SOURCE_PATH}1
-IMAKE_LIBMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}3
-IMAKE_FILEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}5
-IMAKE_GAMEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}6
-IMAKE_MANINSTALL?= maninstall catinstall
.if exists(/usr/include/netinet6)
_OPSYS_HAS_INET6= yes # IPv6 is standard
.else
_OPSYS_HAS_INET6= no # IPv6 is not standard
Index: mk/platform/Darwin.mk
==================================================================
--- mk/platform/Darwin.mk
+++ mk/platform/Darwin.mk
@@ -66,24 +66,10 @@
GROUPADD?= ${LOCALBASE}/sbin/groupadd
USERADD?= ${LOCALBASE}/sbin/useradd
_PKG_USER_HOME?= /var/empty # to match other system accounts
_USER_DEPENDS= user>=20040801:../../sysutils/user_darwin
-
-# imake installs manpages in weird places
-# these values from /usr/X11R6/lib/X11/config/Imake.tmpl
-IMAKE_MAN_SOURCE_PATH= man/man
-IMAKE_MAN_SUFFIX= 1
-IMAKE_LIBMAN_SUFFIX= 3
-IMAKE_FILEMAN_SUFFIX= 5
-IMAKE_GAMEMAN_SUFFIX= 6
-IMAKE_MAN_DIR= ${IMAKE_MAN_SOURCE_PATH}1
-IMAKE_LIBMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}3
-IMAKE_FILEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}5
-IMAKE_GAMEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}6
-IMAKE_MANNEWSUFFIX= ${IMAKE_MAN_SUFFIX}
-IMAKE_MANINSTALL?= maninstall catinstall
_OPSYS_EMULDIR.darwin= # empty
.if ${OS_VERSION:R} >= 6
_OPSYS_HAS_INET6= yes # IPv6 is standard
Index: mk/platform/DragonFly.mk
==================================================================
--- mk/platform/DragonFly.mk
+++ mk/platform/DragonFly.mk
@@ -21,27 +21,10 @@
ROOT_USER?= root
ROOT_GROUP?= wheel
ULIMIT_CMD_datasize?= ulimit -d `ulimit -H -d`
ULIMIT_CMD_stacksize?= ulimit -s `ulimit -H -s`
ULIMIT_CMD_memorysize?= ulimit -m `ulimit -H -m`
-
-# imake installs manpages in weird places
-IMAKE_MAN_SOURCE_PATH= man/man
-IMAKE_MAN_SUFFIX= 1
-IMAKE_LIBMAN_SUFFIX= 3
-IMAKE_KERNMAN_SUFFIX= 4
-IMAKE_FILEMAN_SUFFIX= 5
-IMAKE_GAMEMAN_SUFFIX= 6
-IMAKE_MISCMAN_SUFFIX= 7
-IMAKE_MAN_DIR= ${IMAKE_MAN_SOURCE_PATH}1
-IMAKE_LIBMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}3
-IMAKE_KERNMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}4
-IMAKE_FILEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}5
-IMAKE_GAMEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}6
-IMAKE_MISCMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}7
-IMAKE_MANNEWSUFFIX= ${IMAKE_MAN_SUFFIX}
-IMAKE_MANINSTALL?= maninstall catinstall
_OPSYS_EMULDIR.linux= /compat/linux
_OPSYS_SYSTEM_RPATH?= /usr/lib:/usr/lib/gcc41:/usr/lib/gcc34
Index: mk/platform/FreeBSD.mk
==================================================================
--- mk/platform/FreeBSD.mk
+++ mk/platform/FreeBSD.mk
@@ -26,27 +26,10 @@
ROOT_USER?= root
ROOT_GROUP?= wheel
ULIMIT_CMD_datasize?= ulimit -d `ulimit -H -d`
ULIMIT_CMD_stacksize?= ulimit -s `ulimit -H -s`
ULIMIT_CMD_memorysize?= ulimit -m `ulimit -H -m`
-
-# imake installs manpages in weird places
-IMAKE_MAN_SOURCE_PATH= man/man
-IMAKE_MAN_SUFFIX= 1
-IMAKE_LIBMAN_SUFFIX= 3
-IMAKE_KERNMAN_SUFFIX= 4
-IMAKE_FILEMAN_SUFFIX= 5
-IMAKE_GAMEMAN_SUFFIX= 6
-IMAKE_MISCMAN_SUFFIX= 7
-IMAKE_MAN_DIR= ${IMAKE_MAN_SOURCE_PATH}1
-IMAKE_LIBMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}3
-IMAKE_KERNMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}4
-IMAKE_FILEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}5
-IMAKE_GAMEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}6
-IMAKE_MISCMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}7
-IMAKE_MANNEWSUFFIX= ${IMAKE_MAN_SUFFIX}
-IMAKE_MANINSTALL?= maninstall catinstall
_OPSYS_EMULDIR.freebsd= # empty
_OPSYS_EMULDIR.linux= /compat/linux
_OPSYS_SYSTEM_RPATH?= /lib:/usr/lib # STANDARD_LIBRARY_PATH (from rtld.h)
Index: mk/platform/HPUX.mk
==================================================================
--- mk/platform/HPUX.mk
+++ mk/platform/HPUX.mk
@@ -26,24 +26,10 @@
ULIMIT_CMD_stacksize?= ulimit -s `ulimit -H -s`
ULIMIT_CMD_memorysize?= ulimit -m `ulimit -H -m`
# Fix broken system headers by using pkgtools/posix_headers
FIX_SYSTEM_HEADERS?= yes
-
-# imake installs manpages in weird places
-# these values from /usr/X11R6/lib/X11/config/NetBSD.cf
-IMAKE_MAN_SOURCE_PATH= man/cat
-IMAKE_MAN_SUFFIX= 1
-IMAKE_LIBMAN_SUFFIX= 3
-IMAKE_FILEMAN_SUFFIX= 4
-IMAKE_GAMEMAN_SUFFIX= 6
-IMAKE_MAN_DIR= ${IMAKE_MAN_SOURCE_PATH}1
-IMAKE_LIBMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}3
-IMAKE_FILEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}4
-IMAKE_GAMEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}6
-IMAKE_MANNEWSUFFIX= 1
-IMAKE_MANINSTALL?= maninstall catinstall
_OPSYS_EMULDIR.hpux= # empty
.if exists(/usr/include/netinet/ip6.h)
_OPSYS_HAS_INET6= yes # IPv6 is standard
Index: mk/platform/Haiku.mk
==================================================================
--- mk/platform/Haiku.mk
+++ mk/platform/Haiku.mk
@@ -28,29 +28,10 @@
SERIAL_DEVICES?= /dev/tty
ULIMIT_CMD_datasize?= ulimit -d `ulimit -H -d`
ULIMIT_CMD_stacksize?= ulimit -s `ulimit -H -s`
ULIMIT_CMD_memorysize?= ulimit -m `ulimit -H -m`
USERADD?= /bin/useradd
-
-# imake installs manpages in weird places
-# these values from /boot/common/X11/lib/X11/config/Haiku.cf
-#IMAKE_MAN_SOURCE_PATH= man/man
-#IMAKE_MAN_SUFFIX= 1
-#IMAKE_LIBMAN_SUFFIX= 3
-#IMAKE_KERNMAN_SUFFIX= 4
-#IMAKE_FILEMAN_SUFFIX= 5
-#IMAKE_GAMEMAN_SUFFIX= 6
-#IMAKE_MISCMAN_SUFFIX= 7
-#IMAKE_MAN_DIR= ${IMAKE_MAN_SOURCE_PATH}1
-#IMAKE_LIBMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}3
-#IMAKE_KERNMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}4
-#IMAKE_FILEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}5
-#IMAKE_GAMEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}6
-#IMAKE_MISCMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}7
-#IMAKE_MANNEWSUFFIX= ${IMAKE_MAN_SUFFIX}
-#IMAKE_MANINSTALL?= maninstall catinstall
-#IMAKE_TOOLS= gmake # extra tools required when we use imake
_OPSYS_HAS_INET6= yes # IPv6 is standard
_OPSYS_HAS_JAVA= no # Java is not standard
_OPSYS_HAS_MANZ= no # no MANZ for gzipping of man pages
_OPSYS_HAS_OSSAUDIO= no # libossaudio is available
Index: mk/platform/IRIX.mk
==================================================================
--- mk/platform/IRIX.mk
+++ mk/platform/IRIX.mk
@@ -32,42 +32,10 @@
USERADD?= ${LOCALBASE}/sbin/useradd
GROUPADD?= ${LOCALBASE}/sbin/groupadd
_PKG_USER_HOME?= /dev/null # to match other system accounts
_USER_DEPENDS= user-[0-9]*:../../sysutils/user_irix
-
-# imake installs manpages in weird places
-.if !empty(OS_VERSION:M6*)
-IMAKE_MAN_SOURCE_PATH?= catman/u_man/cat
-IMAKE_MAN_SUFFIX?= 1
-IMAKE_LIBMAN_SUFFIX?= 3
-IMAKE_FILEMAN_SUFFIX?= 5
-IMAKE_GAMEMAN_SUFFIX?= 6
-IMAKE_MAN_DIR?= ${IMAKE_MAN_SOURCE_PATH}1/X11
-IMAKE_LIBMAN_DIR?= ${IMAKE_MAN_SOURCE_PATH}3/X11
-IMAKE_FILEMAN_DIR?= ${IMAKE_MAN_SOURCE_PATH}5/X11
-IMAKE_GAMEMAN_DIR?= ${IMAKE_MAN_SOURCE_PATH}6/X11
-IMAKE_MANNEWSUFFIX?= z
-IMAKE_MANINSTALL?= maninstall
-.else
-IMAKE_MAN_SOURCE_PATH?= man/man
-IMAKE_MAN_SUFFIX?= 1.gz
-IMAKE_LIBMAN_SUFFIX?= 3.gz
-IMAKE_FILEMAN_SUFFIX?= 5.gz
-IMAKE_GAMEMAN_SUFFIX?= 6.gz
-IMAKE_MAN_DIR?= ${IMAKE_MAN_SOURCE_PATH}1
-IMAKE_LIBMAN_DIR?= ${IMAKE_MAN_SOURCE_PATH}3
-IMAKE_FILEMAN_DIR?= ${IMAKE_MAN_SOURCE_PATH}5
-IMAKE_GAMEMAN_DIR?= ${IMAKE_MAN_SOURCE_PATH}6
-IMAKE_MANNEWSUFFIX?= ${IMAKE_MAN_SUFFIX}
-. if defined(USE_IMAKE) && !empty(USE_IMAKE:M[Yy][Ee][Ss])
-MAKE_ENV+= GZIP_CMD="${GZIP_CMD}"
-USE_TOOLS+= gzip
-MANCOMPRESSED= yes
-MANZ= yes
-. endif
-.endif
_OPSYS_EMULDIR.irix= # empty
.if exists(/usr/include/netinet6)
_OPSYS_HAS_INET6= yes # IPv6 is standard
Index: mk/platform/Interix.mk
==================================================================
--- mk/platform/Interix.mk
+++ mk/platform/Interix.mk
@@ -102,27 +102,10 @@
ROOT_GROUP?= 131616 # +Administrators or native language equivalent
TOUCH_FLAGS?=
ULIMIT_CMD_datasize?= ulimit -d `ulimit -H -d`
ULIMIT_CMD_stacksize?= ulimit -s `ulimit -H -s`
ULIMIT_CMD_memorysize?= ulimit -v `ulimit -H -v`
-
-# imake installs manpages in weird places
-IMAKE_MAN_SOURCE_PATH= man/man
-IMAKE_MAN_SUFFIX= n
-IMAKE_LIBMAN_SUFFIX= 3
-IMAKE_KERNMAN_SUFFIX= 4
-IMAKE_FILEMAN_SUFFIX= 5
-IMAKE_GAMEMAN_SUFFIX= 6
-IMAKE_MISCMAN_SUFFIX= 7
-IMAKE_MAN_DIR= ${IMAKE_MAN_SOURCE_PATH}n
-IMAKE_LIBMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}3
-IMAKE_KERNMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}4
-IMAKE_FILEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}5
-IMAKE_GAMEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}6
-IMAKE_MISCMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}7
-IMAKE_MANNEWSUFFIX= ${IMAKE_MAN_SUFFIX}
-IMAKE_MANINSTALL?= maninstall catinstall
.if exists(/usr/include/netinet6)
_OPSYS_HAS_INET6= yes # IPv6 is standard
.else
_OPSYS_HAS_INET6= no # IPv6 is not standard
Index: mk/platform/Linux.mk
==================================================================
--- mk/platform/Linux.mk
+++ mk/platform/Linux.mk
@@ -42,28 +42,10 @@
SERIAL_DEVICES?= /dev/null
ULIMIT_CMD_datasize?= ulimit -d `ulimit -H -d`
ULIMIT_CMD_stacksize?= ulimit -s `ulimit -H -s`
ULIMIT_CMD_memorysize?= ulimit -m `ulimit -H -m`
USERADD?= /usr/sbin/useradd
-
-# imake installs manpages in weird places
-# these values from /usr/X11R6/lib/X11/config/linux.cf
-IMAKE_MAN_SOURCE_PATH= man/man
-IMAKE_MAN_SUFFIX= 1x
-IMAKE_LIBMAN_SUFFIX= 3x
-IMAKE_KERNMAN_SUFFIX= 4
-IMAKE_FILEMAN_SUFFIX= 5x
-IMAKE_GAMEMAN_SUFFIX= 6
-IMAKE_MISCMAN_SUFFIX= 7
-IMAKE_MAN_DIR= ${IMAKE_MAN_SOURCE_PATH}1
-IMAKE_LIBMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}3
-IMAKE_KERNMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}4
-IMAKE_FILEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}5
-IMAKE_GAMEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}6
-IMAKE_MISCMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}7
-IMAKE_MANNEWSUFFIX= ${IMAKE_MAN_SUFFIX}
-IMAKE_MANINSTALL?= maninstall catinstall
_OPSYS_EMULDIR.linux= # empty
_OPSYS_EMULDIR.linux32= # empty
_OPSYS_SYSTEM_RPATH= /lib${LIBABISUFFIX}:/usr/lib${LIBABISUFFIX}
Index: mk/platform/Minix.mk
==================================================================
--- mk/platform/Minix.mk
+++ mk/platform/Minix.mk
@@ -22,28 +22,10 @@
ROOT_GROUP?= operator
ROOT_USER?= root
SERIAL_DEVICES?= /dev/null
USERADD?= /usr/bin/useradd
ULIMIT_CMD_datasize?= :
-
-# imake installs manpages in weird places
-# these values from /usr/X11R6/lib/X11/config/linux.cf
-IMAKE_MAN_SOURCE_PATH= man/man
-IMAKE_MAN_SUFFIX= 1x
-IMAKE_LIBMAN_SUFFIX= 3x
-IMAKE_KERNMAN_SUFFIX= 4
-IMAKE_FILEMAN_SUFFIX= 5x
-IMAKE_GAMEMAN_SUFFIX= 6
-IMAKE_MISCMAN_SUFFIX= 7
-IMAKE_MAN_DIR= ${IMAKE_MAN_SOURCE_PATH}1
-IMAKE_LIBMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}3
-IMAKE_KERNMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}4
-IMAKE_FILEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}5
-IMAKE_GAMEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}6
-IMAKE_MISCMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}7
-IMAKE_MANNEWSUFFIX= ${IMAKE_MAN_SUFFIX}
-IMAKE_MANINSTALL?= maninstall catinstall
_OPSYS_HAS_INET6= no # IPv6 is not standard
_OPSYS_HAS_JAVA= no # Java is not standard
_OPSYS_HAS_MANZ= no # no MANZ for gzipping of man pages
_OPSYS_HAS_OSSAUDIO= no # libossaudio is available
Index: mk/platform/MirBSD.mk
==================================================================
--- mk/platform/MirBSD.mk
+++ mk/platform/MirBSD.mk
@@ -26,25 +26,10 @@
ULIMIT_CMD_datasize?= ulimit -d `ulimit -H -d`
ULIMIT_CMD_stacksize?= ulimit -s `ulimit -H -s`
ULIMIT_CMD_memorysize?= ulimit -m `ulimit -H -m`
X11_TYPE?= modular
-
-# imake installs manpages in weird places
-# these values from /usr/X11R6/lib/X11/config/OpenBSD.cf
-# XXX verify against MirBSD.cf defns
-IMAKE_MAN_SOURCE_PATH= man/cat
-IMAKE_MANNEWSUFFIX= 0
-IMAKE_MAN_SUFFIX= ${IMAKE_MANNEWSUFFIX}
-IMAKE_LIBMAN_SUFFIX= ${IMAKE_MANNEWSUFFIX}
-IMAKE_FILEMAN_SUFFIX= ${IMAKE_MANNEWSUFFIX}
-IMAKE_GAMEMAN_SUFFIX= ${IMAKE_MANNEWSUFFIX}
-IMAKE_MAN_DIR= ${IMAKE_MAN_SOURCE_PATH}1
-IMAKE_LIBMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}3
-IMAKE_FILEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}5
-IMAKE_GAMEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}6
-IMAKE_MANINSTALL?= maninstall catinstall
_OPSYS_HAS_INET6= yes # IPv6 is standard
_OPSYS_HAS_JAVA= no # Java is not standard
_OPSYS_HAS_MANZ= no # MANZ controls gzipping of man pages
_OPSYS_HAS_OSSAUDIO= yes # libossaudio is available
Index: mk/platform/NetBSD.mk
==================================================================
--- mk/platform/NetBSD.mk
+++ mk/platform/NetBSD.mk
@@ -43,28 +43,10 @@
# Native X11 is only supported on NetBSD-5 and later.
.if empty(MACHINE_PLATFORM:MNetBSD-[0-4].*)
X11_TYPE?= native
.endif
-
-# imake installs manpages in weird places
-# these values from /usr/X11R6/lib/X11/config/NetBSD.cf
-IMAKE_MAN_SOURCE_PATH= man/cat
-IMAKE_MANNEWSUFFIX= 0
-IMAKE_MAN_SUFFIX= ${IMAKE_MANNEWSUFFIX}
-IMAKE_LIBMAN_SUFFIX= ${IMAKE_MANNEWSUFFIX}
-IMAKE_KERNMAN_SUFFIX= ${IMAKE_MANNEWSUFFIX}
-IMAKE_FILEMAN_SUFFIX= ${IMAKE_MANNEWSUFFIX}
-IMAKE_GAMEMAN_SUFFIX= ${IMAKE_MANNEWSUFFIX}
-IMAKE_MISCMAN_SUFFIX= ${IMAKE_MANNEWSUFFIX}
-IMAKE_MAN_DIR= ${IMAKE_MAN_SOURCE_PATH}1
-IMAKE_LIBMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}3
-IMAKE_KERNMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}4
-IMAKE_FILEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}5
-IMAKE_GAMEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}6
-IMAKE_MISCMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}7
-IMAKE_MANINSTALL?= maninstall catinstall
_OPSYS_EMULDIR.aout= /emul/aout
_OPSYS_EMULDIR.darwin= /emul/darwin
_OPSYS_EMULDIR.freebsd= /emul/freebsd
_OPSYS_EMULDIR.hpux= /emul/hpux
Index: mk/platform/OSF1.mk
==================================================================
--- mk/platform/OSF1.mk
+++ mk/platform/OSF1.mk
@@ -23,23 +23,10 @@
ROOT_USER?= root
ROOT_GROUP?= system
ULIMIT_CMD_datasize?= ulimit -d `ulimit -H -d`
ULIMIT_CMD_stacksize?= ulimit -s `ulimit -H -s`
ULIMIT_CMD_memorysize?= ulimit -m `ulimit -H -m`
-# imake installs manpages in weird places
-# these values from /usr/X11R6/lib/X11/config/NetBSD.cf
-IMAKE_MAN_SOURCE_PATH= man/cat
-IMAKE_MAN_SUFFIX= 1
-IMAKE_LIBMAN_SUFFIX= 3
-IMAKE_FILEMAN_SUFFIX= 4
-IMAKE_GAMEMAN_SUFFIX= 6
-IMAKE_MAN_DIR= ${IMAKE_MAN_SOURCE_PATH}1
-IMAKE_LIBMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}3
-IMAKE_FILEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}4
-IMAKE_GAMEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}6
-IMAKE_MANNEWSUFFIX= 1
-IMAKE_MANINSTALL?= maninstall catinstall
# Fix broken system headers by using pkgtools/posix_headers
FIX_SYSTEM_HEADERS?= yes
_OPSYS_EMULDIR.osf1= # empty
Index: mk/platform/OpenBSD.mk
==================================================================
--- mk/platform/OpenBSD.mk
+++ mk/platform/OpenBSD.mk
@@ -32,24 +32,10 @@
ULIMIT_CMD_datasize?= ulimit -d `ulimit -H -d`
ULIMIT_CMD_stacksize?= ulimit -s `ulimit -H -s`
ULIMIT_CMD_memorysize?= ulimit -m `ulimit -H -m`
X11_TYPE?= native
-
-# imake installs manpages in weird places
-# these values from /usr/X11R6/lib/X11/config/OpenBSD.cf
-IMAKE_MAN_SOURCE_PATH= man/cat
-IMAKE_MANNEWSUFFIX= 0
-IMAKE_MAN_SUFFIX= ${IMAKE_MANNEWSUFFIX}
-IMAKE_LIBMAN_SUFFIX= ${IMAKE_MANNEWSUFFIX}
-IMAKE_FILEMAN_SUFFIX= ${IMAKE_MANNEWSUFFIX}
-IMAKE_GAMEMAN_SUFFIX= ${IMAKE_MANNEWSUFFIX}
-IMAKE_MAN_DIR= ${IMAKE_MAN_SOURCE_PATH}1
-IMAKE_LIBMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}3
-IMAKE_FILEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}5
-IMAKE_GAMEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}6
-IMAKE_MANINSTALL?= maninstall catinstall
.if exists(/usr/include/netinet6)
_OPSYS_HAS_INET6= yes # IPv6 is standard
.else
_OPSYS_HAS_INET6= no # IPv6 is not standard
Index: mk/platform/SunOS.mk
==================================================================
--- mk/platform/SunOS.mk
+++ mk/platform/SunOS.mk
@@ -30,31 +30,10 @@
.if ${X11_TYPE} == native
MOTIF_TYPE_DEFAULT?= dt # default 2.0 compatible libs type
.else
MOTIF_TYPE_DEFAULT?= lesstif
.endif
-
-# imake installs manpages in weird places
-.if !defined(X11_TYPE) || defined(X11_TYPE) && !empty(X11_TYPE:Mnative)
-# openwindows
-IMAKE_MAN_SOURCE_PATH= share/man/man
-IMAKE_MAN_SUFFIX= 1
-IMAKE_LIBMAN_SUFFIX= 3
-.else
-# xfree86, xorg
-IMAKE_MAN_SOURCE_PATH= man/man
-IMAKE_MAN_SUFFIX= 1x
-IMAKE_LIBMAN_SUFFIX= 3x
-.endif
-IMAKE_FILEMAN_SUFFIX= 4
-IMAKE_GAMEMAN_SUFFIX= 6
-IMAKE_MAN_DIR= ${IMAKE_MAN_SOURCE_PATH}1
-IMAKE_LIBMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}3
-IMAKE_FILEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}4
-IMAKE_GAMEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}6
-IMAKE_MANNEWSUFFIX= ${IMAKE_MAN_SUFFIX}
-IMAKE_MANINSTALL?= maninstall
_OPSYS_EMULDIR.solaris= # empty
_OPSYS_EMULDIR.solaris32= # empty
_OPSYS_EMULDIR.sunos= # empty
Index: mk/platform/UnixWare.mk
==================================================================
--- mk/platform/UnixWare.mk
+++ mk/platform/UnixWare.mk
@@ -24,23 +24,10 @@
SERIAL_DEVICES?= /dev/null
ULIMIT_CMD_datasize?= ulimit -d `ulimit -H -d`
ULIMIT_CMD_stacksize?= ulimit -s `ulimit -H -s`
ULIMIT_CMD_memorysize?= ulimit -v `ulimit -H -v`
USERADD?= /usr/sbin/useradd
-
-# imake installs manpages in weird places
-IMAKE_MAN_SOURCE_PATH= share/man/man
-IMAKE_MAN_SUFFIX= 1
-IMAKE_LIBMAN_SUFFIX= 3
-IMAKE_FILEMAN_SUFFIX= 4
-IMAKE_GAMEMAN_SUFFIX= 6
-IMAKE_MAN_DIR= ${IMAKE_MAN_SOURCE_PATH}1
-IMAKE_LIBMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}3
-IMAKE_FILEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}4
-IMAKE_GAMEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}6
-IMAKE_MANNEWSUFFIX= ${IMAKE_MAN_SUFFIX}
-IMAKE_MANINSTALL?= maninstall
.if exists(/usr/include/netinet/in6.h)
_OPSYS_HAS_INET6= yes # IPv6 is standard
.else
_OPSYS_HAS_INET6= no # IPv6 is not standard
Index: mk/tools/replace.mk
==================================================================
--- mk/tools/replace.mk
+++ mk/tools/replace.mk
@@ -1201,22 +1201,14 @@
TOOLS_CREATE+= ${_t_}
. if !empty(_USE_TOOLS:Mitools)
TOOLS_DEPENDS.${_t_}?= nbitools>=6.3nb4:../../devel/nbitools
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.${_t_}=nbitools
TOOLS_PATH.${_t_}= ${TOOLS_PREFIX.${_t_}}/libexec/itools/${_t_}
-. elif defined(X11_TYPE) && !empty(X11_TYPE:Mmodular)
+. else
TOOLS_DEPENDS.${_t_}?= imake-[0-9]*:../../devel/imake
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.${_t_}=imake
TOOLS_PATH.${_t_}= ${TOOLS_PREFIX.${_t_}}/bin/${_t_}
-. else # !empty(X11_TYPE:Mnative)
-. if exists(${X11BASE}/bin/${_t_})
-TOOLS_PATH.${_t_}= ${X11BASE}/bin/${_t_}
-. else # X11_TYPE native, but tool does not exist, so fall back
-TOOLS_DEPENDS.${_t_}?= imake-[0-9]*:../../devel/imake
-TOOLS_FIND_PREFIX+= TOOLS_PREFIX.${_t_}=imake
-TOOLS_PATH.${_t_}= ${TOOLS_PREFIX.${_t_}}/bin/${_t_}
-. endif
. endif
. endif
. endif
.endfor
@@ -1235,21 +1227,10 @@
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.makedepend=makedepend
TOOLS_PATH.makedepend= ${TOOLS_PREFIX.makedepend}/bin/makedepend
. else # !empty(X11_TYPE:Mnative)
TOOLS_PATH.makedepend= ${X11BASE}/bin/makedepend
. endif
-. endif
-.endif
-#
-# If we're using xpkgwedge, then we need to invoke the special xmkmf
-# script that will find imake config files in both ${PREFIX} and in
-# ${X11BASE}.
-#
-.if !defined(TOOLS_IGNORE.xmkmf) && !empty(_USE_TOOLS:Mxmkmf)
-. if !empty(USE_XPKGWEDGE:M[yY][eE][sS]) && empty(_USE_TOOLS:Mitools)
-TOOLS_FIND_PREFIX+= TOOLS_PREFIX.xpkgwedge=xpkgwedge
-TOOLS_PATH.xmkmf= ${TOOLS_PREFIX.xpkgwedge}/bin/pkgxmkmf
. endif
.endif
######################################################################
Index: mk/tools/tools.IRIX.mk
==================================================================
--- mk/tools/tools.IRIX.mk
+++ mk/tools/tools.IRIX.mk
@@ -35,13 +35,10 @@
TOOLS_PLATFORM.gzip?= /usr/sbin/gzip -nf ${GZIP}
.endif
TOOLS_PLATFORM.head?= /usr/bsd/head
TOOLS_PLATFORM.hostname?= /usr/bsd/hostname
TOOLS_PLATFORM.id?= /usr/bin/id
-.if defined(X11_TYPE) && !empty(X11_TYPE:Mnative) && exists(/usr/bin/X11/imake)
-TOOLS_PLATFORM.imake?= /usr/bin/X11/imake
-.endif
TOOLS_PLATFORM.ln?= /sbin/ln
TOOLS_PLATFORM.ls?= /sbin/ls
TOOLS_PLATFORM.m4?= /sbin/m4
.if exists(/usr/sbin/mailx)
TOOLS_PLATFORM.mail?= /usr/sbin/mailx
Index: sysutils/xbattbar/PLIST
==================================================================
--- sysutils/xbattbar/PLIST
+++ sysutils/xbattbar/PLIST
@@ -1,3 +1,3 @@
@comment $NetBSD: PLIST,v 1.2 2003年03月03日 02:59:29 jschauma Exp $
bin/xbattbar
-${IMAKE_MAN_DIR}/xbattbar.${IMAKE_MANNEWSUFFIX}
+${IMAKE_MAN_DIR}/xbattbar.${IMAKE_MAN_SUFFIX}
Index: sysutils/xbattbar/distinfo
==================================================================
--- sysutils/xbattbar/distinfo
+++ sysutils/xbattbar/distinfo
@@ -1,8 +1,8 @@
$NetBSD: distinfo,v 1.14 2008年01月04日 01:43:58 pooka Exp $
SHA1 (xbattbar_1.4.2.tar.gz) = 14e9aafd62919e4a625d3f84df3b074b9eef8279
RMD160 (xbattbar_1.4.2.tar.gz) = f28a273a1865a0919e32144bbb5b16b3c0340061
Size (xbattbar_1.4.2.tar.gz) = 14079 bytes
-SHA1 (patch-aa) = 3bd4b688ccaeebe766335245c1a8c5dde52768c2
+SHA1 (patch-aa) = cef5072e9fa9dd8beeceff41e6f2d1c1a45196eb
SHA1 (patch-ab) = 17def14cb44ef4374aaa0e67e5bef3f1eeb042f7
SHA1 (patch-ac) = 507cdf9b4e79dc577d020963142e262d04536527
Index: sysutils/xbattbar/patches/patch-aa
==================================================================
--- sysutils/xbattbar/patches/patch-aa
+++ sysutils/xbattbar/patches/patch-aa
@@ -7,9 +7,9 @@
XCOMM
-BINDIR = /usr/local/bin
-MANDIR = /usr/local/man/cat1
+BINDIR = ${PREFIX}/bin
-+MANDIR = ${PREFIX}/man/cat1
++MANDIR = ${PREFIX}/man/man1
LOCAL_LIBRARIES = $(XLIB)
Index: textproc/expat/builtin.mk
==================================================================
--- textproc/expat/builtin.mk
+++ textproc/expat/builtin.mk
@@ -12,19 +12,14 @@
###
### Determine if there is a built-in implementation of the package and
### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
###
.if !defined(IS_BUILTIN.expat)
-IS_BUILTIN.expat= no
. if empty(H_EXPAT:M__nonexistent__)
-. if !empty(H_EXPAT:M${X11BASE}/*)
-BUILTIN_IMAKE_CHECK:= expat:BuildExpatLibrary
-. include "../../mk/buildlink3/imake-check.mk"
-IS_BUILTIN.expat= ${BUILTIN_IMAKE_CHECK.expat}
-. else
IS_BUILTIN.expat= yes
-. endif
+. else
+IS_BUILTIN.expat= no
. endif
.endif
MAKEVARS+= IS_BUILTIN.expat
###
Index: x11/Xcomposite/builtin.mk
==================================================================
--- x11/Xcomposite/builtin.mk
+++ x11/Xcomposite/builtin.mk
@@ -11,15 +11,14 @@
###
### Determine if there is a built-in implementation of the package and
### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
###
.if !defined(IS_BUILTIN.Xcomposite)
-IS_BUILTIN.Xcomposite= no
. if empty(H_XCOMPOSITE:M__nonexistent__)
-BUILTIN_IMAKE_CHECK:= Xcomposite:BuildCompositeLibrary
-. include "../../mk/buildlink3/imake-check.mk"
-IS_BUILTIN.Xcomposite= ${BUILTIN_IMAKE_CHECK.Xcomposite}
+IS_BUILTIN.Xcomposite= yes
+. else
+IS_BUILTIN.Xcomposite= no
. endif
.endif
MAKEVARS+= IS_BUILTIN.Xcomposite
###
Index: x11/Xfixes/builtin.mk
==================================================================
--- x11/Xfixes/builtin.mk
+++ x11/Xfixes/builtin.mk
@@ -10,15 +10,14 @@
###
### Determine if there is a built-in implementation of the package and
### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
###
.if !defined(IS_BUILTIN.Xfixes)
-IS_BUILTIN.Xfixes= no
. if empty(H_XFIXES:M__nonexistent__)
-BUILTIN_IMAKE_CHECK:= Xfixes:BuildXfixesLibrary
-. include "../../mk/buildlink3/imake-check.mk"
-IS_BUILTIN.Xfixes= ${BUILTIN_IMAKE_CHECK.Xfixes}
+IS_BUILTIN.Xfixes= yes
+. else
+IS_BUILTIN.Xfixes= no
. endif
.endif
MAKEVARS+= IS_BUILTIN.Xfixes
###
Index: x11/Xrender/builtin.mk
==================================================================
--- x11/Xrender/builtin.mk
+++ x11/Xrender/builtin.mk
@@ -10,15 +10,14 @@
###
### Determine if there is a built-in implementation of the package and
### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
###
.if !defined(IS_BUILTIN.Xrender)
-IS_BUILTIN.Xrender= no
. if empty(H_XRENDER:M__nonexistent__)
-BUILTIN_IMAKE_CHECK:= Xrender:BuildRenderLibrary
-. include "../../mk/buildlink3/imake-check.mk"
-IS_BUILTIN.Xrender= ${BUILTIN_IMAKE_CHECK.Xrender}
+IS_BUILTIN.Xrender= yes
+. else
+IS_BUILTIN.Xrender= no
. endif
.endif
MAKEVARS+= IS_BUILTIN.Xrender
###
Index: x11/liboldXrandr/builtin.mk
==================================================================
--- x11/liboldXrandr/builtin.mk
+++ x11/liboldXrandr/builtin.mk
@@ -10,15 +10,14 @@
###
### Determine if there is a built-in implementation of the package and
### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
###
.if !defined(IS_BUILTIN.Xrandr)
-IS_BUILTIN.Xrandr= no
. if empty(H_XRANDR:M__nonexistent__)
-BUILTIN_IMAKE_CHECK:= Xrandr:BuildRandRLibrary
-. include "../../mk/buildlink3/imake-check.mk"
-IS_BUILTIN.Xrandr= ${BUILTIN_IMAKE_CHECK.Xrandr}
+IS_BUILTIN.Xrandr= yes
+. else
+IS_BUILTIN.Xrandr= no
. endif
.endif
MAKEVARS+= IS_BUILTIN.Xrandr
###
Index: x11/xcursor/builtin.mk
==================================================================
--- x11/xcursor/builtin.mk
+++ x11/xcursor/builtin.mk
@@ -10,15 +10,14 @@
###
### Determine if there is a built-in implementation of the package and
### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
###
.if !defined(IS_BUILTIN.xcursor)
-IS_BUILTIN.xcursor= no
. if empty(H_XCURSOR:M__nonexistent__)
-BUILTIN_IMAKE_CHECK:= xcursor:BuildXcursorLibrary
-. include "../../mk/buildlink3/imake-check.mk"
-IS_BUILTIN.xcursor= ${BUILTIN_IMAKE_CHECK.xcursor}
+IS_BUILTIN.xcursor= yes
+. else
+IS_BUILTIN.xcursor= no
. endif
.endif
MAKEVARS+= IS_BUILTIN.xcursor
###
Index: x11/xorg-cf-files/Makefile
==================================================================
--- x11/xorg-cf-files/Makefile
+++ x11/xorg-cf-files/Makefile
@@ -1,10 +1,10 @@
# $NetBSD: Makefile,v 1.18 2012年02月15日 15:25:15 hans Exp $
#
DISTNAME= xorg-cf-files-1.0.4
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= x11 devel
MASTER_SITES= ${MASTER_SITE_XORG:=util/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= joerg%NetBSD.org@localhost
@@ -36,9 +36,12 @@
.endfor
${SED} -e "s|@PREFIX@|${PREFIX}|g" \
-e "s|@PKGMANDIR@|${PKGMANDIR}|" \
-e "s|@MAKE@|${MAKE_PROGRAM}|" ${FILESDIR}/host.def > \
${WRKSRC}/host.def
+ if [ ${X11BASE} != ${PREFIX} ]; then \
+ echo '#define RealProjectRoot ${X11BASE}' >>
${WRKSRC}/host.def; \
+ fi
.include "../../x11/xproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: x11/xorg-cf-files/distinfo
==================================================================
--- x11/xorg-cf-files/distinfo
+++ x11/xorg-cf-files/distinfo
@@ -1,17 +1,20 @@
$NetBSD: distinfo,v 1.12 2012年02月15日 15:25:15 hans Exp $
SHA1 (xorg-cf-files-1.0.4.tar.bz2) = c58b7252df481572ec1ccd77b9f1ab561ed89e45
RMD160 (xorg-cf-files-1.0.4.tar.bz2) = 975942e8974812aae91c45d81eb27522e5aa0a5d
Size (xorg-cf-files-1.0.4.tar.bz2) = 367380 bytes
+SHA1 (patch-X11.rules) = 13fee315aced521bef608e9341fc72526341bb1f
+SHA1 (patch-X11.tmpl) = 3f0c5b8ad7a60cd0e1e47afcddaace936b9aaeed
SHA1 (patch-aa) = 6b776ab3c9cc04759eb2fefcd95dcd65ea5909b3
SHA1 (patch-ab) = f8f816409eb233ae4d8430bd9d43b9bf83c5711d
SHA1 (patch-ac) = 1f977650d9e903a4ea72afc8541b7649cb989ab8
SHA1 (patch-ad) = 12c918ad85fa44518525d2c4bc628b342b8c0280
SHA1 (patch-ae) = b1c870feb6372b8443aac498c24dfa802a536ba2
SHA1 (patch-af) = e48481afac82cd93e61a1f44dab84876d645ce09
SHA1 (patch-ag) = 20010c3ade12a6ee07e1093c6143d9600cca3b37
-SHA1 (patch-ah) = f329f44a81c49ba66e8da197ab99a53172a1d247
-SHA1 (patch-ai) = a0795dcd3442471a58c77c667b3eeb50d7bb47bb
-SHA1 (patch-aj) = 6fd05a766895c06b940e28cd5cadde48365790c3
-SHA1 (patch-ak) = ce8c0fa88f6fa4fb1207f95e6e1f3d5ca9018b8c
+SHA1 (patch-ah) = 9b64b2e5f419ab190d47dd8156b8f84634fd6a36
+SHA1 (patch-ai) = dc4791668610d56fad88dbc05088eb5257d52c7f
+SHA1 (patch-aj) = 3be677041b6bff008caa1375d1e6dd5c90d9f501
+SHA1 (patch-ak) = dba7e9f6bd9043e438bf6f309a5dc6f424204fd9
+SHA1 (patch-gnuLib.rules) = 44a39881b4f4b6a10250f7ae4b4508af76cef71d
SHA1 (patch-sv4Lib.rules) = 20bd05fe6e49cabb74317ded2f4b7565dd45c49d
ADDED x11/xorg-cf-files/patches/patch-X11.rules
Index: x11/xorg-cf-files/patches/patch-X11.rules
==================================================================
--- x11/xorg-cf-files/patches/patch-X11.rules
+++ x11/xorg-cf-files/patches/patch-X11.rules
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- X11.rules.orig 2012年03月06日 17:09:41.000000000 +0000
++++ X11.rules
+@@ -37,6 +37,8 @@ XCOMM $XFree86: xc/config/cf/X11.rules,v
+
+ #if defined(X11ProjectRoot)
+ # define XBinDir $(XPROJECTROOT)/bin
++#elif defined(RealProjectRoot)
++# define XBinDir $(REALPROJECTROOT)/bin
+ #elif defined(ProjectRoot)
+ # define XBinDir $(PROJECTROOT)/bin
+ #else
ADDED x11/xorg-cf-files/patches/patch-X11.tmpl
Index: x11/xorg-cf-files/patches/patch-X11.tmpl
==================================================================
--- x11/xorg-cf-files/patches/patch-X11.tmpl
+++ x11/xorg-cf-files/patches/patch-X11.tmpl
@@ -0,0 +1,16 @@
+$NetBSD$
+
+--- X11.tmpl.orig 2012年03月04日 18:19:34.000000000 +0000
++++ X11.tmpl
+@@ -1657,7 +1657,11 @@ XCOMM X Window System make variables; th
+ SHAREDIR = ShareDir /* rgb, XErrorDB, etc. */
+ LIBEXECDIR = LibexecDir
+ MODULEDIR = ModuleDir
++#ifdef RealProjectRoot
++ TOP_X_INCLUDES = TopXInclude -I $(REALPROJECTROOT)/include
++#else
+ TOP_X_INCLUDES = TopXInclude
++#endif
+ XBINDIR = XBinDir /* BINDIR for X11ProjectRoot */
+
+ INSTSRCDIR = InstSrcDir /* Installed source (kernel
modules). */
Index: x11/xorg-cf-files/patches/patch-ah
==================================================================
--- x11/xorg-cf-files/patches/patch-ah
+++ x11/xorg-cf-files/patches/patch-ah
@@ -1,10 +1,23 @@
$NetBSD: patch-ah,v 1.1.1.1 2006年12月19日 22:54:51 joerg Exp $
--- bsdLib.rules.orig 2006年02月03日 04:02:44.000000000 +0100
+++ bsdLib.rules
-@@ -229,11 +229,7 @@ LintLibReferences(varname,libname,libsou
+@@ -192,7 +192,11 @@ LintLibReferences(varname,libname,libsou
+ #endif
+ #ifndef RpathLoadFlags
+ #if UseRpath
+-#define RpathLoadFlags -Wl,-rpath,$(USRLIBDIRPATH)
++# ifdef RealProjectRoot
++# define RpathLoadFlags -Wl,-rpath,$(USRLIBDIRPATH)
-Wl,-rpath,$(REALPROJECTROOT)/lib -L $(REALPROJECTROOT)/lib
++# else
++# define RpathLoadFlags -Wl,-rpath,$(USRLIBDIRPATH)
++# endif
+ #else
+ #define RpathLoadFlags /**/
+ #endif
+@@ -229,11 +233,7 @@ LintLibReferences(varname,libname,libsou
* InstallSharedLibrary - generate rules to install the shared library.
* NOTE: file must be executable, hence "INSTBINFLAGS"
*/
-#if !defined(FreeBSDArchitecture) || defined(DragonFlyArchitecture)
INSTALLMINORREV = true
Index: x11/xorg-cf-files/patches/patch-ai
==================================================================
--- x11/xorg-cf-files/patches/patch-ai
+++ x11/xorg-cf-files/patches/patch-ai
@@ -1,10 +1,21 @@
-$NetBSD: patch-ai,v 1.1.1.1 2006年12月19日 22:54:51 joerg Exp $
+$NetBSD$
---- Imake.tmpl.orig 2006年12月18日 01:09:37.000000000 +0100
+--- Imake.tmpl.orig 2009年10月16日 21:45:42.000000000 +0000
+++ Imake.tmpl
-@@ -1447,9 +1447,9 @@ TCLIBDIR = TclLibDir
+@@ -898,9 +898,8 @@ TCLIBDIR = TclLibDir
+ #ifndef ManPath
+ #define ManPath ManDirectoryRoot
+ #endif
+-#ifndef ManSourcePath
++#undef ManSourcePath
+ #define ManSourcePath $(MANPATH)/man
+-#endif
+ #ifndef ManDir
+ #define ManDir $(MANSOURCEPATH)$(MANSUFFIX)
+ #endif
+@@ -1447,9 +1446,9 @@ TCLIBDIR = TclLibDir
#ifndef DependCmd
#if UseGccMakeDepend
#ifdef UseInstalled /* assume BINDIR in path */
-#define DependCmd gccmakedep
+#define DependCmd ccmakedep
@@ -12,5 +23,57 @@
-#define DependCmd $(DEPENDSRC)/gccmakedep
+#define DependCmd $(DEPENDSRC)/ccmakedep
#endif
#elif UseCCMakeDepend
#ifdef UseInstalled /* assume BINDIR in path */
+@@ -1610,39 +1609,23 @@ TCLIBDIR = TclLibDir
+ #define SHsuf sh
+ #endif
+ #ifndef ManSuffix
+-#define ManSuffix n /* use just one tab or cpp will die */
++#define ManSuffix 1 /* use just one tab or cpp will die */
+ #endif
+ #ifndef LibManSuffix
+ #define LibManSuffix 3 /* use just one tab or cpp will die */
+ #endif
+ #ifndef FileManSuffix
+-#if SystemV || SystemV4 || defined(OSF1Architecture)
+-#define FileManSuffix 4 /* use just one tab or cpp will die */
+-#else
+ #define FileManSuffix 5 /* use just one tab or cpp will die */
+ #endif
+-#endif
+ #ifndef MiscManSuffix
+-#if SystemV || SystemV4 || defined(OSF1Architecture)
+-#define MiscManSuffix 5 /* use just one tab or cpp will die */
+-#else
+ #define MiscManSuffix 7 /* use just one tab or cpp will die */
+ #endif
+-#endif
+ #ifndef DriverManSuffix
+-#if SystemV || SystemV4 || defined(OSF1Architecture)
+-#define DriverManSuffix 7 /* use just one tab or cpp will
die */
+-#else
+ #define DriverManSuffix 4 /* use just one tab or cpp will
die */
+ #endif
+-#endif
+ #ifndef AdminManSuffix
+-#if SystemV || SystemV4
+-#define AdminManSuffix 1m /* use just one tab or cpp will
die */
+-#else
+ #define AdminManSuffix 8 /* use just one tab or cpp will
die */
+ #endif
+-#endif
+ #ifndef ExpandManNames
+ #if SystemV
+ #define ExpandManNames NO
+@@ -2049,6 +2032,10 @@ MODLDCOMBINEFLAGS = ModuleLdCombineFlags
+ INSTDATFLAGS = InstDatFlags /* install flags for data files */
+ INSTKMEMFLAGS = InstKmemFlags /* install flags for /dev/kmem progs */
+
++#ifdef RealProjectRoot
++REALPROJECTROOT = RealProjectRoot
++#endif
++
+ #ifdef ProjectRoot
+ PROJECTROOT = ProjectRoot
+ #endif
Index: x11/xorg-cf-files/patches/patch-aj
==================================================================
--- x11/xorg-cf-files/patches/patch-aj
+++ x11/xorg-cf-files/patches/patch-aj
@@ -12,20 +12,33 @@
-#define UseRpath NO
+#define UseRpath YES
#endif
#ifndef SharedOldX
-@@ -78,7 +78,7 @@ XCOMM $XFree86: xc/config/cf/lnxLib.rule
+@@ -69,7 +69,11 @@ XCOMM $XFree86: xc/config/cf/lnxLib.rule
+ # endif
+ #ifndef RpathLoadFlags
+ #if UseRpath
+-#define RpathLoadFlags -Wl,-rpath,$(USRLIBDIRPATH)
++# ifdef RealProjectRoot
++# define RpathLoadFlags -Wl,-rpath,$(USRLIBDIRPATH)
-Wl,-rpath,$(REALPROJECTROOT)/lib -L $(REALPROJECTROOT)/lib
++# else
++# define RpathLoadFlags -Wl,-rpath,$(USRLIBDIRPATH)
++# endif
+ #else
+ #define RpathLoadFlags /**/
+ #endif
+@@ -78,7 +82,7 @@ XCOMM $XFree86: xc/config/cf/lnxLib.rule
#define LibraryRpathLoadFlags RpathLoadFlags
#endif
# ifndef SharedLibraryLoadFlags
-# define SharedLibraryLoadFlags -shared
+# define SharedLibraryLoadFlags -shared RpathLoadFlags
# endif
# ifndef PositionIndependentCFlags
# define PositionIndependentCFlags -fPIC
-@@ -87,17 +87,7 @@ XCOMM $XFree86: xc/config/cf/lnxLib.rule
+@@ -87,17 +91,7 @@ XCOMM $XFree86: xc/config/cf/lnxLib.rule
# define PositionIndependentCplusplusFlags -fPIC
# endif
# ifndef ExtraLoadFlags
-# if LinuxBinUtilsMajorVersion >= 26
-# ifdef UseInstalled
Index: x11/xorg-cf-files/patches/patch-ak
==================================================================
--- x11/xorg-cf-files/patches/patch-ak
+++ x11/xorg-cf-files/patches/patch-ak
@@ -2,13 +2,13 @@
The standard says that failing () doesn't stop the shell, even when -e
is set, so () constructs need || exit $? on the end. (Which needs to be
$$? when it's coming from inside make.)
---- Imake.rules~ 2005年11月08日 01:33:24.000000000 -0500
-+++ Imake.rules 2008年08月30日 11:57:32.000000000 -0400
-@@ -534,9 +534,9 @@
+--- Imake.rules.orig 2009年10月16日 21:45:42.000000000 +0000
++++ Imake.rules
+@@ -534,9 +534,9 @@ clean cleantc::
@@\
set +x; \ @@\
else \ @@\
if [ -h dir ]; then \ @@\
- (set -x; rm -f dir); \ @@\
+ (set -x; rm -f dir) || exit $$?; \ @@\
@@ -16,11 +16,11 @@
- (set -x; $(MKDIRHIER) dir); \ @@\
+ (set -x; $(MKDIRHIER) dir) || exit $$?; \ @@\
fi
#endif /* MakeDir */
-@@ -545,9 +545,9 @@
+@@ -545,9 +545,9 @@ clean cleantc::
@@\
:; \ @@\
else \ @@\
if [ -h dir ]; then \ @@\
- (set -x; rm -f dir); \ @@\
+ (set -x; rm -f dir) || exit $$?; \ @@\
@@ -28,123 +28,258 @@
- (set -x; $(MKDIRHIER) dir); \ @@\
+ (set -x; $(MKDIRHIER) dir) || exit $$?; \ @@\
fi
#endif /* MakeDirInline */
-@@ -571,7 +571,7 @@
+@@ -571,7 +571,7 @@ includes:: srclist
@@\
@(set -x; cd $(BUILDINCDIR) && for i in srclist; do \ @@\
RemoveFile($$i); \ @@\
$(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/$$i .; \ @@\
- done)
+ done) || exit $$?
#endif /* BuildIncludesTop */
#ifndef BuildIncludes
-@@ -581,7 +581,7 @@
+@@ -581,7 +581,7 @@ includes:: srclist
@@\
@(set -x; cd $(BUILDINCDIR)/dstsubdir && for i in srclist; do \ @@\
RemoveFile($$i); \ @@\
$(LN) $(BUILDINCTOP)/dstupdir/$(CURRENT_DIR)/$$i .; \ @@\
- done)
+ done) || exit $$?
#endif /* BuildIncludes */
/*
-@@ -604,7 +604,7 @@
+@@ -604,7 +604,7 @@ interfaces::
@@\
@(set -x; cd $(BUILDINCDIR)/dstsubdir && for i in srclist; do \ @@\
RemoveFile($$i); \ @@\
$(LN) $(BUILDINCTOP)/dstupdir/$(CURRENT_DIR)/$$i .; \ @@\
- done)
+ done) || exit $$?
#endif /* BuildInterfaces */
/*
-@@ -1302,7 +1302,7 @@
+@@ -1280,20 +1280,18 @@ InstallTarget(install.ln,Concat(llib-l,l
+ * (the limit for using source code control systems on files systems with
+ * short file names).
+ */
+-#ifndef InstallManPageLong
++#undef InstallManPageLong
+ #define InstallManPageLong(file,destdir,dest)
@@\
+ BuildInstallHtmlManPage(file,dest,$(MANSUFFIX))
@@\
+ @@\
+ CppManTarget(file,$(EXTRAMANDEFS)) @@\
+ @@\
+
InstallNamedTarget(install.man,file.$(MANNEWSUFFIX),$(INSTMANFLAGS),destdir,dest.$(MANSUFFIX))
+-#endif /* InstallManPageLong */
+-
+
+ /*
+ * InstallManPageAliases - generate rules to install manual page aliases.
+ */
+-#ifndef InstallManPageAliases
++#undef InstallManPageAliases
+ #define InstallManPageAliases(file,destdir,aliases)
@@\
+ InstallHtmlManPageAliases(file,aliases,$(MANSUFFIX)) @@\
+ @@\
+@@ -1302,17 +1300,15 @@ install.man::
@@\
RemoveFile($${TMP}); \ @@\
echo .so `basename destdir`/file.$(MANSUFFIX) > $${TMP}; \ @@\
for i in aliases; do (set -x; \ @@\
- $(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) $${TMP}
$(DESTDIR)destdir/$$i.$(MANSUFFIX)); \ @@\
+ $(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) $${TMP}
$(DESTDIR)destdir/$$i.$(MANSUFFIX)) || exit $$?; \ @@\
done; \ @@\
RemoveFile($${TMP}))
- #endif /* InstallManPageAliases */
-@@ -1337,7 +1337,7 @@
+-#endif /* InstallManPageAliases */
+-
+
+ /*
+ * InstallGenManPageLong - More general rules for installing manual pages --
+ * doesn't assume MANSUFFIX.
+ */
+-#ifndef InstallGenManPageLong
++#undef InstallGenManPageLong
+ #define InstallGenManPageLong(file,destdir,dest,suffix)
@@\
+ BuildInstallHtmlManPage(file,dest,suffix) @@\
+ @@\
+@@ -1322,13 +1318,11 @@ install.man:: file.$(MANNEWSUFFIX)
@
+ MakeDir($(DESTDIR)destdir) @@\
+ $(INSTALL) -c $(INSTMANFLAGS) file.$(MANNEWSUFFIX) \ @@\
+ $(DESTDIR)destdir/dest.suffix
+-#endif /* InstallGenManPageLong */
+-
+
+ /*
+ * InstallGenManPageAliases - general equivalent of InstallManPageAliases
+ */
+-#ifndef InstallGenManPageAliases
++#undef InstallGenManPageAliases
+ #define InstallGenManPageAliases(file,destdir,suffix,aliases)
@@\
+ InstallHtmlManPageAliases(file,aliases,suffix)
@@\
+ @@\
+@@ -1337,14 +1331,13 @@ install.man::
@@\
RemoveFile($${TMP}); \ @@\
echo .so `basename destdir`/file.suffix > $${TMP}; \ @@\
for i in aliases; do (set -x; \ @@\
- $(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) $${TMP}
$(DESTDIR)destdir/$$i.suffix); \ @@\
+ $(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) $${TMP}
$(DESTDIR)destdir/$$i.suffix) || exit $$?; \ @@\
done; \ @@\
RemoveFile($${TMP}))
- #endif /* InstallGenManPageAliases */
-@@ -1397,8 +1397,8 @@
+-#endif /* InstallGenManPageAliases */
+
+ #else /* CompressManPages */
+
+-#ifndef InstallManPageLong
++#undef InstallManPageLong
+ #define InstallManPageLong(file,destdir,dest) @@\
+ BuildInstallHtmlManPage(file,dest,$(MANSUFFIX))
@@\
+ @@\
+@@ -1356,9 +1349,8 @@ install.man:: file.$(MANNEWSUFFIX)
@
+ $(INSTALL) -c $(INSTMANFLAGS) file.$(MANNEWSUFFIX) \ @@\
+ $(DESTDIR)destdir/dest.$(MANSUFFIX) @@\
+ -$(COMPRESSMANCMD) $(DESTDIR)destdir/dest.$(MANSUFFIX)
+-#endif
+
+-#ifndef InstallGenManPageLong
++#undef InstallGenManPageLong
+ #define InstallGenManPageLong(file,destdir,dest,suffix)
@@\
+ BuildInstallHtmlManPage(file,dest,suffix) @@\
+ @@\
+@@ -1370,9 +1362,8 @@ install.man:: file.$(MANNEWSUFFIX)
@
+ $(INSTALL) -c $(INSTMANFLAGS) file.$(MANNEWSUFFIX) \ @@\
+ $(DESTDIR)destdir/dest.suffix @@\
+ -$(COMPRESSMANCMD) $(DESTDIR)destdir/dest.suffix
+-#endif
+
+-#ifndef InstallMultipleMan
++#undef InstallMultipleMan
+ #define InstallMultipleMan(list,dest) @@\
+ install.man:: list @@\
+ MakeDir($(DESTDIR)dest) @@\
+@@ -1385,39 +1376,35 @@ install.man:: list
@@\
+ $(DESTDIR)dest/$${MNAME}.$(MANSUFFIX); \ @@\
+ $(COMPRESSMANCMD) $(DESTDIR)dest/$${MNAME}.$(MANSUFFIX)); \ @@\
+ done
+-#endif
+
+ /*
+ * InstallManPageAliases - install soft links for aliases.
+ */
+-#ifndef InstallManPageAliasesBase
++#undef InstallManPageAliasesBase
+ #define InstallManPageAliasesBase(file,destdir,aliases)
@@\
+ install.man:: @@\
+ @(SUFFIX=`echo $(DESTDIR)destdir/file.* | sed -e 's,.*/[^\.]*.,,'`; \
@@\
for i in aliases; do (set -x; \ @@\
$(RM) $(DESTDIR)destdir/$$i.*; \ @@\
(cd $(DESTDIR)destdir; $(LN) file.$${SUFFIX} \ @@\
- $$i.$${SUFFIX})); \ @@\
- done)
+-#endif
+ $$i.$${SUFFIX}) || exit $$?) || exit $$?; \ @@\
+ done) || exit $$?
- #endif
+
+-#ifndef InstallManPageAliases
++#undef InstallManPageAliases
+ #define InstallManPageAliases(file,destdir,aliases) @@\
+ InstallHtmlManPageAliases(file,aliases,$(MANSUFFIX)) @@\
+ @@\
+ InstallManPageAliasesBase(file,destdir,aliases)
+-#endif
+
+
+ /*
+ * InstallGenManPageAliases - install soft links for aliases.
+ */
+-#ifndef InstallGenManPageAliases
++#undef InstallGenManPageAliases
+ #define InstallGenManPageAliases(file,destdir,suffix,aliases) @@\
+ InstallHtmlManPageAliases(file,aliases,suffix)
@@\
+ @@\
+ InstallManPageAliasesBase(file,destdir,aliases)
+-#endif
+
+ #endif /* CompressManPages */
+
+@@ -1425,19 +1412,17 @@ InstallManPageAliasesBase(file,destdir,a
+ /*
+ * InstallManPage - generate rules to install the indicated manual page.
+ */
+-#ifndef InstallManPage
++#undef InstallManPage
+ #define InstallManPage(file,destdir)
@@\
+ InstallManPageLong(file,destdir,file)
+-#endif /* InstallManPage */
+
+
+ /*
+ * InstallGenManPage - general equivalent of InstallManPage
+ */
+-#ifndef InstallGenManPage
++#undef InstallGenManPage
+ #define InstallGenManPage(file,destdir,suffix)
@@\
+ InstallGenManPageLong(file,destdir,file,suffix)
+-#endif /* InstallGenManPage */
+
- #ifndef InstallManPageAliases
-@@ -1499,7 +1499,8 @@
+ /*
+@@ -1499,7 +1484,8 @@ install.man:: file.suffix.html
@@\
for i in aliases; do (set -x; \ @@\
RemoveFile($(DESTDIR)$(DOCHTMLDIR)/$$i.$$SUF.html); \ @@\
(cd $(DESTDIR)$(DOCHTMLDIR); \ @@\
- $(LN) file.$$SUF.html $$i.$$SUF.html)); \ @@\
+ $(LN) file.$$SUF.html $$i.$$SUF.html) || exit $$? \ @@\
+ ) || exit $$?; \ @@\
done
#else
#define InstallHtmlManPageAliases(file,aliases,suffix) /**/
-@@ -1681,7 +1682,7 @@
+@@ -1681,7 +1667,7 @@ InstallNamedTargetNoClobber(install,srcn
#ifndef MakeNamedTargetSubdir
#define MakeNamedTargetSubdir(dir,flags,subname)\
(cd dir && $(MAKE) $(MFLAGS) $(PARALLELMFLAGS) \ @@\
- flags subname)
+ flags subname) || exit $$?
#endif
/*
-@@ -1692,7 +1693,7 @@
+@@ -1692,7 +1678,7 @@ InstallNamedTargetNoClobber(install,srcn
step::
@@\
@MakeFlagsToShellFlags(i,set +e); \ @@\
echo " cd" dir; cd dir && \ @@\
- for i in list; do (set -x; $(LN) -f sub/$$i .); done
+ for i in list; do (set -x; $(LN) -f sub/$$i .) || exit $$?; done
#endif
-@@ -1809,7 +1810,7 @@
+@@ -1809,7 +1795,7 @@ step:: list
@@\
MakeDir($(DESTDIR)dest) @@\
@MakeFlagsToShellFlags(i,set +e); \ @@\
for i in list; do \ @@\
- (set -x; $(INSTALL) $(INSTALLFLAGS) flags $$i $(DESTDIR)dest);
\ @@\
+ (set -x; $(INSTALL) $(INSTALLFLAGS) flags $$i $(DESTDIR)dest)
|| exit $$?; \ @@\
done
#endif /* InstallMultipleDestFlags */
-@@ -1876,7 +1877,7 @@
+@@ -1876,7 +1862,7 @@ install.man::
@@\
MakeDir($(DESTDIR)dest) @@\
@MakeFlagsToShellFlags(i,set +e); \ @@\
for i in list; do \ @@\
- (set -x; $(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) $$i.suffix
$(DESTDIR)dest/$$i.$(MANSUFFIX)); \ @@\
+ (set -x; $(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) $$i.suffix
$(DESTDIR)dest/$$i.$(MANSUFFIX)) || exit $$?; \ @@\
done
#endif /* InstallMultipleManSuffix */
-@@ -2601,7 +2602,8 @@
+@@ -2601,7 +2587,8 @@ clean::
@@\
#define LinkBuildLibraryMaybe(lib,doit) MakeDir($(BUILDLIBDIR))
@@\
@if doit; then (set -x; \ @@\
RemoveFile($(BUILDLIBDIR)/lib); \ @@\
- cd $(BUILDLIBDIR) && $(LN) $(BUILDLIBTOP)/$(CURRENT_DIR)/lib .); fi
+ cd $(BUILDLIBDIR) && \ @@\
+ $(LN) $(BUILDLIBTOP)/$(CURRENT_DIR)/lib .) || exit $$?; fi
#endif
#endif /* LinkBuildLibraryMaybe */
-@@ -2615,7 +2617,9 @@
+@@ -2615,7 +2602,9 @@ clean::
@@\
#else
#define LinkBuildSonameLibrary(lib) MakeDirInline($(BUILDLIBDIR));\ @@\
(set -x; RemoveFile($(BUILDLIBDIR)/lib);\ @@\
- (cd $(BUILDLIBDIR) && $(LN) $(BUILDLIBTOP)/$(CURRENT_DIR)/lib .))
+ (cd $(BUILDLIBDIR) && \ @@\
@@ -151,11 +286,11 @@
+ $(LN) $(BUILDLIBTOP)/$(CURRENT_DIR)/lib .) || exit $$? \ @@\
+ ) || exit $$?
#endif
#endif /* LinkBuildSonameLibrary */
-@@ -2713,9 +2717,9 @@
+@@ -2713,9 +2702,9 @@ AllTarget(LibraryTargetName(libname))
@@\
LibraryTargetName(libname): objlist1 objlist2 objlist3 $(EXTRALIBRARYDEPS)
@@\
RemoveFile($@) @@\
- (cd down && MakeLibrary(up/$@,objlist1)) @@\
- (cd down && MakeLibrary(up/$@,objlist2)) @@\
@@ -164,20 +299,20 @@
+ (cd down && MakeLibrary(up/$@,objlist2)) || exit $$? @@\
+ (cd down && MakeLibrary(up/$@,objlist3)) || exit $$? @@\
RanLibrary($@) @@\
_LinkBuildLibrary($@)
#endif /* UnsharedLibraryTarget3 */
-@@ -2952,7 +2956,7 @@
+@@ -2952,7 +2941,7 @@ step:: dir srclist
@@\
@-(list=`echo srclist | sed -e 's/[^ ]*\///g'`; \ @@\
set -x; cd dir && RemoveFiles($$list)) @@\
@for i in srclist; do \ @@\
- (set -x; cd dir && $(LN) ../$$i .); \ @@\
+ (set -x; cd dir && $(LN) ../$$i .) || exit $$?; \ @@\
done @@\
@@\
dir:: @@\
-@@ -2974,8 +2978,9 @@
+@@ -2974,8 +2963,9 @@ name::
@@\
@MakeFlagsToShellFlags(ik,set +e); \ @@\
for i in dirs ;\ @@\
do \ @@\
- echo verb "in $(CURRENT_DIR)/$$i..."; \ @@\
- (cd $$i && LANG=lang $(MAKE) $(MFLAGS) flags subname);\ @@\
@@ -185,23 +320,23 @@
+ (cd $$i && \ @@\
+ LANG=lang $(MAKE) $(MFLAGS) flags subname) || exit $$?; \ @@\
done
#endif
-@@ -3384,7 +3389,7 @@
+@@ -3384,7 +3374,7 @@ clean::
@@\
step::
@@\
DirFailPrefix@MakeFlagsToShellFlags(i,set +e); \ @@\
for i in dirs; do if [ -d $(DESTDIR)$$i ]; then \ @@\
- set +x; else (set -x; $(MKDIRHIER) $(DESTDIR)$$i); fi; \ @@\
+ set +x; else (set -x; $(MKDIRHIER) $(DESTDIR)$$i) || exit $$?;
fi; \ @@\
done
#endif /* MakeDirectories */
-@@ -3610,7 +3615,7 @@
+@@ -3610,7 +3600,7 @@ objname.Osuf: Concat3(libpath,/lib,libna
@$(CP) Concat3(libpath,/lib,libname.a) tmp @@\
@(cd tmp; set -x; ArExtCmd Concat(lib,libname.a); \ @@\
$(LD) $(LDCOMBINEFLAGS) *.Osuf -o ../$@; \ @@\
- RemoveFiles(*.Osuf)) @@\
+ RemoveFiles(*.Osuf)) || exit $$? @@\
@$(RM) -r tmp @@\
@@\
clean::
@@\
ADDED x11/xorg-cf-files/patches/patch-gnuLib.rules
Index: x11/xorg-cf-files/patches/patch-gnuLib.rules
==================================================================
--- x11/xorg-cf-files/patches/patch-gnuLib.rules
+++ x11/xorg-cf-files/patches/patch-gnuLib.rules
@@ -0,0 +1,17 @@
+$NetBSD$
+
+--- gnuLib.rules.orig 2012年03月04日 18:07:20.000000000 +0000
++++ gnuLib.rules
+@@ -45,7 +45,11 @@ XCOMM XXX To rpath or not to rpath...
+ #endif
+ #ifndef RpathLoadFlags
+ #if UseRpath
+-#define RpathLoadFlags -Wl,-rpath=$(USRLIBDIRPATH)
++# ifdef RealProjectRoot
++# define RpathLoadFlags -Wl,-rpath,$(USRLIBDIRPATH)
-Wl,-rpath,$(REALPROJECTROOT)/lib -L $(REALPROJECTROOT)/lib
++# else
++# define RpathLoadFlags -Wl,-rpath,$(USRLIBDIRPATH)
++# endif
+ #else
+ #define RpathLoadFlags /**/
+ #endif
Home |
Main Index |
Thread Index |
Old Index