diff --git a/textproc/domc/Makefile b/textproc/domc/Makefile index 1fdf801e04d1..dfbbd3950f45 100644 --- a/textproc/domc/Makefile +++ b/textproc/domc/Makefile @@ -1,23 +1,23 @@ PORTNAME= domc PORTVERSION= 0.8.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= textproc MASTER_SITES= http://www.ioplex.com/~miallen/domc/dl/ MAINTAINER= ports@FreeBSD.org COMMENT= Lightweight implementation of the DOM in ANSI C WWW= https://www.ioplex.com/~miallen/domc/ LICENSE= MIT LIB_DEPENDS= libexpat.so:textproc/expat2 \ libmba.so:devel/libmba USES= gmake MAKE_ENV= prefix="${LOCALBASE}" INSTDIR="${STAGEDIR}${PREFIX}" MAKE_ARGS= CC="${CC}" RPM_OPT_FLAGS="${CFLAGS}" \ MAJVERSION=${PORTVERSION:R:R} CFLAGS+= -D__USE_XOPEN=__XSI_VISIBLE USE_LDCONFIG= yes .include diff --git a/textproc/domc/files/patch-Makefile b/textproc/domc/files/patch-Makefile index 2b10d9996b58..b0fef605251f 100644 --- a/textproc/domc/files/patch-Makefile +++ b/textproc/domc/files/patch-Makefile @@ -1,42 +1,46 @@ ---- Makefile.orig Fri Sep 10 00:31:42 2004 -+++ Makefile Mon Mar 7 14:48:36 2005 -@@ -1,4 +1,4 @@ +--- Makefile.orig 2004-09-09 22:31:42 UTC ++++ Makefile +@@ -1,7 +1,7 @@ -prefix = /usr/local +prefix ?= /usr/local includedir = $(prefix)/include libdir = $(prefix)/lib - mandir = $(prefix)/man -@@ -16,10 +16,10 @@ CFLAGS = -Wall -W -g -DMSGNO $(RPM_O +-mandir = $(prefix)/man ++mandir = $(prefix)/share/man + CC = gcc + LIBNAME = domc + MAJVERSION = 0.8 +@@ -16,10 +16,10 @@ MAN = DOM_CharacterData.3m.gz DOM_Document.3m.g OBJS = src/expatls.o src/events.o src/node.o src/nodelist.o src/namednodemap.o src/dom.o src/timestamp.o src/wcwidth.o src/mbs.o MAN = DOM_CharacterData.3m.gz DOM_Document.3m.gz DOM_Element.3m.gz DOM_Implementation.3m.gz DOM_NamedNodeMap.3m.gz DOM_Node.3m.gz DOM_NodeList.3m.gz DOM_Text.3m.gz -all: $(ARNAME)($(OBJS)) $(SONAME) src/defines.h +all: $(SONAME) src/defines.h $(SONAME): $(OBJS) - $(CC) -shared $(OBJS) -L$(libdir) -lmba -lexpat -Wl,-h,$(SOVERSION) -o $(SONAME) + $(CC) $(LDFLAGS) -shared $(OBJS) -L$(libdir) -lmba -lexpat -Wl,-h,$(SOVERSION) -o $(SONAME) .c.a: $(CC) $(CFLAGS) -c -o $*.o $< @@ -29,16 +29,15 @@ $(SONAME): $(OBJS) .c.o: $(CC) $(CFLAGS) -fpic -c -o $*.o $< +install: prefix=$(INSTDIR) install: $(SONAME) install -d $(libdir) install -d $(includedir) install -d $(mandir)/man3 - install -m 644 $(ARNAME) $(libdir) - install -m 755 $(SONAME) $(libdir) + ${BSD_INSTALL_LIB} $(SONAME) $(libdir) cd $(libdir) && ln -sf $(SONAME) $(SOVERSION) && ln -sf $(SONAME) lib$(LIBNAME).so - install -m 444 src/domc.h $(includedir) - -install -m 444 docs/man/*.3m.gz $(mandir)/man3 - -/sbin/ldconfig $(libdir) + ${BSD_INSTALL_DATA} src/domc.h $(includedir) + ${BSD_INSTALL_DATA} docs/man/*.3m.gz $(mandir)/man3 zip: cd .. && zip -lr $(DISTRO)/.$(DISTRO).zip $(DISTRO) -x $(DISTRO)/.* $(DISTRO)/docs/man/* $(DISTRO)/tests/utf8* $(DISTRO)/domc.lib $(DISTRO)/domc.dll $(DISTRO)/domc_s.lib diff --git a/textproc/domc/pkg-plist b/textproc/domc/pkg-plist index 4a337e01d16a..cd4782f05020 100644 --- a/textproc/domc/pkg-plist +++ b/textproc/domc/pkg-plist @@ -1,12 +1,12 @@ include/domc.h lib/libdomc.so lib/libdomc.so.0 lib/libdomc.so.0.8.0 -man/man3/DOM_CharacterData.3m.gz -man/man3/DOM_Document.3m.gz -man/man3/DOM_Element.3m.gz -man/man3/DOM_Implementation.3m.gz -man/man3/DOM_NamedNodeMap.3m.gz -man/man3/DOM_Node.3m.gz -man/man3/DOM_NodeList.3m.gz -man/man3/DOM_Text.3m.gz +share/man/man3/DOM_CharacterData.3m.gz +share/man/man3/DOM_Document.3m.gz +share/man/man3/DOM_Element.3m.gz +share/man/man3/DOM_Implementation.3m.gz +share/man/man3/DOM_NamedNodeMap.3m.gz +share/man/man3/DOM_Node.3m.gz +share/man/man3/DOM_NodeList.3m.gz +share/man/man3/DOM_Text.3m.gz