diff --git a/textproc/libcrm114/Makefile b/textproc/libcrm114/Makefile index 085c7acb744e..345c35d44ee4 100644 --- a/textproc/libcrm114/Makefile +++ b/textproc/libcrm114/Makefile @@ -9,7 +9,7 @@ MASTER_SITES= http://crm114.sourceforge.net/tarballs/ MAINTAINER= info@mschuette.name COMMENT= CRM114 C-callable Library -LIB_DEPENDS= tre:${PORTSDIR}/textproc/libtre +LIB_DEPENDS= libtre.so:${PORTSDIR}/textproc/libtre LICENSE= LGPL3 @@ -32,5 +32,4 @@ PLIST_FILES= lib/libcrm114.so \ share/doc/libcrm114/simple_demo.c PLIST_DIRS= share/doc/libcrm114 -NO_STAGE= yes .include diff --git a/textproc/libcrm114/files/patch-Makefile b/textproc/libcrm114/files/patch-Makefile index 12e5b73d104d..5e112810df87 100644 --- a/textproc/libcrm114/files/patch-Makefile +++ b/textproc/libcrm114/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig 2010-05-06 20:14:55.000000000 +0200 -+++ Makefile 2012-05-19 21:10:00.000000000 +0200 +--- Makefile.orig 2010-05-07 02:14:55.000000000 +0800 ++++ Makefile 2014-06-30 23:20:48.222507260 +0800 @@ -31,7 +31,7 @@ #CFLAGS += -O3 -DDO_INLINES # @@ -9,7 +9,7 @@ # #GCC and LD flags for debugging, no optimization, and profile for speed #CFLAGS += -g -pg -@@ -45,6 +45,8 @@ +@@ -45,6 +45,8 @@ CFLAGS += -g CFLAGS += -std=c99 -pedantic -Wall -Wextra -Wpointer-arith -Wstrict-prototypes #well, pretty carefully CFLAGS += -Wno-sign-compare -Wno-overlength-strings @@ -18,7 +18,7 @@ #These are optional. -@@ -97,8 +99,8 @@ +@@ -97,8 +99,8 @@ crm114_strnhash.o \ crm114_util.o \ crm114_regex_tre.o @@ -29,7 +29,7 @@ test: test.o libcrm114.a $(CC) -o test $(LDFLAGS) -Wl,-M -Wl,--cref test.o libcrm114.a -ltre -lm >test.map -@@ -115,6 +117,24 @@ +@@ -115,6 +117,24 @@ simple_demo.o: texts.h $(LIBHDRS) libcrm114.a: $(LIBOBJS) Makefile ar rc libcrm114.a $(LIBOBJS) @@ -41,20 +41,20 @@ + ln -fs libcrm114.so.0 libcrm114.so + +install: libcrm114.so.0 -+ $(BSD_INSTALL_LIB) libcrm114.so.0 $(PREFIX)/lib -+ ln -fs libcrm114.so.0 $(PREFIX)/lib/libcrm114.so -+ $(BSD_INSTALL_DATA) crm114_config.h $(PREFIX)/include -+ $(BSD_INSTALL_DATA) crm114_lib.h $(PREFIX)/include -+ $(BSD_INSTALL_DATA) crm114_structs.h $(PREFIX)/include -+ $(BSD_INSTALL_DATA) crm114_sysincludes.h $(PREFIX)/include -+ $(BSD_INSTALL_DATA) -d $(PREFIX)/share/doc/libcrm114 -+ $(BSD_INSTALL_DATA) HOWTO.txt $(PREFIX)/share/doc/libcrm114 -+ $(BSD_INSTALL_DATA) simple_demo.c $(PREFIX)/share/doc/libcrm114 ++ $(BSD_INSTALL_LIB) libcrm114.so.0 $(DESTDIR)$(PREFIX)/lib ++ ln -fs libcrm114.so.0 $(DESTDIR)$(PREFIX)/lib/libcrm114.so ++ $(BSD_INSTALL_DATA) crm114_config.h $(DESTDIR)$(PREFIX)/include ++ $(BSD_INSTALL_DATA) crm114_lib.h $(DESTDIR)$(PREFIX)/include ++ $(BSD_INSTALL_DATA) crm114_structs.h $(DESTDIR)$(PREFIX)/include ++ $(BSD_INSTALL_DATA) crm114_sysincludes.h $(DESTDIR)$(PREFIX)/include ++ $(BSD_INSTALL_DATA) -d $(DESTDIR)$(PREFIX)/share/doc/libcrm114 ++ $(BSD_INSTALL_DATA) HOWTO.txt $(DESTDIR)$(PREFIX)/share/doc/libcrm114 ++ $(BSD_INSTALL_DATA) simple_demo.c $(DESTDIR)$(PREFIX)/share/doc/libcrm114 + $(LIBOBJS): $(LIBHDRS) clean: clean_test clean_simple_demo clean_lib clean_profiling -@@ -126,7 +146,7 @@ +@@ -126,7 +146,7 @@ clean_simple_demo: rm -f simple_demo simple_demo.map simple_demo.o simple_demo_datablock.txt clean_lib: