kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* Add proper CONFIGURE_ARGS to pull in xpm, readline, and rplay in a

Browse source 
deterministic fashion.  This fixes PR 8392 by Michael South, thanks!
 * Add proper dependency on readline and rplay.
 * Add wildcard dependency on xpmroot.
 * Fix some pkglint woes.
This commit is contained in:
rh 1999-11-01 09:02:05 +00:00
parent 2e41fc607b
commit 696f06939d
3 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
x11/fvwm2/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.20 1999/08/05 03:51:13 hubertf Exp $ # $NetBSD: Makefile,v 1.21 1999/11/01 09:02:05 rh Exp $
# FreeBSD Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp # FreeBSD Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp
# #
@ -10,13 +10,13 @@ MASTER_SITES= ftp://ftp.hpc.uh.edu/pub/fvwm/version-2/ \
ftp://ftp.ics.es.osaka-u.ac.jp/pub/CFAN/fvwm-users-jp/kits/ \ ftp://ftp.ics.es.osaka-u.ac.jp/pub/CFAN/fvwm-users-jp/kits/ \
ftp://ftp.TokyoNet.AD.JP/pub/X/fvwm/sources/2.0.x/ \ ftp://ftp.TokyoNet.AD.JP/pub/X/fvwm/sources/2.0.x/ \
ftp://ftp.TokyoNet.AD.JP/pub/X/fvwm/fvwm-users-jp/kits/ ftp://ftp.TokyoNet.AD.JP/pub/X/fvwm/fvwm-users-jp/kits/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= packages@netbsd.org MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.fvwm.org/ HOMEPAGE= http://www.fvwm.org/
DEPENDS+= xpmroot-2.2:../../x11/xpmroot DEPENDS+= xpmroot-2.*:../../x11/xpmroot
DEPENDS+= readline-*:../../devel/readline
DEPENDS+= rplay-3.*:../../devel/readline
CONFLICTS= fvwm-2.* CONFLICTS= fvwm-2.*
@ -25,6 +25,9 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-extras CONFIGURE_ARGS+= --enable-extras
CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/lib/X11/fvwm2 CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/lib/X11/fvwm2
CONFIGURE_ARGS+= --libexecdir=${PREFIX}/lib/X11 CONFIGURE_ARGS+= --libexecdir=${PREFIX}/lib/X11
CONFIGURE_ARGS+= --with-xpm-includes=${PREFIX}/include
CONFIGURE_ARGS+= --with-readline-includes=${LOCALBASE}/include
CONFIGURE_ARGS+= --with-rplay-includes=${LOCALBASE}/include
CONFIGURE_ARGS+= --with-iconpath=${PREFIX}/lib/X11/fvwm2/pixmaps:${X11ROOT}/include/bitmaps:${X11ROOT}/include/pixmaps CONFIGURE_ARGS+= --with-iconpath=${PREFIX}/lib/X11/fvwm2/pixmaps:${X11ROOT}/include/bitmaps:${X11ROOT}/include/pixmaps
post-install: post-install:

4
x11/fvwm2/files/patch-sum
View file

@ -1,4 +1,4 @@
$NetBSD: patch-sum,v 1.1 1999/07/09 14:23:26 agc Exp $ $NetBSD: patch-sum,v 1.2 1999/11/01 09:02:05 rh Exp $
MD5 (patch-aa) = fe769af0533b1bada86bcd8d273cdd11 MD5 (patch-aa) = 601bb4f219e3edb6bbefb9fa2c48a325
MD5 (patch-ab) = f4abc506e5f46791017c66d758ef0d89 MD5 (patch-ab) = f4abc506e5f46791017c66d758ef0d89

2
x11/fvwm2/patches/patch-aa
View file

@ -1,3 +1,5 @@
$NetBSD: patch-aa,v 1.6 1999/11/01 09:02:05 rh Exp $
--- utils/Makefile.in.orig Wed Jan 20 06:29:27 1999 --- utils/Makefile.in.orig Wed Jan 20 06:29:27 1999
+++ utils/Makefile.in Mon Feb 22 03:54:05 1999 +++ utils/Makefile.in Mon Feb 22 03:54:05 1999
@@ -83,10 +83,10 @@ @@ -83,10 +83,10 @@