head	1.84;
access;
symbols
	pkgsrc-2015Q2:1.83.0.6
	pkgsrc-2015Q2-base:1.83
	pkgsrc-2015Q1:1.83.0.4
	pkgsrc-2015Q1-base:1.83
	pkgsrc-2014Q4:1.83.0.2
	pkgsrc-2014Q4-base:1.83
	pkgsrc-2014Q3:1.82.0.6
	pkgsrc-2014Q3-base:1.82
	pkgsrc-2014Q2:1.82.0.4
	pkgsrc-2014Q2-base:1.82
	pkgsrc-2014Q1:1.82.0.2
	pkgsrc-2014Q1-base:1.82
	pkgsrc-2013Q4:1.81.0.6
	pkgsrc-2013Q4-base:1.81
	pkgsrc-2013Q3:1.81.0.4
	pkgsrc-2013Q3-base:1.81
	pkgsrc-2013Q2:1.81.0.2
	pkgsrc-2013Q2-base:1.81
	pkgsrc-2013Q1:1.80.0.6
	pkgsrc-2013Q1-base:1.80
	pkgsrc-2012Q4:1.80.0.4
	pkgsrc-2012Q4-base:1.80
	pkgsrc-2012Q3:1.80.0.2
	pkgsrc-2012Q3-base:1.80
	pkgsrc-2012Q2:1.79.0.18
	pkgsrc-2012Q2-base:1.79
	pkgsrc-2012Q1:1.79.0.16
	pkgsrc-2012Q1-base:1.79
	pkgsrc-2011Q4:1.79.0.14
	pkgsrc-2011Q4-base:1.79
	pkgsrc-2011Q3:1.79.0.12
	pkgsrc-2011Q3-base:1.79
	pkgsrc-2011Q2:1.79.0.10
	pkgsrc-2011Q2-base:1.79
	pkgsrc-2011Q1:1.79.0.8
	pkgsrc-2011Q1-base:1.79
	pkgsrc-2010Q4:1.79.0.6
	pkgsrc-2010Q4-base:1.79
	pkgsrc-2010Q3:1.79.0.4
	pkgsrc-2010Q3-base:1.79
	pkgsrc-2010Q2:1.79.0.2
	pkgsrc-2010Q2-base:1.79
	pkgsrc-2010Q1:1.78.0.2
	pkgsrc-2010Q1-base:1.78
	pkgsrc-2009Q4:1.77.0.6
	pkgsrc-2009Q4-base:1.77
	pkgsrc-2009Q3:1.77.0.4
	pkgsrc-2009Q3-base:1.77
	pkgsrc-2009Q2:1.77.0.2
	pkgsrc-2009Q2-base:1.77
	pkgsrc-2009Q1:1.75.0.12
	pkgsrc-2009Q1-base:1.75
	pkgsrc-2008Q4:1.75.0.10
	pkgsrc-2008Q4-base:1.75
	pkgsrc-2008Q3:1.75.0.8
	pkgsrc-2008Q3-base:1.75
	cube-native-xorg:1.75.0.6
	cube-native-xorg-base:1.75
	pkgsrc-2008Q2:1.75.0.4
	pkgsrc-2008Q2-base:1.75
	cwrapper-base:1.75
	cwrapper:1.75.0.2
	pkgsrc-2008Q1:1.74.0.4
	pkgsrc-2008Q1-base:1.74
	pkgsrc-2007Q4:1.74.0.2
	pkgsrc-2007Q4-base:1.74
	pkgsrc-2007Q3:1.71.0.8
	pkgsrc-2007Q3-base:1.71
	pkgsrc-2007Q2:1.71.0.6
	pkgsrc-2007Q2-base:1.71
	pkgsrc-2007Q1:1.71.0.4
	pkgsrc-2007Q1-base:1.71
	pkgsrc-2006Q4:1.71.0.2
	pkgsrc-2006Q4-base:1.71
	pkgsrc-2006Q3:1.70.0.2
	pkgsrc-2006Q3-base:1.70
	pkgsrc-2006Q2:1.66.0.2
	pkgsrc-2006Q2-base:1.66
	pkgsrc-2006Q1:1.65.0.2
	pkgsrc-2006Q1-base:1.65
	pkgsrc-2005Q4:1.61.0.2
	pkgsrc-2005Q4-base:1.61
	pkgsrc-2005Q3:1.58.0.4
	pkgsrc-2005Q3-base:1.58
	pkgsrc-2005Q2:1.58.0.2
	pkgsrc-2005Q2-base:1.58
	pkgsrc-2005Q1:1.53.0.6
	pkgsrc-2005Q1-base:1.53
	pkgsrc-2004Q4:1.53.0.4
	pkgsrc-2004Q4-base:1.53
	pkgsrc-2004Q3:1.53.0.2
	pkgsrc-2004Q3-base:1.53
	pkgsrc-2004Q2:1.51.0.2
	pkgsrc-2004Q2-base:1.51
	pkgsrc-2004Q1:1.49.0.2
	pkgsrc-2004Q1-base:1.49
	pkgsrc-2003Q4:1.44.0.2
	pkgsrc-2003Q4-base:1.44
	netbsd-1-6-1:1.34.0.2
	netbsd-1-6-1-base:1.34
	netbsd-1-6:1.32.0.6
	netbsd-1-6-RELEASE-base:1.32
	pkgviews:1.32.0.2
	pkgviews-base:1.32
	buildlink2:1.31.0.2
	buildlink2-base:1.33
	netbsd-1-5-PATCH003:1.31
	netbsd-1-5-PATCH001:1.20
	netbsd-1-5-RELEASE:1.14
	netbsd-1-4-PATCH003:1.14
	netbsd-1-4-PATCH002:1.12
	comdex-fall-1999:1.12
	netbsd-1-4-PATCH001:1.12
	netbsd-1-4-RELEASE:1.12
	netbsd-1-3-PATCH003:1.12;
locks; strict;
comment	@# @;


1.84
date	2015.08.17.08.15.40;	author wiz;	state dead;
branches;
next	1.83;
commitid	YIWtZlECn5Cj6Bxy;

1.83
date	2014.10.09.14.06.51;	author wiz;	state Exp;
branches;
next	1.82;
commitid	fBDATFVmQ3454xTx;

1.82
date	2014.03.03.02.17.47;	author obache;	state Exp;
branches;
next	1.81;
commitid	Ysr1NAx7D1ELdcrx;

1.81
date	2013.04.06.04.07.24;	author rodent;	state Exp;
branches;
next	1.80;

1.80
date	2012.09.11.23.19.40;	author asau;	state Exp;
branches;
next	1.79;

1.79
date	2010.06.06.03.45.17;	author dholland;	state Exp;
branches;
next	1.78;

1.78
date	2010.03.21.16.29.42;	author wiz;	state Exp;
branches;
next	1.77;

1.77
date	2009.05.19.08.59.30;	author wiz;	state Exp;
branches;
next	1.76;

1.76
date	2009.04.09.00.48.14;	author joerg;	state Exp;
branches;
next	1.75;

1.75
date	2008.04.12.22.43.09;	author jlam;	state Exp;
branches;
next	1.74;

1.74
date	2007.12.16.12.43.50;	author tron;	state Exp;
branches;
next	1.73;

1.73
date	2007.12.16.12.29.17;	author tron;	state Exp;
branches;
next	1.72;

1.72
date	2007.11.11.11.35.50;	author martti;	state Exp;
branches;
next	1.71;

1.71
date	2006.10.09.12.52.36;	author joerg;	state Exp;
branches;
next	1.70;

1.70
date	2006.09.27.15.18.15;	author joerg;	state Exp;
branches;
next	1.69;

