diff options
| author | agc <agc> | 1998-01-09 09:27:33 +0000 |
|---|---|---|
| committer | agc <agc> | 1998-01-09 09:27:33 +0000 |
| commit | 4e5793dd33810fcb28bc0377fca15154f3cf663d (patch) | |
| tree | 8bebdff09afdae1e28f55f4c8b6ae40cdd7212e7 /x11 | |
| parent | bb40addd7108f25a6ff892db987dbfc5f4d4cc85 (diff) | |
| download | pkgsrc-4e5793dd33810fcb28bc0377fca15154f3cf663d.tar.gz | |
Delete USE_GMAKE, as it's not necessary. Native make works fine.
(As pointed out by Charles Hannum).
Make this package compile properly by adding the correct include
directory for png.h via a GNU configure argument, and modify the one
Makefile which uses this to reference the includedir definition. The
png library is found because of ldconfig, so this will be broken on ports
which don't have a proper ldconfig.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/windowmaker/Makefile | 6 | ||||
| -rw-r--r-- | x11/windowmaker/patches/patch-ab | 11 |
2 files changed, 14 insertions, 3 deletions
diff --git a/x11/windowmaker/Makefile b/x11/windowmaker/Makefile index 11b202b2238..c6ca83dc49e 100644 --- a/x11/windowmaker/Makefile +++ b/x11/windowmaker/Makefile @@ -4,8 +4,8 @@ # Whom (FreeBSD): handy@physics.montana.edu # Whom (NetBSD): explorer@netbsd.org # -# FreBSD Id: Makefile,v 1.1.1.1 1997/11/04 10:33:43 tg Exp -# $NetBSD: Makefile,v 1.1.1.1 1997/12/08 13:28:51 explorer Exp $ +# $NetBSD: Makefile,v 1.2 1998/01/09 09:27:33 agc Exp $ +# FreeBSD Id: Makefile,v 1.1.1.1 1997/11/04 10:33:43 tg Exp # DISTNAME= WindowMaker-0.6.3 @@ -21,8 +21,8 @@ LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \ jpeg\\.7\\.:${PORTSDIR}/graphics/jpeg USE_X11= yes -USE_GMAKE= yes GNU_CONFIGURE= yes STRIP= +CONFIGURE_ARGS+= --includedir=${LOCALBASE}/include .include <bsd.port.mk> diff --git a/x11/windowmaker/patches/patch-ab b/x11/windowmaker/patches/patch-ab index b369776180a..79b11a3f26e 100644 --- a/x11/windowmaker/patches/patch-ab +++ b/x11/windowmaker/patches/patch-ab @@ -9,3 +9,14 @@ # Run SED to replace the correct version in the main file # +--- wrlib/Makefile.in 1998/01/09 08:57:28 1.1 ++++ wrlib/Makefile.in 1998/01/09 08:57:52 +@@ -29,7 +29,7 @@ + RANLIB = @RANLIB@ + + OPTIONS = @XPM@ @PNG@ -DDEBUG +-CFLAGS = @CFLAGS@ $(OPTIONS) -D_BSD_SOURCE @XFLAGS@ ++CFLAGS = @CFLAGS@ $(OPTIONS) -D_BSD_SOURCE @XFLAGS@ -I${includedir} + LIBS = @LIBS@ @XLFLAGS@ -L. -lwraster @XPMLIB@ @PNGLIB@ @XLIBS@ -lm + + OBJ = raster.o load.o gradient.o xpm.o png.o convert.o context.o misc.o \ |