diff options
| author | Ying-Chieh Liao <ijliao@FreeBSD.org> | 2002-09-24 08:01:07 +0000 |
|---|---|---|
| committer | Ying-Chieh Liao <ijliao@FreeBSD.org> | 2002-09-24 08:01:07 +0000 |
| commit | bd6df865ae54be407b0debed4a64d9f650768ad4 (patch) | |
| tree | 33f9b89ee5997aab41df0f2345e1e51799ff0ecb /textproc/domc/files | |
| parent | 41619882b2fe8406cfbb9fa365b33d7603830957 (diff) | |
| download | ports-bd6df865ae54be407b0debed4a64d9f650768ad4.tar.gz ports-bd6df865ae54be407b0debed4a64d9f650768ad4.zip | |
Notes
Diffstat (limited to 'textproc/domc/files')
| -rw-r--r-- | textproc/domc/files/patch-Makefile | 52 | ||||
| -rw-r--r-- | textproc/domc/files/patch-src::expatls.c | 10 |
2 files changed, 22 insertions, 40 deletions
diff --git a/textproc/domc/files/patch-Makefile b/textproc/domc/files/patch-Makefile index f6ad1c422486..267e292647af 100644 --- a/textproc/domc/files/patch-Makefile +++ b/textproc/domc/files/patch-Makefile @@ -1,38 +1,30 @@ ---- Makefile.orig Thu Dec 20 19:16:25 2001 -+++ Makefile Sun Dec 30 11:43:57 2001 -@@ -1,26 +1,26 @@ --INSTDIR = /usr/local -+INSTDIR = ${PREFIX} - OBJS = src/expatls.o src/events.o src/node.o src/dom.o src/msgno.o src/stack.o +--- Makefile.orig Sun Mar 31 08:56:45 2002 ++++ Makefile Tue Sep 24 15:54:47 2002 +@@ -4,9 +4,9 @@ + version = 0.6.0 + OBJS = src/expatls.o src/events.o src/node.o src/dom.o LIBNAME = domc --SONAME = lib$(LIBNAME).so.0.5.8 --SOVERSION = lib$(LIBNAME).so.0.5 +-SONAME = lib$(LIBNAME).so.0.6.0 +-SOVERSION = lib$(LIBNAME).so.0.6 +-CFLAGS = -Wall -DMSGNO $(RPM_OPT_FLAGS) +SONAME = lib$(LIBNAME).so.${SHLIB_MAJOR} +SOVERSION = lib$(LIBNAME).so.${SHLIB_MAJOR} ++CFLAGS += -Wall -DMSGNO $(RPM_OPT_FLAGS) - all: lib$(LIBNAME).so + $(SONAME): $(OBJS) + gcc $(CFLAGS) -shared $(OBJS) -lc -lmba -lexpat -Wl,-soname -Wl,$(SOVERSION) -o $(SONAME) +@@ -18,11 +18,10 @@ - lib$(LIBNAME).so: $(OBJS) -- gcc -Wall -shared $(OBJS) -lc -Wl,-soname -Wl,$(SOVERSION) -o $(SONAME) -+ ${CC} ${CFLAGS} -shared $(OBJS) -Wl,-soname -Wl,$(SOVERSION) -o $(SONAME) -L${LOCALBASE}/lib -lexpat -Wl,-rpath ${LOCALBASE}/lib + install: $(SONAME) + install -d $(libdir) +- install -m 755 $(SONAME) $(libdir) +- cd $(libdir) && ln -sf $(SONAME) $(SOVERSION) && ln -sf $(SONAME) lib$(LIBNAME).so ++ ${BSD_INSTALL_DATA} $(SONAME) $(INSTDIR)/lib ++ cd $(INSTDIR)/lib ; ln -sf $(SONAME) $(INSTDIR)/lib/lib$(LIBNAME).so + install -d $(includedir) +- install -m 444 src/domc.h $(includedir) +- -/sbin/ldconfig $(libdir) ++ ${BSD_INSTALL_DATA} src/domc.h $(INSTDIR)/include example: $(MAKE) -C examples - - install: -- cp src/dom.h $(INSTDIR)/include/dom.h -- cp src/msgno.h $(INSTDIR)/include/msgno.h -- cp $(SONAME) $(INSTDIR)/lib -- cd $(INSTDIR)/lib && ln -sf $(SONAME) $(SOVERSION) && ln -sf $(SONAME) lib$(LIBNAME).so -+ ${BSD_INSTALL_DATA} src/dom.h $(INSTDIR)/include/dom.h -+ ${BSD_INSTALL_DATA} src/msgno.h $(INSTDIR)/include/msgno.h -+ ${BSD_INSTALL_DATA} $(SONAME) $(INSTDIR)/lib -+ ln -sf $(SONAME) $(INSTDIR)/lib/lib$(LIBNAME).so - - clean: - rm $(OBJS) $(SONAME) $(INSTDIR)/include/dom.h $(INSTDIR)/include/msgno.h $(INSTDIR)/lib/$(SONAME) $(INSTDIR)/lib/$(SOVERSION) $(INSTDIR)/lib/lib$(LIBNAME).so - if [ -f examples/d5.o ]; then $(MAKE) -C examples clean; fi - - .c.o: -- gcc -Wall -I../include -Isrc -Lsrc -fPIC -DPIC -c -o $*.o $< -+ ${CC} ${CFLAGS} -I${LOCALBASE}/include/xml -I../include -Isrc -Lsrc -fPIC -DPIC -c -o $*.o $< diff --git a/textproc/domc/files/patch-src::expatls.c b/textproc/domc/files/patch-src::expatls.c deleted file mode 100644 index 352ebde3c041..000000000000 --- a/textproc/domc/files/patch-src::expatls.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/expatls.c.orig Thu Dec 20 19:00:30 2001 -+++ src/expatls.c Sun Dec 30 11:34:02 2001 -@@ -25,6 +25,7 @@ - /* expatls.c - DOM_DocumentLS - */ - -+#include <sys/types.h> - #include <stdlib.h> - #include <limits.h> - #include <ctype.h> |