1.69
date	2006.09.09.20.31.46;	author schwarz;	state Exp;
branches;
next	1.68;

1.68
date	2006.08.03.17.35.12;	author tv;	state Exp;
branches;
next	1.67;

1.67
date	2006.08.02.20.26.15;	author heinz;	state Exp;
branches;
next	1.66;

1.66
date	2006.04.10.13.38.36;	author schwarz;	state Exp;
branches;
next	1.65;

1.65
date	2006.03.14.01.14.32;	author jlam;	state Exp;
branches;
next	1.64;

1.64
date	2006.01.12.19.02.34;	author joerg;	state Exp;
branches;
next	1.63;

1.63
date	2006.01.06.16.58.32;	author joerg;	state Exp;
branches;
next	1.62;

1.62
date	2005.12.29.06.22.06;	author jlam;	state Exp;
branches;
next	1.61;

1.61
date	2005.12.17.05.20.22;	author jlam;	state Exp;
branches;
next	1.60;

1.60
date	2005.12.05.20.50.51;	author rillig;	state Exp;
branches;
next	1.59;

1.59
date	2005.09.28.20.52.25;	author rillig;	state Exp;
branches;
next	1.58;

1.58
date	2005.06.14.20.12.51;	author jlam;	state Exp;
branches;
next	1.57;

1.57
date	2005.06.14.07.23.56;	author jlam;	state Exp;
branches;
next	1.56;

1.56
date	2005.06.01.18.03.08;	author jlam;	state Exp;
branches;
next	1.55;

1.55
date	2005.05.07.22.24.04;	author wiz;	state Exp;
branches;
next	1.54;

1.54
date	2005.04.11.21.47.06;	author tv;	state Exp;
branches;
next	1.53;

1.53
date	2004.08.27.06.29.10;	author jlam;	state Exp;
branches;
next	1.52;

1.52
date	2004.07.31.01.42.06;	author xtraeme;	state Exp;
branches;
next	1.51;

1.51
date	2004.06.15.02.27.10;	author minskim;	state Exp;
branches;
next	1.50;

1.50
date	2004.04.30.19.44.21;	author tv;	state Exp;
branches;
next	1.49;

1.49
date	2004.02.02.10.08.43;	author jlam;	state Exp;
branches;
next	1.48;

1.48
date	2004.01.20.12.23.58;	author agc;	state Exp;
branches;
next	1.47;

1.47
date	2004.01.04.04.51.47;	author reed;	state Exp;
branches;
next	1.46;

1.46
date	2004.01.03.23.51.08;	author reed;	state Exp;
branches;
next	1.45;

1.45
date	2004.01.03.23.34.21;	author jlam;	state Exp;
branches;
next	1.44;

1.44
date	2003.11.23.08.35.05;	author jlam;	state Exp;
branches;
next	1.43;

1.43
date	2003.11.23.06.46.54;	author jlam;	state Exp;
branches;
next	1.42;

1.42
date	2003.10.18.10.12.09;	author grant;	state Exp;
branches;
next	1.41;

1.41
date	2003.09.10.17.31.43;	author gavan;	state Exp;
branches;
next	1.40;

1.40
date	2003.08.30.22.51.29;	author jlam;	state Exp;
branches;
next	1.39;

1.39
date	2003.08.30.11.08.23;	author jlam;	state Exp;
branches;
next	1.38;

1.38
date	2003.07.21.17.14.11;	author martti;	state Exp;
branches;
next	1.37;

1.37
date	2003.07.17.22.52.20;	author grant;	state Exp;
branches;
next	1.36;

1.36
date	2003.06.12.15.34.38;	author jschauma;	state Exp;
branches;
next	1.35;

1.35
date	2003.03.29.12.42.13;	author jmmv;	state Exp;
branches;
next	1.34;

1.34
date	2002.08.23.05.23.00;	author jlam;	state Exp;
branches;
next	1.33;

1.33
date	2002.08.23.04.22.43;	author jlam;	state Exp;
branches;
next	1.32;

1.32
date	2002.06.07.12.53.49;	author tron;	state Exp;
branches;
next	1.31;

1.31
date	2002.02.26.21.49.06;	author jlam;	state Exp;
branches
	1.31.2.1;
next	1.30;

1.30
date	2001.10.14.16.42.58;	author tron;	state Exp;
branches;
next	1.29;

1.29
date	2001.09.09.20.36.43;	author agc;	state Exp;
branches;
next	1.28;

1.28
date	2001.07.13.07.09.22;	author jlam;	state Exp;
branches;
next	1.27;

1.27
date	2001.07.10.00.58.32;	author hubertf;	state Exp;
branches;
next	1.26;

1.26
date	2001.07.02.21.03.02;	author jlam;	state Exp;
branches;
next	1.25;

1.25
date	2001.07.01.21.13.21;	author jlam;	state Exp;
branches;
next	1.24;

1.24
date	2001.06.29.18.27.30;	author jlam;	state Exp;
branches;
next	1.23;

1.23
date	2001.06.18.05.17.14;	author jlam;	state Exp;
branches;
next	1.22;

1.22
date	2001.06.16.08.53.48;	author veego;	state Exp;
branches;
next	1.21;

1.21
date	2001.05.31.10.25.21;	author dent;	state Exp;
branches;
next	1.20;

1.20
date	2001.02.17.17.51.35;	author wiz;	state Exp;
branches;
next	1.19;

1.19
date	2001.01.29.11.34.39;	author wiz;	state Exp;
branches;
next	1.18;

1.18
date	2001.01.18.17.05.50;	author jlam;	state Exp;
branches;
next	1.17;

1.17
date	2001.01.13.16.23.04;	author tron;	state Exp;
branches;
next	1.16;

1.16
date	2001.01.13.16.21.20;	author tron;	state Exp;
branches;
next	1.15;

1.15
date	2000.10.23.17.32.07;	author jlam;	state Exp;
branches;
next	1.14;

1.14
date	2000.07.14.04.22.41;	author jlam;	state Exp;
branches;
next	1.13;

1.13
date	2000.06.28.15.02.32;	author agc;	state Exp;
branches;
next	1.12;

1.12
date	98.09.27.18.38.30;	author tron;	state Exp;
branches;
next	1.11;

1.11
date	98.09.17.15.47.09;	author agc;	state Exp;
branches;
next	1.10;

1.10
date	98.08.23.21.25.19;	author frueauf;	state Exp;
branches;
next	1.9;

1.9
date	98.08.23.21.18.24;	author frueauf;	state Exp;
branches;
next	1.8;

1.8
date	98.08.11.19.29.26;	author tv;	state Exp;
branches;
next	1.7;

1.7
date	98.08.09.23.16.18;	author tron;	state Exp;
branches;
next	1.6;

1.6
date	98.07.31.19.30.49;	author tv;	state Exp;
branches;
next	1.5;

1.5
date	98.07.31.15.00.41;	author tv;	state Exp;
branches;
next	1.4;

1.4
date	98.07.14.10.56.16;	author frueauf;	state Exp;
branches;
next	1.3;

1.3
date	98.07.01.15.56.35;	author tv;	state Exp;
branches;
next	1.2;

1.2
date	98.06.26.16.41.11;	author tv;	state Exp;
branches;
next	1.1;

1.1
date	98.06.26.16.39.23;	author tv;	state Exp;
branches;
next	;

1.31.2.1
date	2002.05.11.02.09.21;	author jlam;	state Exp;
branches;
next	1.31.2.2;

1.31.2.2
date	2002.06.21.23.05.36;	author jlam;	state Exp;
branches;
next	1.31.2.3;

1.31.2.3
date	2002.06.23.18.57.51;	author jlam;	state Exp;
branches;
next	;


