diff options
| author |   grozin <grozin@32389bae-6d03-0410-99cf-db05cde120eb> | 2008-05-02 22:04:50 +0000 |
|---|---|---|
| committer | grozin <grozin@32389bae-6d03-0410-99cf-db05cde120eb> | 2008-05-02 22:04:50 +0000 |
| commit | 6f30127c78f26338fa5ffa4369bcc620d8e5de06 (patch) | |
| tree | 6a483004c961a46d2d593b6ec429ee16b279e37f /sci-visualization | |
| parent | mathgl-1.6.2 cleanup and improvements (diff) | |
| download | sci-6f30127c78f26338fa5ffa4369bcc620d8e5de06.tar.gz sci-6f30127c78f26338fa5ffa4369bcc620d8e5de06.tar.bz2 sci-6f30127c78f26338fa5ffa4369bcc620d8e5de06.zip | |
udav-0.3.2: cleanup
git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@1036 32389bae-6d03-0410-99cf-db05cde120eb
Diffstat (limited to 'sci-visualization')
| -rw-r--r-- | sci-visualization/udav/Manifest | 4 | ||||
| -rw-r--r-- | sci-visualization/udav/files/udav-fltk.patch | 10 | ||||
| -rw-r--r-- | sci-visualization/udav/udav-0.3.2.ebuild | 14 |
3 files changed, 21 insertions, 7 deletions
diff --git a/sci-visualization/udav/Manifest b/sci-visualization/udav/Manifest index 0bbcae881..e482c5322 100644 --- a/sci-visualization/udav/Manifest +++ b/sci-visualization/udav/Manifest @@ -1,5 +1,5 @@ -AUX udav-fltk.patch 1049 RMD160 0c5254d04fc0b1f47700837178053a6141949bee SHA1 e018e25869b256df1147e08c2ef62bf828d73cc3 SHA256 9e9540823a9242f18d8b9dbfd100b6331a367eb3342bec2d8f7fe073725f473e +AUX udav-fltk.patch 1015 RMD160 c9a00ab68fe01ba9ea6c1085f37362aa37235f49 SHA1 5612c721443be5ea64cf0ca5fa9603bdeb08056c SHA256 b2d5b455973f153947dc6b0ce3e62496b386a4e23c5f324996a37b32c0916600 DIST udav-0.3.2.tgz 792044 RMD160 796ceb387896406511ea87c0e1e8aa55a0ef44c7 SHA1 597a190314920747e36d60d687ce51c70cbe0964 SHA256 b21b935bab264d018702cbb59dbde6e4ca0a0fc3840191c964b3c75c67b8ba91 -EBUILD udav-0.3.2.ebuild 747 RMD160 4656872a2681b50b8cf32d837075afeb114334dd SHA1 adb1edd07bf87ed22fbee83921a9a8248e799274 SHA256 8cc9d05c75efa91bbffb67c5853bbeec7356ed19219e7aa8f057882723dc40e2 +EBUILD udav-0.3.2.ebuild 1129 RMD160 f501ec8264289847953eba3d5c7599d6905b4df5 SHA1 cc936672e059a44e8ea00bce5a539ba96183b4aa SHA256 7549464d6914636595bacdfb96a390b3d8e3acfde2f1df49e5be69f6e463bb0d MISC ChangeLog 251 RMD160 9c1e4f257d789ff05a36dc4b4479f7ccaf350a9f SHA1 1f727f3e3c39e8a7481566e1fc911bc5eb15e4a8 SHA256 63662ba88cd002ad7144e80c8dbe008a4aae5a18b9df53e88a8cfe50ae7a7e84 MISC metadata.xml 325 RMD160 bdc5fff2ae251a58a757532b6b9f566332f0fe4b SHA1 7823da33669f6ee889973afc5c2207f86ecd5447 SHA256 c5b8349fb607df04ecafdb2c05d4941d8b47c2ab31892a9a0ccb54b79298f75f diff --git a/sci-visualization/udav/files/udav-fltk.patch b/sci-visualization/udav/files/udav-fltk.patch index 96953820c..0c0650fdb 100644 --- a/sci-visualization/udav/files/udav-fltk.patch +++ b/sci-visualization/udav/files/udav-fltk.patch @@ -1,20 +1,20 @@ diff -U2 --recursive udav-0.3.2.orig/configure.ac udav-0.3.2/configure.ac --- udav-0.3.2.orig/configure.ac 2008-04-03 01:24:14.000000000 +0700 -+++ udav-0.3.2/configure.ac 2008-04-30 13:43:19.000000000 +0700 ++++ udav-0.3.2/configure.ac 2008-05-03 12:49:16.000000000 +0700 @@ -18,6 +18,6 @@ ) -AC_CHECK_HEADERS([FL/Fl_Export.H],,[echo "Please install FLTK library"; exit]) -AC_CHECK_LIB([fltk], [main], [FLTK_LIBS="-lfltk -lfltk_images" AC_SUBST(FLTK_LIBS)], -+AC_CHECK_HEADERS([fltk-1.1/FL/Fl_Export.H],,[echo "Please install FLTK library"; exit]) -+AC_CHECK_LIB([fltk], [main], [FLTK_LIBS="-L/usr/lib/fltk-1.1 -lfltk -lfltk_images -lXft" AC_SUBST(FLTK_LIBS)], ++AC_CHECK_HEADERS([@FLTK_H@FL/Fl_Export.H],,[echo "Please install FLTK library"; exit]) ++AC_CHECK_LIB([fltk], [main], [FLTK_LIBS="@FLTK_LIBS@" AC_SUBST(FLTK_LIBS)], [echo "Please install FLTK library (libfltk)"; exit],\ ) diff -U2 --recursive udav-0.3.2.orig/src/Makefile.am udav-0.3.2/src/Makefile.am --- udav-0.3.2.orig/src/Makefile.am 2008-04-03 01:24:14.000000000 +0700 -+++ udav-0.3.2/src/Makefile.am 2008-04-30 13:53:00.000000000 +0700 ++++ udav-0.3.2/src/Makefile.am 2008-05-03 12:51:08.000000000 +0700 @@ -8,3 +8,3 @@ udav_LDADD = $(MGL_LIBS) $(FLTK_LIBS) -udav_CPPFLAGS = -O2 -DDOC_DIR=\"$(docdir)/\" -+udav_CPPFLAGS = -I/usr/include/fltk-1.1 -DDOC_DIR=\"$(docdir)/\" ++udav_CPPFLAGS = $(CPPFLASGS) @FLTK_FLAGS@ -DDOC_DIR=\"$(docdir)/\" diff --git a/sci-visualization/udav/udav-0.3.2.ebuild b/sci-visualization/udav/udav-0.3.2.ebuild index d179b2f80..111dbd6bb 100644 --- a/sci-visualization/udav/udav-0.3.2.ebuild +++ b/sci-visualization/udav/udav-0.3.2.ebuild @@ -17,9 +17,23 @@ DEPEND="sci-libs/mathgl x11-libs/fltk" RESTRICT=mirror src_unpack() { + local FLTK_FLAGS,FLTK_LIBS,FLTK_H + unpack ${A} cd "${S}" + + FLTK_FLAGS=`fltk-config --cxxflags` + FLTK_LIBS=`fltk-config --use-images --ldflags` + FLTK_H=`echo ${FLTK_FLAGS} | sed -e 's:-I/usr/include/::'` + [ -n "${FLTK_H}" ] && FLTK_H="${FLTK_H}"/ + epatch "${FILESDIR}"/${PN}-fltk.patch + sed -e "s:@FLTK_H@:${FLTK_H}:g" \ + -e "s:@FLTK_LIBS@:${FLTK_LIBS}:g" \ + -i configure.ac + sed -e "s:@FLTK_FLAGS@:${FLTK_FLAGS}:g" \ + -i src/Makefile.am + eautoreconf } |