diff options
| author | marcus <marcus@FreeBSD.org> | 2003-07-12 13:57:33 +0800 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2003-07-12 13:57:33 +0800 |
| commit | 58c294824aa68e24d67325cc82552e717e095317 (patch) | |
| tree | dbc4da46e254ffdbbd9596d37d3ed15eb547ad3a /x11 | |
| parent | ca8ec2765bfcd7443e8f676050947cd46c3bc935 (diff) | |
| download | freebsd-ports-gnome-58c294824aa68e24d67325cc82552e717e095317.tar.gz freebsd-ports-gnome-58c294824aa68e24d67325cc82552e717e095317.tar.zst freebsd-ports-gnome-58c294824aa68e24d67325cc82552e717e095317.zip | |
Fix libpanel to use USE_GETOPT_LONG.
PR: 54267
Submitted by: nork
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/libpanel/Makefile | 3 | ||||
| -rw-r--r-- | x11/libpanel/files/patch-Makefile | 12 | ||||
| -rw-r--r-- | x11/libpanel/files/patch-appletsConf.sh.in | 10 |
3 files changed, 24 insertions, 1 deletions
diff --git a/x11/libpanel/Makefile b/x11/libpanel/Makefile index 1a94f0112a56..93a2d8658d9e 100644 --- a/x11/libpanel/Makefile +++ b/x11/libpanel/Makefile @@ -19,7 +19,8 @@ USE_X_PREFIX= yes 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 --git a/x11/libpanel/files/patch-Makefile b/x11/libpanel/files/patch-Makefile new file mode 100644 index 000000000000..a20b09ea1b34 --- /dev/null +++ b/x11/libpanel/files/patch-Makefile @@ -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 --git a/x11/libpanel/files/patch-appletsConf.sh.in b/x11/libpanel/files/patch-appletsConf.sh.in new file mode 100644 index 000000000000..e8897d621a89 --- /dev/null +++ b/x11/libpanel/files/patch-appletsConf.sh.in @@ -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" |