desc
@@


1.84
log
@Remove xpkgwedge, not needed any longer.
@
text
@# $NetBSD: Makefile,v 1.83 2014/10/09 14:06:51 wiz Exp $

PKGNAME=	xpkgwedge-1.17
CATEGORIES=	pkgtools devel x11

MAINTAINER=	pkgsrc-users@@NetBSD.org
HOMEPAGE=	ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/doc/pkgsrc.html
COMMENT=	Allows X11 pkgs to be built and used outside of $${X11BASE}
LICENSE=	original-bsd

WRKSRC=		${WRKDIR}
USE_LANGUAGES=	# empty
NO_BUILD=	yes
NO_CONFIGURE=	yes

.include "../../mk/bsd.prefs.mk"

USE_TOOLS+=	imake:run xmkmf:run

.if ${LOCALBASE} == ${X11BASE}
PKG_FAIL_REASON+=	"xpkgwedge is not needed when X11BASE is LOCALBASE"
.endif

.if exists(${X11BASE}/bin/mkfontscale)
CONFLICTS+=	mkfontscale-[0-9]*
.endif

INSTALLATION_DIRS=	bin lib/X11/config

# FONT_PROGS are symlinked from ${X11BASE}/bin to ${PREFIX}/bin to allow
# ${PREFIX}/bin/${prog} to always work.
#
FONT_PROGS=		bdftopcf fstobdf mkfontdir mkfontscale

FILES_SUBST+=		VIEWBASE=${VIEWBASE}
FILES_SUBST+=		FONT_PROGS=${FONT_PROGS:Q}
FILES_SUBST+=		MAKE=${IMAKE_MAKE:Q}
USE_TOOLS+=		${IMAKE_TOOLS}

PLIST_VARS+=		Darwin IRIX IRIX5 IRIX6

.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*)
APPLY_DARWIN_PATCH=	${TRUE}
PLIST.Darwin=		yes
USE_TOOLS+=		patch
.else
APPLY_DARWIN_PATCH=	${FALSE}
.endif

.if ${OPSYS} == "IRIX"
PLIST.IRIX=		yes
USE_TOOLS+=		patch
. if !empty(OS_VERSION:M6*)
PLIST.IRIX6=		yes
. else
PLIST.IRIX5=		yes
. endif
.endif

.include "../../mk/x11.buildlink3.mk"

SUBST_CLASSES+=		paths
SUBST_FILES.paths=	${WRKDIR}/pkgxmkmf
SUBST_SED.paths+=	-e 's,@@PREFIX@@,${PREFIX},g'
SUBST_SED.paths+=	-e 's,@@X11BASE@@,${X11BASE},g'
SUBST_SED.paths+=	-e 's,@@VIEWBASE@@,${VIEWBASE},g'
SUBST_SED.paths+=	-e 's,@@MAKE@@,${IMAKE_MAKE},g'
SUBST_STAGE.paths=	post-patch

post-extract:
	@@${CP} ${FILESDIR}/xpkgwedge.def ${WRKSRC}
	@@${CP} ${FILESDIR}/pkgxmkmf.in ${WRKDIR}/pkgxmkmf

.if defined(X11_TYPE) && !empty(X11_TYPE:Mxorg)
X11TYPEFLAGS?=		-L${X11BASE}/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib
SUBST_CLASSES+=		fix
SUBST_STAGE.fix=	post-patch
SUBST_FILES.fix=	xpkgwedge.def
SUBST_SED.fix=		-e "s|@@X11TYPEFLAGS@@|${X11TYPEFLAGS}|"
.else # X11_TYPE == xorg.
SUBST_CLASSES+=		foo
SUBST_STAGE.foo=	post-patch
SUBST_FILES.foo=	xpkgwedge.def
SUBST_SED.foo=		-e "s|\#define ExtraLoadFlags @@X11TYPEFLAGS@@||"
.endif # X11_TYPE == native.

do-install:
	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/X11/config
	${INSTALL_DATA} ${WRKSRC}/xpkgwedge.def ${DESTDIR}${PREFIX}/lib/X11/config
	${INSTALL_SCRIPT} ${WRKSRC}/pkgxmkmf ${DESTDIR}${PREFIX}/bin/pkgxmkmf
	@@case ${OPSYS} in \
	Darwin) \
	if ${APPLY_DARWIN_PATCH}; then \
	  ${INSTALL_DATA} ${X11BASE}/lib/X11/config/darwin.cf ${DESTDIR}${PREFIX}/lib/X11/config; \
	  cd ${DESTDIR}${PREFIX}/lib/X11/config && patch ${PATCH_STRIP} < ${FILESDIR}/darwin.cf.patch; \
	fi; \
	;; \
	IRIX) \
	${INSTALL_DATA} ${X11BASE}/lib/X11/config/sgi.cf ${DESTDIR}${PREFIX}/lib/X11/config; \
	if [ ${OS_VERSION} -ge 6 ]; then \
		${INSTALL_DATA} ${X11BASE}/lib/X11/config/X11.rules ${DESTDIR}${PREFIX}/lib/X11/config; \
		cd ${DESTDIR}${PREFIX}/lib/X11/config && patch ${PATCH_STRIP} < ${FILESDIR}/irix6.patch; \
	else \
		${INSTALL_DATA} ${X11BASE}/lib/X11/config/sgiLib.rules ${DESTDIR}${PREFIX}/lib/X11/config; \
		cd ${DESTDIR}${PREFIX}/lib/X11/config && patch ${PATCH_STRIP} < ${FILESDIR}/irix5.patch; \
	fi; \
	;; \
	esac

.include "../../mk/bsd.pkg.mk"
@


1.83
log
@Remove pkgviews: don't set PKG_INSTALLATION_TYPES in Makefiles.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.82 2014/03/03 02:17:47 obache Exp $
@


1.82
log
@Just define PKGNAME.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.81 2013/04/06 04:07:24 rodent Exp $
a10 2
PKG_INSTALLATION_TYPES=	overwrite pkgviews

@


1.81
log
@"Definition of PKG_SKIP_REASON is deprecated. Use PKG_FAIL_REASON instead."
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.80 2012/09/11 23:19:40 asau Exp $
d3 1
a3 1
DISTNAME=	xpkgwedge-1.17
a4 2
MASTER_SITES=	# empty
DISTFILES=	# empty
@


1.80
log
@"user-destdir" is default these days
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.79 2010/06/06 03:45:17 dholland Exp $
d25 1
a25 1
PKG_SKIP_REASON+=	"xpkgwedge is not needed when X11BASE is LOCALBASE"
@


1.79
log
@Force-set ManPath on Debian in order to work around silly things Debian
ships in their imake templates, which otherwise result in pkgsrc man pages
landing in /usr/share/man. PR 38248 (and possibly others).
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.78 2010/03/21 16:29:42 wiz Exp $
a13 1
PKG_DESTDIR_SUPPORT=	user-destdir
@


1.78
log
@Reset maintainer, developer lost his commit bit.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.77 2009/05/19 08:59:30 wiz Exp $
d3 1
a3 1
DISTNAME=	xpkgwedge-1.16
@


1.77
log
@Use standard location for LICENSE line (in MAINTAINER/HOMEPAGE/COMMENT
block). Uncomment some commented out LICENSE lines while here.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.76 2009/04/09 00:48:14 joerg Exp $
d8 1
a8 1
MAINTAINER=	jlam@@pkgsrc.org
@


1.76
log
@Remove redundant NO_CHECKSUM and EXTRACT_ONLY definitions.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.75 2008/04/12 22:43:09 jlam Exp $
d11 1
a11 1
#LICENSE=	original-bsd
@


