diff options
| author | jschauma <jschauma> | 2003-01-12 18:30:56 +0000 |
|---|---|---|
| committer | jschauma <jschauma> | 2003-01-12 18:30:56 +0000 |
| commit | 95f4852fa7101c52ef2cbe15178f189df8517fd8 (patch) | |
| tree | 795c9cf6dd59de5324c537f096a38cf45e2e3bfc /x11 | |
| parent | 92062eb62ec9911e07c7a756c0236d185930e0f7 (diff) | |
| download | pkgsrc-95f4852fa7101c52ef2cbe15178f189df8517fd8.tar.gz | |
Add LDFLAGS to the relevant Imakefile in order to fix the problem seen
in Huberts bulk-builds. Remove previous attempt to fix this and while we're
there, we can remove USE_X11 since we already use USE_IMAKE.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/xforms/Makefile | 4 | ||||
| -rw-r--r-- | x11/xforms/distinfo | 3 | ||||
| -rw-r--r-- | x11/xforms/patches/patch-af | 12 |
3 files changed, 15 insertions, 4 deletions
diff --git a/x11/xforms/Makefile b/x11/xforms/Makefile index 17febb41761..35e6d155fc4 100644 --- a/x11/xforms/Makefile +++ b/x11/xforms/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2003/01/10 15:10:17 jschauma Exp $ +# $NetBSD: Makefile,v 1.45 2003/01/12 18:30:56 jschauma Exp $ # DISTNAME= xforms-1.0-release @@ -14,11 +14,9 @@ COMMENT= Graphical user interface toolkit for X Window System USE_BUILDLINK2= YES USE_IMAKE= YES -USE_X11= YES MAKE_ENV= DEPEND_DEFINES="${CPPFLAGS}" SCRIPTS_ENV= DEPEND_DEFINES="${CPPFLAGS}" -LDFLAGS+= -Wl,${_OPSYS_RPATH_NAME}${PREFIX}/lib .include "../../graphics/jpeg/buildlink2.mk" .include "../../graphics/tiff/buildlink2.mk" diff --git a/x11/xforms/distinfo b/x11/xforms/distinfo index 1e1ecb44c21..ed30672f659 100644 --- a/x11/xforms/distinfo +++ b/x11/xforms/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.12 2002/12/28 19:49:07 jschauma Exp $ +$NetBSD: distinfo,v 1.13 2003/01/12 18:30:56 jschauma Exp $ SHA1 (xforms-1.0-release.tgz) = e25a31351c52472de88352388cf879512b20fc62 Size (xforms-1.0-release.tgz) = 1013294 bytes @@ -7,3 +7,4 @@ SHA1 (patch-ab) = 5f0dedd0e35b952d0e4512c5e396ededcf85f994 SHA1 (patch-ac) = 55c32e091b1da5441e4c652d3e4a002202a6d076 SHA1 (patch-ad) = 324100fb05e723fbaa92126e279074860c842f1b SHA1 (patch-ae) = ba8b68d7e886311cb2fbfe4e0a45e975e7790821 +SHA1 (patch-af) = f3fdbbb2a103505e6f18608f0c3882cc1d264b00 diff --git a/x11/xforms/patches/patch-af b/x11/xforms/patches/patch-af new file mode 100644 index 00000000000..f62f0812630 --- /dev/null +++ b/x11/xforms/patches/patch-af @@ -0,0 +1,12 @@ +$NetBSD: patch-af,v 1.1 2003/01/12 18:30:56 jschauma Exp $ + +--- image/Imakefile.orig Sun Jan 12 18:16:51 2003 ++++ image/Imakefile Sun Jan 12 18:17:20 2003 +@@ -121,6 +121,7 @@ + REQUIREDLIBS = \ + $(LDPRELIB) \ + $(XLIB) \ ++ $(LDFLAGS) \ + -L/usr/local/lib \ + -L../lib -lforms \ + $(JPEGLIBDIR) -ljpeg \ |