Date: Sun, 6 Jan 2002 06:33:31 -0500 (EST) From: Alan Eldridge <ports@geeksrus.net> To: FreeBSD-gnats-submit@freebsd.org Cc: riggs@rrr.de, holger@eit.uni-kl.de Subject: ports/33604: update mplayer and win32-codec ports to mplayer-0.60 Message-ID: <200201061133.g06BXVg90047@wwweasel.geeksrus.net>
next in thread | raw e-mail | index | archive | help
>Number: 33604 >Category: ports >Synopsis: update mplayer and win32-codec ports to mplayer-0.60 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Jan 06 03:40:01 PST 2002 >Closed-Date: >Last-Modified: >Originator: Alan Eldridge >Release: FreeBSD 4.4-STABLE i386 >Organization: Geeksrus.NET >Environment: System: FreeBSD wwweasel.geeksrus.net 4.4-STABLE FreeBSD 4.4-STABLE #0: Sun Dec 2 19:14:12 EST 2001 root@wwweasel.geeksrus.net:/usr/obj/usr/src/sys/WWWEASEL i386 >Description: Mplayer 0.60 is out and contains lots of neat updates. This PR just addresses updating these two ports; it does not build or install any of the new mplayer experimental software, like the encoder. This PR covers updates to 2 different ports. Even though these ports have different maintainers, they should be upgraded in lock step. It appears you can update win32-codecs first, but I haven't done much testing of that. Note to mplayer maintainer: the patch-configure file replaces patch-ad. I did this because a diff was kinda meaningless, and the configure patch is a lot smaller, 'cause mplayer's maintainer's got smarter. :) Note also: mplayer-fonts does not have to be upgraded. >How-To-Repeat: >Fix: ---8<-snip---8<-snip---8<-snip---8<-snip---8<-snip---8<-snip---8<--- Index: graphics/win32-codecs/Makefile =================================================================== RCS file: /home/alane/cvsroot/ports/graphics/win32-codecs/Makefile,v retrieving revision 1.13 diff -u -3 -r1.13 Makefile --- graphics/win32-codecs/Makefile 15 Oct 2001 23:12:15 -0000 1.13 +++ graphics/win32-codecs/Makefile 5 Jan 2002 13:43:31 -0000 @@ -16,36 +16,38 @@ http://www.stud.uni-karlsruhe.de/~uedc/mplayer/ \ http://codeczone.virtualave.net/ \ http://www.rrr.de/~riggs/mplayer/ -DISTFILES= w32codec-0.18.zip \ - w32codec-diff-0.18-${CODEC_MPLAYER_VERSION}.zip \ - binaries-${CODEC_VERSION}.zip \ - wmvds32.ax.gz -EXTRACT_ONLY= ${DISTFILES:S/wmvds32.ax.gz//} +DISTFILES= w32codec-${CODEC_MPLAYER_VERSION}.tar.bz2 \ + binaries-${CODEC_VERSION}.tgz \ MAINTAINER= holger@eit.uni-kl.de RESTRICTED= Unsure of codec\'s license ONLY_FOR_ARCHS= i386 -USE_ZIP= yes -EXTRACT_BEFORE_ARGS= -n -q NO_BUILD= yes -NO_WRKSUBDIR= yes +WRKSRC= ${WRKDIR}/${PORTNAME} PLIST_SUB= PKGNAME=${PKGNAME} -CODEC_VERSION= 010122 -CODEC_MPLAYER_VERSION= 0.50 +CODEC_VERSION= 011002 +CODEC_MPLAYER_VERSION= 0.60 # Used by other ports to detect if this is installed CODEC_DETECTION_FILE= ${LOCALBASE}/lib/win32/${PKGNAME} -post-extract: - @${GZCAT} ${DISTDIR}/wmvds32.ax.gz > ${WRKDIR}/wmvds32.ax +do-extract: + ${MKDIR} ${WRKSRC} + cd ${WRKSRC} && ${TAR} xfz \ + ${DISTDIR}/binaries-${CODEC_VERSION}.tgz + cd ${WRKSRC} && ${TAR} xfy \ + ${DISTDIR}/w32codec-${CODEC_MPLAYER_VERSION}.tar.bz2 \ do-install: @${MKDIR} ${PREFIX}/lib/win32 @${CHMOD} 0555 ${PREFIX}/lib/win32 - @${INSTALL_DATA} ${WRKDIR}/* ${PREFIX}/lib/win32 + @${INSTALL_DATA} ${WRKSRC}/win32/* \ + ${PREFIX}/lib/win32 + @${INSTALL_DATA} ${WRKSRC}/w32codec-${CODEC_MPLAYER_VERSION}/* \ + ${PREFIX}/lib/win32 # marker file @${CP} /dev/null ${PREFIX}/lib/win32/${PKGNAME} @${CHMOD} 0444 ${PREFIX}/lib/win32/${PKGNAME} Index: graphics/win32-codecs/distinfo =================================================================== RCS file: /home/alane/cvsroot/ports/graphics/win32-codecs/distinfo,v retrieving revision 1.9 diff -u -3 -r1.9 distinfo --- graphics/win32-codecs/distinfo 15 Oct 2001 23:12:15 -0000 1.9 +++ graphics/win32-codecs/distinfo 5 Jan 2002 13:27:23 -0000 @@ -1,4 +1,2 @@ -MD5 (w32codec-0.18.zip) = 80afcd781e6c6a7d93989e9128d8c753 -MD5 (w32codec-diff-0.18-0.50.zip) = 27e709222f59f7f078fd3219cdf9d32e -MD5 (binaries-010122.zip) = ffc44e68b581994613931a9e47500446 -MD5 (wmvds32.ax.gz) = 886493bf1d0fa9ea088755c3fbddcfd7 +MD5 (w32codec-0.60.tar.bz2) = 7f9a2759d0069146f6f28d1a1ab0db83 +MD5 (binaries-011002.tgz) = 4db4edeeceefb9353b15b047207fa6d3 Index: graphics/win32-codecs/pkg-plist =================================================================== RCS file: /home/alane/cvsroot/ports/graphics/win32-codecs/pkg-plist,v retrieving revision 1.7 diff -u -3 -r1.7 pkg-plist --- graphics/win32-codecs/pkg-plist 15 Oct 2001 23:12:15 -0000 1.7 +++ graphics/win32-codecs/pkg-plist 5 Jan 2002 13:54:20 -0000 @@ -1,4 +1,7 @@ lib/win32/3ivxdmo.dll +lib/win32/acelpdec.ax +lib/win32/apmpg4v1.apl +lib/win32/apmpg4v1.dll lib/win32/asusasv2.dll lib/win32/asusasvd.dll lib/win32/ativcr2.dll @@ -9,8 +12,10 @@ lib/win32/divxa32.acm lib/win32/divxc32.dll lib/win32/divxc32f.dll +lib/win32/divxcfvk.dll +lib/win32/divxcvki.ax +lib/win32/divxcvki.dll lib/win32/divxdec.ax -lib/win32/acelpdec.ax lib/win32/huffyuv.dll lib/win32/i263_32.drv lib/win32/iccvid.dll @@ -23,11 +28,14 @@ lib/win32/ir50_32.dll lib/win32/ir50_qc.dll lib/win32/ir50_qcx.dll +lib/win32/ivvideo.dll lib/win32/l3codeca.acm lib/win32/l3codecx.ax lib/win32/lhacm.acm lib/win32/m3jpeg32.dll lib/win32/m3jpegdec.ax +lib/win32/m3jpegenc.ax +lib/win32/mcdvd_32.dll lib/win32/mcmjpg32.dll lib/win32/mpg4c32.dll lib/win32/mpg4ds32.ax @@ -36,12 +44,17 @@ lib/win32/msgsm32.acm lib/win32/msh261.drv lib/win32/msms001.vwp +lib/win32/msnaudio.acm +lib/win32/msrle32.dll +lib/win32/msscds32.ax lib/win32/msvidc32.dll lib/win32/mvoiced.vwp +lib/win32/pclepim1.dll lib/win32/qdv.dll lib/win32/tm20dec.ax lib/win32/tssoft32.acm lib/win32/ubv263d+.ax +lib/win32/vivog723.acm lib/win32/voxmsdec.ax lib/win32/vp31vfw.dll lib/win32/wmv8ds32.ax ---8<-snip---8<-snip---8<-snip---8<-snip---8<-snip---8<-snip---8<--- ---8<-snip---8<-snip---8<-snip---8<-snip---8<-snip---8<-snip---8<--- Index: graphics/mplayer/Makefile =================================================================== RCS file: /home/alane/cvsroot/ports/graphics/mplayer/Makefile,v retrieving revision 1.10 diff -u -3 -r1.10 Makefile --- graphics/mplayer/Makefile 27 Dec 2001 16:27:15 -0000 1.10 +++ graphics/mplayer/Makefile 6 Jan 2002 11:23:51 -0000 @@ -6,13 +6,13 @@ # PORTNAME= mplayer -PORTVERSION= 0.50.0.2 -PORTREVISION= 1 +PORTVERSION= 0.60 +#PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://ftp.mplayerhq.hu/MPlayer/releases/ \ http://www.stud.uni-karlsruhe.de/~uedc/mplayer/ \ http://www.rrr.de/~riggs/mplayer/ -DISTNAME= MPlayer-0.50 +DISTNAME= MPlayer-0.60 MAINTAINER= riggs@rrr.de Index: graphics/mplayer/distinfo =================================================================== RCS file: /home/alane/cvsroot/ports/graphics/mplayer/distinfo,v retrieving revision 1.3 diff -u -3 -r1.3 distinfo --- graphics/mplayer/distinfo 16 Oct 2001 01:25:41 -0000 1.3 +++ graphics/mplayer/distinfo 6 Jan 2002 09:17:45 -0000 @@ -1 +1 @@ -MD5 (MPlayer-0.50.tar.bz2) = b8c4fc82db0571a237bbed81c602d48c +MD5 (MPlayer-0.60.tar.bz2) = 0acefa2cb6130b14848955695e51d934 Index: graphics/mplayer/files/patch-ad =================================================================== RCS file: graphics/mplayer/files/patch-ad diff -N graphics/mplayer/files/patch-ad --- graphics/mplayer/files/patch-ad 15 Nov 2001 04:42:26 -0000 1.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,150 +0,0 @@ ---- configure.old Sun Oct 7 23:36:29 2001 -+++ configure Tue Nov 13 15:38:29 2001 -@@ -299,7 +299,7 @@ - _confcygwin="TARGET_CYGWIN=no" - _confwin32= - if [ "$system_name" = "FreeBSD" -o "$system_name" = "OpenBSD" -o "$system_name" = "BSD/OS" ]; then -- _archlibs="-rdynamic -pthread" -+ _archlibs="-rdynamic ${PTHREAD_LIBS}" - elif [ `echo $system_name | sed 's/[cC][yY][gG][wW][iI][nN].*/CYGWIN/'` = "CYGWIN" ]; then - _confcygwin="TARGET_CYGWIN=yes" - _confwin32="#define WIN32" -@@ -460,19 +460,8 @@ - fi - - if [ "$host_arch" = i386 ]; then -- if [ -r /proc/cpuinfo ]; then -- # linux with /proc mounted, extract cpu information from it -- _cpuinfo="cat /proc/cpuinfo" -- elif [ -r /compat/linux/proc/cpuinfo ]; then -- # FreeBSD with linux emulation /proc mounted, -- # extract cpu information from it -- _cpuinfo="cat /compat/linux/proc/cpuinfo" -- else -- # all other OS try to extract cpu information from a small helper -- # program TOOLS/cpuinfo instead - $_cc -o TOOLS/cpuinfo TOOLS/cpuinfo.c - _cpuinfo="TOOLS/cpuinfo" -- fi - - pname=`$_cpuinfo | grep 'model name' | cut -d ':' -f 2 | head -1` - pparam=`$_cpuinfo | grep 'features' | cut -d ':' -f 2 | head -1` -@@ -798,7 +787,7 @@ - $_cc $_extraincdir $_extralibdir $TMPC -o $TMPO -lvgagl -lvga > /dev/null 2>&1 && _svga=yes - - if [ "$system_name" = "FreeBSD" -o "$system_name" = "OpenBSD" -o "$system_name" = "BSD/OS" ]; then --$_cc $TMPC -o $TMPO -pthread > /dev/null 2>&1 || \ -+$_cc $TMPC -o $TMPO ${PTHREAD_LIBS} > /dev/null 2>&1 || \ - { echo "Lib pthread not found."; rm -f $TMPC $TMPO $TMPS ; exit 1; } - else - $_cc $TMPC -o $TMPO -lpthread > /dev/null 2>&1 || \ -@@ -893,7 +882,7 @@ - - # this is not yet checked with OpenBSD - atmos - if [ "$system_name" = "FreeBSD" -o "$system_name" = "OpenBSD" ]; then --$_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lGL -lm -pthread $_socklib > /dev/null 2>&1 && _gl=yes -+$_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lGL -lm ${PTHREAD_LIBS} $_socklib > /dev/null 2>&1 && _gl=yes - else - $_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lGL -lm $_socklib > /dev/null 2>&1 && _gl=yes - fi -@@ -904,7 +893,7 @@ - EOF - # this is not yet checked with OpenBSD - atmos - if [ "$system_name" = "FreeBSD" -o "$system_name" = "OpenBSD" ]; then --$_cc $_x11incdir $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lGL -lm -pthread $_socklib > /dev/null 2>&1 || \ -+$_cc $_x11incdir $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lGL -lm ${PTHREAD_LIBS} $_socklib > /dev/null 2>&1 || \ - { _gl=no; echo "GL includes not found!";} - else - $_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lGL -lm $_socklib > /dev/null 2>&1 || \ -@@ -998,33 +987,10 @@ - # --- - # check availability of some header files - --cat > $TMPC << EOF --#include <malloc.h> --int main( void ) { return 0; } --EOF - --_memalign_def= - _memalign=no - _malloc_h=no --if $_cc -o $TMPO $TMPC 2> /dev/null ; then --_malloc_h=yes --# check for memalign - atmos --# should this be restricted to x86, or customized for cpu types (opt for cacheline sizes)? --cat > $TMPC << EOF --#include <malloc.h> --int main ( void ) { --char *string = NULL; --string = memalign(64, sizeof(char)); --return 0; --} --EOF --_memalign_def='/* #define memalign(a,b) malloc(b) */' --_memalign=yes --$_cc -o $TMPO $TMPC 2> /dev/null || _memalign=no --if [ "$_memalign" = "no" ]; then - _memalign_def='#define memalign(a,b) malloc(b)' --fi --fi - - - cat > $TMPC << EOF -@@ -1645,33 +1611,33 @@ - - echo - echo $_echo_n "Checking for gtk version ... $_echo_c" --_gtk=`gtk-config --version 2>&1` -+_gtk=`${GTK_CONFIG} --version 2>&1` - [ -z "$_gtk" ] && { echo 'gtk not found.'; exit 1; } - echo "$_gtk" - - echo $_echo_n "Checking for gtk includes ... $_echo_c" --_gtkinc=`gtk-config --cflags 2>&1` -+_gtkinc=`${GTK_CONFIG} --cflags 2>&1` - [ -z "$_gtkinc" ] && { echo 'gtk not found.'; exit 1; } - echo "done" - - echo $_echo_n "Checking for gtk libs ... $_echo_c" --_gtklib=`gtk-config --libs 2>&1` -+_gtklib=`${GTK_CONFIG} --libs 2>&1` - [ -z "$_gtklib" ] && { echo 'gtk not found.'; exit 1; } - echo "done" - - echo - echo $_echo_n "Checking for glib version ... $_echo_c" --_glib=`glib-config --version 2>&1` -+_glib=`${GLIB_CONFIG} --version 2>&1` - [ -z "$_glib" ] && { echo 'glib not found.'; exit 1; } - echo "$_glib" - - echo $_echo_n "Checking for glib includes ... $_echo_c" --_glibinc=`glib-config --cflags 2>&1` -+_glibinc=`${GLIB_CONFIG} --cflags 2>&1` - [ -z "$_glibinc" ] && { echo 'glib not found.'; exit 1; } - echo "done" - - echo $_echo_n "Checking for glib libs ... $_echo_c" --_gliblib=`glib-config --libs 2>&1` -+_gliblib=`${GLIB_CONFIG} --libs 2>&1` - [ -z "$_gliblib" ] && { echo 'glib not found.'; exit 1; } - echo "done" - -@@ -1700,7 +1666,7 @@ - if [ "$system_name" = "FreeBSD" -o "$system_name" = "OpenBSD" ]; then - # Under XFree86 4.x GL port is poorly designed - if [ -r /usr/X11R6/bin/XFree86 ]; then -- _gllib='-lGL -pthread' -+ _gllib='-lGL ${PTHREAD_LIBS}' - else - _gllib='-lGL' - fi -@@ -1926,7 +1892,7 @@ - # Under FreeBSD (maybe other systems as well?) we have to add to CFLAGS - # for MT applications: - if [ "$system_name" = "FreeBSD" ]; then --CFLAGS="$CFLAGS -D_THREAD_SAFE" -+CFLAGS="$CFLAGS ${PTHREAD_CFLAGS}" - fi - - # 64 bit file offsets? Index: graphics/mplayer/files/patch-ae =================================================================== RCS file: /home/alane/cvsroot/ports/graphics/mplayer/files/patch-ae,v retrieving revision 1.3 diff -u -3 -r1.3 patch-ae --- graphics/mplayer/files/patch-ae 16 Oct 2001 01:25:41 -0000 1.3 +++ graphics/mplayer/files/patch-ae 6 Jan 2002 09:44:32 -0000 @@ -1,29 +1,45 @@ ---- Makefile.orig Fri Oct 5 10:39:21 2001 -+++ Makefile Mon Oct 15 21:51:01 2001 -@@ -118,24 +118,8 @@ +--- Makefile.orig Wed Jan 2 14:05:02 2002 ++++ Makefile Sun Jan 6 04:44:06 2002 +@@ -185,40 +185,8 @@ $(CC) $(CFLAGS) -g codec-cfg.c -o $(PRG_CFG) -DCODECS2HTML install: $(ALL_PRG) -- if [ ! -e $(BINDIR) ]; then \ -- mkdir -p $(BINDIR); \ -- fi -- install -m 755 -s $(PRG) $(BINDIR)/$(PRG) +- if test ! -d $(BINDIR) ; then mkdir -p $(BINDIR) ; fi +- $(INSTALL) -m 755 -s $(PRG) $(BINDIR)/$(PRG) -ifeq ($(GUI),yes) -- -ln -s $(BINDIR)/$(PRG) $(BINDIR)/gmplayer +- -ln -sf $(BINDIR)/$(PRG) $(BINDIR)/gmplayer +-endif +- if test ! -d $(MANDIR)/man1 ; then mkdir -p $(MANDIR)/man1; fi +- $(INSTALL) -c -m 644 DOCS/mplayer.1 $(MANDIR)/man1/mplayer.1 +-ifeq ($(MENCODER),yes) +- $(INSTALL) -m 755 -s $(PRG_MENCODER) $(BINDIR)/$(PRG_MENCODER) +- $(INSTALL) -c -m 644 DOCS/mencoder.1 $(MANDIR)/man1/mencoder.1 -endif -- if [ ! -e $(prefix)/man/man1 ]; then \ -- mkdir -p $(prefix)/man/man1; \ +- @if test ! -d $(DATADIR) ; then mkdir -p $(DATADIR) ; fi +- @if test ! -d $(DATADIR)/font ; then mkdir -p $(DATADIR)/font ; fi +- @if test ! -f $(DATADIR)/font/font.desc ; then \ +- echo "*** Download font at http://www.mplayerhq.hu/homepage/dload.html" ; \ +- echo "*** for OSD/Subtitles support and extract to $(DATADIR)/font/" ; \ - fi -- install -c -m 644 DOCS/mplayer.1 $(prefix)/man/man1/mplayer.1 +-ifeq ($(GUI),yes) +- @if test ! -d $(DATADIR)/Skin ; then mkdir -p $(DATADIR)/Skin ; fi +- @echo "*** Download skin(s) at http://www.mplayerhq.hu/homepage/dload.html" +- @echo "*** for GUI, and extract to $(DATADIR)/Skin/" +-endif +- @if test ! -d $(CONFDIR) ; then mkdir -p $(CONFDIR) ; fi +- @if test -f $(CONFDIR)/codecs.conf.old ; then mv -f $(CONFDIR)/codecs.conf.old $(CONFDIR)/codecs.conf.older ; fi +- @if test -f $(CONFDIR)/codecs.conf ; then mv -f $(CONFDIR)/codecs.conf $(CONFDIR)/codecs.conf.old ; fi +- $(INSTALL) -c -m 644 etc/codecs.conf $(CONFDIR)/codecs.conf +- -ifeq ($(CSS_USE),yes) - @echo "Following task requires root privs. If it fails don't panic" - @echo "however it means you can't use fibmap_mplayer." - @echo "Without this (or without running mplayer as root) you won't be" - @echo "able to play encrypted DVDs." -- -install -o 0 -g 0 -m 4755 -s $(PRG_FIBMAP) $(BINDIR)/$(PRG_FIBMAP) +- -$(INSTALL) -o 0 -g 0 -m 4755 -s $(PRG_FIBMAP) $(BINDIR)/$(PRG_FIBMAP) -endif + @${BSD_INSTALL_PROGRAM} $(PRG) $(BINDIR)/$(PRG) + @${BSD_INSTALL_MAN} DOCS/mplayer.1 $(prefix)/man/man1/mplayer.1 - clean: - rm -f *.o *~ $(OBJS) + uninstall: + -rm -f $(BINDIR)/$(PRG) $(BINDIR)/gmplayer $(MANDIR)/man1/mplayer.1 Index: graphics/mplayer/files/patch-configure =================================================================== RCS file: graphics/mplayer/files/patch-configure diff -N graphics/mplayer/files/patch-configure --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ graphics/mplayer/files/patch-configure 6 Jan 2002 09:36:45 -0000 @@ -0,0 +1,82 @@ +--- configure.orig Wed Jan 2 14:05:02 2002 ++++ configure Sun Jan 6 04:35:26 2002 +@@ -415,19 +415,10 @@ + + # Try to find the available options for the current CPU + if x86 ; then +- if test -r /proc/cpuinfo ; then +- # linux with /proc mounted, extract cpu information from it +- _cpuinfo="cat /proc/cpuinfo" +- elif test -r /compat/linux/proc/cpuinfo ; then +- # FreeBSD with linux emulation /proc mounted, +- # extract cpu information from it +- _cpuinfo="cat /compat/linux/proc/cpuinfo" +- else + # all other OS try to extract cpu information from a small helper + # program TOOLS/cpuinfo instead + $_cc -o TOOLS/cpuinfo TOOLS/cpuinfo.c + _cpuinfo="TOOLS/cpuinfo" +- fi + + pname=`$_cpuinfo | grep 'model name' | cut -d ':' -f 2 | head -1` + pvendor=`$_cpuinfo | grep 'vendor_id' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1` +@@ -1142,6 +1133,7 @@ + _def_malloc='#undef HAVE_MALLOC_H' + fi + # malloc.h emits a warning in FreeBSD ++freebsd && _malloc=no + freebsd && _def_malloc='#undef HAVE_MALLOC_H' + echores "$_malloc" + +@@ -1159,6 +1151,7 @@ + else + _def_memalign='#undef HAVE_MEMALIGN' + fi ++freebsd && _memalign=no + echores "$_memalign" + + +@@ -1235,7 +1228,9 @@ + void* func(void *arg) { return arg; } + int main(void) { pthread_t tid; return pthread_create (&tid, 0, func, 0) == 0 ? 0 : 1; } + EOF +-if ( cc_check && $TMPO ) ; then # QNX ++if freebsd; then ++ _ld_pthread=${PTHREAD_LIBS} ++elif ( cc_check && $TMPO ) ; then # QNX + _ld_pthread='' + elif ( cc_check -lpthread && $TMPO ) ; then + _ld_pthread='-lpthread' +@@ -2613,7 +2608,9 @@ + # Check for GTK: + echocheck "gtk version" + if test -z "$_gtkconfig" ; then +- if ( gtk-config --version ) >/dev/null 2>&1 ; then ++ if freebsd; then ++ _gtkconfig=${GTK_CONFIG} ++ elif ( gtk-config} --version ) >/dev/null 2>&1 ; then + _gtkconfig="gtk-config" + elif ( gtk12-config --version ) >/dev/null 2>&1 ; then + _gtkconfig="gtk12-config" +@@ -2629,7 +2626,9 @@ + # Check for GLIB + echocheck "glib version" + if test -z "$_glibconfig" ; then +- if ( glib-config --version ) >/dev/null 2>&1 ; then ++ if freebsd; then ++ _glibconfig=${GLIB_CONFIG} ++ elif ( glib-config --version ) >/dev/null 2>&1 ; then + _glibconfig="glib-config" + elif ( glib12-config --version ) >/dev/null 2>&1 ; then + _glibconfig="glib12-config" +@@ -2688,7 +2687,9 @@ + fi + + # Thread support +-if linux ; then ++if freebsd; then ++ CFLAGS="$CFLAGS ${PTHREAD_CFLAGS}" ++elif linux ; then + CFLAGS="$CFLAGS -D_REENTRANT" + elif bsd ; then + # FIXME bsd needs this so maybe other OS'es ---8<-snip---8<-snip---8<-snip---8<-snip---8<-snip---8<-snip---8<--- >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?200201061133.g06BXVg90047>