diff options
| author | fredb <fredb@pkgsrc.org> | 2002-04-17 04:45:06 +0000 |
|---|---|---|
| committer | fredb <fredb@pkgsrc.org> | 2002-04-17 04:45:06 +0000 |
| commit | 9807afcb602d970ee86027a46a72552f83b0c0c3 (patch) | |
| tree | dc783e63ef8448e3a620be967f9233cff8ff8e71 /math/xldlas/patches/patch-aa | |
| parent | 6a1cfa23665b0a3668d7753fb1d0c41cfb290b90 (diff) | |
| download | pkgsrc-9807afcb602d970ee86027a46a72552f83b0c0c3.tar.gz | |
Update dependency on xforms. We're mainly bumping the dependency
and package revision, since we may now link against the forms shared
library, and because we also have to add a dependency on jpeg lib.
Diffstat (limited to 'math/xldlas/patches/patch-aa')
| -rw-r--r-- | math/xldlas/patches/patch-aa | 108 |
1 files changed, 42 insertions, 66 deletions
diff --git a/math/xldlas/patches/patch-aa b/math/xldlas/patches/patch-aa index dba3af48763..c38be34c35e 100644 --- a/math/xldlas/patches/patch-aa +++ b/math/xldlas/patches/patch-aa @@ -1,67 +1,43 @@ -$NetBSD: patch-aa,v 1.2 2000/05/14 00:57:41 dmcmahill Exp $ +$NetBSD: patch-aa,v 1.3 2002/04/17 04:45:15 fredb Exp $ -*** Makefile.orig Tue Apr 1 12:13:32 1997 ---- Makefile Mon Apr 27 01:10:50 1998 -*************** -*** 16,26 **** - # want to remove the -DXFORMS86 declaration in the CCFLAG - # assignment. - # -! CCFLAG = -O2 -Wall -DXFORMS86 -! CC = gcc -! COMMONLIBS = -L/usr/X11R6/lib/ -lX11 -lm -! SHAREDLIBS = -lforms -! STATICLIBS = -lXpm /usr/X11R6/lib/libforms.a - ECHO = echo - RM = rm - RMOPTS = -f ---- 16,26 ---- - # want to remove the -DXFORMS86 declaration in the CCFLAG - # assignment. - # -! CCFLAG = ${CFLAGS} -DXFORMS86 -DPREFIX=\"${PREFIX}\" -I${PREFIX}/include -I${PREFIX}/include/X11 -! #CC = gcc -! COMMONLIBS = -L${X11BASE}/lib/ -Wl,-R${X11BASE}/lib -lX11 -lm -! SHAREDLIBS = -lxforms -lXpm -! STATICLIBS = -lXpm ${PREFIX}/lib/libxforms.a - ECHO = echo - RM = rm - RMOPTS = -f -*************** -*** 29,37 **** - INSTALL = install - INSTALLOPTS = -d - -! BINDIR = /usr/local/bin -! MANDIR = /usr/man/man1 -! HELPDIR = /usr/local/xldlas/help - SRCDIR := $$PWD - USER := $$LOGNAME - ---- 29,37 ---- - INSTALL = install - INSTALLOPTS = -d - -! BINDIR = ${PREFIX}/bin -! MANDIR = ${PREFIX}/man/man1 -! HELPDIR = ${PREFIX}/share/xldlas/help - SRCDIR := $$PWD - USER := $$LOGNAME - -*************** -*** 115,121 **** - so the following commands will probably fail"; fi - @$(ECHO) - @$(CP) $(CPOPTS) xldlas $(BINDIR) -! @if test '/usr/local/xldlas' = $(SRCDIR); then \ - $(ECHO) Help Files Already in Place; else \ - $(INSTALL) $(INSTALLOPTS) ./help $(HELPDIR); fi - install.man: ---- 115,121 ---- - so the following commands will probably fail"; fi - @$(ECHO) - @$(CP) $(CPOPTS) xldlas $(BINDIR) -! @if test "${PREFIX}/share/xldlas" = $(SRCDIR); then \ - $(ECHO) Help Files Already in Place; else \ - $(INSTALL) $(INSTALLOPTS) ./help $(HELPDIR); fi - install.man: +--- Makefile.orig Tue Apr 1 11:13:32 1997 ++++ Makefile +@@ -16,11 +16,11 @@ + # want to remove the -DXFORMS86 declaration in the CCFLAG + # assignment. + # +-CCFLAG = -O2 -Wall -DXFORMS86 +-CC = gcc +-COMMONLIBS = -L/usr/X11R6/lib/ -lX11 -lm +-SHAREDLIBS = -lforms +-STATICLIBS = -lXpm /usr/X11R6/lib/libforms.a ++CCFLAG = ${CFLAGS} -DXFORMS86 -DPREFIX=\"${PREFIX}\" -I${PREFIX}/include -I${PREFIX}/include/X11 ++#CC = gcc ++COMMONLIBS = -L${X11BASE}/lib/ -Wl,-R${X11BASE}/lib -lX11 -lm ++SHAREDLIBS = -lforms -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -ljpeg -lXpm ++STATICLIBS = -lXpm ${PREFIX}/lib/libxforms.a ${LOCALBASE}/lib/libjpeg.a + ECHO = echo + RM = rm + RMOPTS = -f +@@ -29,9 +29,9 @@ + INSTALL = install + INSTALLOPTS = -d + +-BINDIR = /usr/local/bin +-MANDIR = /usr/man/man1 +-HELPDIR = /usr/local/xldlas/help ++BINDIR = ${PREFIX}/bin ++MANDIR = ${PREFIX}/man/man1 ++HELPDIR = ${PREFIX}/share/xldlas/help + SRCDIR := $$PWD + USER := $$LOGNAME + +@@ -115,7 +115,7 @@ + so the following commands will probably fail"; fi + @$(ECHO) + @$(CP) $(CPOPTS) xldlas $(BINDIR) +- @if test '/usr/local/xldlas' = $(SRCDIR); then \ ++ @if test "${PREFIX}/share/xldlas" = $(SRCDIR); then \ + $(ECHO) Help Files Already in Place; else \ + $(INSTALL) $(INSTALLOPTS) ./help $(HELPDIR); fi + install.man: |