diff options
author | Edwin Groothuis <edwin@FreeBSD.org> | 2005-11-26 13:10:21 +0000 |
---|---|---|
committer | Edwin Groothuis <edwin@FreeBSD.org> | 2005-11-26 13:10:21 +0000 |
commit | 3517637f90b967f990664ebe06d82916af0e44c6 (patch) | |
tree | 12bfba5e3927164ee5af0def878c9b8ad5b03e21 /textproc/pcrs/files | |
parent | 70b1179c61675622ee3de992eacb5c99f9032045 (diff) |
Notes
Diffstat (limited to 'textproc/pcrs/files')
-rw-r--r-- | textproc/pcrs/files/patch-Makefile.in | 54 | ||||
-rw-r--r-- | textproc/pcrs/files/patch-configure | 40 |
2 files changed, 94 insertions, 0 deletions
diff --git a/textproc/pcrs/files/patch-Makefile.in b/textproc/pcrs/files/patch-Makefile.in new file mode 100644 index 000000000000..d8a754e85e49 --- /dev/null +++ b/textproc/pcrs/files/patch-Makefile.in @@ -0,0 +1,54 @@ +--- Makefile.in.orig Mon Mar 11 08:56:16 2002 ++++ Makefile.in Sun Nov 27 00:07:10 2005 +@@ -19,6 +19,7 @@ + + BINDIR = @bindir@ + LIBDIR = @libdir@ ++INCLUDEDIR = @includedir@ + MANDIR = @mandir@/man3 + + +@@ -47,6 +48,7 @@ + ############################################################################# + + CFLAGS = @CFLAGS@ -Wall -Wstrict-prototypes -Wshadow -Wconversion -pedantic \ ++ -I$(INCLUDEDIR) -L$(LIBDIR) \ + @PARANOID_FU@ -Wunreachable-code -Wmissing-prototypes \ + -Waggregate-return -W -Wfloat-equal -Wsign-compare \ + -Wwrite-strings +@@ -66,29 +68,25 @@ + $(CC) $(CFLAGS) pcrsed.c pcrs.@OBJEXT@ -o pcrsed@EXEEXT@ $(LIBS) + + shared: pcrs.@OBJEXT@ +- $(CC) $(CLFLAGS) $(LDFLAGS) $(LIBFLAGS) -Wl,-soname,libpcrs.so.$(VERSION_MAJOR) -o libpcrs.so.$(VERSION) pcrs.@OBJEXT@ $(LIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) $(LIBFLAGS) -Wl,-soname,libpcrs.so.$(VERSION_MAJOR) -o libpcrs.so.$(VERSION_MAJOR) pcrs.@OBJEXT@ $(LIBS) + + static: + $(AR) libpcrs.a pcrs.@OBJEXT@ + + install: all +- $(INSTALL) -m 755 libpcrs.so.$(VERSION) $(LIBDIR) +- $(LN_S) -f libpcrs.so.$(VERSION) $(LIBDIR)/libpcrs.so +- $(INSTALL) -m 644 libpcrs.a $(LIBDIR) ++ $(INSTALL) -m 755 libpcrs.so.$(VERSION_MAJOR) $(prefix)/lib ++ $(LN_S) -f libpcrs.so.$(VERSION_MAJOR) $(prefix)/lib/libpcrs.so ++ $(INSTALL) -m 644 libpcrs.a $(prefix)/lib + $(INSTALL) -m 644 pcrs.3 $(MANDIR) + +- if test "$(HAVE_GZIP)" = "yes"; then \ +- gzip -f $(MANDIR)/pcrs.3; \ +- fi +- + @echo -e " ***************************************************\n" \ +- "** Libraries have been installed in $(LIBDIR). \n" \ ++ "** Libraries have been installed in $(prefix)/lib. \n" \ + "** Don't forget to run ldconfig. \n" \ + "***************************************************" + + @if test -f pcrsed@EXEEXT@; then\ + echo -e "\nRebuilding pcrsed to use the installed shared library"; \ +- $(CC) $(CFLAGS) -L$(LIBDIR) pcrsed.c -o pcrsed@EXEEXT@ $(LIBS) -lpcrs; \ ++ $(CC) $(CFLAGS) -L$(prefix)/lib pcrsed.c -o pcrsed@EXEEXT@ $(LIBS) -lpcrs; \ + fi + + clean: diff --git a/textproc/pcrs/files/patch-configure b/textproc/pcrs/files/patch-configure new file mode 100644 index 000000000000..3a82a058d29e --- /dev/null +++ b/textproc/pcrs/files/patch-configure @@ -0,0 +1,40 @@ +--- configure.orig Tue Dec 2 10:45:42 2003 ++++ configure Sat Nov 26 02:57:22 2005 +@@ -19,12 +19,12 @@ + # dashes changed to underlines. + build=NONE + cache_file=./config.cache +-exec_prefix=NONE ++exec_prefix=/usr/local + host=NONE + no_create= + nonopt=NONE + no_recursion= +-prefix=NONE ++prefix=/usr/local + program_prefix=NONE + program_suffix=NONE + program_transform_name=s,x,x, +@@ -42,8 +42,8 @@ + sysconfdir='${prefix}/etc' + sharedstatedir='${prefix}/com' + localstatedir='${prefix}/var' +-libdir='${exec_prefix}/lib' +-includedir='${prefix}/include' ++libdir="${exec_prefix}/lib" ++includedir="${prefix}/include" + oldincludedir='/usr/include' + infodir='${prefix}/info' + mandir='${prefix}/man' +@@ -685,9 +685,9 @@ + rm -fr conftest* + ac_ext=c + # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +-ac_cpp='$CPP $CPPFLAGS' ++ac_cpp='$CPP -I${includedir} -L${libdir} $CPPFLAGS' + ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ++ac_link='${CC-cc} -I${includedir} -L${libdir} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + cross_compiling=$ac_cv_prog_cc_cross + + echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 |