Date: Mon, 22 Jul 2002 21:42:52 -0700 (PDT) From: KAWATA Masahiko <kawata@mta.biglobe.ne.jp> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/40915: Fix pkg-plist for net/ethereal Message-ID: <200207230442.g6N4gquk081522@www.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 40915
>Category: ports
>Synopsis: Fix pkg-plist for net/ethereal
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Mon Jul 22 21:50:03 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: KAWATA Masahiko
>Release: 4.6-RC
>Organization:
>Environment:
FreeBSD figo 4.6-RC FreeBSD 4.6-RC #4: Wed Jun 5 14:06:32 JST 2002 kawata@mta.biglobe.ne.jp:/usr/obj/usr/src/sys/FIGO i386
>Description:
There are two issues in net/ethereal port.
A. Static libraries (and associated libtool library files) for
plugins are installed.
/usr/X11R6/lib/ethereal/plugins/0.9.5/coseventcomm.a
/usr/X11R6/lib/ethereal/plugins/0.9.5/coseventcomm.la
/usr/X11R6/lib/ethereal/plugins/0.9.5/cosnaming.a
/usr/X11R6/lib/ethereal/plugins/0.9.5/cosnaming.la
/usr/X11R6/lib/ethereal/plugins/0.9.5/gryphon.a
/usr/X11R6/lib/ethereal/plugins/0.9.5/gryphon.la
/usr/X11R6/lib/ethereal/plugins/0.9.5/mgcp.a
/usr/X11R6/lib/ethereal/plugins/0.9.5/mgcp.la
B. Diameter DTD and XML files are installed in a "etc/diameter"
subdirectory(not "etc" directory). same as PR:40387
/usr/X11R6/etc/diameter/dictionary.dtd
/usr/X11R6/etc/diameter/dictionary.xml
/usr/X11R6/etc/diameter/mobileipv4.xml
/usr/X11R6/etc/diameter/nasreq.xml
/usr/X11R6/etc/diameter/sunping.xml
>How-To-Repeat:
cd /usr/ports/net/ethereal
make install
make deinstall
>Fix:
For ISSUE A.
There is no reason to install static library (and libtool
library file) for using as plugin, I think.
--- Makefile.orig Tue Jul 23 13:18:13 2002
+++ Makefile Tue Jul 23 13:19:49 2002
@@ -48,6 +48,8 @@
CONFIGURE_ARGS+= --enable-snmp=no
.endif
+CONFIGURE_ARGS+= --enable-static=no
+
MAN1+= editcap.1 idl2eth.1 mergecap.1 tethereal.1 text2pcap.1
pre-install:
diff -uN files.orig/patch-plugins files/patch-plugins
--- files.orig/patch-plugins Thu Jan 1 09:00:00 1970
+++ files/patch-plugins Tue Jul 23 13:25:40 2002
@@ -0,0 +1,72 @@
+--- plugins/mgcp/Makefile.in.orig Sat Jun 29 10:04:05 2002
++++ plugins/mgcp/Makefile.in Tue Jul 23 13:14:22 2002
+@@ -157,6 +157,7 @@
+ plugindir = @PLUGIN_DIR@
+
+ plugin_LTLIBRARIES = mgcp.la
++plugin_SOLIBRARIES = ${plugin_LTLIBRARIES:C/\.la$/.so/}
+ mgcp_la_SOURCES = packet-mgcp.c moduleinfo.h
+ mgcp_la_LDFLAGS = -module -avoid-version
+
+@@ -225,10 +226,10 @@
+ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+ $(mkinstalldirs) $(DESTDIR)$(plugindir)
+- @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
+- if test -f $$p; then \
++ @list='$(plugin_SOLIBRARIES)'; for p in $$list; do \
++ if test -f .libs/$$p; then \
+ echo "$(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(plugindir)/$$p"; \
+- $(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(plugindir)/$$p; \
++ $(INSTALL) .libs/$$p $(DESTDIR)$(plugindir)/$$p; \
+ else :; fi; \
+ done
+
+--- plugins/gryphon/Makefile.in.orig Sat Jun 29 10:04:04 2002
++++ plugins/gryphon/Makefile.in Tue Jul 23 13:13:20 2002
+@@ -157,6 +157,7 @@
+ plugindir = @PLUGIN_DIR@
+
+ plugin_LTLIBRARIES = gryphon.la
++plugin_SOLIBRARIES = ${plugin_LTLIBRARIES:C/\.la$/.so/}
+ gryphon_la_SOURCES = packet-gryphon.c packet-gryphon.h moduleinfo.h
+ gryphon_la_LDFLAGS = -module -avoid-version
+
+@@ -225,10 +226,10 @@
+ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+ $(mkinstalldirs) $(DESTDIR)$(plugindir)
+- @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
+- if test -f $$p; then \
++ @list='$(plugin_SOLIBRARIES)'; for p in $$list; do \
++ if test -f .libs/$$p; then \
+ echo "$(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(plugindir)/$$p"; \
+- $(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(plugindir)/$$p; \
++ $(INSTALL) .libs/$$p $(DESTDIR)$(plugindir)/$$p; \
+ else :; fi; \
+ done
+
+--- plugins/giop/Makefile.in.orig Sat Jun 29 10:04:05 2002
++++ plugins/giop/Makefile.in Tue Jul 23 13:12:43 2002
+@@ -160,6 +160,7 @@
+ plugindir = @PLUGIN_DIR@
+
+ plugin_LTLIBRARIES = cosnaming.la coseventcomm.la
++plugin_SOLIBRARIES = ${plugin_LTLIBRARIES:C/\.la$/.so/}
+ cosnaming_la_SOURCES = packet-cosnaming.c moduleinfo.h
+ cosnaming_la_LDFLAGS = -module -avoid-version
+
+@@ -235,10 +236,10 @@
+ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+ $(mkinstalldirs) $(DESTDIR)$(plugindir)
+- @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
+- if test -f $$p; then \
++ @list='$(plugin_SOLIBRARIES)'; for p in $$list; do \
++ if test -f .libs/$$p; then \
+ echo "$(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(plugindir)/$$p"; \
+- $(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(plugindir)/$$p; \
++ $(INSTALL) .libs/$$p $(DESTDIR)$(plugindir)/$$p; \
+ else :; fi; \
+ done
+
For ISSUE B. (same as PR:40387 without a bit of addition)
--- pkg-plist.orig Wed Feb 6 08:24:11 2002
+++ pkg-plist Tue Jul 23 08:32:12 2002
@@ -5,15 +5,16 @@
bin/tethereal
bin/text2pcap
etc/manuf
-etc/dictionary.dtd
-etc/dictionary.xml
-etc/mobileipv4.xml
-etc/nasreq.xml
-etc/sunping.xml
+etc/diameter/dictionary.dtd
+etc/diameter/dictionary.xml
+etc/diameter/mobileipv4.xml
+etc/diameter/nasreq.xml
+etc/diameter/sunping.xml
lib/ethereal/plugins/%%PORTVERSION%%/coseventcomm.so
lib/ethereal/plugins/%%PORTVERSION%%/cosnaming.so
lib/ethereal/plugins/%%PORTVERSION%%/gryphon.so
lib/ethereal/plugins/%%PORTVERSION%%/mgcp.so
+@dirrm etc/diameter
@dirrm lib/ethereal/plugins/%%PORTVERSION%%
@dirrm lib/ethereal/plugins
@dirrm lib/ethereal
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200207230442.g6N4gquk081522>