ports/54267: x11/libpanel implicitly depends on libgnugetopt

[Norikatsu Shigemura]

>Number:         54267
>Category:       ports
>Synopsis:       x11/libpanel implicitly depends on libgnugetopt
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jul 09 08:20:17 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Norikatsu Shigemura
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
Ensure Technology Ltd. (http://www.ensure-tech.co.jp)
>Environment:
System: FreeBSD nadesico.ninth-nine.com 5.1-CURRENT FreeBSD 5.1-CURRENT #16: Tue Jul 1 01:42:04 JST 2003 nork at nadesico.ninth-nine.com:/usr/obj/usr/src/sys/NADESICO i386
>Description:
	x11/libpannel required libgnugetopt.
>How-To-Repeat:
	grep getopt appletsConf.sh.in.
>Fix:
--- diff begins here ---
diff -urN libpanel.orig/Makefile libpanel/Makefile
--- libpanel.orig/Makefile	Tue Apr  8 17:02:24 2003
+++ libpanel/Makefile	Thu Jul 10 00:01:07 2003
@@ -19,7 +19,8 @@
 GNOME_DESKTOP_VERSION=1
 USE_GNOME=	gnomelibs
 INSTALLS_SHLIB=	yes
-MAKE_ENV=	X11BASE="${X11BASE}" LOCALBASE="${LOCALBASE}"
+USE_GETOPT_LONG=yes
+MAKE_ENV=	X11BASE="${X11BASE}" LOCALBASE="${LOCALBASE}" LDFLAGS="${LDFLAGS}"
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/libpanel_applet.so.5 ${PREFIX}/lib
diff -urN libpanel.orig/files/patch-Makefile libpanel/files/patch-Makefile
--- libpanel.orig/files/patch-Makefile	Thu Jan  1 09:00:00 1970
+++ libpanel/files/patch-Makefile	Thu Jul 10 00:03:18 2003
@@ -0,0 +1,12 @@
+--- Makefile.orig	Wed Jul 10 21:34:30 2002
++++ Makefile	Thu Jul 10 00:01:56 2003
+@@ -30,7 +30,8 @@
+ 	touch my_gnome_panel_idl
+ 
+ appletsConf.sh: appletsConf.sh.in
+-	sed 's|%%LOCALBASE%%|${LOCALBASE}|g ; s|%%X11BASE%%|${X11BASE}|g' \
++	sed -e 's|%%LOCALBASE%%|${LOCALBASE}|g ; s|%%X11BASE%%|${X11BASE}|g' \
++		-e 's|%%GNUGETOPT%%|${LDFLAGS}|g' \
+ 		< appletsConf.sh.in > appletsConf.sh
+ 
+ .include <bsd.lib.mk>
diff -urN libpanel.orig/files/patch-appletsConf.sh.in libpanel/files/patch-appletsConf.sh.in
--- libpanel.orig/files/patch-appletsConf.sh.in	Thu Jan  1 09:00:00 1970
+++ libpanel/files/patch-appletsConf.sh.in	Thu Jul 10 00:02:41 2003
@@ -0,0 +1,10 @@
+--- appletsConf.sh.in.orig	Wed Jul 10 19:28:23 2002
++++ appletsConf.sh.in	Thu Jul 10 00:02:08 2003
+@@ -2,6 +2,6 @@
+ # Configuration file for creating GNOME panel applets
+ #
+ APPLETS_LIBDIR="-Wl,-E -L%%X11BASE%%/lib -L%%LOCALBASE%%/lib"
+-APPLETS_LIBS="-lpanel_applet -Wl,-E -lgnorba -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lwrap -lXpm -ljpeg -lgnomeui -lart_lgpl -lgdk_imlib -ltiff -lungif -lpng -lz -lSM -lICE -lgtk12 -lgdk12 -lgmodule12 -lXext -lX11 -lgnome -lgnomesupport -lintl -lesd -lgnugetopt -laudiofile -lm -lglib12"
++APPLETS_LIBS="-lpanel_applet -Wl,-E -lgnorba -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lwrap -lXpm -ljpeg -lgnomeui -lart_lgpl -lgdk_imlib -ltiff -lungif -lpng -lz -lSM -lICE -lgtk12 -lgdk12 -lgmodule12 -lXext -lX11 -lgnome -lgnomesupport -lintl -lesd %%GNUGETOPT%% -laudiofile -lm -lglib12"
+ APPLETS_INCLUDEDIR="-I%%X11BASE%%/include/gnome-1.0 -I%%X11BASE%%/include -DNEED_GNOMESUPPORT_H -I%%X11BASE%%/lib/gnome-libs/include -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include/orbit-1.0 -I%%LOCALBASE%%/include -I%%X11BASE%%/include/gtk12 -I%%X11BASE%%/include/libcapplet1 -I%%X11BASE%%/include/gnome-1.0 -I%%X11BASE%%/include -DNEED_GNOMESUPPORT_H -I%%X11BASE%%/lib/gnome-libs/include -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include/orbit-1.0 -I%%LOCALBASE%%/include -I%%X11BASE%%/include/gtk12"
+ MODULE_VERSION="applets-1.4.1"
--- diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted: