diff options
| author | jmmv <jmmv@pkgsrc.org> | 2004-09-10 08:40:51 +0000 |
|---|---|---|
| committer | jmmv <jmmv@pkgsrc.org> | 2004-09-10 08:40:51 +0000 |
| commit | f950e8c2d214b2e3b668a32b419a5f51c65bb673 (patch) | |
| tree | 1921c77b262dc9457853c9168757f2e83a6e4627 /textproc | |
| parent | bc2727675fef31389a4f9dac0c00255fa072c029 (diff) | |
| download | pkgsrc-f950e8c2d214b2e3b668a32b419a5f51c65bb673.tar.gz | |
Avoid hardcoded /usr/pkg paths in the package, to let this build where
LOCALBASE != /usr/pkg. While here, remove multiple gcc specific flags.
Closes PR pkg/26898.
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/xml2doc/Makefile | 7 | ||||
| -rw-r--r-- | textproc/xml2doc/distinfo | 3 | ||||
| -rw-r--r-- | textproc/xml2doc/patches/patch-ab | 21 |
3 files changed, 29 insertions, 2 deletions
diff --git a/textproc/xml2doc/Makefile b/textproc/xml2doc/Makefile index 82736a48de2..8eb7499fb8a 100644 --- a/textproc/xml2doc/Makefile +++ b/textproc/xml2doc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/05/29 13:04:00 minskim Exp $ +# $NetBSD: Makefile,v 1.3 2004/09/10 08:40:51 jmmv Exp $ # DISTNAME= xml2doc-20030510 @@ -16,6 +16,11 @@ USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes USE_GNU_TOOLS+= make +CFLAGS+= -I${BUILDLINK_PREFIX.libxml2}/include/libxml2 +CFLAGS+= -I${BUILDLINK_PREFIX.pdflib}/include +LDFLAGS+= -L${BUILDLINK_PREFIX.libxml2}/lib +LDFLAGS+= -L${BUILDLINK_PREFIX.pdflib}/lib + .include "../../print/pdflib/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/xml2doc/distinfo b/textproc/xml2doc/distinfo index 44ede4c0831..0373076537e 100644 --- a/textproc/xml2doc/distinfo +++ b/textproc/xml2doc/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2004/02/23 08:39:00 xtraeme Exp $ +$NetBSD: distinfo,v 1.2 2004/09/10 08:40:51 jmmv Exp $ SHA1 (xml2doc-20030510.tgz) = 2453ff5437c40974f8804fe5907e483792ae6d2a Size (xml2doc-20030510.tgz) = 53307 bytes SHA1 (patch-aa) = 72daac7f1af2278957f00622bafd44657ed1fea8 +SHA1 (patch-ab) = 714a95e6d7dc9ccf6c690904dcfdcd85ada0e5d7 diff --git a/textproc/xml2doc/patches/patch-ab b/textproc/xml2doc/patches/patch-ab new file mode 100644 index 00000000000..3e0f3871fdb --- /dev/null +++ b/textproc/xml2doc/patches/patch-ab @@ -0,0 +1,21 @@ +$NetBSD: patch-ab,v 1.1 2004/09/10 08:40:51 jmmv Exp $ + +--- src/Makefile.in.orig 2003-05-03 03:37:38.000000000 +0200 ++++ src/Makefile.in +@@ -11,13 +11,9 @@ PREFIX=@PREFIX@ + + CC=gcc + OBJ=main.o defs.o parse.o parse_include.o parse_info.o parse_img.o parse_t.o parse_page.o parse_default.o parse_bookmark.o parse_add.o parse_list.o parse_sep.o output_t.o output_doc.o output_img.o output_info.o output_page.o output_sep.o output_list.o parm.o +-IPATH=-I/usr/pkg/include/libxml2 -I/usr/include/libxml2 -I. -I/usr/pkg/include -I/usr/local/include +-LPATH=-L/usr/pkg/lib -L/usr/local/lib +-CFLAGS+=-Wall -c $(IPATH) $(I_PDF)\ +- -DVERSION=\"$(VERSION)\" $(DEBUG)\ +- -fno-asm -funroll-all-loops -fstrength-reduce -frerun-loop-opt \ +- -x c -fshort-enums +-LFLAGS=-lxml2 $(L_PDF) $(LPATH) ++CFLAGS+=-c -I. $(I_PDF)\ ++ -DVERSION=\"$(VERSION)\" $(DEBUG) ++LFLAGS=$(LDFLAGS) -lxml2 $(L_PDF) $(LPATH) + BIN=xml2doc + + all: |