Attachment #145746 for bug #181736

Lines 3-9 Link Here

(-)textproc/domc/Makefile (-21 / +8 lines)
3		3
4	PORTNAME= domc	4	PORTNAME= domc
5	PORTVERSION= 0.8.0	5	PORTVERSION= 0.8.0
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= textproc	7	CATEGORIES= textproc
8	MASTER_SITES= http://www.ioplex.com/~miallen/domc/dl/	8	MASTER_SITES= http://www.ioplex.com/~miallen/domc/dl/
9		9
Lines 10-38 MASTER_SITES= http://www.ioplex.com/~miallen/domc/ Link Here
10	MAINTAINER= ports@FreeBSD.org	10	MAINTAINER= ports@FreeBSD.org
11	COMMENT= Lightweight implementation of the DOM in ANSI C	11	COMMENT= Lightweight implementation of the DOM in ANSI C
12		12
		13	LICENSE= MIT
		14
13	LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 \	15	LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 \
14	libmba.so:${PORTSDIR}/devel/libmba	16	libmba.so:${PORTSDIR}/devel/libmba
15		17
16	USES= gmake	18	USES= gmake
17	MAKE_ENV= SHLIB_MAJOR="${SHLIB_MAJOR}" INSTDIR=${PREFIX}	19	MAKE_ENV= prefix="${LOCALBASE}" INSTDIR="${STAGEDIR}${PREFIX}"
		20	MAKE_ARGS= CC="${CC}" RPM_OPT_FLAGS="${CFLAGS}" \
		21	MAJVERSION=${PORTVERSION:R:R}
		22	CFLAGS+= -D__USE_XOPEN=__XSI_VISIBLE
18	USE_LDCONFIG= yes	23	USE_LDCONFIG= yes
19		24
20	CFLAGS+= -I${LOCALBASE}/include -fPIC	25	.include <bsd.port.mk>
21	LDFLAGS+= -L${LOCALBASE}/lib
22	SHLIB_MAJOR= 0
23
24	PLIST_SUB= SHLIB_MAJOR="${SHLIB_MAJOR}"
25
26	MAN3= DOM_CharacterData.3m DOM_Document.3m DOM_Element.3m \
27	DOM_Implementation.3m DOM_NamedNodeMap.3m DOM_Node.3m \
28	DOM_NodeList.3m DOM_Text.3m
29	MANCOMPRESSED= yes
30
31	NO_STAGE= yes
32	.include <bsd.port.pre.mk>
33
34	.if ${ARCH} == "sparc64"
35	BROKEN= Does not compile on sparc64-8: duplicate definition of strlen
36	.endif
37
38	.include <bsd.port.post.mk>




--- Makefile.orig	Fri Sep 10 00:31:42 2004
+++ Makefile	Mon Mar  7 14:48:36 2005
@@ -1,4 +1,4 @@
-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
 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
 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)
+	$(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)
-	rm $*.o
 
 .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
+	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
-	-/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

Line 0 Link Here

(-)textproc/domc/files/patch-src_defines.h (+11 lines)
	1	--- src/defines.h~
	2	+++ src/defines.h
	3	@@ -1,7 +1,7 @@
	4	#ifndef DEFINES_H
	5	#define DEFINES_H
	6
	7	-#if defined(__sparc__)
	8	+#if 0 //defined(__sparc__)
	9
	10	#define NL "\n"
	11	#define HAVE_ENCDEC 0




--- src/domc.h.orig	Thu Sep  9 23:52:10 2004
+++ src/domc.h	Sun Apr 10 22:14:52 2005
@@ -33,7 +33,7 @@
 #include <errno.h>
 #include <time.h>
 
-#if defined(__sparc__)
+#if 0 //defined(__sparc__)
+  #include <inttypes.h>
+#elif defined(__sparc__)
   #include <sys/inttypes.h>
 #elif defined(_WIN32)
   typedef unsigned __int64 uint64_t;




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

Return to bug 181736

Lines 1-30 Link Here

