Date: Thu, 26 Feb 2004 07:47:45 +0100 From: "Meno Abels" <abels@adviser.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/63380: crm114 doesn't build with ports-current Message-ID: <20040226064746.584758400B@pmff.de> Resent-Message-ID: <200402260650.i1Q6oFfv053290@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 63380
>Category: ports
>Synopsis: crm114 doesn't build with ports-current
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Feb 25 22:50:15 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: Meno Abels
>Release: FreeBSD 5.2.1-RELEASE i386
>Organization:
ADVISER COM
>Environment:
System: FreeBSD race 5.2.1-RELEASE FreeBSD 5.2.1-RELEASE #6: Mon Feb 23 18:41:05 CET 2004 root@neo.abels.adviser.com:/usr/obj/usr/src/sys/GENERIC i386
>Description:
The patched Makefile of crm114 has some incompatible
changes so that ports-current would build.
>How-To-Repeat:
...
>Fix:
Update port: mail/crm114
Here is the patch to the patch-Makefile which enables the build of
crm114 with ports-current.
diff -ruN /usr/ports/mail/crm114/files/patch-Makefile /usr/ports/mail/crm114.new/files/patch-Makefile
--- /usr/ports/mail/crm114/files/patch-Makefile Tue Feb 24 15:17:04 2004
+++ /usr/ports/mail/crm114.new/files/patch-Makefile Thu Feb 26 07:33:59 2004
@@ -1,53 +1,143 @@
---- Makefile.orig Thu Feb 12 03:42:43 2004
-+++ Makefile Tue Feb 24 14:58:58 2004
-@@ -4,7 +4,7 @@
- # If you want to install the executables somewhere else, change
- # BINDIR here. Default is /usr/bin
- #
--prefix=/usr
-+#prefix=/usr/local
- BINDIR=${prefix}/bin
-
- # VER_SUFFIX defines a version suffix for our installed executables,
-@@ -65,15 +65,7 @@
- $(CC) $(LDFLAGS) crm114.o crmregex_gnu.o crm_mathexec.o -lm -o crm114_gnu $(LIBS)
-
- crm114_tre: crm114.o crmregex_tre.o crm_mathexec.o
-- #
-- # Note: if you haven't installed TRElib, the next step
-- # will get an error.
-- # For TRElib, look in the TRE sub-directory of this kit.
-- # You will also need to add /usr/local/lib to /etc/ld.so.conf,
-- # and then run ldconfig (as root) to set the library up and make
-- # the library known to the static and runtime linkers.
-- #
-- $(CC) $(LDFLAGS) crm114.o crmregex_tre.o crm_mathexec.o -static -lm -ltre -o crm114_tre $(LIBS)
-+ $(CC) $(LDFLAGS) crm114.o crmregex_tre.o crm_mathexec.o -lm -ltre -o crm114_tre $(LIBS)
-
- crm114.o: crm114.c crm114.h crm114_structs.h crm114_config.h crm114_sysincludes.h
- $(CC) $(CFLAGS) -DVERSION='"$(VERSION)"' -c crm114.c -o crm114.o
-@@ -89,14 +81,14 @@
-
- cssutil: cssutil.c crm114.h crm114_structs.h crm114_config.h crm114_sysincludes.h
- $(CC) $(CFLAGS) -c cssutil.c -o cssutil.o
-- $(CC) $(CFLAGS) cssutil.o -static -lm -ltre -o cssutil
-+ $(CC) $(LDFLAGS) $(CFLAGS) cssutil.o -lm -ltre -o cssutil $(LIBS)
-
- cssdiff: cssdiff.c crm114.h crm114_structs.h crm114_config.h crm114_sysincludes.h
- $(CC) $(CFLAGS) -c cssdiff.c -o cssdiff.o
-- $(CC) $(CFLAGS) -static -ltre cssdiff.o -o cssdiff
-+ $(CC) $(LDFLAGS) $(CFLAGS) -ltre cssdiff.o -o cssdiff $(LIBS)
-
- cssmerge: cssmerge.c crm114.h crm114_structs.h crm114_config.h crm114_sysincludes.h
-- $(CC) $(CFLAGS) -static -ltre cssmerge.c -o cssmerge
-+ $(CC) $(LDFLAGS) $(CFLAGS) -ltre cssmerge.c -o cssmerge $(LIBS)
-
- clean:
- -rm -f crm114
-@@ -254,4 +246,4 @@
- distribution: install src_gzip i386_gzip css_gzip
- md5sum crm114-$(VERSION).*.tar.gz
-
--FORCE:
+*** Makefile.orig Thu Feb 12 03:42:43 2004
+--- Makefile Thu Feb 26 07:33:20 2004
+***************
+*** 4,10 ****
+ # If you want to install the executables somewhere else, change
+ # BINDIR here. Default is /usr/bin
+ #
+! prefix=/usr
+ BINDIR=${prefix}/bin
+
+ # VER_SUFFIX defines a version suffix for our installed executables,
+--- 4,10 ----
+ # If you want to install the executables somewhere else, change
+ # BINDIR here. Default is /usr/bin
+ #
+! #prefix=/usr/local
+ BINDIR=${prefix}/bin
+
+ # VER_SUFFIX defines a version suffix for our installed executables,
+***************
+*** 56,79 ****
+ experimental: crm114_tre
+ install -m 755 crm114_tre $(BINDIR)/crma
+
+! crm114: crm114.c crm114.h crm114_structs.h crm114_config.h crm114_sysincludes.h
+! $(MAKE) crm114_tre
+! # ./crm114 is used locally; make sure it's there too.
+ ln -f -s crm114_tre crm114
+
+ crm114_gnu: crm114.o crmregex_gnu.o crm_mathexec.o
+ $(CC) $(LDFLAGS) crm114.o crmregex_gnu.o crm_mathexec.o -lm -o crm114_gnu $(LIBS)
+
+ crm114_tre: crm114.o crmregex_tre.o crm_mathexec.o
+! #
+! # Note: if you haven't installed TRElib, the next step
+! # will get an error.
+! # For TRElib, look in the TRE sub-directory of this kit.
+! # You will also need to add /usr/local/lib to /etc/ld.so.conf,
+! # and then run ldconfig (as root) to set the library up and make
+! # the library known to the static and runtime linkers.
+! #
+! $(CC) $(LDFLAGS) crm114.o crmregex_tre.o crm_mathexec.o -static -lm -ltre -o crm114_tre $(LIBS)
+
+ crm114.o: crm114.c crm114.h crm114_structs.h crm114_config.h crm114_sysincludes.h
+ $(CC) $(CFLAGS) -DVERSION='"$(VERSION)"' -c crm114.c -o crm114.o
+--- 56,69 ----
+ experimental: crm114_tre
+ install -m 755 crm114_tre $(BINDIR)/crma
+
+! crm114: crm114_tre
+ ln -f -s crm114_tre crm114
+
+ crm114_gnu: crm114.o crmregex_gnu.o crm_mathexec.o
+ $(CC) $(LDFLAGS) crm114.o crmregex_gnu.o crm_mathexec.o -lm -o crm114_gnu $(LIBS)
+
+ crm114_tre: crm114.o crmregex_tre.o crm_mathexec.o
+! $(CC) $(LDFLAGS) crm114.o crmregex_tre.o crm_mathexec.o -lm -ltre -o crm114_tre $(LIBS)
+
+ crm114.o: crm114.c crm114.h crm114_structs.h crm114_config.h crm114_sysincludes.h
+ $(CC) $(CFLAGS) -DVERSION='"$(VERSION)"' -c crm114.c -o crm114.o
+***************
+*** 89,102 ****
+
+ cssutil: cssutil.c crm114.h crm114_structs.h crm114_config.h crm114_sysincludes.h
+ $(CC) $(CFLAGS) -c cssutil.c -o cssutil.o
+! $(CC) $(CFLAGS) cssutil.o -static -lm -ltre -o cssutil
+
+ cssdiff: cssdiff.c crm114.h crm114_structs.h crm114_config.h crm114_sysincludes.h
+ $(CC) $(CFLAGS) -c cssdiff.c -o cssdiff.o
+! $(CC) $(CFLAGS) -static -ltre cssdiff.o -o cssdiff
+
+ cssmerge: cssmerge.c crm114.h crm114_structs.h crm114_config.h crm114_sysincludes.h
+! $(CC) $(CFLAGS) -static -ltre cssmerge.c -o cssmerge
+
+ clean:
+ -rm -f crm114
+--- 79,92 ----
+
+ cssutil: cssutil.c crm114.h crm114_structs.h crm114_config.h crm114_sysincludes.h
+ $(CC) $(CFLAGS) -c cssutil.c -o cssutil.o
+! $(CC) $(LDFLAGS) $(CFLAGS) cssutil.o -lm -ltre -o cssutil $(LIBS)
+
+ cssdiff: cssdiff.c crm114.h crm114_structs.h crm114_config.h crm114_sysincludes.h
+ $(CC) $(CFLAGS) -c cssdiff.c -o cssdiff.o
+! $(CC) $(LDFLAGS) $(CFLAGS) -ltre cssdiff.o -o cssdiff $(LIBS)
+
+ cssmerge: cssmerge.c crm114.h crm114_structs.h crm114_config.h crm114_sysincludes.h
+! $(CC) $(LDFLAGS) $(CFLAGS) -ltre cssmerge.c -o cssmerge $(LIBS)
+
+ clean:
+ -rm -f crm114
+***************
+*** 108,129 ****
+ -rm -f crm114_tre
+ -rm -f *.o
+
+! install_crm114: crm114
+! #
+! # NOTE - the default CRM114 now uses the TRE regex lib, not GNU
+! # If you want the GNU one (not recommended) you should
+! # use 'install_gnu' as the make target.
+! #
+! $(MAKE) install_tre
+
+! install_utils:
+! $(MAKE) cssmerge cssutil cssdiff
+ install -m 755 -s cssdiff $(BINDIR)/cssdiff$(VER_SUFFIX)
+ install -m 755 -s cssmerge $(BINDIR)/cssmerge$(VER_SUFFIX)
+ install -m 755 -s cssutil $(BINDIR)/cssutil$(VER_SUFFIX)
+
+! install: FORCE
+! $(MAKE) install_crm114 install_utils
+
+ install_tre: crm114_tre
+ install -m 755 -s crm114_tre $(BINDIR)/crm$(VER_SUFFIX)
+--- 98,111 ----
+ -rm -f crm114_tre
+ -rm -f *.o
+
+! install_crm114: crm114 install_tre
+
+! install_utils: cssmerge cssutil cssdiff
+ install -m 755 -s cssdiff $(BINDIR)/cssdiff$(VER_SUFFIX)
+ install -m 755 -s cssmerge $(BINDIR)/cssmerge$(VER_SUFFIX)
+ install -m 755 -s cssutil $(BINDIR)/cssutil$(VER_SUFFIX)
+
+! install: install_crm114 install_utils
+
+ install_tre: crm114_tre
+ install -m 755 -s crm114_tre $(BINDIR)/crm$(VER_SUFFIX)
+***************
+*** 254,257 ****
+ distribution: install src_gzip i386_gzip css_gzip
+ md5sum crm114-$(VERSION).*.tar.gz
+
+! FORCE:
\ No newline at end of file
-+FORCE:
+--- 236,240 ----
+ distribution: install src_gzip i386_gzip css_gzip
+ md5sum crm114-$(VERSION).*.tar.gz
+
+! FORCE:
+!
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040226064746.584758400B>