1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-23 04:23:08 +00:00

unbreak package at bento(i386/RELENG_4):

o get rid of hardcoded CONFIGURE_TARGET from pkg-plist.
o utilize USE_SDL as pkg-plist includes its modules.
o utilize USE_GETOPT_LONG as configure detects libgnugetopt.
o utilize PTHREAD_LIBS to avoid linking both libc and libc_r in -STABLE.
o supply CPPFLAGS/LDFLAGS to configure to detect ogg/vorbis/id3tag and others.
o and add number of modules built accordingly.
o then sort pkg-plist.
This commit is contained in:
FUJISHIMA Satsuki 2003-09-14 09:56:09 +00:00
parent 3c8a99c287
commit 63dcec2a01
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=88979
6 changed files with 76 additions and 40 deletions

View File

@ -31,10 +31,18 @@ LIB_DEPENDS= dvdcss.2:${PORTSDIR}/multimedia/libdvdcss \
# After libmpeg2 release 0.3.2
# mpeg2.0:${PORTSDIR}/multimedia/libmpeg2 \
USE_GETOPT_LONG=yes
USE_GMAKE= yes
USE_GNOME= gtk12
USE_REINPLACE= yes
USE_SDL= yes
USE_XLIB= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
CONFIGURE_ENV= PATH_GTKCONFIG="${GTK_CONFIG}"
GNU_CONFIGURE= yes
CONFIGURE_ENV= PATH_GTKCONFIG="${GTK_CONFIG}" \
CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
LDFLAGS=-L${LOCALBASE}/lib
CONFIGURE_ARGS+=--with-dvdcss=${LOCALBASE} \
--with-dvdread=${LOCALBASE} \
--with-mad=${LOCALBASE} \
@ -44,14 +52,11 @@ CONFIGURE_ARGS+=--with-dvdcss=${LOCALBASE} \
--enable-ffmpeg \
--with-ffmpeg=${LOCALBASE} \
--disable-libmpeg2 \
--program-prefix="" \
--without-libintl-prefix \
--without-libiconv-prefix
# dirty
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
USE_GNOME= gtk12
USE_GMAKE= yes
post-patch:
@${REINPLACE_CMD} -e 's/-lc_r/${PTHREAD_LIBS}/' ${WRKSRC}/configure
.include <bsd.port.mk>

View File

@ -1,6 +1,14 @@
--- configure.orig Mon Jun 30 18:06:22 2003
+++ configure Mon Jun 30 18:07:02 2003
@@ -14017,7 +14017,7 @@
--- configure.orig Mon Jun 23 04:24:14 2003
+++ configure Fri Sep 12 14:30:22 2003
@@ -4501,7 +4501,6 @@
;;
*bsd*)
SYS="${target_os}"
- CFLAGS_save="${CFLAGS_save} -pthread"; CFLAGS="${CFLAGS_save}"
;;
darwin*)
SYS=darwin
@@ -14017,7 +14016,7 @@
fi

View File