(-)textproc/domc/files/patch-Makefile (-27 / +15 lines)
1	--- Makefile.orig Fri Sep 10 00:31:42 2004	1	--- Makefile.orig Fri Sep 10 00:31:42 2004
2	+++ Makefile Mon Mar 7 14:48:36 2005	2	+++ Makefile Mon Mar 7 14:48:36 2005
3	@@ -1,17 +1,15 @@	3	@@ -1,4 +1,4 @@
4	-prefix = /usr/local	4	-prefix = /usr/local
5	+prefix = ${PREFIX}	5	+prefix ?= /usr/local
6	includedir = $(prefix)/include	6	includedir = $(prefix)/include
7	libdir = $(prefix)/lib	7	libdir = $(prefix)/lib
8	mandir = $(prefix)/man	8	mandir = $(prefix)/man
9	-CC = gcc	9	@@ -16,10 +16,10 @@ CFLAGS = -Wall -W -g -DMSGNO $(RPM_O
10	LIBNAME = domc
11	MAJVERSION = 0.8
12	MINVERSION = 0.8.0
13	ARNAME = lib$(LIBNAME).a
14	-SONAME = lib$(LIBNAME).so.$(MINVERSION)
15	-SOVERSION = lib$(LIBNAME).so.$(MAJVERSION)
16	+SONAME = lib$(LIBNAME).so.${SHLIB_MAJOR}
17	+SOVERSION = lib$(LIBNAME).so.${SHLIB_MAJOR}
18	DISTRO = $(LIBNAME)-$(MINVERSION)
19	-RPM_OPT_FLAGS = -O2
20	-CFLAGS = -Wall -W -g -DMSGNO $(RPM_OPT_FLAGS) -I$(includedir) -L$(libdir)
21	+CFLAGS += -Wall -W -g -DMSGNO -I$(includedir) -L$(libdir)
22	#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
23	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	10	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
24	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	11	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
25	@@ -19,12 +17,11 @@
26	all: $(ARNAME)($(OBJS)) $(SONAME) src/defines.h
27		12
		13	-all: $(ARNAME)($(OBJS)) $(SONAME) src/defines.h
		14	+all: $(SONAME) src/defines.h
		15
28	$(SONAME): $(OBJS)	16	$(SONAME): $(OBJS)
29	- $(CC) -shared $(OBJS) -L$(libdir) -lmba -lexpat -Wl,-h,$(SOVERSION) -o $(SONAME)	17	- $(CC) -shared $(OBJS) -L$(libdir) -lmba -lexpat -Wl,-h,$(SOVERSION) -o $(SONAME)
30	+ $(CC) $(LDFLAGS) -shared $(OBJS) -L$(libdir) -lmba -lexpat -Wl,-h,$(SOVERSION) -o $(SONAME)	18	+ $(CC) $(LDFLAGS) -shared $(OBJS) -L$(libdir) -lmba -lexpat -Wl,-h,$(SOVERSION) -o $(SONAME)
Lines 31-54 Link Here
31		19
32	.c.a:	20	.c.a:
33	$(CC) $(CFLAGS) -c -o $*.o $<	21	$(CC) $(CFLAGS) -c -o $*.o $<
34	ar rv $@ $*.o	22	@@ -29,16 +29,15 @@ $(SONAME): $(OBJS)
35	- rm $*.o
36
37	.c.o:	23	.c.o:
38	$(CC) $(CFLAGS) -fpic -c -o $*.o $<	24	$(CC) $(CFLAGS) -fpic -c -o $*.o $<
39	@@ -33,12 +30,10 @@	25
		26	+install: prefix=$(INSTDIR)
		27	install: $(SONAME)
40	install -d $(libdir)	28	install -d $(libdir)
41	install -d $(includedir)	29	install -d $(includedir)
42	install -d $(mandir)/man3	30	install -d $(mandir)/man3
43	- install -m 644 $(ARNAME) $(libdir)	31	- install -m 644 $(ARNAME) $(libdir)
44	- install -m 755 $(SONAME) $(libdir)	32	- install -m 755 $(SONAME) $(libdir)
45	- cd $(libdir) && ln -sf $(SONAME) $(SOVERSION) && ln -sf $(SONAME) lib$(LIBNAME).so	33	+ ${BSD_INSTALL_LIB} $(SONAME) $(libdir)
		34	cd $(libdir) && ln -sf $(SONAME) $(SOVERSION) && ln -sf $(SONAME) lib$(LIBNAME).so
46	- install -m 444 src/domc.h $(includedir)	35	- install -m 444 src/domc.h $(includedir)
47	+ ${BSD_INSTALL_DATA} $(SONAME) $(INSTDIR)/lib	36	- -install -m 444 docs/man/*.3m.gz $(mandir)/man3
48	+ cd $(INSTDIR)/lib ; ln -sf $(SONAME) $(INSTDIR)/lib/lib$(LIBNAME).so
49	+ ${BSD_INSTALL_DATA} src/domc.h $(INSTDIR)/include
50	-install -m 444 docs/man/*.3m.gz $(mandir)/man3
51	- -/sbin/ldconfig $(libdir)	37	- -/sbin/ldconfig $(libdir)
		38	+ ${BSD_INSTALL_DATA} src/domc.h $(includedir)
		39	+ ${BSD_INSTALL_DATA} docs/man/*.3m.gz $(mandir)/man3
52		40
53	zip:	41	zip:
54	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	42	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

Lines 1-13 Link Here

(-)textproc/domc/files/patch-src_domc.h (-4 / +2 lines)
1	--- src/domc.h.orig Thu Sep 9 23:52:10 2004	1	--- src/domc.h.orig Thu Sep 9 23:52:10 2004
2	+++ src/domc.h Sun Apr 10 22:14:52 2005	2	+++ src/domc.h Sun Apr 10 22:14:52 2005
3	@@ -33,7 +33,9 @@	3	@@ -33,7 +33,7 @@
4	#include <errno.h>	4	#include <errno.h>
5	#include <time.h>	5	#include <time.h>
6		6
7	-#if defined(__sparc__)	7	-#if defined(__sparc__)
8	+#if defined(__FreeBSD__)	8	+#if 0 //defined(__sparc__)
9	+ #include <inttypes.h>
10	+#elif defined(__sparc__)
11	#include <sys/inttypes.h>	9	#include <sys/inttypes.h>
12	#elif defined(_WIN32)	10	#elif defined(_WIN32)
13	typedef unsigned __int64 uint64_t;	11	typedef unsigned __int64 uint64_t;

Lines 1-3 Link Here

(-)textproc/domc/pkg-plist (-1 / +10 lines)
1	include/domc.h	1	include/domc.h
2	lib/libdomc.so	2	lib/libdomc.so
3	lib/libdomc.so.%%SHLIB_MAJOR%%	3	lib/libdomc.so.0
		4	lib/libdomc.so.0.8.0
		5	man/man3/DOM_CharacterData.3m.gz
		6	man/man3/DOM_Document.3m.gz
		7	man/man3/DOM_Element.3m.gz
		8	man/man3/DOM_Implementation.3m.gz
		9	man/man3/DOM_NamedNodeMap.3m.gz
		10	man/man3/DOM_Node.3m.gz
		11	man/man3/DOM_NodeList.3m.gz
		12	man/man3/DOM_Text.3m.gz