diff options
| author | wiz <wiz> | 2003-07-24 17:47:25 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2003-07-24 17:47:25 +0000 |
| commit | 0c2126402cf115a058d0f7397f9d34f220113069 (patch) | |
| tree | d8ced09eb28229a125a94275faf56e48fda12c43 /textproc | |
| parent | b8cb40abb2584049d86e778181827b5870120cb6 (diff) | |
| download | pkgsrc-0c2126402cf115a058d0f7397f9d34f220113069.tar.gz | |
Convert to buildlink2 -- fixes PR 22222 from Marko Schuetz, who
also provided the buildlink2ification.
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/gocr/Makefile | 6 | ||||
| -rw-r--r-- | textproc/gocr/distinfo | 4 | ||||
| -rw-r--r-- | textproc/gocr/patches/patch-aa | 14 |
3 files changed, 12 insertions, 12 deletions
diff --git a/textproc/gocr/Makefile b/textproc/gocr/Makefile index a2d7bb4dcf0..55c47eaa1e2 100644 --- a/textproc/gocr/Makefile +++ b/textproc/gocr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2003/07/22 12:34:24 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2003/07/24 17:47:25 wiz Exp $ DISTNAME= gocr-0.37 CATEGORIES= textproc @@ -10,8 +10,6 @@ COMMENT= GOCR is a set of OCR tools GNU_CONFIGURE= yes USE_GMAKE= yes - -MAKE_ENV+= LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} -CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} +USE_BUILDLINK2= yes .include "../../mk/bsd.pkg.mk" diff --git a/textproc/gocr/distinfo b/textproc/gocr/distinfo index c4eb0da161d..651798b8a77 100644 --- a/textproc/gocr/distinfo +++ b/textproc/gocr/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2003/06/23 07:19:38 mrg Exp $ +$NetBSD: distinfo,v 1.2 2003/07/24 17:47:25 wiz Exp $ SHA1 (gocr-0.37.tar.gz) = 41fa2e3f1fc17d27f1f1610441cec4d5f4a6201e Size (gocr-0.37.tar.gz) = 672962 bytes -SHA1 (patch-aa) = cbe18fbaced7a726225e02315a6e157f93c9b2fe +SHA1 (patch-aa) = 106daf9fb2bf37f9a11972244b3c4e292178dbe2 diff --git a/textproc/gocr/patches/patch-aa b/textproc/gocr/patches/patch-aa index dcb0b59013e..4ed197226c6 100644 --- a/textproc/gocr/patches/patch-aa +++ b/textproc/gocr/patches/patch-aa @@ -1,16 +1,18 @@ -$NetBSD: patch-aa,v 1.1.1.1 2003/06/23 07:19:38 mrg Exp $ +$NetBSD: patch-aa,v 1.2 2003/07/24 17:47:26 wiz Exp $ ---- configure.orig 2002-08-13 01:18:53.000000000 +1000 -+++ configure 2003-06-21 05:42:36.000000000 +1000 -@@ -946,9 +946,9 @@ else +--- configure.orig 2002-08-12 17:18:53.000000000 +0200 ++++ configure +@@ -946,9 +946,11 @@ else fi -CPPFLAGS=-I/usr/X11R6/include -+CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" ++#CPPFLAGS=-I/usr/X11R6/include ++CPPFLAGS= #LDFLAGS="-L/usr/X11R6/lib -lpbm -lpgm -lppm -lpnm" -LDFLAGS="-L/usr/X11R6/lib -L/usr/local/netpbm/lib" -+LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" ++#LDFLAGS="-L/usr/X11R6/lib -L/usr/local/netpbm/lib" ++LDFLAGS= ## pnm can only be found, if LDFLAGS contains -lpgm -lpnm ... etc. ## is there a better solution ? |