Index: head/math/proofgeneral/Makefile =================================================================== --- head/math/proofgeneral/Makefile (revision 186600) +++ head/math/proofgeneral/Makefile (revision 186601) @@ -1,86 +1,84 @@ # New ports collection makefile for: proofgeneral # Date created: 11 August 2005 # Whom: Timothy Bourke # # $FreeBSD$ # PORTNAME= proofgeneral PORTVERSION= 3.6 PORTREVISION= 2 CATEGORIES= math elisp MASTER_SITES= http://proofgeneral.inf.ed.ac.uk/releases/ DISTNAME= ProofGeneral-3.6pre061107 MAINTAINER= timbob@bigpond.com COMMENT= A generic interface for proof assistants PKGNAMESUFFIX+= -${EMACS_NAME} BUILD_DEPENDS+= bash:${PORTSDIR}/shells/bash RUN_DEPENDS+= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme -BROKEN= Incomplete pkg-plist - # # Unless EMACS_PORT_NAME is overriden by the user, # use any installed version of [X]Emacs. # # If there is none installed, use xemacs21-mule. # .if !defined(EMACS_PORT_NAME) .if !exists(${LOCALBASE}/bin/emacs) EMACS_PORT_NAME=xemacs21-mule BUILD_DEPENDS+= ${LOCALBASE}/bin/xemacs:${PORTSDIR}/editors/${EMACS_PORT_NAME} RUN_DEPENDS+= ${LOCALBASE}/bin/xemacs:${PORTSDIR}/editors/${EMACS_PORT_NAME} # xemacs21-mule does not depend on xemacs-packages, so add a dependency here BUILD_DEPENDS+= ${LOCALBASE}/lib/xemacs/xemacs-packages/lisp/xlib/xlib-xlib.el:${PORTSDIR}/editors/xemacs-packages RUN_DEPENDS+= ${LOCALBASE}/lib/xemacs/xemacs-packages/lisp/xlib/xlib-xlib.el:${PORTSDIR}/editors/xemacs-packages .else EMACS_PORT_NAME=emacs BUILD_DEPENDS+= ${LOCALBASE}/bin/emacs:${PORTSDIR}/editors/${EMACS_PORT_NAME} RUN_DEPENDS+= ${LOCALBASE}/bin/emacs:${PORTSDIR}/editors/${EMACS_PORT_NAME} .endif .endif USE_EMACS= yes USE_GMAKE= yes USE_GNOME= gnomehier INSTALLS_ICONS= yes USE_PERL5= yes .include .if ${ARCH} == "amd64" BROKEN="Does not build on amd64" .endif MAKE_ARGS+= EMACS_NAME=${EMACS_NAME} EMACS_SITE_LISPDIR=${EMACS_SITE_LISPDIR} SUB_FILES= pkg-message SUB_LIST= EMACS_SITE_LISPDIR=${EMACS_SITE_LISPDIR} MAN1= proofgeneral.1 MANCOMPRESSED= no INFO= PG-adapting ProofGeneral .if !defined(NOPORTDOCS) MAKE_ARGS+= DOCSDIR=${DOCSDIR} INSTALLDOC=install-doc BUILD_DEPENDS+= ${LOCALBASE}/bin/texi2pdf:${PORTSDIR}/print/teTeX-base .endif post-patch: @${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' \ ${WRKSRC}/etc/desktop/proofgeneral.desktop ${TOUCH} ${WRKSRC}/.byte-compile pre-build: #.if defined(BYTE_COMPILE) @${RM} ${WRKSRC}/.byte-compile || ${TRUE} #.endif post-install: @${CAT} ${PKGMESSAGE} .include Property changes on: head/math/proofgeneral/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.12 \ No newline at end of property +1.13 \ No newline at end of property Index: head/math/proofgeneral/files/patch-Makefile =================================================================== --- head/math/proofgeneral/files/patch-Makefile (revision 186600) +++ head/math/proofgeneral/files/patch-Makefile (revision 186601) @@ -1,165 +1,166 @@ --- Makefile.orig Sat Sep 23 05:26:01 2006 -+++ Makefile Tue Jan 2 10:42:43 2007 ++++ Makefile Mon Mar 5 19:53:43 2007 @@ -15,7 +15,7 @@ # Set this to "emacs" or "xemacs" according to your version of Emacs. # NB: this is also used to set default install path names below. -EMACS=$(shell if [ -z "`which xemacs`" ]; then echo emacs; else echo xemacs; fi) +EMACS=${EMACS_NAME} # We default to /usr rather than /usr/local because installs of # desktop and doc files under /usr/local are unlikely to work with @@ -23,8 +23,7 @@ # individually before the install section. # NB: DEST_PREFIX is used for final destination prefix, in case we're # packaging into a build prefix rather than live root (e.g. in rpmbuild). -PREFIX=/usr -DEST_PREFIX=/usr +DEST_PREFIX=${PREFIX} PWD=$(shell pwd) @@ -78,7 +77,7 @@ ## compiles. ## compile: .byte-compile - lastemacs=`cat .byte-compile`; if [ "$$lastemacs" != "$(EMACS)" ]; then rm -f .byte-compile; make .byte-compile; fi + lastemacs=`cat .byte-compile`; if [ "$$lastemacs" != "$(EMACS_NAME)" ]; then rm -f .byte-compile; $(MAKE) .byte-compile; fi .byte-compile: $(EL) x-symbol/lisp/*.el @@ -136,42 +135,37 @@ # Set Elisp directories according to paths used in Red Hat RPMs # (which may or may not be official Emacs policy). We generate # a pg-init.el file which loads the appropriate proof-site.el. -ifeq ($(EMACS),xemacs) -ELISPP=share/xemacs/site-packages/lisp/ProofGeneral -ELISP_START=${PREFIX}/share/xemacs/site-packages/lisp/site-start.d -else -ELISPP=share/${EMACS}/site-lisp/ProofGeneral -ELISP_START=${PREFIX}/share/${EMACS}/site-lisp/site-start.d -endif +ELISPP=${EMACS_SITE_LISPDIR}/proofgeneral +ELISP_START=${PREFIX}/${EMACS_SITE_LISPDIR}/site-start.d ELISP=${PREFIX}/${ELISPP} DEST_ELISP=${DEST_PREFIX}/${ELISPP} BINDIR=${PREFIX}/bin DESKTOP=${PREFIX}/share -DOCDIR=${PREFIX}/share/doc/ProofGeneral -MANDIR=${PREFIX}/share/man/man1 -INFODIR=${PREFIX}/share/info +DOCDIR=${DOCSDIR} +MANDIR=${PREFIX}/man/man1 +INFODIR=${PREFIX}/info -install: install-desktop install-elisp install-bin install-init +install: install-desktop install-elisp install-bin install-init ${INSTALLDOC} install-desktop: - mkdir -p ${DESKTOP}/icons/hicolor/16x16 - cp etc/desktop/icons/16x16/proofgeneral.png ${DESKTOP}/icons/hicolor/16x16 - mkdir -p ${DESKTOP}/icons/hicolor/32x32 - cp etc/desktop/icons/32x32/proofgeneral.png ${DESKTOP}/icons/hicolor/32x32 - mkdir -p ${DESKTOP}/icons/hicolor/48x48 - cp etc/desktop/icons/48x48/proofgeneral.png ${DESKTOP}/icons/hicolor/48x48 - mkdir -p ${DESKTOP}/pixmaps - cp etc/desktop/icons/48x48/proofgeneral.png ${DESKTOP}/pixmaps - mkdir -p ${DESKTOP}/applications - cp etc/desktop/proofgeneral.desktop ${DESKTOP}/applications - mkdir -p ${DESKTOP}/mime-info - cp etc/desktop/mime-info/proofgeneral.mime ${DESKTOP}/mime-info - cp etc/desktop/mime-info/proofgeneral.keys ${DESKTOP}/mime-info + if [ -d ${DESKTOP}/icons/hicolor ]; then \ + ${BSD_INSTALL_DATA} etc/desktop/icons/16x16/proofgeneral.png ${DESKTOP}/icons/hicolor/16x16; \ + ${BSD_INSTALL_DATA} etc/desktop/icons/32x32/proofgeneral.png ${DESKTOP}/icons/hicolor/32x32; \ + ${BSD_INSTALL_DATA} etc/desktop/icons/48x48/proofgeneral.png ${DESKTOP}/icons/hicolor/48x48; \ + fi + + if [ -d ${DESKTOP}/gnome ]; then \ + ${BSD_INSTALL_DATA} etc/desktop/icons/48x48/proofgeneral.png ${DESKTOP}/gnome/pixmaps; \ + ${BSD_INSTALL_DATA} etc/desktop/proofgeneral.desktop ${DESKTOP}/gnome/applications; \ + ${BSD_INSTALL_DATA} etc/desktop/mime-info/proofgeneral.mime ${DESKTOP}/gnome/mime-info; \ + ${BSD_INSTALL_DATA} etc/desktop/mime-info/proofgeneral.keys ${DESKTOP}/gnome/mime-info; \ + fi + # backwards compatibility with old linuxes - mkdir -p ${DESKTOP}/application-registry +- mkdir -p ${DESKTOP}/application-registry - cp etc/desktop/application-registry/proofgeneral.applications ${DESKTOP}/application-registry ++ mkdir -p ${DESKTOP}/gnome/application-registry + cp etc/desktop/application-registry/proofgeneral.applications ${DESKTOP}/gnome/application-registry # NB: .el files are not strictly necessary, but we package/install them # for the time being to help with debugging, or for users to recompile. @@ -186,15 +180,23 @@ install-el: mkdir -p ${ELISP} for f in ${ELISP_DIRS} ${EXTRA_DIRS}; do mkdir -p ${ELISP}/$$f; done - for f in ${ELISP_DIRS}; do cp -pf $$f/*.el ${ELISP}/$$f; done - for f in ${EXTRA_DIRS}; do cp -prf $$f/* ${ELISP}/$$f; done - for f in ${ELISP_EXTRAS}; do cp -pf $$f ${ELISP}/$$f; done + for f in ${ELISP_DIRS}; do ${BSD_INSTALL_DATA} $$f/*.el ${ELISP}/$$f; done + for f in ${ELISP_EXTRAS}; do ${BSD_INSTALL_DATA} $$f ${ELISP}/$$f; done + for f in ${EXTRA_DIRS}; \ + do for g in `find -d $$f -type d`; \ + do mkdir -p ${ELISP}/$$g; \ + files=`find $$g -depth 1 -type f \\! -perm +u+x`; \ + if [ "$$files" != "" ]; then ${BSD_INSTALL_DATA} $$files ${ELISP}/$$g; fi; \ + scripts=`find $$g -depth 1 -type f -perm +u+x`; \ + if [ "$$scripts" != "" ]; then ${BSD_INSTALL_SCRIPT} $$scripts ${ELISP}/$$g; fi; \ + done; \ + done install-elc: compile mkdir -p ${ELISP} for f in ${ELISP_DIRS} ${EXTRA_DIRS}; do mkdir -p ${ELISP}/$$f; done - for f in ${ELISP_DIRS}; do cp -pf $$f/*.elc ${ELISP}/$$f; done - for f in ${ELISP_EXTRAS}; do cp -pf $$f ${ELISP}/$$f; done + for f in ${ELISP_DIRS}; do ${BSD_INSTALL_DATA} $$f/*.elc ${ELISP}/$$f; done + for f in ${ELISP_EXTRAS}; do ${BSD_INSTALL_DATA} $$f ${ELISP}/$$f; done install-init: mkdir -p ${ELISP_START} @@ -204,24 +206,31 @@ install-bin: scripts mkdir -p ${BINDIR} - cp -pf ${BIN_SCRIPTS} ${BINDIR} + ${BSD_INSTALL_SCRIPT} ${BIN_SCRIPTS} ${BINDIR} -install-doc: doc.info doc.pdf +install-doc: doc.info doc.pdf doc.html mkdir -p ${MANDIR} - cp -pf doc/proofgeneral.1 ${MANDIR} - mkdir -p ${INFODIR} - cp -pf doc/*.info ${INFODIR} - /sbin/install-info ${INFODIR}/ProofGeneral.info* ${INFODIR}/dir - /sbin/install-info ${INFODIR}/PG-adapting.info* ${INFODIR}/dir + ${BSD_INSTALL_MAN} doc/proofgeneral.1 ${MANDIR} + ${BSD_INSTALL_MAN} doc/PG-adapting.info ${INFODIR} + ${BSD_INSTALL_MAN} doc/ProofGeneral.info ${INFODIR} mkdir -p ${DOCDIR} - for f in ${DOC_FILES}; do cp -pf $$f ${DOCDIR}; done - for f in ${DOC_EXAMPLES}; do mkdir -p ${DOCDIR}/`dirname $$f`; cp -pf $$f ${DOCDIR}/$$f; done + for f in ${DOC_FILES}; do ${BSD_INSTALL_MAN} $$f ${DOCDIR}; done + for f in ${DOC_EXAMPLES}; do mkdir -p ${DOCDIR}/`dirname $$f`; \ + ${BSD_INSTALL_MAN} $$f ${DOCDIR}/$$f; done + mkdir -p ${DOCDIR}/ProofGeneral + for f in doc/ProofGeneral/*.html; do \ + ${BSD_INSTALL_MAN} $$f ${DOCDIR}/ProofGeneral/`basename $$f`; done + mkdir -p ${DOCDIR}/PG-adapting + for f in doc/PG-adapting/*.html; do \ + ${BSD_INSTALL_MAN} $$f ${DOCDIR}/PG-adapting/`basename $$f`; done + for f in ProofGeneral.pdf PG-adapting.pdf; do \ + ${BSD_INSTALL_MAN} doc/$$f ${DOCDIR}/$$f; done doc: FORCE - (cd doc; make $*) + (cd doc; $(MAKE) $*) doc.%: FORCE - (cd doc; make $*) + (cd doc; $(MAKE) $*) ## ## scripts: try to patch bash and perl scripts with correct paths Property changes on: head/math/proofgeneral/files/patch-Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property