Revision: 124750 https://trac.macports.org/changeset/124750 Author: jmr@macports.org Date: 2014-08-27 16:24:24 -0700 (Wed, 27 Aug 2014) Log Message: ----------- angst: fix destroot violation and other makefile issues Modified Paths: -------------- trunk/dports/net/angst/Portfile Added Paths: ----------- trunk/dports/net/angst/files/ trunk/dports/net/angst/files/Makefile.patch Modified: trunk/dports/net/angst/Portfile =================================================================== --- trunk/dports/net/angst/Portfile 2014-08-27 23:05:31 UTC (rev 124749) +++ trunk/dports/net/angst/Portfile 2014-08-27 23:24:24 UTC (rev 124750) @@ -15,6 +15,10 @@ master_sites sourceforge:project/angst/angst-${version}/angst-0.4.tar.gz checksums md5 21643cd776bf478c6fbe4ddabb826be8 depends_lib lib:libnet:libnet -configure { reinplace "s|/usr/local|${prefix}|g" ${worksrcpath}/Makefile - reinplace "s|${prefix}/sbin|${destroot}${prefix}/sbin|g" ${worksrcpath}/Makefile - reinplace "s|${prefix}/share/man|${destroot}${prefix}/share/man|g" ${worksrcpath}/Makefile } +patchfiles Makefile.patch +post-patch { + reinplace "s|__PREFIX__|${prefix}|" ${worksrcpath}/Makefile + reinplace "s|__ARCHFLAGS__|[get_canonical_archflags cc]|" ${worksrcpath}/Makefile +} +use_configure no +build.env CC="${configure.cc}" Added: trunk/dports/net/angst/files/Makefile.patch =================================================================== --- trunk/dports/net/angst/files/Makefile.patch (rev 0) +++ trunk/dports/net/angst/files/Makefile.patch 2014-08-27 23:24:24 UTC (rev 124750) @@ -0,0 +1,48 @@ +--- Makefile.orig 2001-02-09 00:44:06.000000000 +1100 ++++ Makefile 2014-08-28 09:21:30.000000000 +1000 +@@ -5,13 +5,14 @@ + # + # $Id: Makefile,v 1.17 2001/02/08 13:44:06 argp Exp $ + +-CC = gcc +-INSTALL_DIR = /usr/bin/install -c -o root -g bin +-INSTALL_SBIN = /usr/bin/install -c -s -o root -g bin -m 555 +-INSTALL_MAN = /usr/bin/install -c -o root -g bin -m 444 +-CFLAGS = -O2 -Wall +-INCLUDE = -I/usr/local/include +-LIBS = -L/usr/local/lib `libnet-config --libs` -lpcap ++CC ?= gcc ++INSTALL_DIR = /usr/bin/install -c ++INSTALL_SBIN = /usr/bin/install -c -m 550 ++INSTALL_MAN = /usr/bin/install -c -m 444 ++CFLAGS = -O2 -Wall __ARCHFLAGS__ ++prefix = __PREFIX__ ++INCLUDE = -I$(prefix)/include ++LIBS = -L$(prefix)/lib `libnet-config --libs` -lpcap + DEFINE = `libnet-config --defines` #-DDEBUG + OBJS = main.o active.o enable.o help.o host.o pcap.o signal.o util.o + +@@ -27,15 +28,15 @@ + rm -f angst *.o *.core core + + install: +- $(INSTALL_DIR) -d /usr/local/sbin +- rm -f /usr/local/sbin/angst +- $(INSTALL_SBIN) -m 550 angst /usr/local/sbin +- $(INSTALL_DIR) -d /usr/local/man/man8 +- rm -f /usr/local/man/man8/angst.8 +- $(INSTALL_MAN) angst.8 /usr/local/man/man8 ++ $(INSTALL_DIR) -d $(DESTDIR)$(prefix)/sbin ++ rm -f $(DESTDIR)$(prefix)/sbin/angst ++ $(INSTALL_SBIN) angst $(DESTDIR)$(prefix)/sbin ++ $(INSTALL_DIR) -d $(DESTDIR)$(prefix)/share/man/man8 ++ rm -f $(DESTDIR)$(prefix)/share/man/man8/angst.8 ++ $(INSTALL_MAN) angst.8 $(DESTDIR)$(prefix)/share/man/man8 + + uninstall: +- rm -f /usr/local/sbin/angst +- rm -f /usr/local/man/man8/angst.8 ++ rm -f $(DESTDIR)$(prefix)/sbin/angst ++ rm -f $(DESTDIR)$(prefix)/share/man/man8/angst.8 + + # EOF