summaryrefslogtreecommitdiff
path: root/pkgtools/xpkgwedge
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2001-07-02 21:03:02 +0000
committerjlam <jlam@pkgsrc.org>2001-07-02 21:03:02 +0000
commit1442a19b0f648d77a98f7c5f84222cf3698d7d40 (patch)
treeaa3fe4e83d9e7a750505b1926ea11aeaba04d47c /pkgtools/xpkgwedge
parenta6e2cd6cdcd7dc36c0333ab1d984d3ae6a6b9261 (diff)
downloadpkgsrc-1442a19b0f648d77a98f7c5f84222cf3698d7d40.tar.gz
Update xpkgwedge to 1.5. This version factored out the buildlink logic
into a separate package (buildlink-x11) usable even without xpkgwedge installed.
Diffstat (limited to 'pkgtools/xpkgwedge')
-rw-r--r--pkgtools/xpkgwedge/Makefile4
-rw-r--r--pkgtools/xpkgwedge/files/xpkgwedge.def32
2 files changed, 3 insertions, 33 deletions
diff --git a/pkgtools/xpkgwedge/Makefile b/pkgtools/xpkgwedge/Makefile
index 30ff637c0a0..03698d4a33b 100644
--- a/pkgtools/xpkgwedge/Makefile
+++ b/pkgtools/xpkgwedge/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2001/07/01 21:13:21 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2001/07/02 21:03:02 jlam Exp $
#
-DISTNAME= xpkgwedge-1.4
+DISTNAME= xpkgwedge-1.5
CATEGORIES= pkgtools devel x11
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/pkgtools/xpkgwedge/files/xpkgwedge.def b/pkgtools/xpkgwedge/files/xpkgwedge.def
index 71d5962514a..70d39eda0fb 100644
--- a/pkgtools/xpkgwedge/files/xpkgwedge.def
+++ b/pkgtools/xpkgwedge/files/xpkgwedge.def
@@ -1,4 +1,4 @@
-/* $NetBSD: xpkgwedge.def,v 1.7 2001/07/01 21:13:21 jlam Exp $ */
+/* $NetBSD: xpkgwedge.def,v 1.8 2001/07/02 21:03:02 jlam Exp $ */
#ifdef AfterVendorCF
@@ -63,34 +63,4 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
#define ImakeCmd imake -I$(PREFIX)/lib/X11/config
#endif
-#ifdef BuildLink
-/*
- * Force the buildlink include and lib directories to the head of the
- * compiler search paths. The include directory is added through the
- * C{,plusplus}DebugFlags, which are the first options given to the
- * compiler. It is _required_ that BUILDLINK_DIR be defined in the
- * environment.
- */
-#ifdef UseInstalled
-# ifndef BuildLinkCppFlags
-# define BuildLinkCppFlags -I$(BUILDLINK_DIR)/include $(PKGSRC_CPPFLAGS)
-# endif
-# ifndef BuildLinkLdFlags
-# define BuildLinkLdFlags -L$(BUILDLINK_DIR)/lib
-# endif
-# undef DependFlags
-# define DependFlags BuildLinkCppFlags
-# undef OptimizedCDebugFlags
-# define OptimizedCDebugFlags -O2 BuildLinkCppFlags $(PKGSRC_CFLAGS)
-# undef OptimizedCplusplusDebugFlags
-# define OptimizedCplusplusDebugFlags -O2 BuildLinkCppFlags $(PKGSRC_CXXFLAGS)
-# undef LdPreLib
-# define LdPreLib BuildLinkLdFlags
-# undef LdPostLib
-# define LdPostLib BuildLinkLdFlags
-# undef ImakeCmd
-# define ImakeCmd imake -DBuildLink -I$(PREFIX)/lib/X11/config
-#endif
-#endif /* BuildLink */
-
#endif /* AfterVendorCF */