Date: Thu, 27 Mar 2014 16:41:03 +0000 (UTC) From: Pawel Pekala <pawel@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r349345 - in head/devel/dprog: . files Message-ID: <201403271641.s2RGf3vE070422@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pawel Date: Thu Mar 27 16:41:02 2014 New Revision: 349345 URL: http://svnweb.freebsd.org/changeset/ports/349345 QAT: https://qat.redports.org/buildarchive/r349345/ Log: - Add staging support - Remove leading article from COMMENT - Convert to new LIB_DEPENDS format - Remove Install prefix from option description - Run ranlib on library prior to installing it, this allows non-root staging solving write permission error Modified: head/devel/dprog/Makefile head/devel/dprog/files/patch-Makefile.in Modified: head/devel/dprog/Makefile ============================================================================== --- head/devel/dprog/Makefile Thu Mar 27 16:34:38 2014 (r349344) +++ head/devel/dprog/Makefile Thu Mar 27 16:41:02 2014 (r349345) @@ -8,9 +8,9 @@ CATEGORIES= devel MASTER_SITES= http://www.daimi.au.dk/~mailund/dprog/download/ MAINTAINER= ports@FreeBSD.org -COMMENT= A language for specifying dynamic programming algorithms +COMMENT= Language for specifying dynamic programming algorithms -LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt +LIB_DEPENDS= libpopt.so:${PORTSDIR}/devel/popt GNU_CONFIGURE= yes CPPFLAGS+= ${CXXFLAGS} -I${LOCALBASE}/include @@ -18,21 +18,11 @@ LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= EMACS OPTIONS_DEFAULT= EMACS -EMACS_DESC= Install emacs syntax files - -NO_STAGE= yes -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MEMACS} -PLIST_SUB+= EMACS="" -.else -PLIST_SUB+= EMACS="@comment " -.endif +OPTIONS_SUB= yes +EMACS_DESC= Emacs syntax files post-install: -.if ${PORT_OPTIONS:MEMACS} - @${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/elisp/*.el ${DATADIR} -.endif + @${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/elisp/*.el ${STAGEDIR}${DATADIR} .include <bsd.port.mk> Modified: head/devel/dprog/files/patch-Makefile.in ============================================================================== --- head/devel/dprog/files/patch-Makefile.in Thu Mar 27 16:34:38 2014 (r349344) +++ head/devel/dprog/files/patch-Makefile.in Thu Mar 27 16:41:02 2014 (r349345) @@ -1,5 +1,5 @@ ---- Makefile.in.orig Mon Apr 21 20:29:07 2003 -+++ Makefile.in Tue Apr 6 09:05:17 2004 +--- Makefile.in.orig 2003-04-21 14:29:07.000000000 +0200 ++++ Makefile.in 2014-03-27 17:32:22.000000000 +0100 @@ -87,7 +87,7 @@ ARCH = `uname -mrs` DATE = `date '+%d %h %y'` @@ -18,3 +18,19 @@ cxx_dprog_test_SOURCES = cxx_dprog_test.cc symbol_checking_test_SOURCES = ast.hh ast.cc visitor.hh pretty_printer.hh pretty_printer.cc symbol_checking.hh symbol_checking.cc type_checking.hh type_checking.cc functions.hh functions.cc codegen.hh codegen.cc cxx_codegen.hh cxx_codegen.cc options.hh options.cc symbol_checking_test.cc +@@ -315,6 +315,7 @@ + @list='$(lib_LIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ $(RANLIB) $$p; \ + echo " $(libLIBRARIES_INSTALL) $$p $(DESTDIR)$(libdir)/$$f"; \ + $(libLIBRARIES_INSTALL) $$p $(DESTDIR)$(libdir)/$$f; \ + else :; fi; \ +@@ -324,7 +325,6 @@ + if test -f $$p; then \ + p="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \ +- $(RANLIB) $(DESTDIR)$(libdir)/$$p; \ + else :; fi; \ + done +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403271641.s2RGf3vE070422>