From owner-svn-ports-all@FreeBSD.ORG Tue Dec 17 08:02:00 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BE21158B; Tue, 17 Dec 2013 08:02:00 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A931817A4; Tue, 17 Dec 2013 08:02:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBH820af060237; Tue, 17 Dec 2013 08:02:00 GMT (envelope-from dinoex@svn.freebsd.org) Received: (from dinoex@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBH820lo060232; Tue, 17 Dec 2013 08:02:00 GMT (envelope-from dinoex@svn.freebsd.org) Message-Id: <201312170802.rBH820lo060232@svn.freebsd.org> From: Dirk Meyer Date: Tue, 17 Dec 2013 08:02:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336696 - head/print/a2ps X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 08:02:00 -0000 Author: dinoex Date: Tue Dec 17 08:01:59 2013 New Revision: 336696 URL: http://svnweb.freebsd.org/changeset/ports/336696 Log: - use STAGEDIR - use OPT_USE, OPT_USES, OPT_CONFIGURE_* - update LIB_DEPENDS Modified: head/print/a2ps/Makefile head/print/a2ps/pkg-plist Modified: head/print/a2ps/Makefile ============================================================================== --- head/print/a2ps/Makefile Tue Dec 17 06:29:37 2013 (r336695) +++ head/print/a2ps/Makefile Tue Dec 17 08:01:59 2013 (r336696) @@ -14,17 +14,14 @@ COMMENT= Formats an ASCII file for print LICENSE= GPLv2 -LIB_DEPENDS= paper:${PORTSDIR}/print/libpaper +LIB_DEPENDS= libpaper.so:${PORTSDIR}/print/libpaper PORTSCOUT= skipv:4.14 -NO_STAGE= yes USES= perl5 USE_CSTD= gnu89 GNU_CONFIGURE= yes USE_LDCONFIG= yes -MAN1= a2ps.1 ogonkify.1 card.1 psmandup.1 fixps.1 pdiff.1 psset.1 \ - texi2dvi4a2ps.1 INFO= a2ps ogonkify regex WRKSRC= ${WRKDIR}/${PORTNAME}-4.13 I18N_PACKAGE= i18n-fonts-0.1 @@ -43,31 +40,28 @@ RUN_DEPENDS+= ${LOCALBASE}/etc/papersize OPTIONS_DEFINE=NLS I18N EMACS OPTIONS_DEFAULT=NLS NO_OPTIONS_SORT=yes +OPTIONS_SUB= yes EMACS_DESC=Enable Emacs support I18N_DESC=Enable I18N support -.include +NLS_USES= gettext +NLS_CONFIGURE_ENABLE= nls +EMACS_USE= EMACS=yes +EMACS_CONFIGURE_ON= --with-lispdir=${LOCALBASE}/${EMACS_SITE_LISPDIR} -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+= --disable-nls -PLIST_SUB+= NLS="@comment " -.endif +.include -.if ${PORT_OPTIONS:MEMACS} -USE_EMACS= yes -CONFIGURE_ARGS+= --with-lispdir=${LOCALBASE}/${EMACS_SITE_LISPDIR} -PLIST_SUB+= WITHEMACS="" -.else +.if ! ${PORT_OPTIONS:MEMACS} CONFIGURE_ENV+= EMACS=no -PLIST_SUB+= WITHEMACS="@comment " .endif +post-patch: + ${REINPLACE_CMD} -e 's|^DESTDIR|#DESTDIR|' \ + `${FIND} ${WRKSRC} -name "Makefile.in"` + .if ${PORT_OPTIONS:MI18N} +#DISTFILES+= ${I18N_PACKAGE}${EXTRACT_SUFX}:i18n DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${I18N_PACKAGE}${EXTRACT_SUFX}:i18n -PLIST_SUB+= WITHI18N="" pre-configure: cd ${WRKDIR}/${I18N_PACKAGE}/afm && \ @@ -83,21 +77,19 @@ post-configure: @cd ${WRKSRC}/afm && { ${ECHO} ''; \ ${ECHO} "i18n_afms =" `cat ${WRKDIR}/${I18N_PACKAGE}/afm/afms.lst`; } >> Makefile && \ ${REINPLACE_CMD} 's,^\(all_afms = .*\),\1 $$(i18n_afms),' Makefile -.else -PLIST_SUB+= WITHI18N="@comment " .endif post-install: - ${STRIP_CMD} ${PREFIX}/bin/a2ps + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/a2ps .if ${PORT_OPTIONS:MEMACS} - ${MKDIR} ${PREFIX}/lib/xemacs/site-lisp - ${LN} -sf ${PREFIX}/share/emacs/site-lisp/a2ps-print.el \ - ${PREFIX}/lib/xemacs/site-lisp/a2ps-print.el - ${LN} -sf ${PREFIX}/share/emacs/site-lisp/a2ps.el \ - ${PREFIX}/lib/xemacs/site-lisp/a2ps.el + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/xemacs/site-lisp + ${LN} -sf ${STAGEDIR}${PREFIX}/share/emacs/site-lisp/a2ps-print.el \ + ${STAGEDIR}${PREFIX}/lib/xemacs/site-lisp/a2ps-print.el + ${LN} -sf ${STAGEDIR}${PREFIX}/share/emacs/site-lisp/a2ps.el \ + ${STAGEDIR}${PREFIX}/lib/xemacs/site-lisp/a2ps.el .endif cd ${WRKSRC}/doc && \ - ${SETENV} ${MAKE_ENV} ${MAKE} ${.MAKEFLAGS} ${INSTALL_TARGET} - ${RM} -f ${PREFIX}/lib/liba2ps.la + ${SETENV} ${MAKE_ENV} ${MAKE} ${.MAKEFLAGS} ${MAKE_ARGS} ${INSTALL_TARGET} + ${RM} -f ${STAGEDIR}${PREFIX}/lib/liba2ps.la .include Modified: head/print/a2ps/pkg-plist ============================================================================== --- head/print/a2ps/pkg-plist Tue Dec 17 06:29:37 2013 (r336695) +++ head/print/a2ps/pkg-plist Tue Dec 17 08:01:59 2013 (r336696) @@ -12,6 +12,14 @@ etc/a2ps-site.cfg etc/a2ps.cfg include/liba2ps.h lib/liba2ps.a +man/man1/a2ps.1.gz +man/man1/ogonkify.1.gz +man/man1/card.1.gz +man/man1/psmandup.1.gz +man/man1/fixps.1.gz +man/man1/pdiff.1.gz +man/man1/psset.1.gz +man/man1/texi2dvi4a2ps.1.gz %%DATADIR%%/README %%DATADIR%%/afm/fonts.map %%DATADIR%%/afm/make_fonts_map.sh @@ -47,16 +55,16 @@ lib/liba2ps.a %%DATADIR%%/afm/ptmr.afm %%DATADIR%%/afm/pzcmi.afm %%DATADIR%%/afm/pzdr.afm -%%WITHI18N%%%%DATADIR%%/afm/colle10.afm -%%WITHI18N%%%%DATADIR%%/afm/colle8.afm -%%WITHI18N%%%%DATADIR%%/afm/colle9.afm -%%WITHI18N%%%%DATADIR%%/afm/crr35__i.afm -%%WITHI18N%%%%DATADIR%%/afm/crr36__i.afm -%%WITHI18N%%%%DATADIR%%/afm/crr55__i.afm -%%WITHI18N%%%%DATADIR%%/afm/crr56__i.afm -%%WITHI18N%%%%DATADIR%%/afm/textb18.afm -%%WITHI18N%%%%DATADIR%%/afm/textb19.afm -%%WITHI18N%%%%DATADIR%%/afm/textb20.afm +%%I18N%%%%DATADIR%%/afm/colle10.afm +%%I18N%%%%DATADIR%%/afm/colle8.afm +%%I18N%%%%DATADIR%%/afm/colle9.afm +%%I18N%%%%DATADIR%%/afm/crr35__i.afm +%%I18N%%%%DATADIR%%/afm/crr36__i.afm +%%I18N%%%%DATADIR%%/afm/crr55__i.afm +%%I18N%%%%DATADIR%%/afm/crr56__i.afm +%%I18N%%%%DATADIR%%/afm/textb18.afm +%%I18N%%%%DATADIR%%/afm/textb19.afm +%%I18N%%%%DATADIR%%/afm/textb20.afm %%DATADIR%%/encoding/ascii.edf %%DATADIR%%/encoding/encoding.map %%DATADIR%%/encoding/hp.edf @@ -76,16 +84,16 @@ lib/liba2ps.a %%DATADIR%%/encoding/mac.edf %%DATADIR%%/encoding/ms-cp1250.edf %%DATADIR%%/fonts/pcfont.pfa -%%WITHI18N%%%%DATADIR%%/fonts/colle10.pfb -%%WITHI18N%%%%DATADIR%%/fonts/colle8.pfb -%%WITHI18N%%%%DATADIR%%/fonts/colle9.pfb -%%WITHI18N%%%%DATADIR%%/fonts/crr35__i.pfb -%%WITHI18N%%%%DATADIR%%/fonts/crr36__i.pfb -%%WITHI18N%%%%DATADIR%%/fonts/crr55__i.pfb -%%WITHI18N%%%%DATADIR%%/fonts/crr56__i.pfb -%%WITHI18N%%%%DATADIR%%/fonts/textb18.pfb -%%WITHI18N%%%%DATADIR%%/fonts/textb19.pfb -%%WITHI18N%%%%DATADIR%%/fonts/textb20.pfb +%%I18N%%%%DATADIR%%/fonts/colle10.pfb +%%I18N%%%%DATADIR%%/fonts/colle8.pfb +%%I18N%%%%DATADIR%%/fonts/colle9.pfb +%%I18N%%%%DATADIR%%/fonts/crr35__i.pfb +%%I18N%%%%DATADIR%%/fonts/crr36__i.pfb +%%I18N%%%%DATADIR%%/fonts/crr55__i.pfb +%%I18N%%%%DATADIR%%/fonts/crr56__i.pfb +%%I18N%%%%DATADIR%%/fonts/textb18.pfb +%%I18N%%%%DATADIR%%/fonts/textb19.pfb +%%I18N%%%%DATADIR%%/fonts/textb20.pfb %%DATADIR%%/ogonkify/README %%DATADIR%%/ogonkify/adobe.enc %%DATADIR%%/ogonkify/afm/pcrb-o.afm @@ -276,12 +284,12 @@ lib/liba2ps.a %%NLS%%share/locale/sl/LC_MESSAGES/a2ps.mo %%NLS%%share/locale/sv/LC_MESSAGES/a2ps.mo %%NLS%%share/locale/tr/LC_MESSAGES/a2ps.mo -%%WITHEMACS%%%%EMACS_SITE_LISPDIR%%/a2ps-print.el -%%WITHEMACS%%%%EMACS_SITE_LISPDIR%%/a2ps-print.elc -%%WITHEMACS%%%%EMACS_SITE_LISPDIR%%/a2ps.el -%%WITHEMACS%%%%EMACS_SITE_LISPDIR%%/a2ps.elc -%%WITHEMACS%%lib/xemacs/site-lisp/a2ps-print.el -%%WITHEMACS%%lib/xemacs/site-lisp/a2ps.el +%%EMACS%%%%EMACS_SITE_LISPDIR%%/a2ps-print.el +%%EMACS%%%%EMACS_SITE_LISPDIR%%/a2ps-print.elc +%%EMACS%%%%EMACS_SITE_LISPDIR%%/a2ps.el +%%EMACS%%%%EMACS_SITE_LISPDIR%%/a2ps.elc +%%EMACS%%lib/xemacs/site-lisp/a2ps-print.el +%%EMACS%%lib/xemacs/site-lisp/a2ps.el @dirrm %%DATADIR%%/ogonkify/fonts @dirrm %%DATADIR%%/ogonkify/afm @dirrm %%DATADIR%%/ogonkify @@ -292,5 +300,5 @@ lib/liba2ps.a @dirrm %%DATADIR%%/encoding @dirrm %%DATADIR%%/afm @dirrm %%DATADIR%% -%%WITHEMACS%%@dirrm lib/xemacs/site-lisp -%%WITHEMACS%%@dirrm lib/xemacs +%%EMACS%%@dirrm lib/xemacs/site-lisp +%%EMACS%%@dirrm lib/xemacs