diff options
| author | jlam <jlam@pkgsrc.org> | 2003-08-16 09:33:03 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2003-08-16 09:33:03 +0000 |
| commit | 195b6e6d0691a758f4a2f27f1a86a34da5482f72 (patch) | |
| tree | 71d403a5314a1c57a87119ee75080c38661e4315 | |
| parent | 82570c604bd5a84fd54280d055f3d5cb2b2ccc4f (diff) | |
| download | pkgsrc-195b6e6d0691a758f4a2f27f1a86a34da5482f72.tar.gz | |
No longer support undocumented USE_X11_LINKS. It just makes life harder
for pkgviews developers.
| -rw-r--r-- | mk/buildlink2/bsd.buildlink2.mk | 9 | ||||
| -rw-r--r-- | mk/x11.buildlink2.mk | 24 |
2 files changed, 1 insertions, 32 deletions
diff --git a/mk/buildlink2/bsd.buildlink2.mk b/mk/buildlink2/bsd.buildlink2.mk index 0edfb0edc74..85ce25fb21a 100644 --- a/mk/buildlink2/bsd.buildlink2.mk +++ b/mk/buildlink2/bsd.buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink2.mk,v 1.90.4.8 2003/08/16 09:25:36 jlam Exp $ +# $NetBSD: bsd.buildlink2.mk,v 1.90.4.9 2003/08/16 09:33:03 jlam Exp $ # # An example package buildlink2.mk file: # @@ -87,13 +87,8 @@ MAKE_ENV+= BUILDLINK_CACHE_ALL=yes .endfor .if defined(USE_X11) -USE_X11_LINKS?= YES -. if !empty(USE_X11_LINKS:M[nN][oO]) -. include "../../mk/x11.buildlink2.mk" -. else BUILD_DEPENDS+= x11-links>=0.12:../../pkgtools/x11-links _BLNK_X11_DIR= ${LOCALBASE}/share/x11-links -. endif _BLNK_CPPFLAGS+= -I${X11BASE}/include _BLNK_LDFLAGS+= -L${X11BASE}/lib .if ${_USE_RPATH} == "yes" @@ -171,9 +166,7 @@ buildlink-directories: .if defined(USE_X11) ${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${BUILDLINK_X11_DIR} ${_PKG_SILENT}${_PKG_DEBUG}${LN} -sf ${BUILDLINK_DIR} ${BUILDLINK_X11_DIR} -. if empty(USE_X11_LINKS:M[nN][oO]) ${_PKG_SILENT}${_PKG_DEBUG}${CP} -R ${_BLNK_X11_DIR}/* ${BUILDLINK_X11_DIR} -. endif .endif ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${BUILDLINK_DIR}/include ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${BUILDLINK_DIR}/lib diff --git a/mk/x11.buildlink2.mk b/mk/x11.buildlink2.mk deleted file mode 100644 index 163b44cec4e..00000000000 --- a/mk/x11.buildlink2.mk +++ /dev/null @@ -1,24 +0,0 @@ -# $NetBSD: x11.buildlink2.mk,v 1.4 2003/06/12 15:27:09 jschauma Exp $ -# -# This file is for internal use by bsd.buildlink2.mk and should _not_ be -# include by package Makefiles. - -.if !defined(X11_BUILDLINK2_MK) -X11_BUILDLINK2_MK= # defined - -USE_X11?= # defined -USE_X11_LINKS= no - -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "IRIX" -. include "../../pkgtools/x11-links/xsgi.buildlink2.mk" -.else -. if !empty(X11BASE:M*openwin) -. include "../../pkgtools/x11-links/openwin.buildlink2.mk" -. else -. include "../../pkgtools/x11-links/xfree.buildlink2.mk" -. endif -.endif - -.endif # X11_BUILDLINK2_MK |