Bug 148559 - Update port: graphics/swftools
Summary: Update port: graphics/swftools
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Martin Wilke
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-07-13 19:10 UTC by tkato432
Modified: 2010-09-11 12:20 UTC (History)
0 users

See Also:


Attachments
file.diff (1.80 KB, patch)
2010-07-13 19:10 UTC, tkato432
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description tkato432 2010-07-13 19:10:10 UTC
- Add missing math/fftw3 to LIB_DEPENDS
- Add OPTION for print/pdflib support
- Fix disabling WITH_LAME to effect properly
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2010-07-13 19:11:36 UTC
Responsible Changed
From-To: freebsd-ports-bugs->miwi

miwi@ wants his PRs (via the GNATS Auto Assign Tool)
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2010-07-13 19:11:37 UTC
Maintainer of graphics/swftools,

Please note that PR ports/148559 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/148559

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 3 Edwin Groothuis freebsd_committer freebsd_triage 2010-07-13 19:11:39 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 4 Carlo Strub freebsd_committer freebsd_triage 2010-07-24 13:19:50 UTC
Thanks a lot for this patch. The pkg-plist diff should not include
%%PDF%%, do you agree? Please send a fixed patch.

Cheers,
Carlo
Comment 5 tkato432 2010-07-25 13:00:06 UTC
"c-s@c-s.li" <c-s@c-s.li> wrote:

> Thanks a lot for this patch. The pkg-plist diff should not include
> %%PDF%%, do you agree? Please send a fixed patch.

I suppose it's necessary to modify pkg-plist if pdflib support is
acceptable. Do I need to remove the section about pdflib?
Comment 6 Carlo Strub freebsd_committer freebsd_triage 2010-07-25 23:04:19 UTC
Sorry, I think you misunderstood me. I am completely happy with your
changes. The only thing that bothers me is the %%PDF%% part in front of
/bin/pdf2pdf. Using ports-mgmt/genplist creates only /bin/pdf2pdf as an
entry without the %%PDF%% part. Moreover, I don't see which path this would
typically represent. In short, I suggest removing "%%PDF%%" from pkg-plist.
What do you think?
Comment 7 tkato432 2010-07-26 18:30:06 UTC
"c-s@c-s.li" <c-s@c-s.li> wrote:

> Sorry, I think you misunderstood me. I am completely happy with your
> changes. The only thing that bothers me is the %%PDF%% part in front of
> /bin/pdf2pdf. Using ports-mgmt/genplist creates only /bin/pdf2pdf as an
> entry without the %%PDF%% part. Moreover, I don't see which path this would
> typically represent. In short, I suggest removing "%%PDF%%" from pkg-plist.
> What do you think?

Oh, I finally realized what was actually wrong. How to tell
configure script to avoid detecting pdflib didn't work as
expected.

Here is a fixed patch.


diff -urN /usr/ports/graphics/swftools/Makefile graphics/swftools/Makefile
--- /usr/ports/graphics/swftools/Makefile	2010-07-07 15:33:19.000000000 +0900
+++ graphics/swftools/Makefile	2010-07-26 16:30:54.000000000 +0900
@@ -8,6 +8,7 @@
 
 PORTNAME=	swftools
 PORTVERSION=	0.9.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.swftools.org/ \
 		http://www.c-s.li/ports/
@@ -18,18 +19,21 @@
 LIB_DEPENDS=	t1.5:${PORTSDIR}/devel/t1lib \
 		jpeg.11:${PORTSDIR}/graphics/jpeg \
 		ungif.5:${PORTSDIR}/graphics/libungif \
+		fftw3.5:${PORTSDIR}/math/fftw3 \
 		freetype.9:${PORTSDIR}/print/freetype2 \
 		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
 
 LICENSE=	GPLv2
 
-OPTIONS=	LAME "LAME MP3 audio encoder support" off
+OPTIONS=	LAME "LAME MP3 audio encoder support" off \
+		PDF "PDFlib support" off
 
 USE_GNOME=	pkgconfig
 USE_GL=		glut
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
+		ac_cv_lib_zzip_zzip_file_open=no
 
 MAKE_JOBS_SAFE=	yes
 
@@ -45,7 +49,17 @@
 .if defined(WITH_LAME)
 LIB_DEPENDS+=	mp3lame.0:${PORTSDIR}/audio/lame
 .else
-CONFIGURE_ARGS+=	--disable-lame
+#CONFIGURE_ARGS+=	--disable-lame
+CONFIGURE_ENV+=	ac_cv_lib_mp3lame_lame_init=no
+.endif
+
+.if defined(WITH_PDF)
+LIB_DEPENDS+=	pdf.8:${PORTSDIR}/print/pdflib
+PLIST_SUB+=	PDF=""
+MAN1+=		pdf2pdf.1
+.else
+CONFIGURE_ENV+=	ac_cv_lib_pdf_PDF_open_file=no
+PLIST_SUB+=	PDF="@comment "
 .endif
 
 post-patch:
diff -urN /usr/ports/graphics/swftools/pkg-plist graphics/swftools/pkg-plist
--- /usr/ports/graphics/swftools/pkg-plist	2009-05-09 22:07:32.000000000 +0900
+++ graphics/swftools/pkg-plist	2010-06-06 20:16:30.000000000 +0900
@@ -2,6 +2,7 @@
 bin/font2swf
 bin/gif2swf
 bin/jpeg2swf
+%%PDF%%bin/pdf2pdf
 bin/pdf2swf
 bin/png2swf
 bin/swfbbox
Comment 8 Carlo Strub freebsd_committer freebsd_triage 2010-08-02 20:17:20 UTC
I approve this last patch. Many thanks for submitting it.
Comment 9 dfilter service freebsd_committer freebsd_triage 2010-09-11 12:18:39 UTC
miwi        2010-09-11 11:18:35 UTC

  FreeBSD ports repository

  Modified files:
    graphics/swftools    Makefile pkg-plist 
  Log:
  - Add missing math/fftw3 to LIB_DEPENDS
  - Add OPTION for print/pdflib support
  - Fix disabling WITH_LAME to effect properly
  
  PR:             148559
  Submitted by:   Ports Fury
  Approved by:    maintainer
  
  Revision  Changes    Path
  1.36      +17 -3     ports/graphics/swftools/Makefile
  1.10      +1 -0      ports/graphics/swftools/pkg-plist
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
Comment 10 Martin Wilke freebsd_committer freebsd_triage 2010-09-11 12:18:45 UTC
State Changed
From-To: feedback->closed

Committed. Thanks!