head	1.5;
access;
symbols
	pkgsrc-2013Q2:1.5.0.54
	pkgsrc-2013Q2-base:1.5
	pkgsrc-2012Q4:1.5.0.52
	pkgsrc-2012Q4-base:1.5
	pkgsrc-2011Q4:1.5.0.50
	pkgsrc-2011Q4-base:1.5
	pkgsrc-2011Q2:1.5.0.48
	pkgsrc-2011Q2-base:1.5
	pkgsrc-2009Q4:1.5.0.46
	pkgsrc-2009Q4-base:1.5
	pkgsrc-2008Q4:1.5.0.44
	pkgsrc-2008Q4-base:1.5
	pkgsrc-2008Q3:1.5.0.42
	pkgsrc-2008Q3-base:1.5
	cube-native-xorg:1.5.0.40
	cube-native-xorg-base:1.5
	pkgsrc-2008Q2:1.5.0.38
	pkgsrc-2008Q2-base:1.5
	pkgsrc-2008Q1:1.5.0.36
	pkgsrc-2008Q1-base:1.5
	pkgsrc-2007Q4:1.5.0.34
	pkgsrc-2007Q4-base:1.5
	pkgsrc-2007Q3:1.5.0.32
	pkgsrc-2007Q3-base:1.5
	pkgsrc-2007Q2:1.5.0.30
	pkgsrc-2007Q2-base:1.5
	pkgsrc-2007Q1:1.5.0.28
	pkgsrc-2007Q1-base:1.5
	pkgsrc-2006Q4:1.5.0.26
	pkgsrc-2006Q4-base:1.5
	pkgsrc-2006Q3:1.5.0.24
	pkgsrc-2006Q3-base:1.5
	pkgsrc-2006Q2:1.5.0.22
	pkgsrc-2006Q2-base:1.5
	pkgsrc-2006Q1:1.5.0.20
	pkgsrc-2006Q1-base:1.5
	pkgsrc-2005Q4:1.5.0.18
	pkgsrc-2005Q4-base:1.5
	pkgsrc-2005Q3:1.5.0.16
	pkgsrc-2005Q3-base:1.5
	pkgsrc-2005Q2:1.5.0.14
	pkgsrc-2005Q2-base:1.5
	pkgsrc-2005Q1:1.5.0.12
	pkgsrc-2005Q1-base:1.5
	pkgsrc-2004Q4:1.5.0.10
	pkgsrc-2004Q4-base:1.5
	pkgsrc-2004Q3:1.5.0.8
	pkgsrc-2004Q3-base:1.5
	pkgsrc-2004Q2:1.5.0.6
	pkgsrc-2004Q2-base:1.5
	pkgsrc-2004Q1:1.5.0.4
	pkgsrc-2004Q1-base:1.5
	pkgsrc-2003Q4:1.5.0.2
	pkgsrc-2003Q4-base:1.5
	buildlink2-base:1.5
	netbsd-1-5-RELEASE:1.4
	netbsd-1-4-PATCH003:1.4
	netbsd-1-4-PATCH002:1.4
	comdex-fall-1999:1.3
	netbsd-1-4-PATCH001:1.3
	netbsd-1-4-RELEASE:1.3
	netbsd-1-3-PATCH003:1.3
	netbsd-1-3-PATCH002:1.2;
locks; strict;
comment	@# @;


1.5
date	2000.12.12.02.11.07;	author wiz;	state dead;
branches;
next	1.4;

1.4
date	2000.01.11.01.08.24;	author simonb;	state Exp;
branches;
next	1.3;

1.3
date	98.08.07.11.18.05;	author agc;	state Exp;
branches;
next	1.2;

1.2
date	98.03.24.23.32.15;	author tron;	state Exp;
branches;
next	1.1;

1.1
date	98.03.10.23.24.52;	author tron;	state Exp;
branches;
next	;


desc
@@


1.5
log
@Added wm category to main Makefile; remove packages that have been moved
from x11 to wm; fix paths in packages that depend on the moved ones.
@
text
@$NetBSD: patch-af,v 1.4 2000/01/11 01:08:24 simonb Exp $

--- configure.orig	Wed Dec 11 03:55:16 1996
+++ configure	Tue Jan 11 10:23:21 2000
@@@@ -2126,7 +2126,7 @@@@
 fvwm_icons="$x_includes/X11/bitmaps:$x_includes/X11/pixmaps:$prefix/icons"
 
 if test "x$x_libraries" != x ; then
-  x_libraries="-L$x_libraries"
+  x_libraries="-L$x_libraries -Wl,-R$x_libraries"
 fi
 if test "x$x_includes" != x ; then
   x_includes="-I$x_includes"
@@@@ -2247,7 +2247,6 @@@@
           libs/Makefile \
           mini-icons/Makefile \
           utils/Makefile \
-          xpmroot/Makefile \
           sample.fvwmrc/Makefile \
           modules/Makefile \
           modules/FvwmAudio/Makefile \
@@@@ -2329,7 +2328,6 @@@@
           libs/Makefile \
           mini-icons/Makefile \
           utils/Makefile \
-          xpmroot/Makefile \
           sample.fvwmrc/Makefile \
           modules/Makefile \
           modules/FvwmAudio/Makefile \
@


1.4
log
@Split patch-af into two (one for each file).
Add some "-Wl,-R"s to get working on ELF.
@
text
@d1 1
a1 1
$NetBSD$
@


1.3
log
@Add NetBSD RCS Ids.
@
text
@d3 11
a13 2
--- configure.orig	Tue Dec 10 17:55:16 1996
+++ configure	Wed Mar 25 00:22:14 1998
a29 11
--- Makefile.in.orig	Tue Jun 25 18:26:47 1996
+++ Makefile.in	Wed Mar 25 00:21:32 1998
@@@@ -10,7 +10,7 @@@@
 
 prefix=@@prefix@@
 exec_prefix=@@exec_prefix@@
-subdirs=libs fvwm modules utils sample.fvwmrc xpmroot icons mini-icons
+subdirs=libs fvwm modules utils sample.fvwmrc icons mini-icons
 
 CFLAGS = -O
 
@


1.2
log
@Don't install "xpmroot", depend on the "xpmroot" package instead.
@
text
@d1 2
@


1.1
log
@Install "xpmroot" as "xpmroot95" to avoid conflict with "fvwm2" package,
fixes PR pkg/5138 by Klaus Klein.
@
text
@d1 21
a21 5
--- xpmroot/Makefile.in.orig	Tue Sep 10 20:36:19 1996
+++ xpmroot/Makefile.in	Wed Mar 11 00:08:21 1998
@@@@ -24,7 +24,7 @@@@
 INSTALL_PROGRAM=@@INSTALL_PROGRAM@@
 RM=@@RM@@
d23 6
a28 2
-PROG=xpmroot
+PROG=xpmroot95
a29 2
 SRCS = xpmroot.c
 OBJS = xpmroot.o
@