@ -1,6 +1,6 @@
bin/i386-portbld-freebsd4.8-vlc-config
bin/i386-portbld-freebsd4.8-vlc
bin/gvlc
bin/vlc
bin/vlc-config
bin/wxvlc
include/vlc/aout.h
include/vlc/decoder.h
@ -9,12 +9,7 @@ include/vlc/intf.h
include/vlc/sout.h
include/vlc/vlc.h
include/vlc/vout.h
lib/charset.alias
lib/libvlc.a
lib/vlc/libidct.a
lib/vlc/libidctclassic.a
lib/vlc/libmotion.a
lib/vlc/libmpeg_video_old.a
lib/vlc/access/libaccess_directory_plugin.so
lib/vlc/access/libaccess_file_plugin.so
lib/vlc/access/libaccess_ftp_plugin.so
@ -24,6 +19,7 @@ lib/vlc/access/libaccess_udp_plugin.so
lib/vlc/access/libcdda_plugin.so
lib/vlc/access/libdvd_plugin.so
lib/vlc/access/libdvdread_plugin.so
lib/vlc/access/libslp_plugin.so
lib/vlc/access/libvcd_plugin.so
lib/vlc/access_output/libaccess_output_dummy_plugin.so
lib/vlc/access_output/libaccess_output_file_plugin.so
@ -66,6 +62,7 @@ lib/vlc/codec/liblpcm_plugin.so
lib/vlc/codec/libmpeg_audio_plugin.so
lib/vlc/codec/librawvideo_plugin.so
lib/vlc/codec/libspudec_plugin.so
lib/vlc/codec/libvorbis_plugin.so
lib/vlc/control/libgestures_plugin.so
lib/vlc/control/libhttp_plugin.so
lib/vlc/control/librc_plugin.so
@ -79,10 +76,12 @@ lib/vlc/demux/libdemuxdump_plugin.so
lib/vlc/demux/libdemuxsub_plugin.so
lib/vlc/demux/libes_plugin.so
lib/vlc/demux/libid3_plugin.so
lib/vlc/demux/libid3tag_plugin.so
lib/vlc/demux/libm3u_plugin.so
lib/vlc/demux/libm4v_plugin.so
lib/vlc/demux/libmp4_plugin.so
lib/vlc/demux/libmpeg_system_plugin.so
lib/vlc/demux/libogg_plugin.so
lib/vlc/demux/libps_plugin.so
lib/vlc/demux/librawdv_plugin.so
lib/vlc/demux/libts_plugin.so
@ -93,9 +92,13 @@ lib/vlc/libi420_rgb_mmx.a
lib/vlc/libi420_ymga_mmx.a
lib/vlc/libi420_yuy2_mmx.a
lib/vlc/libi422_yuy2_mmx.a
lib/vlc/libidct.a
lib/vlc/libidctclassic.a
lib/vlc/libmemcpy3dn.a
lib/vlc/libmemcpymmx.a
lib/vlc/libmemcpymmxext.a
lib/vlc/libmotion.a
lib/vlc/libmpeg_video_old.a
lib/vlc/misc/libdummy_plugin.so
lib/vlc/misc/libgtk_main_plugin.so
lib/vlc/misc/libhttpd_plugin.so
@ -107,6 +110,7 @@ lib/vlc/misc/libsap_plugin.so
lib/vlc/misc/libscreensaver_plugin.so
lib/vlc/mux/libmux_avi_plugin.so
lib/vlc/mux/libmux_dummy_plugin.so
lib/vlc/mux/libmux_ogg_plugin.so
lib/vlc/mux/libmux_ps_plugin.so
lib/vlc/mux/libmux_ts_plugin.so
lib/vlc/packetizer/libpacketizer_a52_plugin.so
@ -226,6 +230,7 @@ share/vlc/vlc48x48.png
@dirrm share/vlc/skins/default
@dirrm share/vlc/skins
@dirrm share/vlc
@dirrm lib/vlc/visualization
@dirrm lib/vlc/video_output
@dirrm lib/vlc/video_filter
@dirrm lib/vlc/video_chroma
@ -234,6 +239,7 @@ share/vlc/vlc48x48.png
@dirrm lib/vlc/mux
@dirrm lib/vlc/misc
@dirrm lib/vlc/gui
@dirrm lib/vlc/encoder
@dirrm lib/vlc/demux
@dirrm lib/vlc/control
@dirrm lib/vlc/codec
@ -242,6 +248,5 @@ share/vlc/vlc48x48.png
@dirrm lib/vlc/audio_filter
@dirrm lib/vlc/access_output
@dirrm lib/vlc/access
@unexec rmdir %D/lib/vlc/visualization 2>/dev/null || true
@unexec rmdir %D/lib/vlc/encoder 2>/dev/null || true
@dirrm lib/vlc
@dirrm include/vlc

View File

@ -31,10 +31,18 @@ LIB_DEPENDS= dvdcss.2:${PORTSDIR}/multimedia/libdvdcss \
# After libmpeg2 release 0.3.2
# mpeg2.0:${PORTSDIR}/multimedia/libmpeg2 \
USE_GETOPT_LONG=yes
USE_GMAKE= yes
USE_GNOME= gtk12
USE_REINPLACE= yes
USE_SDL= yes
USE_XLIB= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
CONFIGURE_ENV= PATH_GTKCONFIG="${GTK_CONFIG}"
GNU_CONFIGURE= yes
CONFIGURE_ENV= PATH_GTKCONFIG="${GTK_CONFIG}" \
CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
LDFLAGS=-L${LOCALBASE}/lib
CONFIGURE_ARGS+=--with-dvdcss=${LOCALBASE} \
--with-dvdread=${LOCALBASE} \
--with-mad=${LOCALBASE} \
@ -44,14 +52,11 @@ CONFIGURE_ARGS+=--with-dvdcss=${LOCALBASE} \
--enable-ffmpeg \
--with-ffmpeg=${LOCALBASE} \
--disable-libmpeg2 \
--program-prefix="" \
--without-libintl-prefix \
--without-libiconv-prefix
# dirty
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
USE_GNOME= gtk12
USE_GMAKE= yes
post-patch:
@${REINPLACE_CMD} -e 's/-lc_r/${PTHREAD_LIBS}/' ${WRKSRC}/configure
.include <bsd.port.mk>

View File

@ -1,6 +1,14 @@
--- configure.orig Mon Jun 30 18:06:22 2003
+++ configure Mon Jun 30 18:07:02 2003
@@ -14017,7 +14017,7 @@
--- configure.orig Mon Jun 23 04:24:14 2003
+++ configure Fri Sep 12 14:30:22 2003
@@ -4501,7 +4501,6 @@
;;
*bsd*)
SYS="${target_os}"
- CFLAGS_save="${CFLAGS_save} -pthread"; CFLAGS="${CFLAGS_save}"
;;
darwin*)
SYS=darwin
@@ -14017,7 +14016,7 @@
fi

