diff options
| author | Cy Schubert <cy@FreeBSD.org> | 2002-09-14 01:39:27 +0000 |
|---|---|---|
| committer | Cy Schubert <cy@FreeBSD.org> | 2002-09-14 01:39:27 +0000 |
| commit | d38fb021dd70f6503902cd94f588ef8efa63f26b (patch) | |
| tree | 7a2b8f01e954c7c6e31d6c565a7ca865f01530ee /x11-wm | |
| parent | ${PERL} -> ${REINPLACE_CMD} (diff) | |
Enable PNG support.
PR: 42721
Submitted by: adam@vectors.cx
Notes
Notes:
svn path=/head/; revision=66287
Diffstat (limited to 'x11-wm')
| -rw-r--r-- | x11-wm/fvwm2-devel/Makefile | 10 | ||||
| -rw-r--r-- | x11-wm/fvwm2-devel/files/patch-configure | 20 |
2 files changed, 29 insertions, 1 deletions
diff --git a/x11-wm/fvwm2-devel/Makefile b/x11-wm/fvwm2-devel/Makefile index 976080d00e1d..979ff2c49227 100644 --- a/x11-wm/fvwm2-devel/Makefile +++ b/x11-wm/fvwm2-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME= fvwm PORTVERSION= 2.5.3 +PORTREVISION= 1 CATEGORIES= x11-wm MASTER_SITES= ftp://ftp.fvwm.org/pub/fvwm/version-2/ \ http://www.fvwm.org/generated/icon_download/ @@ -46,6 +47,12 @@ CONFIGURE_ARGS+= --disable-sm CONFIGURE_ARGS+= --disable-shape .endif +.if !defined(WITHOUT_PNG) +LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png +CONFIGURE_ARGS+= --with-png --with-png-includes=${LOCALBASE}/include \ + --with-png-library=${LOCALBASE}/lib +.endif + PLIST_SUB+= FVWM_VERSION="${PORTVERSION}" .if ${HAVE_GNOME:Mimlib}!="" @@ -77,7 +84,8 @@ post-extract: post-patch: @${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},' \ - ${WRKSRC}/modules/FvwmM4/FvwmM4.c + ${WRKSRC}/modules/FvwmM4/FvwmM4.c \ + ${WRKSRC}/configure post-install: @${INSTALL_DATA} ${WRKSRC}/sample.fvwmrc/system.fvwm2rc \ diff --git a/x11-wm/fvwm2-devel/files/patch-configure b/x11-wm/fvwm2-devel/files/patch-configure new file mode 100644 index 000000000000..a677cb854b25 --- /dev/null +++ b/x11-wm/fvwm2-devel/files/patch-configure @@ -0,0 +1,20 @@ +--- configure.orig Sun Aug 25 04:31:08 2002 ++++ configure Fri Sep 13 18:29:58 2002 +@@ -3758,7 +3758,7 @@ + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" +-LIBS="-lpng ${png_LIBS} -lz -lm $LIBS" ++LIBS="-L%%LOCALBASE%%/lib -lpng ${png_LIBS} -lz -lm $LIBS" + cat > conftest.$ac_ext <<EOF + #line 3764 "configure" + #include "confdefs.h" +@@ -3921,7 +3921,7 @@ + #define HAVE_PNG 1 + EOF + +- png_LIBS="-lpng -lz" ++ png_LIBS="-L%%LOCALBASE%%/lib -lpng -lz" + problem_png="" + else + with_png=no |