Date: Fri, 8 Nov 2013 18:47:55 +0000 (UTC) From: Dirk Meyer <dinoex@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333257 - in head/misc/magicpoint: . files Message-ID: <201311081847.rA8IltaL004165@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dinoex Date: Fri Nov 8 18:47:55 2013 New Revision: 333257 URL: http://svnweb.freebsd.org/changeset/ports/333257 Log: - use prefixed DEPENDS and CONFIGURE - fix build warnings Added: head/misc/magicpoint/files/patch-ctlwords.c (contents, props changed) Deleted: head/misc/magicpoint/files/patch-xmindpath-Makefile.in Modified: head/misc/magicpoint/Makefile head/misc/magicpoint/pkg-plist Modified: head/misc/magicpoint/Makefile ============================================================================== --- head/misc/magicpoint/Makefile Fri Nov 8 18:37:05 2013 (r333256) +++ head/misc/magicpoint/Makefile Fri Nov 8 18:47:55 2013 (r333257) @@ -15,17 +15,15 @@ LIB_DEPENDS+= png15:${PORTSDIR}/graphics RUN_DEPENDS+= pnmscale:${PORTSDIR}/graphics/netpbm MAKE_JOBS_UNSAFE= yes -NO_STAGE= yes USES= imake:env pkgconfig USE_XORG= x11 xext xmu xt sm ice xi xtst WANT_GNOME= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-vflib --enable-locale +CPPFLAGS+= -I.. LATE_INSTALL_ARGS= install.man -MAN1= mgp.1 mgp2ps.1 mgpembed.1 mgpnet.1 xwintoppm.1 xmindpath.1 - PORTDOCS= ${DOCS} sample emacs-lisp scripts DOCS= COPYRIGHT COPYRIGHT.jp FAQ README README.fonts \ README.fonts.jp README.lang RELNOTES SYNTAX TODO.jp \ @@ -46,38 +44,24 @@ OPTIONS_DEFINE=FREETYPE XFT GIF IMLIB OPTIONS_DEFAULT=FREETYPE XFT NO_OPTIONS_SORT=yes -.include <bsd.port.options.mk> +FREETYPE_CONFIGURE_ENABLE= freetype +XFT_USES= iconv +XFT_LIB_DEPENDS= libttf.so:${PORTSDIR}/print/freetype +XFT_CONFIGURE_ENABLE= xft2 +XFT_CONFIGURE_ON= --enable-freetype-charset16 +GIF_CONFIGURE_ENABLE= gif +GIF_LIB_DEPENDS= libgif.so:${PORTSDIR}/graphics/giflib +GIF_CPPFLAGS= -I${LOCALBASE}/include +IMLIB_CONFIGURE_ENABLE= imlib -.if ${PORT_OPTIONS:MFREETYPE} -# Only freetype 1.x is supported -LIB_DEPENDS+= ttf:${PORTSDIR}/print/freetype -CONFIGURE_ARGS+= --enable-freetype \ - --enable-freetype-charset16 -.else -CONFIGURE_ARGS+= --disable-freetype -.endif +.include <bsd.port.options.mk> .if ${PORT_OPTIONS:MXFT} -USES+= iconv USE_XORG+= xft -CONFIGURE_ARGS+= --enable-xft2 -.else -CONFIGURE_ARGS+= --disable-xft2 -.endif - -.if ${PORT_OPTIONS:MGIF} -LIB_DEPENDS+= gif:${PORTSDIR}/graphics/giflib -CONFIGURE_ARGS+= --enable-gif -CFLAGS+= -I${LOCALBASE}/include -.else -CONFIGURE_ARGS+= --disable-gif .endif .if ${PORT_OPTIONS:MIMLIB} -USE_GNOME= imlib -CONFIGURE_ARGS+= --enable-imlib -.else -CONFIGURE_ARGS+= --disable-imlib +USE_GNOME+= imlib .endif post-patch: @@ -86,33 +70,39 @@ post-patch: ${WRKSRC}/configure post-configure: - (cd ${CONFIGURE_WRKSRC} && ${SETENV} ${MAKE_ENV} ${XMKMF} ${XMKMF_ARGS}) + cd ${CONFIGURE_WRKSRC} && \ + ${SETENV} ${MAKE_ENV} ${XMKMF} ${XMKMF_ARGS} cd ${WRKSRC}/contrib/xmindpath && \ ${SH} ${CONFIGURE_SCRIPT} --prefix=${PREFIX} post-build: cd ${WRKSRC}/contrib/xmindpath && \ - ${MAKE} + ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} post-install: - cd ${WRKSRC}/contrib/xmindpath && \ - ${MAKE} install + ${INSTALL_MAN} ${WRKSRC}/contrib/xmindpath/xmindpath.1 \ + ${STAGEDIR}${MANPREFIX}/man/man1/ + ${INSTALL} ${WRKSRC}/contrib/xmindpath/xmindpath \ + ${STAGEDIR}${PREFIX}/bin/ .if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && \ - ${INSTALL_DATA} ${DOCS} ${DOCSDIR} - ${MKDIR} ${DOCSDIR}/sample + ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}/ + ${MKDIR} ${STAGEDIR}${DOCSDIR}/sample cd ${WRKSRC}/sample && \ - ${INSTALL_DATA} ${SAMPLES} ${DOCSDIR}/sample/ - ${MKDIR} ${DOCSDIR}/emacs-lisp + ${INSTALL_DATA} ${SAMPLES} ${STAGEDIR}${DOCSDIR}/sample/ + ${MKDIR} ${STAGEDIR}${DOCSDIR}/emacs-lisp cd ${WRKSRC}/contrib && \ - ${INSTALL_DATA} ${EMACS_LISPS} ${DOCSDIR}/emacs-lisp/ - ${MKDIR} ${DOCSDIR}/emacs-lisp/mgp-el + ${INSTALL_DATA} ${EMACS_LISPS} \ + ${STAGEDIR}${DOCSDIR}/emacs-lisp/ + ${MKDIR} ${STAGEDIR}${DOCSDIR}/emacs-lisp/mgp-el cd ${WRKSRC}/contrib/mgp-el && \ - ${INSTALL_DATA} ${EMACS_LISPS_MGP} ${DOCSDIR}/emacs-lisp/mgp-el - ${MKDIR} ${DOCSDIR}/scripts + ${INSTALL_DATA} ${EMACS_LISPS_MGP} \ + ${STAGEDIR}${DOCSDIR}/emacs-lisp/mgp-el/ + ${MKDIR} ${STAGEDIR}${DOCSDIR}/scripts cd ${WRKSRC}/contrib && \ - ${INSTALL_SCRIPT} ${SAMPLE_SCRIPTS} ${DOCSDIR}/scripts/ + ${INSTALL_SCRIPT} ${SAMPLE_SCRIPTS} \ + ${STAGEDIR}${DOCSDIR}/scripts/ .endif .include <bsd.port.mk> Added: head/misc/magicpoint/files/patch-ctlwords.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/magicpoint/files/patch-ctlwords.c Fri Nov 8 18:47:55 2013 (r333257) @@ -0,0 +1,10 @@ +--- ctlwords.c.orig 1999-02-15 00:02:25.000000000 +0100 ++++ ctlwords.c 2013-11-08 09:05:06.000000000 +0100 +@@ -24,6 +24,7 @@ + + #include <stdio.h> + #include <string.h> ++#include <stdlib.h> + + main(int argc, char *argv[]) + { Modified: head/misc/magicpoint/pkg-plist ============================================================================== --- head/misc/magicpoint/pkg-plist Fri Nov 8 18:37:05 2013 (r333256) +++ head/misc/magicpoint/pkg-plist Fri Nov 8 18:47:55 2013 (r333257) @@ -8,4 +8,10 @@ lib/X11/mgp/default.mgp lib/X11/mgp/mgp1.jpg lib/X11/mgp/mgp2.jpg lib/X11/mgp/mgp3.jpg +man/man1/mgp.1.gz +man/man1/mgp2ps.1.gz +man/man1/mgpembed.1.gz +man/man1/mgpnet.1.gz +man/man1/xwintoppm.1.gz +man/man1/xmindpath.1.gz @dirrm lib/X11/mgp
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311081847.rA8IltaL004165>