diff options
| -rw-r--r-- | graphics/imlib2/Makefile | 21 | ||||
| -rw-r--r-- | graphics/imlib2/distinfo | 2 | ||||
| -rw-r--r-- | graphics/imlib2/files/patch-aa | 8 | ||||
| -rw-r--r-- | graphics/imlib2/files/patch-configure | 10 | ||||
| -rw-r--r-- | graphics/imlib2/files/patch-loaders::Makefile.in | 63 | ||||
| -rw-r--r-- | graphics/imlib2/files/patch-ltmain.sh | 33 | ||||
| -rw-r--r-- | graphics/imlib2/files/patch-src::Makefile.in | 65 | ||||
| -rw-r--r-- | graphics/imlib2/pkg-plist | 4 |
8 files changed, 112 insertions, 94 deletions
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile index 3b2da9c0c49e..dcffd679040b 100644 --- a/graphics/imlib2/Makefile +++ b/graphics/imlib2/Makefile @@ -6,8 +6,7 @@ # PORTNAME= imlib2 -PORTVERSION= 1.0.6 -PORTREVISION= 1 +PORTVERSION= 1.1.0 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= enlightenment @@ -15,20 +14,20 @@ MASTER_SITE_SUBDIR= enlightenment MAINTAINER= ports@FreeBSD.org COMMENT= The next generation graphic library for enlightenment package -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ - ltdl.4:${PORTSDIR}/devel/libltdl \ +LIB_DEPENDS= ltdl.4:${PORTSDIR}/devel/libltdl \ + jpeg.9:${PORTSDIR}/graphics/jpeg \ + ungif.5:${PORTSDIR}/graphics/libungif \ png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ - ungif.5:${PORTSDIR}/graphics/libungif + freetype.9:${PORTSDIR}/print/freetype2 -USE_REINPLACE= yes USE_X_PREFIX= yes -USE_FREETYPE= yes -USE_LIBTOOL= yes +USE_GNOME= gnomehack pkgconfig +USE_REINPLACE= yes +GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" INSTALLS_SHLIB= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype1 \ - -I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" .include <bsd.port.pre.mk> diff --git a/graphics/imlib2/distinfo b/graphics/imlib2/distinfo index 39082d645bf4..689ce4100728 100644 --- a/graphics/imlib2/distinfo +++ b/graphics/imlib2/distinfo @@ -1 +1 @@ -MD5 (imlib2-1.0.6.tar.gz) = e3475376bf27347c47c7a9ffb49bdb96 +MD5 (imlib2-1.1.0.tar.gz) = 1589ebb054da76734fe08ae570460034 diff --git a/graphics/imlib2/files/patch-aa b/graphics/imlib2/files/patch-aa index 7a8b2a5a55a0..0a1f4f63e5e1 100644 --- a/graphics/imlib2/files/patch-aa +++ b/graphics/imlib2/files/patch-aa @@ -1,11 +1,11 @@ ---- imlib2-config.in.orig Tue Aug 22 16:38:40 2000 -+++ imlib2-config.in Sun Oct 29 21:38:09 2000 +--- imlib2-config.in.orig Sun Jul 20 15:10:43 2003 ++++ imlib2-config.in Mon Dec 8 04:30:33 2003 @@ -45,7 +45,7 @@ echo $includes @x_cflags@ ;; --libs) - libdirs=-L@libdir@ -+ libdirs="-L@libdir@ -L@localbase@/lib" - echo $libdirs -lImlib2 -lttf -lm @dlopen_libs@ @x_ldflags@ @x_libs@ ++ libdirs=-L@libdir@ -L@localbase@/lib + echo $libdirs -lImlib2 @freetype_libs@ -lm @dlopen_libs@ @x_ldflags@ @x_libs@ ;; *) diff --git a/graphics/imlib2/files/patch-configure b/graphics/imlib2/files/patch-configure index 2452f649c284..c42001234b6b 100644 --- a/graphics/imlib2/files/patch-configure +++ b/graphics/imlib2/files/patch-configure @@ -1,10 +1,10 @@ ---- configure.orig Wed Aug 29 21:48:58 2001 -+++ configure Sun Oct 7 17:23:22 2001 -@@ -1031,16 +1031,6 @@ +--- configure.orig Mon Sep 8 11:12:12 2003 ++++ configure Mon Dec 8 05:29:41 2003 +@@ -1244,16 +1244,6 @@ fi -- case "$enable_ltdl_convenience" in +- case $enable_ltdl_convenience in - no) { echo "configure: error: this package needs a convenience libltdl" 1>&2; exit 1; } ;; - "") enable_ltdl_convenience=yes - ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; @@ -17,7 +17,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -@@ -4313,75 +4303,5 @@ +@@ -7682,75 +7672,5 @@ esac done diff --git a/graphics/imlib2/files/patch-loaders::Makefile.in b/graphics/imlib2/files/patch-loaders::Makefile.in index 11132fb7706a..261021fbf73a 100644 --- a/graphics/imlib2/files/patch-loaders::Makefile.in +++ b/graphics/imlib2/files/patch-loaders::Makefile.in @@ -1,51 +1,16 @@ ---- loaders/Makefile.in.orig Fri Apr 26 08:45:29 2002 -+++ loaders/Makefile.in Fri Sep 20 04:20:42 2002 -@@ -108,39 +108,39 @@ +--- loaders/Makefile.in.orig Mon Sep 8 11:12:29 2003 ++++ loaders/Makefile.in Mon Dec 8 05:09:37 2003 +@@ -99,10 +99,10 @@ + # A list of all the files in the current directory which can be regenerated + MAINTAINERCLEANFILES = Makefile.in + +-LDFLAGS = -L$(top_builddir)/src -L$(top_builddir)/src/.libs -L/usr/X11R6/lib ++LDFLAGS = @LDFLAGS@ + INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/src \ +- -I$(top_srcdir)/loaders -I$(top_srcdir)/libltdl \ +- -I/usr/X11R6/include $(X_CFLAGS) \ ++ -I$(top_srcdir)/loaders \ ++ $(X_CFLAGS) \ + -I$(prefix)/include -I$(includedir) - jpeg_la_SOURCES = loader_jpeg.c - jpeg_la_LDFLAGS = -no-undefined -module -avoid-version --jpeg_la_LIBADD = @JPEGLIBS@ -L$(top_builddir)/src -lImlib2 -+jpeg_la_LIBADD = @JPEGLIBS@ $(top_builddir)/src/libImlib2.la - png_la_SOURCES = loader_png.c - png_la_LDFLAGS = -no-undefined -module -avoid-version --png_la_LIBADD = @PNGLIBS@ -L$(top_builddir)/src -lImlib2 -+png_la_LIBADD = @PNGLIBS@ $(top_builddir)/src/libImlib2.la - - tiff_la_SOURCES = loader_tiff.c - tiff_la_LDFLAGS = -no-undefined -module -avoid-version --tiff_la_LIBADD = @TIFFLIBS@ -L$(top_builddir)/src -lImlib2 -+tiff_la_LIBADD = @TIFFLIBS@ $(top_builddir)/src/libImlib2.la - - gif_la_SOURCES = loader_gif.c - gif_la_LDFLAGS = -no-undefined -module -avoid-version --gif_la_LIBADD = @GIFLIBS@ -L$(top_builddir)/src -lImlib2 -+gif_la_LIBADD = @GIFLIBS@ $(top_builddir)/src/libImlib2.la - - pnm_la_SOURCES = loader_pnm.c - pnm_la_LDFLAGS = -no-undefined -module -avoid-version --pnm_la_LIBADD = -L$(top_builddir)/src -lImlib2 -+pnm_la_LIBADD = $(top_builddir)/src/libImlib2.la - - argb_la_SOURCES = loader_argb.c - argb_la_LDFLAGS = -no-undefined -module -avoid-version --argb_la_LIBADD = -L$(top_builddir)/src -lImlib2 -+argb_la_LIBADD = $(top_builddir)/src/libImlib2.la - - bmp_la_SOURCES = loader_bmp.c - bmp_la_LDFLAGS = -no-undefined -module -avoid-version --bmp_la_LIBADD = -L$(top_builddir)/src -lImlib2 -+bmp_la_LIBADD = $(top_builddir)/src/libImlib2.la - - xpm_la_SOURCES = loader_xpm.c - xpm_la_LDFLAGS = -no-undefined -module -avoid-version --xpm_la_LIBADD = -L$(top_builddir)/src -lImlib2 -+xpm_la_LIBADD = $(top_builddir)/src/libImlib2.la - - tga_la_SOURCES = loader_tga.c - tga_la_LDFLAGS = -no-undefined -module -avoid-version --tga_la_LIBADD = -L$(top_builddir)/src -lImlib2 -+tga_la_LIBADD = $(top_builddir)/src/libImlib2.la - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h - CONFIG_CLEAN_FILES = diff --git a/graphics/imlib2/files/patch-ltmain.sh b/graphics/imlib2/files/patch-ltmain.sh new file mode 100644 index 000000000000..281979539cdb --- /dev/null +++ b/graphics/imlib2/files/patch-ltmain.sh @@ -0,0 +1,33 @@ +--- ltmain.sh.orig Mon Sep 8 11:12:11 2003 ++++ ltmain.sh Mon Dec 8 05:15:45 2003 +@@ -944,6 +944,7 @@ + ;; + + -avoid-version) ++ build_old_libs=no + avoid_version=yes + continue + ;; +@@ -2408,6 +2409,9 @@ + *-*-netbsd*) + # Don't link with libc until the a.out ld.so is fixed. + ;; ++ *-*-freebsd*) ++ # FreeBSD doesn't need this.... ++ ;; + *) + # Add libc to deplibs on all other systems if necessary. + if test "$build_libtool_need_lc" = "yes"; then +@@ -4175,10 +4179,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" diff --git a/graphics/imlib2/files/patch-src::Makefile.in b/graphics/imlib2/files/patch-src::Makefile.in index 9912ca392a04..d39d0ff27235 100644 --- a/graphics/imlib2/files/patch-src::Makefile.in +++ b/graphics/imlib2/files/patch-src::Makefile.in @@ -1,26 +1,33 @@ ---- src/Makefile.in.orig Fri Sep 21 12:31:03 2001 -+++ src/Makefile.in Sun Oct 7 18:25:33 2001 -@@ -93,7 +93,7 @@ +--- src/Makefile.in.orig Mon Sep 8 11:12:28 2003 ++++ src/Makefile.in Mon Dec 8 04:42:05 2003 +@@ -99,10 +99,10 @@ + # A list of all the files in the current directory which can be regenerated MAINTAINERCLEANFILES = Makefile.in loaderpath.h - LDFLAGS = -L/usr/X11R6/lib --INCLUDES = -I/usr/X11R6/include -I$(top_srcdir)/libltdl $(X_CFLAGS) -I$(prefix)/include -I$(includedir) -I. -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/loaders -+INCLUDES = -I/usr/X11R6/include $(X_CFLAGS) -I$(prefix)/include -I$(includedir) -I. -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/loaders +-LDFLAGS = -L/usr/X11R6/lib ++LDFLAGS = @LDFLAGS@ + INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/src \ +- -I$(top_srcdir)/loaders -I$(top_srcdir)/libltdl \ +- $(freetype_cflags) -I/usr/X11R6/include $(X_CFLAGS) \ ++ -I$(top_srcdir)/loaders \ ++ $(freetype_cflags) $(X_CFLAGS) \ + -I$(prefix)/include -I$(includedir) - MMX_SRCS = asm_blend.S asm_rgba.S asm_scale.S asm_rotate.S asm_blend_cmod.S + MMX_SRCS = asm_blend.S asm_rgba.S asm_scale.S asm_rotate.S \ +@@ -128,10 +128,10 @@ -@@ -107,8 +107,8 @@ - EXTRA_libImlib2_la_SOURCES = rend.c ximage.c rgba.c color.c grab.c draw.c context.c color.h context.h draw.h grab.h rend.h rgba.h ximage.h $(MMX_SRCS) - - libImlib2_la_LDFLAGS = -version-info 1:4:0 --@HAVE_MMX_TRUE@libImlib2_la_LIBADD = $(X_OBJS) @DLLDFLAGS@ $(MMX_OBJS) $(top_builddir)/libltdl/libltdlc.la $(x_libs) -lttf $(LDFLAGS) --@HAVE_MMX_FALSE@libImlib2_la_LIBADD = $(X_OBJS) @DLLDFLAGS@ $(top_builddir)/libltdl/libltdlc.la $(x_libs) -lttf $(LDFLAGS) -+@HAVE_MMX_TRUE@libImlib2_la_LIBADD = $(X_OBJS) @DLLDFLAGS@ $(MMX_OBJS) -lltdl $(x_libs) -lttf $(LDFLAGS) -+@HAVE_MMX_FALSE@libImlib2_la_LIBADD = $(X_OBJS) @DLLDFLAGS@ -lltdl $(x_libs) -lttf $(LDFLAGS) - @HAVE_MMX_TRUE@libImlib2_la_DEPENDENCIES = $(top_builddir)/config.h $(X_OBJS) $(MMX_OBJS) - @HAVE_MMX_FALSE@libImlib2_la_DEPENDENCIES = $(top_builddir)/config.h $(X_OBJS) - -@@ -283,48 +283,48 @@ + libImlib2_la_LDFLAGS = -version-info 2:0:1 + @HAVE_MMX_TRUE@libImlib2_la_LIBADD = @HAVE_MMX_TRUE@$(X_OBJS) @DLLDFLAGS@ $(MMX_OBJS) \ +-@HAVE_MMX_TRUE@ $(top_builddir)/libltdl/libltdlc.la \ ++@HAVE_MMX_TRUE@ -lltdl \ + @HAVE_MMX_TRUE@ $(x_libs) $(freetype_libs) $(LDFLAGS) + @HAVE_MMX_FALSE@libImlib2_la_LIBADD = @HAVE_MMX_FALSE@$(X_OBJS) @DLLDFLAGS@ \ +-@HAVE_MMX_FALSE@ $(top_builddir)/libltdl/libltdlc.la \ ++@HAVE_MMX_FALSE@ -lltdl \ + @HAVE_MMX_FALSE@ $(x_libs) $(freetype_libs) $(LDFLAGS) + @HAVE_MMX_TRUE@libImlib2_la_DEPENDENCIES = @HAVE_MMX_TRUE@$(top_builddir)/config.h $(X_OBJS) $(MMX_OBJS) + @HAVE_MMX_FALSE@libImlib2_la_DEPENDENCIES = @HAVE_MMX_FALSE@$(top_builddir)/config.h $(X_OBJS) +@@ -314,57 +314,57 @@ fi; \ done api.lo api.o : api.c ../config.h common.h colormod.h image.h \ @@ -51,10 +58,22 @@ filter.lo filter.o : filter.c common.h ../config.h colormod.h image.h \ - ../libltdl/ltdl.h blend.h filter.h + blend.h filter.h - font.lo font.o : font.c ../config.h common.h colormod.h image.h \ -- ../libltdl/ltdl.h blend.h font.h file.h updates.h rgbadraw.h \ -+ blend.h font.h file.h updates.h rgbadraw.h \ - rotate.h + font_draw.lo font_draw.o : font_draw.c ../config.h common.h colormod.h \ +- image.h ../libltdl/ltdl.h blend.h font.h file.h updates.h \ ++ image.h blend.h font.h file.h updates.h \ + rgbadraw.h rotate.h + font_load.lo font_load.o : font_load.c ../config.h common.h colormod.h \ +- image.h ../libltdl/ltdl.h blend.h font.h file.h updates.h \ ++ image.h blend.h font.h file.h updates.h \ + rgbadraw.h rotate.h + font_main.lo font_main.o : font_main.c ../config.h common.h colormod.h \ +- image.h ../libltdl/ltdl.h blend.h font.h file.h updates.h \ ++ image.h blend.h font.h file.h updates.h \ + rgbadraw.h rotate.h + font_query.lo font_query.o : font_query.c ../config.h common.h \ +- colormod.h image.h ../libltdl/ltdl.h blend.h font.h file.h \ ++ colormod.h image.h blend.h font.h file.h \ + updates.h rgbadraw.h rotate.h format.lo format.o : format.c format.h grab.lo grab.o : grab.c common.h ../config.h grab.h grad.lo grad.o : grad.c common.h ../config.h colormod.h image.h \ diff --git a/graphics/imlib2/pkg-plist b/graphics/imlib2/pkg-plist index deed84cf0e5c..6de5e8396329 100644 --- a/graphics/imlib2/pkg-plist +++ b/graphics/imlib2/pkg-plist @@ -2,19 +2,21 @@ bin/imlib2-config include/Imlib2.h lib/libImlib2.a lib/libImlib2.so -lib/libImlib2.so.1 +lib/libImlib2.so.2 lib/loaders/filter/bump_map.so lib/loaders/filter/colormod.so lib/loaders/filter/testfilter.so lib/loaders/image/argb.so lib/loaders/image/bmp.so lib/loaders/image/gif.so +lib/loaders/image/gzbz2.so lib/loaders/image/jpeg.so lib/loaders/image/png.so lib/loaders/image/pnm.so lib/loaders/image/tga.so lib/loaders/image/tiff.so lib/loaders/image/xpm.so +libdata/pkgconfig/imlib2.pc @dirrm lib/loaders/image @dirrm lib/loaders/filter @dirrm lib/loaders |