[Midnightbsd-cvs] mports [21269] fix build
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Mar 25 22:28:29 EDT 2016
Revision: 21269
http://svnweb.midnightbsd.org/mports/?rev=21269
Author: laffer1
Date: 2016-03-25 22:28:29 -0400 (Fri, 25 Mar 2016)
Log Message:
-----------
fix build
Modified Paths:
--------------
trunk/graphics/gdk-pixbuf/Makefile
trunk/graphics/gdk-pixbuf/files/patch-ltmain.sh
trunk/graphics/gdk-pixbuf/pkg-plist
Added Paths:
-----------
trunk/graphics/gdk-pixbuf/files/patch-gdk-pixbuf_Makefile.in
trunk/graphics/gdk-pixbuf/files/patch-gdk-pixbuf_pixops_have_mmx.S
Removed Paths:
-------------
trunk/graphics/gdk-pixbuf/files/patch-aa
trunk/graphics/gdk-pixbuf/files/patch-ab
trunk/graphics/gdk-pixbuf/files/patch-ac
trunk/graphics/gdk-pixbuf/files/patch-ad
trunk/graphics/gdk-pixbuf/files/patch-gdk-pixbuf::pixops::have_mmx.S
Property Changed:
----------------
trunk/graphics/gdk-pixbuf/files/patch-io-png.c
trunk/graphics/gdk-pixbuf/files/patch-ltmain.sh
trunk/graphics/gdk-pixbuf/files/patch-pixbuf-security
Modified: trunk/graphics/gdk-pixbuf/Makefile
===================================================================
--- trunk/graphics/gdk-pixbuf/Makefile 2016-03-26 02:21:57 UTC (rev 21268)
+++ trunk/graphics/gdk-pixbuf/Makefile 2016-03-26 02:28:29 UTC (rev 21269)
@@ -2,7 +2,7 @@
PORTNAME?= gdk-pixbuf
PORTVERSION= 0.22.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES?= graphics
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/gdk-pixbuf/0.22
@@ -37,7 +37,6 @@
@${REINPLACE_CMD} '/confexecdir =/s/=.*/= $$(sysconfdir)/' \
${WRKSRC}/Makefile.in
@${REINPLACE_CMD} -e 's|echo aout|echo elf|' \
- -e 's/freebsd/freebsd*|midnightbsd/' \
${WRKSRC}/configure
.include <bsd.port.mk>
Deleted: trunk/graphics/gdk-pixbuf/files/patch-aa
===================================================================
--- trunk/graphics/gdk-pixbuf/files/patch-aa 2016-03-26 02:21:57 UTC (rev 21268)
+++ trunk/graphics/gdk-pixbuf/files/patch-aa 2016-03-26 02:28:29 UTC (rev 21269)
@@ -1,41 +0,0 @@
---- configure.orig Thu Apr 18 18:52:49 2002
-+++ configure Fri Apr 19 12:40:56 2002
-@@ -8849,6 +8849,7 @@
- fi
- STRIP_DUMMY=
-
-+if [ x"$BUILD_CANVAS" != x"no" ]; then
- # Extract the first word of "gnome-config", so it can be a program name with args.
- set dummy gnome-config; ac_word=$2
- echo "$as_me:8854: checking for $ac_word" >&5
-@@ -8878,6 +8879,10 @@
- esac
- fi
- GNOME_CONFIG=$ac_cv_path_GNOME_CONFIG
-+else
-+GNOME_CONFIG="no"
-+fi
-+
-
- if test -n "$GNOME_CONFIG"; then
- echo "$as_me:8883: result: $GNOME_CONFIG" >&5
-@@ -8994,8 +8999,8 @@
- #define USE_GMODULE 1
- EOF
-
-- GMODULE_LIBS="`glib-config --libs gmodule`"
-- GMODULE_FLAGS="`glib-config --cflags gmodule`"
-+ GMODULE_LIBS="`$GLIB_CONFIG --libs gmodule`"
-+ GMODULE_FLAGS="`$GLIB_CONFIG --cflags gmodule`"
-
- echo "$as_me:9000: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-@@ -10104,7 +10109,7 @@
- fi;
-
- if test "x$with_html_dir" = "x" ; then
-- HTML_DIR='${datadir}/gnome/html'
-+ HTML_DIR='${datadir}/html'
- else
- HTML_DIR=$with_html_dir
- fi
Deleted: trunk/graphics/gdk-pixbuf/files/patch-ab
===================================================================
--- trunk/graphics/gdk-pixbuf/files/patch-ab 2016-03-26 02:21:57 UTC (rev 21268)
+++ trunk/graphics/gdk-pixbuf/files/patch-ab 2016-03-26 02:28:29 UTC (rev 21269)
@@ -1,28 +0,0 @@
---- Makefile.in.orig Sat Oct 5 01:19:24 2002
-+++ Makefile.in Sat Oct 5 01:20:58 2002
-@@ -115,22 +115,10 @@
-
- bin_SCRIPTS = gdk-pixbuf-config
-
--confexecdir = $(libdir)
--confexec_DATA = \
-- gdk_pixbufConf.sh \
-- gdk_pixbuf_xlibConf.sh \
-- gnomecanvaspixbufConf.sh
--
--
--EXTRA_DIST = \
-- gdk_pixbufConf.sh.in \
-- gdk_pixbuf_xlibConf.sh.in \
-- gnomecanvaspixbufConf.sh.in \
-- gdk-pixbuf-config.in \
-- gdk-pixbuf.m4 \
-- gdk-pixbuf.spec \
-- gdk-pixbuf.spec.in
-+confexecdir = $(sysconfdir)
-+confexec_DATA = gdk_pixbufConf.sh gdk_pixbuf_xlibConf.sh @BUILD_CANVAS_ITEM_TRUE at gnomecanvaspixbufConf.sh
-
-+EXTRA_DIST = gdk_pixbufConf.sh.in gdk_pixbuf_xlibConf.sh.in gdk-pixbuf-config.in gdk-pixbuf.m4 gdk-pixbuf.spec gdk-pixbuf.spec.in @BUILD_CANVAS_ITEM_TRUE at gnomecanvaspixbufConf.sh.in
-
- m4datadir = $(prefix)/share/aclocal
- m4data_DATA = gdk-pixbuf.m4
Deleted: trunk/graphics/gdk-pixbuf/files/patch-ac
===================================================================
--- trunk/graphics/gdk-pixbuf/files/patch-ac 2016-03-26 02:21:57 UTC (rev 21268)
+++ trunk/graphics/gdk-pixbuf/files/patch-ac 2016-03-26 02:28:29 UTC (rev 21269)
@@ -1,118 +0,0 @@
---- gdk-pixbuf/Makefile.in.orig Sat Oct 5 01:29:29 2002
-+++ gdk-pixbuf/Makefile.in Sat Oct 5 01:32:30 2002
-@@ -132,71 +132,71 @@
- # The PNG plugin.
- #
- libpixbufloader_png_la_SOURCES = io-png.c
--libpixbufloader_png_la_LDFLAGS = -module -avoid-version
--libpixbufloader_png_la_LIBADD = $(LIBPNG) libgdk_pixbuf.la $(GTK_LIBS)
-+libpixbufloader_png_la_LDFLAGS = -avoid-version -module
-+libpixbufloader_png_la_LIBADD = $(LIBPNG) libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS)
-
- #
- # The JPEG loader
- #
- libpixbufloader_jpeg_la_SOURCES = io-jpeg.c
--libpixbufloader_jpeg_la_LDFLAGS = -module -avoid-version
--libpixbufloader_jpeg_la_LIBADD = $(LIBJPEG) libgdk_pixbuf.la $(GTK_LIBS)
-+libpixbufloader_jpeg_la_LDFLAGS = -avoid-version -module
-+libpixbufloader_jpeg_la_LIBADD = $(LIBJPEG) libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS)
-
- #
- # The XPM loader
- #
- libpixbufloader_xpm_la_SOURCES = io-xpm.c
--libpixbufloader_xpm_la_LDFLAGS = -module -avoid-version
--libpixbufloader_xpm_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
-+libpixbufloader_xpm_la_LDFLAGS = -avoid-version -module
-+libpixbufloader_xpm_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS)
-
- #
- # The GIF loader
- #
- libpixbufloader_gif_la_SOURCES = io-gif.c
--libpixbufloader_gif_la_LDFLAGS = -module -avoid-version
--libpixbufloader_gif_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
-+libpixbufloader_gif_la_LDFLAGS = -avoid-version -module
-+libpixbufloader_gif_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS)
-
- #
- # The ICO loader
- #
- libpixbufloader_ico_la_SOURCES = io-ico.c
--libpixbufloader_ico_la_LDFLAGS = -module -avoid-version
--libpixbufloader_ico_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
-+libpixbufloader_ico_la_LDFLAGS = -avoid-version -module
-+libpixbufloader_ico_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS)
-
- #
- # The RAS loader
- #
- libpixbufloader_ras_la_SOURCES = io-ras.c
--libpixbufloader_ras_la_LDFLAGS = -module -avoid-version
--libpixbufloader_ras_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
-+libpixbufloader_ras_la_LDFLAGS = -avoid-version -module
-+libpixbufloader_ras_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS)
-
- #
- # The TIFF loader
- #
- libpixbufloader_tiff_la_SOURCES = io-tiff.c
--libpixbufloader_tiff_la_LDFLAGS = -module -avoid-version
--libpixbufloader_tiff_la_LIBADD = $(LIBTIFF) libgdk_pixbuf.la $(GTK_LIBS)
-+libpixbufloader_tiff_la_LDFLAGS = -avoid-version -module
-+libpixbufloader_tiff_la_LIBADD = $(LIBTIFF) libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS)
-
- #
- # The PNM loader
- #
- libpixbufloader_pnm_la_SOURCES = io-pnm.c
--libpixbufloader_pnm_la_LDFLAGS = -module -avoid-version
--libpixbufloader_pnm_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
-+libpixbufloader_pnm_la_LDFLAGS = -avoid-version -module
-+libpixbufloader_pnm_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS)
-
- #
- # The BMP loader
- #
- libpixbufloader_bmp_la_SOURCES = io-bmp.c
--libpixbufloader_bmp_la_LDFLAGS = -module -avoid-version
--libpixbufloader_bmp_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
-+libpixbufloader_bmp_la_LDFLAGS = -avoid-version -module
-+libpixbufloader_bmp_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS)
-
- #
- # The XBM loader
- #
- libpixbufloader_xbm_la_SOURCES = io-xbm.c
--libpixbufloader_xbm_la_LDFLAGS = -module -avoid-version
--libpixbufloader_xbm_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
-+libpixbufloader_xbm_la_LDFLAGS = -avoid-version -module
-+libpixbufloader_xbm_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS)
-
- @HAVE_PNG_TRUE at PNG_LIB = @HAVE_PNG_TRUE at libpixbufloader-png.la
-
-@@ -259,11 +259,11 @@
-
- LDADDS = libgdk_pixbuf.la $(GLIB_LIBS) $(GTK_LIBS) $(STATIC_LIB_DEPS)
-
--test_gdk_pixbuf_LDADD = $(LDADDS) $(GNOME_LIBS) -lgmodule
--testpixbuf_LDADD = $(LDADDS) $(GNOME_LIBS) -lgmodule
-+test_gdk_pixbuf_LDADD = $(LDADDS) $(GNOME_LIBS) `$(GLIB_CONFIG) --libs gmodule`
-+testpixbuf_LDADD = $(LDADDS) $(GNOME_LIBS) `$(GLIB_CONFIG) --libs gmodule`
- testpixbuf_drawable_LDADD = $(LDADDS) $(GNOME_LIBS)
- testpixbuf_scale_LDADD = $(LDADDS) $(GNOME_LIBS)
--testanimation_LDADD = $(LDADDS) $(GNOME_LIBS) -lgmodule
-+testanimation_LDADD = $(LDADDS) $(GNOME_LIBS) `$(GLIB_CONFIG) --libs gmodule`
-
- GDK_PIXBUF_LIBS = $(GLIB_LIBS) $(GTK_LIBS)
-
-@@ -400,7 +400,7 @@
- libpixbufloader_bmp_la_OBJECTS = io-bmp.lo
- libpixbufloader_xbm_la_DEPENDENCIES = libgdk_pixbuf.la
- libpixbufloader_xbm_la_OBJECTS = io-xbm.lo
--noinst_PROGRAMS = test-gdk-pixbuf$(EXEEXT) testpixbuf$(EXEEXT) \
-+noinst_PROGRAMS = # test-gdk-pixbuf$(EXEEXT) testpixbuf$(EXEEXT) \
- testpixbuf-drawable$(EXEEXT) testanimation$(EXEEXT) \
- testpixbuf-scale$(EXEEXT)
- PROGRAMS = $(noinst_PROGRAMS)
Deleted: trunk/graphics/gdk-pixbuf/files/patch-ad
===================================================================
--- trunk/graphics/gdk-pixbuf/files/patch-ad 2016-03-26 02:21:57 UTC (rev 21268)
+++ trunk/graphics/gdk-pixbuf/files/patch-ad 2016-03-26 02:28:29 UTC (rev 21269)
@@ -1,16 +0,0 @@
---- gdk-pixbuf-config.in.orig Tue Oct 23 20:44:44 2001
-+++ gdk-pixbuf-config.in Fri Oct 26 11:06:32 2001
-@@ -40,11 +40,11 @@
- ;;
- --cflags)
- includes=-I at includedir@/gdk-pixbuf-1.0
-- echo $includes `gtk-config --cflags`
-+ echo $includes `@GTK_CONFIG@ --cflags`
- ;;
- --libs)
- libdirs=-L at libdir@
-- echo $libdirs -lgdk_pixbuf `gtk-config --libs`
-+ echo $libdirs -lgdk_pixbuf `@GTK_CONFIG@ --libs`
- ;;
- *)
- echo "${usage}" 1>&2
Deleted: trunk/graphics/gdk-pixbuf/files/patch-gdk-pixbuf::pixops::have_mmx.S
===================================================================
--- trunk/graphics/gdk-pixbuf/files/patch-gdk-pixbuf::pixops::have_mmx.S 2016-03-26 02:21:57 UTC (rev 21268)
+++ trunk/graphics/gdk-pixbuf/files/patch-gdk-pixbuf::pixops::have_mmx.S 2016-03-26 02:28:29 UTC (rev 21269)
@@ -1,11 +0,0 @@
---- gdk-pixbuf/pixops/have_mmx.S 2001/11/16 10:34:50 1.1
-+++ gdk-pixbuf/pixops/have_mmx.S 2001/11/16 10:35:21
-@@ -19,6 +19,8 @@
- popfl
- pushfl
- popl %eax
-+ pushl %ebx
-+ popfl
-
- cmpl %eax, %ebx
-
Added: trunk/graphics/gdk-pixbuf/files/patch-gdk-pixbuf_Makefile.in
===================================================================
--- trunk/graphics/gdk-pixbuf/files/patch-gdk-pixbuf_Makefile.in (rev 0)
+++ trunk/graphics/gdk-pixbuf/files/patch-gdk-pixbuf_Makefile.in 2016-03-26 02:28:29 UTC (rev 21269)
@@ -0,0 +1,11 @@
+--- gdk-pixbuf/Makefile.in.orig Sat Oct 5 01:29:29 2002
++++ gdk-pixbuf/Makefile.in Sat Oct 5 01:32:30 2002
+@@ -400,7 +400,7 @@
+ libpixbufloader_bmp_la_OBJECTS = io-bmp.lo
+ libpixbufloader_xbm_la_DEPENDENCIES = libgdk_pixbuf.la
+ libpixbufloader_xbm_la_OBJECTS = io-xbm.lo
+-noinst_PROGRAMS = test-gdk-pixbuf$(EXEEXT) testpixbuf$(EXEEXT) \
++noinst_PROGRAMS = # test-gdk-pixbuf$(EXEEXT) testpixbuf$(EXEEXT) \
+ testpixbuf-drawable$(EXEEXT) testanimation$(EXEEXT) \
+ testpixbuf-scale$(EXEEXT)
+ PROGRAMS = $(noinst_PROGRAMS)
Property changes on: trunk/graphics/gdk-pixbuf/files/patch-gdk-pixbuf_Makefile.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/graphics/gdk-pixbuf/files/patch-gdk-pixbuf_pixops_have_mmx.S
===================================================================
--- trunk/graphics/gdk-pixbuf/files/patch-gdk-pixbuf_pixops_have_mmx.S (rev 0)
+++ trunk/graphics/gdk-pixbuf/files/patch-gdk-pixbuf_pixops_have_mmx.S 2016-03-26 02:28:29 UTC (rev 21269)
@@ -0,0 +1,11 @@
+--- gdk-pixbuf/pixops/have_mmx.S 2001/11/16 10:34:50 1.1
++++ gdk-pixbuf/pixops/have_mmx.S 2001/11/16 10:35:21
+@@ -19,6 +19,8 @@
+ popfl
+ pushfl
+ popl %eax
++ pushl %ebx
++ popfl
+
+ cmpl %eax, %ebx
+
Property changes on: trunk/graphics/gdk-pixbuf/files/patch-gdk-pixbuf_pixops_have_mmx.S
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: trunk/graphics/gdk-pixbuf/files/patch-io-png.c
===================================================================
--- trunk/graphics/gdk-pixbuf/files/patch-io-png.c 2016-03-26 02:21:57 UTC (rev 21268)
+++ trunk/graphics/gdk-pixbuf/files/patch-io-png.c 2016-03-26 02:28:29 UTC (rev 21269)
Property changes on: trunk/graphics/gdk-pixbuf/files/patch-io-png.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/graphics/gdk-pixbuf/files/patch-ltmain.sh
===================================================================
--- trunk/graphics/gdk-pixbuf/files/patch-ltmain.sh 2016-03-26 02:21:57 UTC (rev 21268)
+++ trunk/graphics/gdk-pixbuf/files/patch-ltmain.sh 2016-03-26 02:28:29 UTC (rev 21269)
@@ -8,26 +8,3 @@
continue
;;
-@@ -2442,6 +2443,9 @@
- *-*-openbsd*)
- # Do not include libc due to us having libc/libc_r.
- ;;
-+ *-*-freebsd*)
-+ # FreeBSD doesn't need this...
-+ ;;
- *)
- # Add libc to deplibs on all other systems if necessary.
- if test $build_libtool_need_lc = "yes"; then
-@@ -4208,10 +4212,12 @@
- fi
-
- # Install the pseudo-library for information purposes.
-+ if /usr/bin/false; then
- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- instname="$dir/$name"i
- $show "$install_prog $instname $destdir/$name"
- $run eval "$install_prog $instname $destdir/$name" || exit $?
-+ fi
-
- # Maybe install the static library, too.
- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
Property changes on: trunk/graphics/gdk-pixbuf/files/patch-ltmain.sh
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/graphics/gdk-pixbuf/files/patch-pixbuf-security
===================================================================
--- trunk/graphics/gdk-pixbuf/files/patch-pixbuf-security 2016-03-26 02:21:57 UTC (rev 21268)
+++ trunk/graphics/gdk-pixbuf/files/patch-pixbuf-security 2016-03-26 02:28:29 UTC (rev 21269)
Property changes on: trunk/graphics/gdk-pixbuf/files/patch-pixbuf-security
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/graphics/gdk-pixbuf/pkg-plist
===================================================================
--- trunk/graphics/gdk-pixbuf/pkg-plist 2016-03-26 02:21:57 UTC (rev 21268)
+++ trunk/graphics/gdk-pixbuf/pkg-plist 2016-03-26 02:28:29 UTC (rev 21269)
@@ -1,6 +1,7 @@
bin/gdk-pixbuf-config
etc/gdk_pixbufConf.sh
etc/gdk_pixbuf_xlibConf.sh
+etc/gnomecanvaspixbufConf.sh
include/gdk-pixbuf-1.0/gdk-pixbuf/gdk-pixbuf-features.h
include/gdk-pixbuf-1.0/gdk-pixbuf/gdk-pixbuf-loader.h
include/gdk-pixbuf-1.0/gdk-pixbuf/gdk-pixbuf-xlib.h
More information about the Midnightbsd-cvs
mailing list