1.75
log
@Convert to use PLIST_VARS instead of manually passing "@@comment "
through PLIST_SUBST to the plist module.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.74 2007/12/16 12:43:50 tron Exp $
a16 1
EXTRACT_ONLY=	# empty
a19 1
NO_CHECKSUM=	yes
@


1.74
log
@Fix build on pre-Leopard Mac OS X systems.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.73 2007/12/16 12:29:17 tron Exp $
d47 2
d51 1
a51 1
PLIST_SUBST+=		IS_DARWIN=
a54 1
PLIST_SUBST+=		IS_DARWIN="@@comment "
d58 1
a58 1
PLIST_SUBST+=		IS_IRIX=
d61 1
a61 2
PLIST_SUBST+=		IS_IRIX5="@@comment "
PLIST_SUBST+=		IS_IRIX6=
d63 1
a63 2
PLIST_SUBST+=		IS_IRIX5=
PLIST_SUBST+=		IS_IRIX6="@@comment "
a64 4
.else
PLIST_SUBST+=		IS_IRIX="@@comment "
PLIST_SUBST+=		IS_IRIX5="@@comment "
PLIST_SUBST+=		IS_IRIX6="@@comment "
@


1.73
log
@Mac OS X Leopard doesn't "InstallFlags" in "darwin.cf". We therefore don't
need to (and cannot) apply a patch to prevent that. This package builds
under Leopard now.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.72 2007/11/11 11:35:50 martti Exp $
d47 2
a48 1
.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-i386)
d52 1
d105 1
a105 1
	if [ -z "$IS_DARWIN" ]; then \
@


1.72
log
@Added commented-out LICENSE=something.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.71 2006/10/09 12:52:36 joerg Exp $
d47 1
a47 1
.if ${OPSYS} == "Darwin"
d103 4
a106 2
	${INSTALL_DATA} ${X11BASE}/lib/X11/config/darwin.cf ${DESTDIR}${PREFIX}/lib/X11/config; \
	cd ${DESTDIR}${PREFIX}/lib/X11/config && patch ${PATCH_STRIP} < ${FILESDIR}/darwin.cf.patch; \
@


1.71
log
@Flag a number of packages I use as supporting (user-)destdir.
apg is a bit special as it has some hardcoded ownership, so
mark that as "destdir".
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.70 2006/09/27 15:18:15 joerg Exp $
d11 1
@


