head 1.5; access; symbols pkgsrc-2013Q2:1.5.0.6 pkgsrc-2013Q2-base:1.5 pkgsrc-2012Q4:1.5.0.4 pkgsrc-2012Q4-base:1.5 pkgsrc-2011Q4:1.5.0.2 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q3:1.4.0.28 pkgsrc-2011Q3-base:1.4 pkgsrc-2011Q2:1.4.0.26 pkgsrc-2011Q2-base:1.4 pkgsrc-2011Q1:1.4.0.24 pkgsrc-2011Q1-base:1.4 pkgsrc-2010Q4:1.4.0.22 pkgsrc-2010Q4-base:1.4 pkgsrc-2010Q3:1.4.0.20 pkgsrc-2010Q3-base:1.4 pkgsrc-2010Q2:1.4.0.18 pkgsrc-2010Q2-base:1.4 pkgsrc-2010Q1:1.4.0.16 pkgsrc-2010Q1-base:1.4 pkgsrc-2009Q4:1.4.0.14 pkgsrc-2009Q4-base:1.4 pkgsrc-2009Q3:1.4.0.12 pkgsrc-2009Q3-base:1.4 pkgsrc-2009Q2:1.4.0.10 pkgsrc-2009Q2-base:1.4 pkgsrc-2009Q1:1.4.0.8 pkgsrc-2009Q1-base:1.4 pkgsrc-2008Q4:1.4.0.6 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.4 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.2 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.3.0.24 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.22 pkgsrc-2008Q1:1.3.0.20 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.18 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.16 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.14 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.12 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.10 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.8 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.6 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.4 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.2 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.2.0.24 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.22 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.20 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.18 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.16 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.14 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.12 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.10 pkgsrc-2003Q4-base:1.2 netbsd-1-6-1:1.2.0.6 netbsd-1-6-1-base:1.2 netbsd-1-6:1.2.0.8 netbsd-1-6-RELEASE-base:1.2 pkgviews:1.2.0.4 pkgviews-base:1.2 buildlink2:1.2.0.2 buildlink2-base:1.2 netbsd-1-5-PATCH003:1.2 netbsd-1-5-PATCH001:1.1; locks; strict; comment @# @; 1.5 date 2011.11.27.14.17.41; author drochner; state dead; branches; next 1.4; 1.4 date 2008.07.14.23.01.32; author christos; state Exp; branches; next 1.3; 1.3 date 2005.12.12.19.55.41; author joerg; state Exp; branches; next 1.2; 1.2 date 2001.09.08.20.03.44; author jlam; state Exp; branches; next 1.1; 1.1 date 2001.04.05.14.06.57; author wiz; state Exp; branches; next ; desc @@ 1.5 log @update to 2.3.3 changes: bugfixes @ text @$NetBSD: patch-af,v 1.4 2008/07/14 23:01:32 christos Exp $ --- lib/Mrm/Makefile.in.orig 2008-05-04 00:30:45.000000000 -0400 +++ lib/Mrm/Makefile.in 2008-06-28 16:38:02.000000000 -0400 @@@@ -131,7 +131,7 @@@@ INSTALL_PROGRAM = @@INSTALL_PROGRAM@@ INSTALL_SCRIPT = @@INSTALL_SCRIPT@@ INSTALL_STRIP_PROGRAM = @@INSTALL_STRIP_PROGRAM@@ -LDFLAGS = -version-info @@CURRENT@@:@@REVISION@@:@@AGE@@ +LDFLAGS = @@LDFLAGS@@ LEX = @@LEX@@ LEXLIB = @@LEXLIB@@ LEX_OUTPUT_ROOT = @@LEX_OUTPUT_ROOT@@ @@@@ -234,6 +234,7 @@@@ EXTRA_DIST = Mrm.msg Imakefile INCLUDES = -I$(srcdir)/.. -I.. -I../Xm ${X_CFLAGS} mrmdir = $(includedir)/Mrm +libMrm_la_LDFLAGS = -version-info @@CURRENT@@:@@REVISION@@:@@AGE@@ libMrm_la_LIBADD = ../Xm/libXm.la ${X_LIBS} -lXt ${X_PRE_LIBS} -lX11 ${X_EXTRA_LIBS} lib_LTLIBRARIES = libMrm.la noinst_HEADERS = IDB.h \ @ 1.4 log @update to openmotif 2.3.1 @ text @d1 1 a1 1 $NetBSD: patch-af,v 1.3 2005/12/12 19:55:41 joerg Exp $ @ 1.3 log @Update OpenMotif to 2.2.3. Too many changes to list here, but most importantly no more imake usage. @ text @d1 1 a1 1 $NetBSD$ d3 6 a8 6 --- lib/Mrm/Makefile.in.orig 2005-11-25 10:46:23.000000000 +0100 +++ lib/Mrm/Makefile.in @@@@ -101,7 +101,7 @@@@ mrmdir = $(includedir)/Mrm libMrm_la_LIBADD = ../Xm/libXm.la ${X_LIBS} -lXt ${X_PRE_LIBS} -lX11 ${X_EXTRA_LIBS} d11 9 a19 1 d21 1 a21 10 @@@@ -131,7 +131,7 @@@@ X_CFLAGS = @@X_CFLAGS@@ X_LIBS = @@X_LIBS@@ X_EXTRA_LIBS = @@X_EXTRA_LIBS@@ X_PRE_LIBS = @@X_PRE_LIBS@@ -libMrm_la_LDFLAGS = +libMrm_la_LDFLAGS = -version-info @@CURRENT@@:@@REVISION@@:@@AGE@@ libMrm_la_DEPENDENCIES = ../Xm/libXm.la libMrm_la_OBJECTS = MrmIbuffer.lo MrmIentry.lo MrmIfile.lo \ MrmIheader.lo MrmIindex.lo MrmIindexw.lo MrmIrid.lo MrmIswap.lo \ @ 1.2 log @Fix OpenMotif package to not overwrite X11R6 files when installed without xpkgwedge. Also, OpenMotif can actually be installed into ${LOCALBASE} if xpkgwedge is installed. Use x11.buildlink.mk and mark as USE_BUILDLINK_ONLY, and add a buildlink.mk file for use by other package Makefiles. @ text @d3 3 a5 4 --- config/cf/bsdLib.tmpl.orig Sat Sep 8 03:07:54 2001 +++ config/cf/bsdLib.tmpl @@@@ -59,18 +59,18 @@@@ #endif d7 1 a7 25 #define SharedX11Reqs SharedThreadReqs -#define SharedOldXReqs $(LDPRELIB) $(XLIBONLY) -#define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) SharedThreadReqs -#define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB) -#define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB) -#define SharedXextReqs $(LDPRELIB) $(XLIBONLY) -#define SharedXiReqs $(LDPRELIB) $(XLIB) -#define SharedPexReqs $(LDPRELIB) $(XLIBONLY) MathLibrary -#define SharedXtstReqs $(LDPRELIB) $(XLIB) -#define SharedXieReqs $(LDPRELIB) $(XLIBONLY) -#define SharedSMReqs $(LDPRELIB) $(ICELIB) -#define SharedFrescoReqs $(LDPRELIB) $(XLIBONLY) FrescoSysLibs -#define SharedXtfReqs $(LDPRELIB) $(FRESCOLIB) $(XTOOLLIB) $(XLIB) FrescoSysLibs +#define SharedOldXReqs $(LDPRELIBS) $(XLIBONLY) +#define SharedXtReqs $(LDPRELIBS) $(XLIBONLY) $(SMLIB) $(ICELIB) SharedThreadReqs +#define SharedXawReqs $(LDPRELIBS) $(XMULIB) $(XTOOLLIB) $(XLIB) +#define SharedXmuReqs $(LDPRELIBS) $(XTOOLLIB) $(XLIB) +#define SharedXextReqs $(LDPRELIBS) $(XLIBONLY) +#define SharedXiReqs $(LDPRELIBS) $(XLIB) +#define SharedPexReqs $(LDPRELIBS) $(XLIBONLY) MathLibrary +#define SharedXtstReqs $(LDPRELIBS) $(XLIB) +#define SharedXieReqs $(LDPRELIBS) $(XLIBONLY) +#define SharedSMReqs $(LDPRELIBS) $(ICELIB) +#define SharedFrescoReqs $(LDPRELIBS) $(XLIBONLY) FrescoSysLibs +#define SharedXtfReqs $(LDPRELIBS) $(FRESCOLIB) $(XTOOLLIB) $(XLIB) FrescoSysLibs d9 14 a22 2 #define SharedXReqs $(XTOOLLIB) $(XPLIB) $(XLIB) #define SharedXmReqs $(LDPRELIBS) SharedXReqs @ 1.1 log @Standardize patch file names. @ text @d1 1 a1 1 $NetBSD: patch-config-imake-Imakefile,v 1.1.1.1 2000/10/29 16:17:13 mjl Exp $ d3 4 a6 5 --- config/imake/Imakefile.orig Sun Oct 29 15:29:28 2000 +++ config/imake/Imakefile Sun Oct 29 15:31:43 2000 @@@@ -5,6 +5,21 @@@@ XCOMM XCOMM $XFree86: xc/config/imake/Imakefile,v 3.6.2.1 1997/06/11 12:08:33 dawes Exp $ d8 28 a35 18 +XCOMM +XCOMM +XCOMM + +#ifdef NetBSDArchitecture +#undef InstallProgram +#define InstallProgram(file,dest) /* as nothing */ +#undef InstallNamedProg +#define InstallNamedProg(srcname,dstname,dest) /* as nothing */ +#undef InstallManPage +#define InstallManPage(file,dest) /* as nothing */ +#undef InstallManPageLong +#define InstallManPageLong(srcname,dest,dstname) /* as nothing */ +#endif + XCOMM Some compilers generate fatal errors if an -L directory does XCOMM not exist. Since BUILDLIBDIR may not exist yet suppress its use. LDPRELIB = @