From: <ow...@us...> - 2008-11-10 16:59:57
|
Revision: 2046 http://ipcop.svn.sourceforge.net/ipcop/?rev=2046&view=rev Author: owes Date: 2008-11-10 16:59:55 +0000 (Mon, 10 Nov 2008) Log Message: ----------- Instead of modifying Makefile, patch Makefile.in and report to upstream. Modified Paths: -------------- ipcop/trunk/lfs/libpcap Added Paths: ----------- ipcop/trunk/src/patches/libpcap-1.0.0-force-manpages-symlink.patch Modified: ipcop/trunk/lfs/libpcap =================================================================== --- ipcop/trunk/lfs/libpcap 2008-11-10 16:40:17 UTC (rev 2045) +++ ipcop/trunk/lfs/libpcap 2008-11-10 16:59:55 UTC (rev 2046) @@ -84,11 +84,11 @@ @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + # installation is broken if man pages already exist + cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-force-manpages-symlink.patch #fixes: error in active-filter expression: inbound/outbound not supported on linktype (pppd) cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/libpcap-0.8.3-ppp.patch cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls - # installation is broken if man pages already exist - cd $(DIR_APP) && sed -i -e 's@ln $$(DESTDIR)@ln -f $$(DESTDIR)@' Makefile # install headers and static version cd $(DIR_APP) && make cd $(DIR_APP) && make install Added: ipcop/trunk/src/patches/libpcap-1.0.0-force-manpages-symlink.patch =================================================================== --- ipcop/trunk/src/patches/libpcap-1.0.0-force-manpages-symlink.patch (rev 0) +++ ipcop/trunk/src/patches/libpcap-1.0.0-force-manpages-symlink.patch 2008-11-10 16:59:55 UTC (rev 2046) @@ -0,0 +1,35 @@ +--- libpcap-1.0.0.orig/Makefile.in 2008-11-10 16:41:03.000000000 +0000 ++++ libpcap-1.0.0/Makefile.in 2008-11-10 16:41:59.000000000 +0000 +@@ -452,23 +452,23 @@ + for i in $(MAN3PCAP); do \ + $(INSTALL_DATA) $(srcdir)/$$i \ + $(DESTDIR)$(mandir)/man3/$$i; done +- ln $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_name.3pcap \ ++ ln -f $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_name.3pcap \ + $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_description.3pcap +- ln $(DESTDIR)$(mandir)/man3/pcap_dump_open.3pcap \ ++ ln -f $(DESTDIR)$(mandir)/man3/pcap_dump_open.3pcap \ + $(DESTDIR)$(mandir)/man3/pcap_dump_fopen.3pcap +- ln $(DESTDIR)$(mandir)/man3/pcap_geterr.3pcap \ ++ ln -f $(DESTDIR)$(mandir)/man3/pcap_geterr.3pcap \ + $(DESTDIR)$(mandir)/man3/pcap_perror.3pcap +- ln $(DESTDIR)$(mandir)/man3/pcap_inject.3pcap \ ++ ln -f $(DESTDIR)$(mandir)/man3/pcap_inject.3pcap \ + $(DESTDIR)$(mandir)/man3/pcap_sendpacket.3pcap +- ln $(DESTDIR)$(mandir)/man3/pcap_loop.3pcap \ ++ ln -f $(DESTDIR)$(mandir)/man3/pcap_loop.3pcap \ + $(DESTDIR)$(mandir)/man3/pcap_dispatch.3pcap +- ln $(DESTDIR)$(mandir)/man3/pcap_major_version.3pcap \ ++ ln -f $(DESTDIR)$(mandir)/man3/pcap_major_version.3pcap \ + $(DESTDIR)$(mandir)/man3/pcap_minor_version.3pcap +- ln $(DESTDIR)$(mandir)/man3/pcap_next_ex.3pcap \ ++ ln -f $(DESTDIR)$(mandir)/man3/pcap_next_ex.3pcap \ + $(DESTDIR)$(mandir)/man3/pcap_next.3pcap +- ln $(DESTDIR)$(mandir)/man3/pcap_open_offline.3pcap \ ++ ln -f $(DESTDIR)$(mandir)/man3/pcap_open_offline.3pcap \ + $(DESTDIR)$(mandir)/man3/pcap_fopen_offline.3pcap +- ln $(DESTDIR)$(mandir)/man3/pcap_setnonblock.3pcap \ ++ ln -f $(DESTDIR)$(mandir)/man3/pcap_setnonblock.3pcap \ + $(DESTDIR)$(mandir)/man3/pcap_getnonblock.3pcap + for i in $(MANFILE); do \ + $(INSTALL_DATA) $(srcdir)/`echo $$i | sed 's/.manfile.in/.manfile/'` \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |