Mon Jan 14 08:27:32 2008 UTC ()
Retire support for builtin X11 on HP-UX. The builtin libs are simply
too broken. (Missing dynamic Xaw libs, header issues and so on ...)
I'll make X11_TYPE=modular the default on HP-UX instead.


(tnn)
diff -r1.89 -r1.90 pkgsrc/pkgtools/x11-links/Makefile
diff -r1.1 -r0 pkgsrc/pkgtools/x11-links/xhp.mk
diff -r1.1 -r0 pkgsrc/pkgtools/x11-links/files/xhp
cvs diff -r1.89 -r1.90 pkgsrc/pkgtools/x11-links/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/Makefile 2008/01/05 16:08:52 1.89
+++ pkgsrc/pkgtools/x11-links/Makefile 2008/01/14 08:27:31 1.90
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.89 2008/01/05 16:08:52 tron Exp $ 1# $NetBSD: Makefile,v 1.90 2008/01/14 08:27:31 tnn Exp $
2# 2#
3# NOTE: If you update this package, then you'll likely need to also update 3# NOTE: If you update this package, then you'll likely need to also update
4# the x11-links dependency in buildlink3.mk to the correct version, 4# the x11-links dependency in buildlink3.mk to the correct version,
5# usually the most recent. 5# usually the most recent.
6 6
7DISTNAME= x11-links-0.35 7DISTNAME= x11-links-0.35
8CATEGORIES= pkgtools x11 8CATEGORIES= pkgtools x11
9MASTER_SITES= # empty 9MASTER_SITES= # empty
10DISTFILES= # empty 10DISTFILES= # empty
11 11
12MAINTAINER= jlam@pkgsrc.org 12MAINTAINER= jlam@pkgsrc.org
13HOMEPAGE= ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/doc/pkgsrc.html 13HOMEPAGE= ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/doc/pkgsrc.html
14COMMENT= Shadow tree of links to native X11 headers and libraries 14COMMENT= Shadow tree of links to native X11 headers and libraries
@@ -27,28 +27,26 @@ PLIST_SRC.dirs= ${WRKDIR}/.PLIST_SRC.di @@ -27,28 +27,26 @@ PLIST_SRC.dirs= ${WRKDIR}/.PLIST_SRC.di
27PLIST_SRC.files= ${WRKDIR}/.PLIST_SRC.files 27PLIST_SRC.files= ${WRKDIR}/.PLIST_SRC.files
28PLIST_SRC= ${.CURDIR}/PLIST ${PLIST_SRC.files} ${PLIST_SRC.dirs} 28PLIST_SRC= ${.CURDIR}/PLIST ${PLIST_SRC.files} ${PLIST_SRC.dirs}
29 29
30.include "../../mk/bsd.prefs.mk" 30.include "../../mk/bsd.prefs.mk"
31 31
32.if !exists(${X11BASE}/include/X11/X.h) 32.if !exists(${X11BASE}/include/X11/X.h)
33PKG_FAIL_REASON+= "${PKGNAME} requires X headers to be installed" 33PKG_FAIL_REASON+= "${PKGNAME} requires X headers to be installed"
34.endif 34.endif
35 35
36.if ${OPSYS} == "IRIX" 36.if ${OPSYS} == "IRIX"
37. include "xsgi.mk" 37. include "xsgi.mk"
38.elif ${OPSYS} == "OSF1" 38.elif ${OPSYS} == "OSF1"
39. include "xdec.mk" 39. include "xdec.mk"
40.elif ${OPSYS} == "HPUX" 
41. include "xhp.mk" 
42.elif !empty(X11BASE:M*openwin) 40.elif !empty(X11BASE:M*openwin)
43. include "openwin.mk" 41. include "openwin.mk"
44.elif exists(${X11BASE}/lib/X11/config/xorgversion.def) 42.elif exists(${X11BASE}/lib/X11/config/xorgversion.def)
45. include "xorg.mk" 43. include "xorg.mk"
46.else 44.else
47. include "xfree.mk" 45. include "xfree.mk"
48.endif 46.endif
49 47
50X11_LINKS_SUBDIR= share/x11-links 48X11_LINKS_SUBDIR= share/x11-links
51X11_LINKS_BUILD_DIR= ${WRKSRC}/${X11_LINKS_SUBDIR} 49X11_LINKS_BUILD_DIR= ${WRKSRC}/${X11_LINKS_SUBDIR}
52X11_LINKS_DIR= ${PREFIX}/${X11_LINKS_SUBDIR} 50X11_LINKS_DIR= ${PREFIX}/${X11_LINKS_SUBDIR}
53 51
54FILES_LIST_CMD= ${SED} -e "s/@ABI@/${ABI}/" ${FILES_LIST} | ${GREP} -v "^\#" 52FILES_LIST_CMD= ${SED} -e "s/@ABI@/${ABI}/" ${FILES_LIST} | ${GREP} -v "^\#"
File Deleted: pkgsrc/pkgtools/x11-links/Attic/xhp.mk
File Deleted: pkgsrc/pkgtools/x11-links/files/Attic/xhp