1.70
log
@Remove XFree86.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.69 2006/09/09 20:31:46 schwarz Exp $
d13 1
d97 3
a99 3
	${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/config
	${INSTALL_DATA} ${WRKSRC}/xpkgwedge.def ${PREFIX}/lib/X11/config
	${INSTALL_SCRIPT} ${WRKSRC}/pkgxmkmf ${PREFIX}/bin/pkgxmkmf
d102 2
a103 2
	${INSTALL_DATA} ${X11BASE}/lib/X11/config/darwin.cf ${PREFIX}/lib/X11/config; \
	cd ${PREFIX}/lib/X11/config && patch ${PATCH_STRIP} < ${FILESDIR}/darwin.cf.patch; \
d106 1
a106 1
	${INSTALL_DATA} ${X11BASE}/lib/X11/config/sgi.cf ${PREFIX}/lib/X11/config; \
d108 2
a109 2
		${INSTALL_DATA} ${X11BASE}/lib/X11/config/X11.rules ${PREFIX}/lib/X11/config; \
		cd ${PREFIX}/lib/X11/config && patch ${PATCH_STRIP} < ${FILESDIR}/irix6.patch; \
d111 2
a112 2
		${INSTALL_DATA} ${X11BASE}/lib/X11/config/sgiLib.rules ${PREFIX}/lib/X11/config; \
		cd ${PREFIX}/lib/X11/config && patch ${PATCH_STRIP} < ${FILESDIR}/irix5.patch; \
@


1.69
log
@
improve support for IRIX 5 working around some bad default settings
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.68 2006/08/03 17:35:12 tv Exp $
d82 1
a82 2
.if defined(X11_TYPE) && !empty(X11_TYPE:Mxorg) || \
    defined(X11_TYPE) && !empty(X11_TYPE:MXFree86)
d88 1
a88 1
.else # X11_TYPE == XFree86 || X11_TYPE == xorg.
@


1.68
log
@xpkgwedge is an in-pkgsrc tool; it doesn't use PKGREVISION.  Make it 1.16.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.67 2006/08/02 20:26:15 heinz Exp $
d56 1
d59 1
d64 1
d111 1
@


1.67
log
@On Linux the Imake files need gmake, so we do _not_ need MAKE but
IMAKE_MAKE replaced in pkgxmkmf.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.66 2006/04/10 13:38:36 schwarz Exp $
d3 1
a3 2
DISTNAME=	xpkgwedge-1.15
PKGREVISION=	1
@


1.66
log
@
Modified xmkmf support for Darwin and IRIX:
- on Darwin, pkgsrc no longer tries to set user or group when installing
  as unprivileged user, i.e. with UNPRIVILEGED set to yes.
- on IRIX (5 and 6) the system's xmkmf config files are no longer modified.
  Instead copies (that take priority with pkgsrc's xmkmf) are used for that
  purpose.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.65 2006/03/14 01:14:32 jlam Exp $
d4 1
d73 1
a73 1
SUBST_SED.paths+=	-e 's,@@MAKE@@,${MAKE},g'
@


1.65
log
@Modify the pkginstall framework so that it manages all aspects of
INSTALL/DEINSTALL script creation within pkgsrc.

If an INSTALL or DEINSTALL script is found in the package directory,
it is automatically used as a template for the pkginstall-generated
scripts.  If instead, they should be used simply as the full scripts,
then the package Makefile should set INSTALL_SRC or DEINSTALL_SRC
explicitly, e.g.:

	INSTALL_SRC=	${PKGDIR}/INSTALL
	DEINSTALL_SRC=	# emtpy

As part of the restructuring of the pkginstall framework internals,
we now *always* generate temporary INSTALL or DEINSTALL scripts.  By
comparing these temporary scripts with minimal INSTALL/DEINSTALL
scripts formed from only the base templates, we determine whether or
not the INSTALL/DEINSTALL scripts are actually needed by the package
(see the generate-install-scripts target in bsd.pkginstall.mk).

In addition, more variables in the framework have been made private.
The *_EXTRA_TMPL variables have been renamed to *_TEMPLATE, which are
more sensible names given the very few exported variables in this
framework.  The only public variables relating to the templates are:

	INSTALL_SRC		INSTALL_TEMPLATE
	DEINSTALL_SRC		DEINSTALL_TEMPLATE
				HEADER_TEMPLATE

The packages in pkgsrc have been modified to reflect the changes in
the pkginstall framework.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.64 2006/01/12 19:02:34 joerg Exp $
d45 20
d97 15
@


1.64
log
@Add runtime dependency of xpkgwedge on imake and xmkmf.

When using non-native X11, xpkgwedge could be installed before imake
and host.def en up with just the xpkgwedge.def include. This means
that ProjectRoot as set by xorg's host.def is not used and wrong
path names are used. This run time dependency is the easiest way to
ensure proper order, but isn't perfect. Just providing a fixed host.def
and a secondary include file for Lesstif to modify breaks with
USE_XPKGWEDGE=NO, so keep the old approach.

Discussed with jlam@@
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.63 2006/01/06 16:58:32 joerg Exp $
a32 2
DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
@


1.63
log
@Use SUBST framework.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.62 2005/12/29 06:22:06 jlam Exp $
d3 1
a3 1
DISTNAME=	xpkgwedge-1.14
d22 3
@


1.62
log
@Remove USE_PKGINSTALL from pkgsrc now that mk/install/pkginstall.mk
automatically detects whether we want the pkginstall machinery to be
used by the package Makefile.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.61 2005/12/17 05:20:22 jlam Exp $
d17 1
d46 8
d56 1
a56 3

do-build:
	@@${SED} ${FILES_SUBST_SED} ${FILESDIR}/pkgxmkmf.in > ${WRKDIR}/pkgxmkmf
@


1.61
log
@Change my MAINTAINER email address to the one I've been using for
pkgsrc work.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.60 2005/12/05 20:50:51 rillig Exp $
a28 1
USE_PKGINSTALL=		YES
@


1.60
log
@Fixed pkglint warnings. The warnings are mostly quoting issues, for
example MAKE_ENV+=FOO=${BAR} is changed to MAKE_ENV+=FOO=${BAR:Q}. Some
other changes are outlined in

    http://mail-index.netbsd.org/tech-pkg/2005/12/02/0034.html
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.59 2005/09/28 20:52:25 rillig Exp $
d8 1
a8 1
MAINTAINER=	jlam@@NetBSD.org
@


1.59
log
@Replaced "# defined" with "yes" in Makefile variables like GNU_CONFIGURE,
NO_BUILD, USE_LIBTOOL.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.58 2005/06/14 20:12:51 jlam Exp $
d55 1
a55 1
SUBST_CLASSES=		fix
d60 1
a60 1
SUBST_CLASSES=		foo
@


1.58
log
@Update pkgtools/xpkgwedge to 1.14.  Changes from 1.13 include using
the make required by the imake config files, which is specified by
${IMAKE_MAKE}.  This allows differing make programs to be used for
the main build versus xmkmf.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.57 2005/06/14 07:23:56 jlam Exp $
d17 2
a18 2
NO_CONFIGURE=	# defined
NO_CHECKSUM=	# defined
@


1.57
log
@Update pkgtools/xpkgwedge to 1.13.  Changes from version 1.12 include
invoking the make(1) program as "make" instead of hardcoding the
(wrong) path in ${MAKE_PROGRAM}.  This will rely on the tools framework
to have set up "make" to properly call the correct make(1) program.
This should fix cases where pkgxmkmf called the wrong make(1) program
on Linux systems.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.56 2005/06/01 18:03:08 jlam Exp $
d3 1
a3 1
DISTNAME=	xpkgwedge-1.13
d41 2
@


1.56
log
@Massive cleanup of buildlink3.mk and builtin.mk files in pkgsrc.
Several changes are involved since they are all interrelated.  These
changes affect about 1000 files.

The first major change is rewriting bsd.builtin.mk as well as all of
the builtin.mk files to follow the new example in bsd.builtin.mk.
The loop to include all of the builtin.mk files needed by the package
is moved from bsd.builtin.mk and into bsd.buildlink3.mk.  bsd.builtin.mk
is now included by each of the individual builtin.mk files and provides
some common logic for all of the builtin.mk files.  Currently, this
includes the computation for whether the native or pkgsrc version of
the package is preferred.  This causes USE_BUILTIN.* to be correctly
set when one builtin.mk file includes another.

The second major change is teach the builtin.mk files to consider
files under ${LOCALBASE} to be from pkgsrc-controlled packages.  Most
of the builtin.mk files test for the presence of built-in software by
checking for the existence of certain files, e.g. <pthread.h>, and we
now assume that if that file is under ${LOCALBASE}, then it must be
from pkgsrc.  This modification is a nod toward LOCALBASE=/usr.  The
exceptions to this new check are the X11 distribution packages, which
are handled specially as noted below.

The third major change is providing builtin.mk and version.mk files
for each of the X11 distribution packages in pkgsrc.  The builtin.mk
file can detect whether the native X11 distribution is the same as
the one provided by pkgsrc, and the version.mk file computes the
version of the X11 distribution package, whether it's built-in or not.

The fourth major change is that the buildlink3.mk files for X11 packages
that install parts which are part of X11 distribution packages, e.g.
Xpm, Xcursor, etc., now use imake to query the X11 distribution for
whether the software is already provided by the X11 distribution.
This is more accurate than grepping for a symbol name in the imake
config files.  Using imake required sprinkling various builtin-imake.mk
helper files into pkgsrc directories.  These files are used as input
to imake since imake can't use stdin for that purpose.

The fifth major change is in how packages note that they use X11.
Instead of setting USE_X11, package Makefiles should now include
x11.buildlink3.mk instead.  This causes the X11 package buildlink3
and builtin logic to be executed at the correct place for buildlink3.mk
and builtin.mk files that previously set USE_X11, and fixes packages
that relied on buildlink3.mk files to implicitly note that X11 is
needed.  Package buildlink3.mk should also include x11.buildlink3.mk
when linking against the package libraries requires also linking
against the X11 libraries.  Where it was obvious, redundant inclusions
of x11.buildlink3.mk have been removed.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.55 2005/05/07 22:24:04 wiz Exp $
d3 1
a3 1
DISTNAME=	xpkgwedge-1.12
a40 1
FILES_SUBST+=		MAKE=${MAKE_PROGRAM:Q}
@


1.55
log
@Refer doc/pkgsrc.html instead of Packages.txt (HOMEPAGE variable).
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.54 2005/04/11 21:47:06 tv Exp $
a28 1
USE_X11=		YES
d43 2
@


1.54
log
@Remove USE_BUILDLINK3 and NO_BUILDLINK; these are no longer used.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.53 2004/08/27 06:29:10 jlam Exp $
d9 1
a9 1
HOMEPAGE=	ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/Packages.txt
@


1.53
log
@Replace RPATH_FLAG with LINKER_RPATH_FLAG and COMPILER_RPATH_FLAG,
which are the full option names used to set rpath directives for the
linker and the compiler, respectively.  In places were we are invoking
the linker, use "${LINKER_RPATH_FLAG} <path>", where the space is
inserted in case the flag is a word, e.g. -rpath.  The default values
of *_RPATH_FLAG are set by the compiler/*.mk files, depending on the
compiler that you use.  They may be overridden on a ${OPSYS}-specific
basis by setting _OPSYS_LINKER_RPATH_FLAG and _OPSYS_COMPILER_RPATH_FLAG,
respectively.  Garbage-collect _OPSYS_RPATH_NAME and _COMPILER_LD_FLAG.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.52 2004/07/31 01:42:06 xtraeme Exp $
a17 1
NO_BUILDLINK=	# defined
@


1.52
log
@I don't know why, but using XFree86 or xorg from pkgsrc, doesn't get
the correct link flags, anyway adding ExtraLoadFlags seems to fix this.

Bump version to 1.12 (XFree86/xorg fix).
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.51 2004/06/15 02:27:10 minskim Exp $
d53 1
a53 2
X11TYPEFLAGS?=		-L${X11BASE}/lib \
	${_COMPILER_LD_FLAG}${RPATH_FLAG}${X11BASE}/lib
@


1.51
log
@Let xpkgwedge to create a symlink ${PREFIX}/bin/mkfontscale, which is
required to install fonts/jmk-fonts and fonts/sgi-fonts with recent X.
Suggested by Kibum Han.

Also add mkfontscale to CONFLICTS because mkfontscale installs
bin/mkfontscale.

Bump PKGVERSION to 1.11.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.50 2004/04/30 19:44:21 tv Exp $
d3 1
a3 1
DISTNAME=	xpkgwedge-1.11
d45 3
d51 15
d68 1
a68 1
	${INSTALL_DATA} ${FILESDIR}/xpkgwedge.def ${PREFIX}/lib/X11/config
@


1.50
log
@1.10: Add a chunk of shlib override make-code to make this work on Interix,
and patch site.def (but differently from how it is patched on OpenWindows).
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.49 2004/02/02 10:08:43 jlam Exp $
d3 1
a3 1
DISTNAME=	xpkgwedge-1.10
d26 4
d39 1
a39 1
FONT_PROGS=		bdftopcf fstobdf mkfontdir
@


1.49
log
@These packages don't use any compilers, so set USE_LANGUAGES to an empty
value.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.48 2004/01/20 12:23:58 agc Exp $
d3 1
a3 1
DISTNAME=	xpkgwedge-1.9
@


1.48
log
@Move WRKSRC definition away from the first paragraph in a Makefile.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.47 2004/01/04 04:51:47 reed Exp $
d16 1
@


1.47
log
@Make sure LOCALBASE and X11BASE are defined before comparing them.
(Thank you, Takahiro.)
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.46 2004/01/03 23:51:08 reed Exp $
a3 1
WRKSRC=		${WRKDIR}
d14 1
@


1.46
log
@xpkgwedge is not needed when X11BASE is LOCALBASE,
so use PKG_SKIP_REASON. (Okay'd by jlam@@).

(Next I need to make sure that MesaLib and Xrender are not installed
when using wip/XFree86-libs.)
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.45 2004/01/03 23:34:21 jlam Exp $
d20 1
@


1.45
log
@Update pkgtools/xpkgwedge to 1.9.  Changes from version 1.8 are making
this package work in a pkgviews world by looking for imake config files
in ${PREFIX}/lib/X11/config, then ${VIEWBASE}/lib/X11/config, then
${X11BASE}/lib/X11/config.  The second directory is where some packages
may share a commonly-editted host.def file.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.44 2003/11/23 08:35:05 jlam Exp $
d20 4
@


1.44
log
@We're not ready for pkgviews yet!
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.43 2003/11/23 06:46:54 jlam Exp $
d3 1
a3 1
DISTNAME=	xpkgwedge-1.8
d13 2
d31 1
@


1.43
log
@Update the host.def file during view (de)installation.  Also deal with
the font program symlinks at both view-deinstall and normal deinstallation
time since the files aren't listed in the PLIST (the font programs are
handled completely by the INSTALL/DEINSTALL scripts).
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.42 2003/10/18 10:12:09 grant Exp $
a11 2

PKG_INSTALLATION_TYPES=	overwrite pkgviews
@


1.42
log
@s,/usr/X11R6/,$${X11BASE}, in COMMENT.

yes, this deliberately does not expand ${X11BASE}, as that would
lead to the same confusion (X11R6 vs. openwin, etc.) when we use
this pkg's COMMENT on the web site/search.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.41 2003/09/10 17:31:43 gavan Exp $
d13 2
d24 1
@


1.41
log
@Add handling for OpenWin on Solaris. Two files are patched with
sed at install time which override the versions in the /usr/openwin
tree.

PREFIX no longer has a default value, as this relied on nonportable
BSD make syntax. Makefiles generated with pkgxmkmf will now always
need PREFIX set in the environment.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.40 2003/08/30 22:51:29 jlam Exp $
d11 1
a11 1
COMMENT=	Allows X11 pkgs to be built and used outside of /usr/X11R6
@


1.40
log
@Add definitions for DEINSTALL_EXTRA_TMPL and INSTALL_EXTRA_TMPL if
USE_PKGINSTALL is "YES".  bsd.pkg.install.mk will no longer automatically
pick up a INSTALL/DEINSTALL script in the package directory and assume that
you want it for the corresponding *_EXTRA_TMPL variable.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.39 2003/08/30 11:08:23 jlam Exp $
d3 1
a3 1
DISTNAME=	xpkgwedge-1.7
a11 2

NOT_FOR_PLATFORM=	SunOS-*-*
@


1.39
log
@Modernize this package a bit:

* Use bsd.pkg.install.mk instead of supplying custom INSTALL/DEINSTALL
  scripts.

* Note that this package doesn't really use buildlink.

* Remove ancient BUILDLINK_DEPENDS= line at the bottom of the file that
  we no longer need since the buildlink1 days of yore.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.38 2003/07/21 17:14:11 martti Exp $
d20 4
a23 2
USE_PKGINSTALL=	YES
USE_X11=	YES
@


1.38
log
@COMMENT should start with a capital letter.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.37 2003/07/17 22:52:20 grant Exp $
d17 1
d20 2
a21 4
USE_BUILDLINK2=	# defined

DEINSTALL_FILE=	${WRKDIR}/DEINSTALL
INSTALL_FILE=	${WRKDIR}/INSTALL
d28 2
a29 21
FILES_SUBST=		FONT_PROGS=${FONT_PROGS:Q}
FILES_SUBST+=		X11BASE=${X11BASE}
FILES_SUBST+=		PREFIX=${PREFIX}
FILES_SUBST+=		CMP=${CMP:Q}
FILES_SUBST+=		CP=${CP:Q}
FILES_SUBST+=		ECHO=${ECHO:Q}
FILES_SUBST+=		GREP=${GREP:Q}
FILES_SUBST+=		LN=${LN:Q}
FILES_SUBST+=		MAKE=${MAKE:Q}
FILES_SUBST+=		RM=${RM:Q}
FILES_SUBST+=		RMDIR=${RMDIR:Q}
FILES_SUBST+=		TRUE=${TRUE:Q}
FILES_SUBST_SED=	${FILES_SUBST:S/=/@@!/:S/$/!g/:S/^/ -e s!@@/}

pre-extract:
	@@if [ ! -f ${X11BASE}/include/X11/X.h ]; then \
		${ECHO} 'xpkgwedge requires $$X11BASE to point to the real X distribution.'; \
		${ECHO} 'If you are setting this variable in mk.conf, fix or remove the setting'; \
		${ECHO} 'and then install xpkgwedge.'; \
		${FALSE}; \
	fi
d32 1
a32 5
	${SED} ${FILES_SUBST_SED} ${FILESDIR}/pkgxmkmf.in > ${WRKDIR}/pkgxmkmf

pre-install:
	${SED} ${FILES_SUBST_SED} ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
	${SED} ${FILES_SUBST_SED} ${PKGDIR}/INSTALL > ${INSTALL_FILE}
a38 3
post-install:
	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL

a39 4

# Clear the build dependencies list so that xpkgwedge will not be recursively
# dependent on itself.
BUILD_DEPENDS=
@


1.37
log
@s/netbsd.org/NetBSD.org/
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.36 2003/06/12 15:34:38 jschauma Exp $
d11 1
a11 1
COMMENT=	allows X11 pkgs to be built and used outside of /usr/X11R6
@


1.36
log
@Use ${MAKE}, too.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.35 2003/03/29 12:42:13 jmmv Exp $
d9 2
a10 2
MAINTAINER=	jlam@@netbsd.org
HOMEPAGE=	ftp://ftp.netbsd.org/pub/NetBSD/packages/pkgsrc/Packages.txt
@


1.35
log
@Place WRKSRC where it belongs, to make pkglint happy; ok'ed by wiz.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.34 2002/08/23 05:23:00 jlam Exp $
d37 1
@


1.34
log
@Merge pkgsrc/pkgtools from the buildlink2 branch back to the main trunk.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.31.2.3 2002/06/23 18:57:51 jlam Exp $
d4 1
a16 1
WRKSRC=		${WRKDIR}
@


1.33
log
@Merge pkgtools/xpkgwedge from the buildlink2 branch back into the main
trunk.
@
text
@d1 1
a1 1
# $NetBSD$
@


1.32
log
@This package doesn't work under Solaris because the include OpenWindows
is based on a very old X11 release.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.31 2002/02/26 21:49:06 jlam Exp $
d18 2
@


1.31
log
@Symlink/remove bdftopcf, fstobdf, and mkfontdir in the INSTALL/DEINSTALL
scripts so that they are properly added and removed if xpkgwedge is
installed as a binary package.  Also, add some protection against the case
where ${X11BASE} == ${PREFIX} by checking this isn't true before removing
these font-manipulation programs.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.30 2001/10/14 16:42:58 tron Exp $
d11 2
@


1.31.2.1
log
@First pass at conversion of various packages to use the buildlink2
framework.  Add many buildlink2.mk files to add to the framework.  Please
see buildlink2.txt for more details.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.31 2002/02/26 21:49:06 jlam Exp $
a15 2

USE_BUILDLINK2_ONLY=	# defined
@


1.31.2.2
log
@Rename USE_BUILDLINK2_ONLY to USE_BUILDLINK2 for less verbosity.  Also
convert a few more packages to use the buildlink2 framework.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.31.2.1 2002/05/11 02:09:21 jlam Exp $
d17 1
a17 1
USE_BUILDLINK2=	# defined
@


1.31.2.3
log
@Merge from pkgsrc-current to buildlink2 branch.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.31.2.2 2002/06/21 23:05:36 jlam Exp $
a10 2

NOT_FOR_PLATFORM=	SunOS-*-*
@


1.30
log
@Create links for X11 font tools so that packages building own fonts e.g.
the "xjewel" will build again. Bump version number to 1.7.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.29 2001/09/09 20:36:43 agc Exp $
d20 7
a26 1
FILES_SUBST=		X11BASE=${X11BASE}
d30 1
d32 1
a56 3
	for FILE in bdftopcf fstobdf mkfontdir; do \
	  ${LN} -fs ${X11BASE}/bin/$$FILE ${PREFIX}/bin; \
	done
@


1.29
log
@Deprecate NO_WRKSUBDIR, replacing it with an explicit assignment of:

WRKSRC= ${WRKDIR}

This is much cleaner, much more indicative of what happens, and removes
another of the negative definitions (NO_.* = value).
@
text
@d1 1
a1 2
# $NetBSD: Makefile,v 1.28 2001/07/13 07:09:22 jlam Exp $
#
d3 1
a3 1
DISTNAME=	xpkgwedge-1.6
d49 3
@


1.28
log
@In package Makefiles, create FILES_SUBST instead of duplicating sed
expression for substituting in DEINSTALL/INSTALL scripts.  Use "${CMP} -s"
instead of "diff -q" since the former is more portable across OSes.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.27 2001/07/10 00:58:32 hubertf Exp $
d15 1
a15 1
NO_WRKSUBDIR=	# defined
@


1.27
log
@bump version to 1.6 - work with host.def not existing on Solaris 8/x86
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.26 2001/07/02 21:03:02 jlam Exp $
a20 9
.include "../../mk/bsd.prefs.mk"

.if (${OPSYS} == SunOS)
DEPENDS+=	diffutils>=2.7:../../devel/diffutils
DIFF=		${LOCALBASE}/bin/gdiff
.else
DIFF=		/usr/bin/diff
.endif

d23 1
a24 1
FILES_SUBST+=		DIFF=${DIFF:Q}
@


1.26
log
@Update xpkgwedge to 1.5.  This version factored out the buildlink logic
into a separate package (buildlink-x11) usable even without xpkgwedge
installed.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.25 2001/07/01 21:13:21 jlam Exp $
d4 1
a4 1
DISTNAME=	xpkgwedge-1.5
@


1.25
log
@Make sure the -DBuildLink gets passed through to subdir Imakefiles if
BuildLink is defined.  Bump xpkgwedge version number to 1.4 and increase
xpkgwedge dependency version in bsd.pkg.mk.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.24 2001/06/29 18:27:30 jlam Exp $
d4 1
a4 1
DISTNAME=	xpkgwedge-1.4
@


1.24
log
@Update xpkgwedge to 1.3.  Changes from version 1.2 are adding a section
triggered by the definition of "BuildLink" that forces ${BUILDLINK_DIR}
to be searched ahead of ${LOCALBASE} and ${X11BASE} for headers and
libraries.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.23 2001/06/18 05:17:14 jlam Exp $
d4 1
a4 1
DISTNAME=	xpkgwedge-1.3
@


1.23
log
@Use FILES_SUBST instead of repeating substitution pattern for all the
files, and substitute for a few more utilities instead of using unqualified
names for programs.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.22 2001/06/16 08:53:48 veego Exp $
d4 1
a4 1
DISTNAME=	xpkgwedge-1.2
@


1.22
log
@Add a local modified copy of InstallAppDefaultsLong:
 This is the same as the one in X11.tmpl, but without the LinkConfDirectory.
 LinkConfDirectory removes the app-defaults directory in $(PREFIX)/lib/X11
 and creates a link to the real X11 app-defaults directory and moves the old
 app-defaults files into it. This is not what we want for pkgsrc.

This is for the people who use the real XFree86 version and not the one from
xsrc/xfree which has a NetBSD specific hack which breaks sharing /usr/X11R6.

Bump to version 1.2.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.21 2001/05/31 10:25:21 dent Exp $
d30 10
d49 5
a53 8
	${SED}  -e "s,@@X11BASE@@,${X11BASE},g" \
		-e "s,@@PREFIX@@,${PREFIX},g" \
		< ${FILESDIR}/pkgxmkmf.in > ${WRKDIR}/pkgxmkmf
	${SED}	-e "s,@@X11BASE@@,${X11BASE},g" \
		-e "s,@@DIFF@@,${DIFF},g" \
		< ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
	${SED}	-e "s,@@X11BASE@@,${X11BASE},g" \
		< ${PKGDIR}/INSTALL > ${INSTALL_FILE}
@


1.21
log
@Fix dead HOMEPAGE.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.20 2001/02/17 17:51:35 wiz Exp $
d4 1
a4 1
DISTNAME=	xpkgwedge-1.1
@


1.20
log
@Update to new COMMENT style: COMMENT var in Makefile instead of pkg/COMMENT.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.19 2001/01/29 11:34:39 wiz Exp $
d10 1
a10 1
HOMEPAGE=	http://www.netbsd.org/Documentation/netbsd/Packages.txt
@


1.19
log
@Add automatic ${VARIABLE} handling for MESSAGE files.
Convert most MESSAGE files to new syntax (${VARIABLE} gets replaced,
not @@VARIABLE@@, nor @@@@VARIABLE@@@@).
By default, substitutions are done for LOCALBASE, PKGNAME, PREFIX,
X11BASE, X11PREFIX; additional patterns can be added via MESSAGE_SUBST.
Clean up some packages while I'm there; add RCS tags to most MESSAGEs.
Remove some uninteresting MESSAGEs.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.18 2001/01/18 17:05:50 jlam Exp $
d11 1
@


1.18
log
@Pull in a minor change to xmkmf from XFree86-4.0.2: xmkmf now supports
adding preprocessor definitions on the command line with -DVAR=var.
Update package version to 1.1.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.17 2001/01/13 16:23:04 tron Exp $
a18 1
MESSAGE_FILE=	${WRKDIR}/MESSAGE
a45 2
	${SED}	-e "s,@@PREFIX@@,${PREFIX},g" \
		< ${PKGDIR}/MESSAGE.pre > ${MESSAGE_FILE}
@


1.17
log
@Fix typo in last commit.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.16 2001/01/13 16:21:20 tron Exp $
d4 1
a4 1
DISTNAME=	xpkgwedge-1.0
@


1.16
log
@Use "gdiff" from "diffutils" package under Solaris.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.15 2000/10/23 17:32:07 jlam Exp $
d24 2
a25 2
DEPENDS+=	diffutils>=2.7:../../textproc/diffutils
DIFF=		${LOCALBASE}/bin/giff
@


1.15
log
@Update xpkgwedge to 1.0 and make appropriate changes to bsd.pkg.mk to handle
the new version of xpkgwedge.  Changes from xpkgwedge 0.4:

	* Redefine ImakeCmd to "imake -I$(PREFIX)/lib/X11/config" to
	  pick up X11 config files in $(PREFIX)/lib/X11/config before the
	  ones in the standard X11 tree.

	* Install a program called "pkgxmkmf" that's actually xmkmf, but
	  checks in $(PREFIX)/lib/X11/config before the standard X11 config
	  directory.

	* Create the host.def file in $(PREFIX)/lib/X11/config instead of
	  always in ${X11BASE}/lib/X11/config.

The benefits of this are:

	1) xpkgwedge can now install into $(PREFIX) instead of always into
	   $(X11BASE).

	2) Keeps the X11 tree "pure", and doesn't affect people who want
	   to run xmkmf and not include all the xpkgwedge stuff, even if
	   it's installed.

	3) Packages that install config files (lesstif, xview-config) can
	   now do so in $(PREFIX).

	4) People only have to use 'pkgxmkmf' instead of 'xmkmf', and
	   (hopefully) no other changes, if they want to use the config
	   files in xpkgwedge'd packages.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.14 2000/07/14 04:22:41 jlam Exp $
d21 9
a41 2

post-build:
d43 1
@


1.14
log
@Add NO_MTREE so installation doesn't pollute X11BASE with a lot of
unnecessary, empty directories.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.13 2000/06/28 15:02:32 agc Exp $
d4 1
a4 1
DISTNAME=	xpkgwedge-0.4
d6 2
a7 1
DISTFILES=	# none
d9 2
a10 1
MAINTAINER=	tv@@netbsd.org
d12 4
a15 5
NO_CHECKSUM=	yes
NO_BUILD=	yes
NO_MTREE=	yes
NO_WRKSUBDIR=	yes
USE_IMAKE=	yes
d17 2
d29 17
a45 2
pre-configure:
	@@${CP} ${FILESDIR}/Imakefile ${FILESDIR}/xpkgwedge.def ${WRKSRC}
d47 2
a48 3
pre-install:
	@@${SED} -e 's|@@@@PREFIX@@@@|${LOCALBASE}|g' < ${PKGDIR}/MESSAGE.pre \
		> ${MESSAGE_FILE}
a50 4

# In order to force xpkgwedge to install into X11BASE, we forcibly override
# the PREFIX definition.  _NO_ other pkg should do this.
PREFIX=${X11BASE}
@


1.13
log
@Remove the user setting of the USE_LOCALBASE_FOR_X11 definition.
(Users can still set it if they want, but it won't make much
difference).

In bsd.pkg.mk, check for the presence of the xpkgwedge package to
determine whether to use LOCALBASE for X11 programs.  Set
_USE_LOCALBASE_FOR_X11 (an internal definition) if xpkgwedge is
installed. Remove BUILD_DEPENDS on xpkgwedge (it would always have
been true anyway).

Add a new X11PREFIX definition, which reflects the PREFIX for X11
packages, and set it to LOCALBASE or X11BASE accordingly.

Remove all references to USE_LOCALBASE_FOR_X11 from the xpkgwedge
package.

In all, make the installation of xpkgwedge a tad less clumsy.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.12 1998/09/27 18:38:30 tron Exp $
d12 1
@


1.12
log
@Add "pkgtools" to "${CATEGORIES}".
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.11 1998/09/17 15:47:09 agc Exp $
d35 1
a35 1
# any user setting of USE_LOCALBASE_FOR_X11.  _NO_ other pkg should do this.
@


1.11
log
@Make the REQ and MESSAGE files specifiable from package Makefiles,
as REQ_FILE and MESSAGE_FILE respectively.
Modify xpkgwedge to create its MESSAGE_FILE in the WRKDIR.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.10 1998/08/23 21:25:19 frueauf Exp $
d5 1
a5 1
CATEGORIES=	devel x11
@


1.10
log
@Setting NO_CHECKSUM=yes is enough.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.9 1998/08/23 21:18:24 frueauf Exp $
d15 2
d30 1
a30 4
		> ${PKGDIR}/MESSAGE

pre-clean:
	@@${RM} -f ${PKGDIR}/MESSAGE
@


1.9
log
@As there is nothing to extract, set EXTRACT_ONLY=#empty and remove
unnecessery md5 file.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.8 1998/08/11 19:29:26 tv Exp $
d10 1
a10 1
EXTRACT_ONLY=	# empty
@


1.8
log
@Set ${PREFIX} after inclusion of bsd.pkg.mk; don't depend on bsd.pkg.mk to
conditionally set PREFIX.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.7 1998/08/09 23:16:18 tron Exp $
d10 1
@


1.7
log
@"make clean" shouldn't fail if nothing was built so far.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.6 1998/07/31 19:30:49 tv Exp $
a13 4
# In order to force xpkgwedge to install into X11BASE, we forcibly set PREFIX
# here.  No other pkg should do this.
PREFIX=${X11BASE}

d33 4
@


1.6
log
@Make xpkgwedge capable of building a "binary pkg", for uniformity.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.5 1998/07/31 15:00:41 tv Exp $
d34 1
a34 1
	@@${RM} ${PKGDIR}/MESSAGE
@


1.5
log
@Update to "0.4": new layout to coincide with USE_LOCALBASE_FOR_X11
changes.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.4 1998/07/14 10:56:16 frueauf Exp $
a8 2

RESTRICTED=	optional package affecting many pkg builds
@


1.4
log
@cat ${PKGDIR}/MESSAGE in bsd.pkg.mk if it exists, don't do it in every
package Makefile.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.3 1998/07/01 15:56:35 tv Exp $
d4 1
a4 1
DISTNAME=	xpkgwedge-0.2
d16 4
d21 3
a23 4
	@@if [ x${LOCALBASE} = x${X11BASE} ]; then \
		${ECHO} '$$LOCALBASE == $$X11BASE; this patch cannot be applied.'; \
		${ECHO} 'During install, xpkgwedge requires $$X11BASE to point to the real X distribution.'; \
		${ECHO} 'If you are setting this variable in mk.conf, remove the setting temporarily'; \
d39 4
@


1.3
log
@Update to "0.2": define ConfigDir in terms of $(X11_ROOT), so that imake
can be used recursively ("make Makefiles").
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.2 1998/06/26 16:41:11 tv Exp $
d28 6
a33 2
post-install:
	@@${SED} -e s,@@@@PREFIX@@@@,${LOCALBASE}, ${PKGDIR}/MESSAGE
@


1.2
log
@No need for both IS_INTERACTIVE and RESTRICTED; just put in RESTRICTED
with a suitable message.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.1 1998/06/26 16:39:23 tv Exp $
d4 1
a4 1
DISTNAME=	xpkgwedge-0.1
@


1.1
log
@Add xpkgwedge, an experimental patch that enables the build of X11 pkgs
(even imake ones) that will install in /usr/pkg instead of /usr/X11R6.
This is NOT (yet?) the standard X11 pkg build procedure, but it does
provide a "way out" for users that do not want to pollute their /usr/X11R6
tree with pkgs.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.15 1998/04/24 09:20:39 agc Exp $
d10 1
a10 2
RESTRICTED=	optional	# NOT for distro as a "binary" pkg
IS_INTERACTIVE=	yes		# should not be built when batch
@