Revision: 70978 http://trac.macports.org/changeset/70978 Author: ryandesign@macports.org Date: 2010-08-28 18:14:02 -0700 (Sat, 28 Aug 2010) Log Message: ----------- vantages: fix mtree violations; see #23881 Modified Paths: -------------- trunk/dports/net/vantages/Portfile Added Paths: ----------- trunk/dports/net/vantages/files/patch-makefile_fixes.diff Removed Paths: ------------- trunk/dports/net/vantages/files/patch-destroot_variable_fix.diff Modified: trunk/dports/net/vantages/Portfile =================================================================== --- trunk/dports/net/vantages/Portfile 2010-08-29 01:12:43 UTC (rev 70977) +++ trunk/dports/net/vantages/Portfile 2010-08-29 01:14:02 UTC (rev 70978) @@ -4,7 +4,7 @@ name vantages version 0.8.3.1b -revision 1 +revision 2 categories net platforms darwin maintainers nomaintainer @@ -26,7 +26,7 @@ master_sites ${homepage}src/ checksums sha1 e78bb8de21f7302335d2d73a5423613593e1d6fa extract.suffix .tgz -patchfiles patch-destroot_variable_fix.diff +patchfiles patch-makefile_fixes.diff universal_variant no depends_lib port:curl-ca-bundle \ Deleted: trunk/dports/net/vantages/files/patch-destroot_variable_fix.diff =================================================================== --- trunk/dports/net/vantages/files/patch-destroot_variable_fix.diff 2010-08-29 01:12:43 UTC (rev 70977) +++ trunk/dports/net/vantages/files/patch-destroot_variable_fix.diff 2010-08-29 01:14:02 UTC (rev 70978) @@ -1,63 +0,0 @@ ---- Makefile.in.orig 2010-02-26 16:42:37.000000000 +0100 -+++ Makefile.in 2010-02-26 17:00:57.000000000 +0100 -@@ -99,35 +99,35 @@ - $(MAKE) clean -C shttpd-1.42/src - - install: installman installldconfig -- -( mkdir -p $(bindir) ) -- $(INSTALL_PROGRAM) $(INSTALL_MODE) bin/vantaged $(bindir)/vantaged -- $(INSTALL_PROGRAM) $(INSTALL_MODE) bin/dnsfunnel $(bindir)/dnsfunnel -- $(INSTALL_PROGRAM) $(INSTALL_MODE) bin/dnskey-grab $(bindir)/dnskey-grab -- $(INSTALL_PROGRAM) $(INSTALL_MODE) scripts/create-db.pl $(bindir)/create-db.pl -- $(INSTALL_PROGRAM) $(INSTALL_MODE) scripts/vant-setup $(bindir)/vant-setup -- $(INSTALL) -m 755 -d $(libdir) -- $(LIBTOOL) --mode=install cp dns/libvdns.la $(libdir) -- $(LIBTOOL) --mode=finish $(libdir) -- $(INSTALL_PROGRAM) $(INSTALL_MODE) -d $(includedir)/vantages -- for i in `ls dns/*.h`; do $(INSTALL_PROGRAM) $(DOC_MODE) $$i $(includedir)/vantages/; done -- -( mkdir -p $(docdir) ) -- -( mkdir -p $(datarootdir)/vantages ) -- cp -RL sql $(datarootdir)/vantages/ -- $(INSTALL_PROGRAM) $(DOC_MODE) doc/vantaged.conf.sample $(datarootdir)/vantages/vantaged.conf.sample -- $(INSTALL_PROGRAM) $(DOC_MODE) LICENSE $(datarootdir)/vantages/LICENSE -- $(INSTALL_PROGRAM) $(DOC_MODE) README $(datarootdir)/vantages/README -- $(INSTALL_PROGRAM) $(DOC_MODE) ERRATA $(datarootdir)/vantages/ERRATA -+ -( mkdir -p $(DESTDIR)$(bindir) ) -+ $(INSTALL_PROGRAM) $(INSTALL_MODE) bin/vantaged $(DESTDIR)$(bindir)/vantaged -+ $(INSTALL_PROGRAM) $(INSTALL_MODE) bin/dnsfunnel $(DESTDIR)$(bindir)/dnsfunnel -+ $(INSTALL_PROGRAM) $(INSTALL_MODE) bin/dnskey-grab $(DESTDIR)$(bindir)/dnskey-grab -+ $(INSTALL_PROGRAM) $(INSTALL_MODE) scripts/create-db.pl $(DESTDIR)$(bindir)/create-db.pl -+ $(INSTALL_PROGRAM) $(INSTALL_MODE) scripts/vant-setup $(DESTDIR)$(bindir)/vant-setup -+ $(INSTALL) -m 755 -d $(DESTDIR)$(libdir) -+ $(LIBTOOL) --mode=install cp dns/libvdns.la $(DESTDIR)$(libdir) -+ $(LIBTOOL) --mode=finish $(DESTDIR)$(libdir) -+ $(INSTALL_PROGRAM) $(INSTALL_MODE) -d $(DESTDIR)$(includedir)/vantages -+ for i in `ls dns/*.h`; do $(INSTALL_PROGRAM) $(DOC_MODE) $$i $(DESTDIR)$(includedir)/vantages/; done -+ -( mkdir -p $(DESTDIR)$(docdir) ) -+ -( mkdir -p $(DESTDIR)$(datarootdir)/vantages ) -+ cp -RL sql $(DESTDIR)$(datarootdir)/vantages/ -+ $(INSTALL_PROGRAM) $(DOC_MODE) doc/vantaged.conf.sample $(DESTDIR)$(datarootdir)/vantages/vantaged.conf.sample -+ $(INSTALL_PROGRAM) $(DOC_MODE) LICENSE $(DESTDIR)$(datarootdir)/vantages/LICENSE -+ $(INSTALL_PROGRAM) $(DOC_MODE) README $(DESTDIR)$(datarootdir)/vantages/README -+ $(INSTALL_PROGRAM) $(DOC_MODE) ERRATA $(DESTDIR)$(datarootdir)/vantages/ERRATA - @echo "" - @grep '^--' README - - installman: -- $(INSTALL) -m 755 -d $(man1dir) -- $(INSTALL) -m 755 -d $(man5dir) -- $(INSTALL) -m 755 -d $(man8dir) -- $(INSTALL_PROGRAM) $(DOC_MODE) doc/dnsfunnel.1 $(man1dir)/dnsfunnel.1 -- $(INSTALL_PROGRAM) $(DOC_MODE) doc/dnskey-grab.1 $(man1dir)/dnskey-grab.1 -- $(INSTALL_PROGRAM) $(DOC_MODE) doc/vantaged.conf.5 $(man5dir)/vantaged.conf.5 -- $(INSTALL_PROGRAM) $(DOC_MODE) doc/vantaged.8 $(man8dir)/vantaged.8 -+ $(INSTALL) -m 755 -d $(DESTDIR)$(man1dir) -+ $(INSTALL) -m 755 -d $(DESTDIR)$(man5dir) -+ $(INSTALL) -m 755 -d $(DESTDIR)$(man8dir) -+ $(INSTALL_PROGRAM) $(DOC_MODE) doc/dnsfunnel.1 $(DESTDIR)$(man1dir)/dnsfunnel.1 -+ $(INSTALL_PROGRAM) $(DOC_MODE) doc/dnskey-grab.1 $(DESTDIR)$(man1dir)/dnskey-grab.1 -+ $(INSTALL_PROGRAM) $(DOC_MODE) doc/vantaged.conf.5 $(DESTDIR)$(man5dir)/vantaged.conf.5 -+ $(INSTALL_PROGRAM) $(DOC_MODE) doc/vantaged.8 $(DESTDIR)$(man8dir)/vantaged.8 - - installldconfig: - -( if [ -e /etc/ld.so.conf ]; then if [ "x" = "x`grep '^$(libdir)' /etc/ld.so.conf`" ];then echo "$(libdir)" >> /etc/ld.so.conf; ldconfig; fi; fi ) Copied: trunk/dports/net/vantages/files/patch-makefile_fixes.diff (from rev 68000, trunk/dports/net/vantages/files/patch-destroot_variable_fix.diff) =================================================================== --- trunk/dports/net/vantages/files/patch-makefile_fixes.diff (rev 0) +++ trunk/dports/net/vantages/files/patch-makefile_fixes.diff 2010-08-29 01:14:02 UTC (rev 70978) @@ -0,0 +1,83 @@ +--- Makefile.in.orig 2010-03-01 11:43:04.000000000 +0100 ++++ Makefile.in 2010-03-01 15:15:00.000000000 +0100 +@@ -66,10 +66,10 @@ + includedir = @includedir@ + datarootdir = @datarootdir@ + datadir = @datadir@ +-docdir = $(datadir)/doc/vantages +-localedir = $(datadir)/locale ++docdir = @docdir@ ++localedir = @localedir@ + +-mandir = $(prefix)/man ++mandir = @mandir@ + manpfx = man + + man1ext = .1 +@@ -99,40 +99,40 @@ + $(MAKE) clean -C shttpd-1.42/src + + install: installman installldconfig +- -( mkdir -p $(bindir) ) +- $(INSTALL_PROGRAM) $(INSTALL_MODE) bin/vantaged $(bindir)/vantaged +- $(INSTALL_PROGRAM) $(INSTALL_MODE) bin/dnsfunnel $(bindir)/dnsfunnel +- $(INSTALL_PROGRAM) $(INSTALL_MODE) bin/dnskey-grab $(bindir)/dnskey-grab +- $(INSTALL_PROGRAM) $(INSTALL_MODE) scripts/create-db.pl $(bindir)/create-db.pl +- $(INSTALL_PROGRAM) $(INSTALL_MODE) scripts/vant-setup $(bindir)/vant-setup +- $(INSTALL) -m 755 -d $(libdir) +- $(LIBTOOL) --mode=install cp dns/libvdns.la $(libdir) +- $(LIBTOOL) --mode=finish $(libdir) +- $(INSTALL_PROGRAM) $(INSTALL_MODE) -d $(includedir)/vantages +- for i in `ls dns/*.h`; do $(INSTALL_PROGRAM) $(DOC_MODE) $$i $(includedir)/vantages/; done +- -( mkdir -p $(docdir) ) +- -( mkdir -p $(datarootdir)/vantages ) +- cp -RL sql $(datarootdir)/vantages/ +- $(INSTALL_PROGRAM) $(DOC_MODE) doc/vantaged.conf.sample $(datarootdir)/vantages/vantaged.conf.sample +- $(INSTALL_PROGRAM) $(DOC_MODE) LICENSE $(datarootdir)/vantages/LICENSE +- $(INSTALL_PROGRAM) $(DOC_MODE) README $(datarootdir)/vantages/README +- $(INSTALL_PROGRAM) $(DOC_MODE) ERRATA $(datarootdir)/vantages/ERRATA ++ -( mkdir -p $(DESTDIR)$(bindir) ) ++ $(INSTALL_PROGRAM) $(INSTALL_MODE) bin/vantaged $(DESTDIR)$(bindir)/vantaged ++ $(INSTALL_PROGRAM) $(INSTALL_MODE) bin/dnsfunnel $(DESTDIR)$(bindir)/dnsfunnel ++ $(INSTALL_PROGRAM) $(INSTALL_MODE) bin/dnskey-grab $(DESTDIR)$(bindir)/dnskey-grab ++ $(INSTALL_PROGRAM) $(INSTALL_MODE) scripts/create-db.pl $(DESTDIR)$(bindir)/create-db.pl ++ $(INSTALL_PROGRAM) $(INSTALL_MODE) scripts/vant-setup $(DESTDIR)$(bindir)/vant-setup ++ $(INSTALL) -m 755 -d $(DESTDIR)$(libdir) ++ $(LIBTOOL) --mode=install cp dns/libvdns.la $(DESTDIR)$(libdir) ++ $(LIBTOOL) --mode=finish $(DESTDIR)$(libdir) ++ $(INSTALL_PROGRAM) $(INSTALL_MODE) -d $(DESTDIR)$(includedir)/vantages ++ for i in `ls dns/*.h`; do $(INSTALL_PROGRAM) $(DOC_MODE) $$i $(DESTDIR)$(includedir)/vantages/; done ++ -( mkdir -p $(DESTDIR)$(docdir)/vantages ) ++ -( mkdir -p $(DESTDIR)$(datarootdir)/vantages ) ++ cp -RL sql $(DESTDIR)$(datarootdir)/vantages/ ++ $(INSTALL_PROGRAM) $(DOC_MODE) doc/vantaged.conf.sample $(DESTDIR)$(docdir)/vantages/vantaged.conf.sample ++ $(INSTALL_PROGRAM) $(DOC_MODE) LICENSE $(DESTDIR)$(docdir)/vantages/LICENSE ++ $(INSTALL_PROGRAM) $(DOC_MODE) README $(DESTDIR)$(docdir)/vantages/README ++ $(INSTALL_PROGRAM) $(DOC_MODE) ERRATA $(DESTDIR)$(docdir)/vantages/ERRATA + @echo "" + @grep '^--' README + + installman: +- $(INSTALL) -m 755 -d $(man1dir) +- $(INSTALL) -m 755 -d $(man5dir) +- $(INSTALL) -m 755 -d $(man8dir) +- $(INSTALL_PROGRAM) $(DOC_MODE) doc/dnsfunnel.1 $(man1dir)/dnsfunnel.1 +- $(INSTALL_PROGRAM) $(DOC_MODE) doc/dnskey-grab.1 $(man1dir)/dnskey-grab.1 +- $(INSTALL_PROGRAM) $(DOC_MODE) doc/vantaged.conf.5 $(man5dir)/vantaged.conf.5 +- $(INSTALL_PROGRAM) $(DOC_MODE) doc/vantaged.8 $(man8dir)/vantaged.8 ++ $(INSTALL) -m 755 -d $(DESTDIR)$(man1dir) ++ $(INSTALL) -m 755 -d $(DESTDIR)$(man5dir) ++ $(INSTALL) -m 755 -d $(DESTDIR)$(man8dir) ++ $(INSTALL_PROGRAM) $(DOC_MODE) doc/dnsfunnel.1 $(DESTDIR)$(man1dir)/dnsfunnel.1 ++ $(INSTALL_PROGRAM) $(DOC_MODE) doc/dnskey-grab.1 $(DESTDIR)$(man1dir)/dnskey-grab.1 ++ $(INSTALL_PROGRAM) $(DOC_MODE) doc/vantaged.conf.5 $(DESTDIR)$(man5dir)/vantaged.conf.5 ++ $(INSTALL_PROGRAM) $(DOC_MODE) doc/vantaged.8 $(DESTDIR)$(man8dir)/vantaged.8 + + installldconfig: + -( if [ -e /etc/ld.so.conf ]; then if [ "x" = "x`grep '^$(libdir)' /etc/ld.so.conf`" ];then echo "$(libdir)" >> /etc/ld.so.conf; ldconfig; fi; fi ) + + setup: +- @echo "Seting up database..." ++ @echo "Setting up database..." + $(bindir)/vant-setup -d $(datarootdir)/vantages/sql +