View File

@ -1,6 +1,6 @@
bin/i386-portbld-freebsd4.8-vlc-config
bin/i386-portbld-freebsd4.8-vlc
bin/gvlc
bin/vlc
bin/vlc-config
bin/wxvlc
include/vlc/aout.h
include/vlc/decoder.h
@ -9,12 +9,7 @@ include/vlc/intf.h
include/vlc/sout.h
include/vlc/vlc.h
include/vlc/vout.h
lib/charset.alias
lib/libvlc.a
lib/vlc/libidct.a
lib/vlc/libidctclassic.a
lib/vlc/libmotion.a
lib/vlc/libmpeg_video_old.a
lib/vlc/access/libaccess_directory_plugin.so
lib/vlc/access/libaccess_file_plugin.so
lib/vlc/access/libaccess_ftp_plugin.so
@ -24,6 +19,7 @@ lib/vlc/access/libaccess_udp_plugin.so
lib/vlc/access/libcdda_plugin.so
lib/vlc/access/libdvd_plugin.so
lib/vlc/access/libdvdread_plugin.so
lib/vlc/access/libslp_plugin.so
lib/vlc/access/libvcd_plugin.so
lib/vlc/access_output/libaccess_output_dummy_plugin.so
lib/vlc/access_output/libaccess_output_file_plugin.so
@ -66,6 +62,7 @@ lib/vlc/codec/liblpcm_plugin.so
lib/vlc/codec/libmpeg_audio_plugin.so
lib/vlc/codec/librawvideo_plugin.so
lib/vlc/codec/libspudec_plugin.so
lib/vlc/codec/libvorbis_plugin.so
lib/vlc/control/libgestures_plugin.so
lib/vlc/control/libhttp_plugin.so
lib/vlc/control/librc_plugin.so
@ -79,10 +76,12 @@ lib/vlc/demux/libdemuxdump_plugin.so
lib/vlc/demux/libdemuxsub_plugin.so
lib/vlc/demux/libes_plugin.so
lib/vlc/demux/libid3_plugin.so
lib/vlc/demux/libid3tag_plugin.so
lib/vlc/demux/libm3u_plugin.so
lib/vlc/demux/libm4v_plugin.so
lib/vlc/demux/libmp4_plugin.so
lib/vlc/demux/libmpeg_system_plugin.so
lib/vlc/demux/libogg_plugin.so
lib/vlc/demux/libps_plugin.so
lib/vlc/demux/librawdv_plugin.so
lib/vlc/demux/libts_plugin.so
@ -93,9 +92,13 @@ lib/vlc/libi420_rgb_mmx.a
lib/vlc/libi420_ymga_mmx.a
lib/vlc/libi420_yuy2_mmx.a
lib/vlc/libi422_yuy2_mmx.a
lib/vlc/libidct.a
lib/vlc/libidctclassic.a
lib/vlc/libmemcpy3dn.a
lib/vlc/libmemcpymmx.a
lib/vlc/libmemcpymmxext.a
lib/vlc/libmotion.a
lib/vlc/libmpeg_video_old.a
lib/vlc/misc/libdummy_plugin.so
lib/vlc/misc/libgtk_main_plugin.so
lib/vlc/misc/libhttpd_plugin.so
@ -107,6 +110,7 @@ lib/vlc/misc/libsap_plugin.so
lib/vlc/misc/libscreensaver_plugin.so
lib/vlc/mux/libmux_avi_plugin.so
lib/vlc/mux/libmux_dummy_plugin.so
lib/vlc/mux/libmux_ogg_plugin.so
lib/vlc/mux/libmux_ps_plugin.so
lib/vlc/mux/libmux_ts_plugin.so
lib/vlc/packetizer/libpacketizer_a52_plugin.so
@ -226,6 +230,7 @@ share/vlc/vlc48x48.png
@dirrm share/vlc/skins/default
@dirrm share/vlc/skins
@dirrm share/vlc
@dirrm lib/vlc/visualization
@dirrm lib/vlc/video_output
@dirrm lib/vlc/video_filter
@dirrm lib/vlc/video_chroma
@ -234,6 +239,7 @@ share/vlc/vlc48x48.png
@dirrm lib/vlc/mux
@dirrm lib/vlc/misc
@dirrm lib/vlc/gui
@dirrm lib/vlc/encoder
@dirrm lib/vlc/demux
@dirrm lib/vlc/control
@dirrm lib/vlc/codec
@ -242,6 +248,5 @@ share/vlc/vlc48x48.png
@dirrm lib/vlc/audio_filter
@dirrm lib/vlc/access_output
@dirrm lib/vlc/access
@unexec rmdir %D/lib/vlc/visualization 2>/dev/null || true
@unexec rmdir %D/lib/vlc/encoder 2>/dev/null || true
@dirrm lib/vlc
@dirrm include/vlc