Date: Thu, 14 Aug 2014 20:57:30 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r364867 - in head/textproc/domc: . files Message-ID: <201408142057.s7EKvUhf002613@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Thu Aug 14 20:57:30 2014 New Revision: 364867 URL: http://svnweb.freebsd.org/changeset/ports/364867 QAT: https://qat.redports.org/buildarchive/r364867/ Log: Stage textproc/domc and unbreak on sparc64, amd64 PR: 181736 Submitted by: Jan Beich Added: head/textproc/domc/files/patch-src_defines.h (contents, props changed) Modified: head/textproc/domc/Makefile head/textproc/domc/files/patch-Makefile head/textproc/domc/files/patch-src_domc.h head/textproc/domc/pkg-plist Modified: head/textproc/domc/Makefile ============================================================================== --- head/textproc/domc/Makefile Thu Aug 14 20:43:48 2014 (r364866) +++ head/textproc/domc/Makefile Thu Aug 14 20:57:30 2014 (r364867) @@ -3,36 +3,23 @@ PORTNAME= domc PORTVERSION= 0.8.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc MASTER_SITES= http://www.ioplex.com/~miallen/domc/dl/ MAINTAINER= ports@FreeBSD.org COMMENT= Lightweight implementation of the DOM in ANSI C +LICENSE= MIT + LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 \ libmba.so:${PORTSDIR}/devel/libmba USES= gmake -MAKE_ENV= SHLIB_MAJOR="${SHLIB_MAJOR}" INSTDIR=${PREFIX} +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 -CFLAGS+= -I${LOCALBASE}/include -fPIC -LDFLAGS+= -L${LOCALBASE}/lib -SHLIB_MAJOR= 0 - -PLIST_SUB= SHLIB_MAJOR="${SHLIB_MAJOR}" - -MAN3= DOM_CharacterData.3m DOM_Document.3m DOM_Element.3m \ - DOM_Implementation.3m DOM_NamedNodeMap.3m DOM_Node.3m \ - DOM_NodeList.3m DOM_Text.3m -MANCOMPRESSED= yes - -NO_STAGE= yes -.include <bsd.port.pre.mk> - -.if ${ARCH} == "sparc64" -BROKEN= Does not compile on sparc64-8: duplicate definition of strlen -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/textproc/domc/files/patch-Makefile ============================================================================== --- head/textproc/domc/files/patch-Makefile Thu Aug 14 20:43:48 2014 (r364866) +++ head/textproc/domc/files/patch-Makefile Thu Aug 14 20:57:30 2014 (r364867) @@ -1,29 +1,17 @@ --- Makefile.orig Fri Sep 10 00:31:42 2004 +++ Makefile Mon Mar 7 14:48:36 2005 -@@ -1,17 +1,15 @@ +@@ -1,4 +1,4 @@ -prefix = /usr/local -+prefix = ${PREFIX} ++prefix ?= /usr/local includedir = $(prefix)/include libdir = $(prefix)/lib mandir = $(prefix)/man --CC = gcc - LIBNAME = domc - MAJVERSION = 0.8 - MINVERSION = 0.8.0 - ARNAME = lib$(LIBNAME).a --SONAME = lib$(LIBNAME).so.$(MINVERSION) --SOVERSION = lib$(LIBNAME).so.$(MAJVERSION) -+SONAME = lib$(LIBNAME).so.${SHLIB_MAJOR} -+SOVERSION = lib$(LIBNAME).so.${SHLIB_MAJOR} - DISTRO = $(LIBNAME)-$(MINVERSION) --RPM_OPT_FLAGS = -O2 --CFLAGS = -Wall -W -g -DMSGNO $(RPM_OPT_FLAGS) -I$(includedir) -L$(libdir) -+CFLAGS += -Wall -W -g -DMSGNO -I$(includedir) -L$(libdir) - #CFLAGS = -Wall -W -DMSGNO -I$(includedir) -L$(libdir) $(RPM_OPT_FLAGS) -ansi -pedantic -Wbad-function-cast -Wcast-align -Wcast-qual -Wchar-subscripts -Winline -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wredundant-decls -Wshadow -Wstrict-prototypes -Wwrite-strings -Wtraditional -Wconversion -Waggregate-return -Wno-parentheses +@@ -16,10 +16,10 @@ CFLAGS = -Wall -W -g -DMSGNO $(RPM_O 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 -@@ -19,12 +17,11 @@ - all: $(ARNAME)($(OBJS)) $(SONAME) src/defines.h + +-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) @@ -31,24 +19,24 @@ .c.a: $(CC) $(CFLAGS) -c -o $*.o $< - ar rv $@ $*.o -- rm $*.o - +@@ -29,16 +29,15 @@ $(SONAME): $(OBJS) .c.o: $(CC) $(CFLAGS) -fpic -c -o $*.o $< -@@ -33,12 +30,10 @@ + ++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) -- cd $(libdir) && ln -sf $(SONAME) $(SOVERSION) && ln -sf $(SONAME) lib$(LIBNAME).so ++ ${BSD_INSTALL_LIB} $(SONAME) $(libdir) + cd $(libdir) && ln -sf $(SONAME) $(SOVERSION) && ln -sf $(SONAME) lib$(LIBNAME).so - install -m 444 src/domc.h $(includedir) -+ ${BSD_INSTALL_DATA} $(SONAME) $(INSTDIR)/lib -+ cd $(INSTDIR)/lib ; ln -sf $(SONAME) $(INSTDIR)/lib/lib$(LIBNAME).so -+ ${BSD_INSTALL_DATA} src/domc.h $(INSTDIR)/include - -install -m 444 docs/man/*.3m.gz $(mandir)/man3 +- -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 Added: head/textproc/domc/files/patch-src_defines.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/domc/files/patch-src_defines.h Thu Aug 14 20:57:30 2014 (r364867) @@ -0,0 +1,11 @@ +--- src/defines.h~ ++++ src/defines.h +@@ -1,7 +1,7 @@ + #ifndef DEFINES_H + #define DEFINES_H + +-#if defined(__sparc__) ++#if 0 //defined(__sparc__) + + #define NL "\n" + #define HAVE_ENCDEC 0 Modified: head/textproc/domc/files/patch-src_domc.h ============================================================================== --- head/textproc/domc/files/patch-src_domc.h Thu Aug 14 20:43:48 2014 (r364866) +++ head/textproc/domc/files/patch-src_domc.h Thu Aug 14 20:57:30 2014 (r364867) @@ -1,13 +1,11 @@ --- src/domc.h.orig Thu Sep 9 23:52:10 2004 +++ src/domc.h Sun Apr 10 22:14:52 2005 -@@ -33,7 +33,9 @@ +@@ -33,7 +33,7 @@ #include <errno.h> #include <time.h> -#if defined(__sparc__) -+#if defined(__FreeBSD__) -+ #include <inttypes.h> -+#elif defined(__sparc__) ++#if 0 //defined(__sparc__) #include <sys/inttypes.h> #elif defined(_WIN32) typedef unsigned __int64 uint64_t; Modified: head/textproc/domc/pkg-plist ============================================================================== --- head/textproc/domc/pkg-plist Thu Aug 14 20:43:48 2014 (r364866) +++ head/textproc/domc/pkg-plist Thu Aug 14 20:57:30 2014 (r364867) @@ -1,3 +1,12 @@ include/domc.h lib/libdomc.so -lib/libdomc.so.%%SHLIB_MAJOR%% +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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408142057.s7EKvUhf002613>