From d0ccf560b2e727075afa3e7dccfb1fb41740516d Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Sat, 6 Sep 2014 09:18:56 +0000 Subject: [PATCH] Set SHARED_ONLY and drop .la and .a module files. Strip LIB_DEPENDS. Add CPPFLAGS to use our libltdl headers instead of the bundled ones. Drop patch and use FAKE_FLAGS instead. --- multimedia/synfig/Makefile | 21 +++--- .../patches/patch-src_modules_Makefile_in | 12 --- multimedia/synfig/pkg/PFRAG.shared | 22 ------ multimedia/synfig/pkg/PLIST | 75 ++++++------------- 4 files changed, 33 insertions(+), 97 deletions(-) delete mode 100644 multimedia/synfig/patches/patch-src_modules_Makefile_in delete mode 100644 multimedia/synfig/pkg/PFRAG.shared diff --git a/multimedia/synfig/Makefile b/multimedia/synfig/Makefile index e36e09f15d4..224a7826f1e 100644 --- a/multimedia/synfig/Makefile +++ b/multimedia/synfig/Makefile @@ -1,4 +1,6 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2014/09/06 07:03:52 bentley Exp $ +# $OpenBSD: Makefile,v 1.2 2014/09/06 09:18:56 ajacoutot Exp $ + +SHARED_ONLY = Yes COMMENT = 2D animation software @@ -31,25 +33,24 @@ LIB_DEPENDS = archivers/xz \ devel/libtool,-ltdl \ devel/pango \ graphics/ImageMagick \ - graphics/djvulibre \ - graphics/ilmbase \ - graphics/jasper \ - graphics/jbigkit \ - graphics/lcms2 \ - graphics/libwmf \ graphics/libmng \ graphics/openexr \ - graphics/tiff \ - math/fftw3 \ textproc/libxml++ # .libs/libsynfig.so.0.0: undefined reference to `lt_libltdlc_LTX_preloaded_symbols' USE_LIBTOOL= gnu -CONFIGURE_ENV = LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_STYLE = gnu +CONFIGURE_ARGS = --without-included-ltdl + +FAKE_FLAGS = sysconfdir=${PREFIX}/share/examples/synfig pre-configure: ${SUBST_CMD} ${WRKDIST}/src/synfig/main.cpp +post-install: + rm ${PREFIX}/lib/synfig/modules/*.{a,la} + .include diff --git a/multimedia/synfig/patches/patch-src_modules_Makefile_in b/multimedia/synfig/patches/patch-src_modules_Makefile_in deleted file mode 100644 index 40689e8e9ba..00000000000 --- a/multimedia/synfig/patches/patch-src_modules_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_modules_Makefile_in,v 1.1.1.1 2014/09/06 07:03:52 bentley Exp $ ---- src/modules/Makefile.in.orig Fri Jul 18 12:05:52 2014 -+++ src/modules/Makefile.in Fri Jul 18 12:06:03 2014 -@@ -341,7 +341,7 @@ srcdir = @srcdir@ - subdirs = @subdirs@ - synfigincludedir = @synfigincludedir@ - sys_symbol_underscore = @sys_symbol_underscore@ --sysconfdir = @sysconfdir@ -+sysconfdir = @prefix@/share/examples/synfig - target_alias = @target_alias@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ diff --git a/multimedia/synfig/pkg/PFRAG.shared b/multimedia/synfig/pkg/PFRAG.shared deleted file mode 100644 index a6af79ddfe7..00000000000 --- a/multimedia/synfig/pkg/PFRAG.shared +++ /dev/null @@ -1,22 +0,0 @@ -@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2014/09/06 07:03:52 bentley Exp $ -lib/synfig/modules/liblyr_freetype.so -lib/synfig/modules/liblyr_std.so -lib/synfig/modules/libmod_bmp.so -lib/synfig/modules/libmod_dv.so -lib/synfig/modules/libmod_example.so -lib/synfig/modules/libmod_ffmpeg.so -lib/synfig/modules/libmod_filter.so -lib/synfig/modules/libmod_geometry.so -lib/synfig/modules/libmod_gif.so -lib/synfig/modules/libmod_gradient.so -lib/synfig/modules/libmod_imagemagick.so -lib/synfig/modules/libmod_jpeg.so -lib/synfig/modules/libmod_magickpp.so -lib/synfig/modules/libmod_mng.so -lib/synfig/modules/libmod_noise.so -lib/synfig/modules/libmod_openexr.so -lib/synfig/modules/libmod_particle.so -lib/synfig/modules/libmod_png.so -lib/synfig/modules/libmod_ppm.so -lib/synfig/modules/libmod_svg.so -lib/synfig/modules/libmod_yuv420p.so diff --git a/multimedia/synfig/pkg/PLIST b/multimedia/synfig/pkg/PLIST index a8028adb563..4a51f32b9a5 100644 --- a/multimedia/synfig/pkg/PLIST +++ b/multimedia/synfig/pkg/PLIST @@ -1,5 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2014/09/06 07:03:52 bentley Exp $ -%%SHARED%% +@comment $OpenBSD: PLIST,v 1.2 2014/09/06 09:18:56 ajacoutot Exp $ @bin bin/synfig bin/synfig-config include/synfig-0.0/ @@ -148,52 +147,30 @@ include/synfig-0.0/synfig/widthpoint.h lib/libsynfig.a lib/libsynfig.la @lib lib/libsynfig.so.${LIBsynfig_VERSION} -lib/pkgconfig/ lib/pkgconfig/synfig.pc lib/synfig/ lib/synfig/modules/ -lib/synfig/modules/liblyr_freetype.a -lib/synfig/modules/liblyr_freetype.la -lib/synfig/modules/liblyr_std.a -lib/synfig/modules/liblyr_std.la -lib/synfig/modules/libmod_bmp.a -lib/synfig/modules/libmod_bmp.la -lib/synfig/modules/libmod_dv.a -lib/synfig/modules/libmod_dv.la -lib/synfig/modules/libmod_example.a -lib/synfig/modules/libmod_example.la -lib/synfig/modules/libmod_ffmpeg.a -lib/synfig/modules/libmod_ffmpeg.la -lib/synfig/modules/libmod_filter.a -lib/synfig/modules/libmod_filter.la -lib/synfig/modules/libmod_geometry.a -lib/synfig/modules/libmod_geometry.la -lib/synfig/modules/libmod_gif.a -lib/synfig/modules/libmod_gif.la -lib/synfig/modules/libmod_gradient.a -lib/synfig/modules/libmod_gradient.la -lib/synfig/modules/libmod_imagemagick.a -lib/synfig/modules/libmod_imagemagick.la -lib/synfig/modules/libmod_jpeg.a -lib/synfig/modules/libmod_jpeg.la -lib/synfig/modules/libmod_magickpp.a -lib/synfig/modules/libmod_magickpp.la -lib/synfig/modules/libmod_mng.a -lib/synfig/modules/libmod_mng.la -lib/synfig/modules/libmod_noise.a -lib/synfig/modules/libmod_noise.la -lib/synfig/modules/libmod_openexr.a -lib/synfig/modules/libmod_openexr.la -lib/synfig/modules/libmod_particle.a -lib/synfig/modules/libmod_particle.la -lib/synfig/modules/libmod_png.a -lib/synfig/modules/libmod_png.la -lib/synfig/modules/libmod_ppm.a -lib/synfig/modules/libmod_ppm.la -lib/synfig/modules/libmod_svg.a -lib/synfig/modules/libmod_svg.la -lib/synfig/modules/libmod_yuv420p.a -lib/synfig/modules/libmod_yuv420p.la +lib/synfig/modules/liblyr_freetype.so +lib/synfig/modules/liblyr_std.so +lib/synfig/modules/libmod_bmp.so +lib/synfig/modules/libmod_dv.so +lib/synfig/modules/libmod_example.so +lib/synfig/modules/libmod_ffmpeg.so +lib/synfig/modules/libmod_filter.so +lib/synfig/modules/libmod_geometry.so +lib/synfig/modules/libmod_gif.so +lib/synfig/modules/libmod_gradient.so +lib/synfig/modules/libmod_imagemagick.so +lib/synfig/modules/libmod_jpeg.so +lib/synfig/modules/libmod_magickpp.so +lib/synfig/modules/libmod_mng.so +lib/synfig/modules/libmod_noise.so +lib/synfig/modules/libmod_openexr.so +lib/synfig/modules/libmod_particle.so +lib/synfig/modules/libmod_png.so +lib/synfig/modules/libmod_ppm.so +lib/synfig/modules/libmod_svg.so +lib/synfig/modules/libmod_yuv420p.so share/examples/synfig/ share/examples/synfig/synfig_modules.cfg @sample ${SYSCONFDIR}/synfig_modules.cfg @@ -204,16 +181,12 @@ share/locale/de/LC_MESSAGES/synfig.mo share/locale/el_GR/ share/locale/el_GR/LC_MESSAGES/ share/locale/el_GR/LC_MESSAGES/synfig.mo -share/locale/en_GB/ -share/locale/en_GB/LC_MESSAGES/ share/locale/en_GB/LC_MESSAGES/synfig.mo share/locale/es/LC_MESSAGES/synfig.mo share/locale/eu/LC_MESSAGES/synfig.mo share/locale/eu_ES/ share/locale/eu_ES/LC_MESSAGES/ share/locale/eu_ES/LC_MESSAGES/synfig.mo -share/locale/fa_IR/ -share/locale/fa_IR/LC_MESSAGES/ share/locale/fa_IR/LC_MESSAGES/synfig.mo share/locale/fr/LC_MESSAGES/synfig.mo share/locale/hu/LC_MESSAGES/synfig.mo @@ -221,8 +194,6 @@ share/locale/it/LC_MESSAGES/synfig.mo share/locale/ja_JP/ share/locale/ja_JP/LC_MESSAGES/ share/locale/ja_JP/LC_MESSAGES/synfig.mo -share/locale/lt/ -share/locale/lt/LC_MESSAGES/ share/locale/lt/LC_MESSAGES/synfig.mo share/locale/nl/LC_MESSAGES/synfig.mo share/locale/no_NO/ @@ -234,8 +205,6 @@ share/locale/pl_PL/LC_MESSAGES/synfig.mo share/locale/pt_BR/LC_MESSAGES/synfig.mo share/locale/ro/LC_MESSAGES/synfig.mo share/locale/ru/LC_MESSAGES/synfig.mo -share/locale/si/ -share/locale/si/LC_MESSAGES/ share/locale/si/LC_MESSAGES/synfig.mo share/locale/sk_SK/ share/locale/sk_SK/LC_MESSAGES/