Attachment 171073 Details for Bug 210062 – include shared libraries and enable stripping

[patch] include shared libraries and enable stripping

routino.diff (text/plain), 11.76 KB, created by Christoph Moench-Tegeder on 2016-06-05 20:21:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christoph Moench-Tegeder

Created: 2016-06-05 20:21:23 UTC

Size: 11.76 KB

patch

obsolete

>Index: astro/routino/Makefile
>===================================================================
>--- astro/routino/Makefile	(revision 416394)
>+++ astro/routino/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	routino
> PORTVERSION=	3.1.1
>+PORTREVISION=	1
> CATEGORIES=	astro
> MASTER_SITES=	http://www.routino.org/download/
> 
>@@ -26,7 +27,17 @@
> 	${MKDIR} ${STAGEDIR}${WWWDIR}
> 	(cd ${WRKSRC}/web && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} \
> 		"! -name Makefile")
>+	${CHMOD} 0644 ${STAGEDIR}${PREFIX}/lib/lib*
>+	${CHMOD} 0755 ${STAGEDIR}${PREFIX}/bin/*
>+	${CHMOD} 0755 ${STAGEDIR}${WWWDIR}/bin/*
>+	${RM} ${STAGEDIR}${PREFIX}/lib/libroutino*.so
>+	${RM} ${STAGEDIR}${PREFIX}/lib/libroutino*.so.0
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
> 	${STRIP_CMD} ${STAGEDIR}${WWWDIR}/bin/*
>+.for f in routino.so.0.0.0 routino-slim.so.0.0.0
>+	${LN} -sf lib${f} ${STAGEDIR}${PREFIX}/lib/lib${f:R:R}
>+	${LN} -sf lib${f:R:R} ${STAGEDIR}${PREFIX}/lib/lib${f:R:R:R}
>+.endfor
> 
> .include <bsd.port.mk>
>Index: astro/routino/files/patch-doc_Makefile
>===================================================================
>--- astro/routino/files/patch-doc_Makefile	(nonexistent)
>+++ astro/routino/files/patch-doc_Makefile	(working copy)
>@@ -0,0 +1,28 @@
>+--- doc/Makefile.orig	2016-06-04 17:01:05 UTC
>++++ doc/Makefile
>+@@ -43,19 +43,19 @@ install: install-txt install-html
>+ install-txt:
>+ 	@[ -d $(DESTDIR)$(docdir) ] || mkdir -p $(DESTDIR)$(docdir)
>+ 	@for file in $(TOP_FILES); do \
>+-	    echo cp $$file $(DESTDIR)$(docdir) ;\
>+-	    cp -f $$file $(DESTDIR)$(docdir) ;\
>++	    echo install $$file $(DESTDIR)$(docdir) ;\
>++	    install $$file $(DESTDIR)$(docdir) ;\
>+ 	 done
>+ 	@for file in $(TXT_FILES); do \
>+-	    echo cp $$file $(DESTDIR)$(docdir) ;\
>+-	    cp -f $$file $(DESTDIR)$(docdir) ;\
>++	    echo install $$file $(DESTDIR)$(docdir) ;\
>++	    install $$file $(DESTDIR)$(docdir) ;\
>+ 	 done
>+ 
>+ install-html:
>+ 	@[ -d $(DESTDIR)$(docdir)/html ] || mkdir -p $(DESTDIR)$(docdir)/html
>+ 	@for file in $(HTML_FILES); do \
>+-	    echo cp html/$$file $(DESTDIR)$(docdir)/html ;\
>+-	    cp -f html/$$file $(DESTDIR)$(docdir)/html ;\
>++	    echo install html/$$file $(DESTDIR)$(docdir)/html ;\
>++	    install html/$$file $(DESTDIR)$(docdir)/html ;\
>+ 	 done
>+ 
>+ ########
>
>Property changes on: astro/routino/files/patch-doc_Makefile
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: astro/routino/files/patch-extras_find-fixme_Makefile
>===================================================================
>--- astro/routino/files/patch-extras_find-fixme_Makefile	(nonexistent)
>+++ astro/routino/files/patch-extras_find-fixme_Makefile	(working copy)
>@@ -0,0 +1,42 @@
>+--- extras/find-fixme/Makefile.orig	2016-06-04 17:12:29 UTC
>++++ extras/find-fixme/Makefile
>+@@ -52,8 +52,8 @@ all-bin: $(EXE)
>+ 	@[ -d $(WEBBINDIR) ] || mkdir -p $(WEBBINDIR)
>+ 	@for file in $(EXE); do \
>+ 	    if [ ! -f $(WEBBINDIR)/$$file ] || [ $$file -nt $(WEBBINDIR)/$$file ]; then \
>+-	       echo cp $$file $(WEBBINDIR) ;\
>+-	       cp -f $$file $(WEBBINDIR) ;\
>++	       echo install $$file $(WEBBINDIR) ;\
>++	       install $$file $(WEBBINDIR) ;\
>+ 	    fi ;\
>+ 	 done
>+ 
>+@@ -61,22 +61,22 @@ all-data:
>+ 	@[ -d $(WEBDATADIR) ] || mkdir -p $(WEBDATADIR)
>+ 	@for file in $(DATA); do \
>+ 	    if [ ! -f $(WEBDATADIR)/$$file ] || [ $$file -nt $(WEBDATADIR)/$$file ]; then \
>+-	       echo cp $$file $(WEBDATADIR) ;\
>+-	       cp -f $$file $(WEBDATADIR) ;\
>++	       echo install $$file $(WEBDATADIR) ;\
>++	       install $$file $(WEBDATADIR) ;\
>+ 	    fi ;\
>+ 	 done
>+ 
>+ all-www:
>+ 	@for file in $(WWW_COPY); do \
>+ 	    if [ ! -f $(WEBWWWDIR)/$$file ] || [ $(ROUTINO_WEBWWWDIR)/$$file -nt $(WEBWWWDIR)/$$file ]; then \
>+-	       echo cp $(ROUTINO_WEBWWWDIR)/$$file $(WEBWWWDIR) ;\
>+-	       cp -f $(ROUTINO_WEBWWWDIR)/$$file $(WEBWWWDIR) ;\
>++	       echo install $(ROUTINO_WEBWWWDIR)/$$file $(WEBWWWDIR) ;\
>++	       install $(ROUTINO_WEBWWWDIR)/$$file $(WEBWWWDIR) ;\
>+ 	    fi ;\
>+ 	 done
>+ 	@for file in $(DOC_COPY); do \
>+ 	    if [ ! -f $(WEBWWWDIR)/$$file ] || [ $(ROUTINO_DOCDIR)/$$file -nt $(WEBWWWDIR)/$$file ]; then \
>+-	       echo cp $(ROUTINO_DOCDIR)/$$file $(WEBWWWDIR) ;\
>+-	       cp -f $(ROUTINO_DOCDIR)/$$file $(WEBWWWDIR) ;\
>++	       echo install $(ROUTINO_DOCDIR)/$$file $(WEBWWWDIR) ;\
>++	       install $(ROUTINO_DOCDIR)/$$file $(WEBWWWDIR) ;\
>+ 	    fi ;\
>+ 	 done
>+ 
>
>Property changes on: astro/routino/files/patch-extras_find-fixme_Makefile
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: astro/routino/files/patch-src_Makefile
>===================================================================
>--- astro/routino/files/patch-src_Makefile	(nonexistent)
>+++ astro/routino/files/patch-src_Makefile	(working copy)
>@@ -0,0 +1,43 @@
>+--- src/Makefile.orig	2015-09-29 18:09:59 UTC
>++++ src/Makefile
>+@@ -38,9 +38,7 @@ EXE=planetsplitter$(.EXE) planetsplitter
>+     router+lib$(.EXE) router+lib-slim$(.EXE)
>+ 
>+ ifneq ($(HOST),MINGW)
>+-LIB =libroutino.so               libroutino-slim.so
>+-LIB+=libroutino.so.$(SOVERSION)  libroutino-slim.so.$(SOVERSION)
>+-LIB+=libroutino.so.$(LIBVERSION) libroutino-slim.so.$(LIBVERSION)
>++LIB=libroutino.so.$(LIBVERSION) libroutino-slim.so.$(LIBVERSION)
>+ else
>+ LIB =routino.dll routino-slim.dll
>+ LIB+=routino.def routino-slim.def
>+@@ -284,22 +282,23 @@ install-local: all-local
>+ 	@[ -d $(DESTDIR)$(bindir) ] || mkdir -p $(DESTDIR)$(bindir)
>+ 	@for file in $(EXE); do \
>+ 	    if [ -f $$file ]; then \
>+-	       echo cp $$file $(DESTDIR)$(bindir) ;\
>+-	       cp -f $$file $(DESTDIR)$(bindir) ;\
>++	       echo install -s $$file $(DESTDIR)$(bindir) ;\
>++	       install -s $$file $(DESTDIR)$(bindir) ;\
>+ 	    fi ;\
>+ 	 done
>+ 	@[ -d $(DESTDIR)$(incdir) ] || mkdir -p $(DESTDIR)$(incdir)
>+ 	@for file in $(INC); do \
>+ 	    if [ -f $$file ]; then \
>+-	       echo cp $$file $(DESTDIR)$(incdir) ;\
>+-	       cp -f $$file $(DESTDIR)$(incdir) ;\
>++	       echo install $$file $(DESTDIR)$(incdir) ;\
>++	       install $$file $(DESTDIR)$(incdir) ;\
>+ 	    fi ;\
>+ 	 done
>+ 	@[ -d $(DESTDIR)$(libdir) ] || mkdir -p $(DESTDIR)$(libdir)
>++	echo $(LIB)
>+ 	@for file in $(LIB); do \
>+ 	    if [ -f $$file ]; then \
>+-	       echo cp $$file $(DESTDIR)$(libdir) ;\
>+-	       cp -df $$file $(DESTDIR)$(libdir) ;\
>++	       echo install -s $$file $(DESTDIR)$(libdir) ;\
>++	       install -s $$file $(DESTDIR)$(libdir) ;\
>+ 	    fi ;\
>+ 	 done
>+ 
>
>Property changes on: astro/routino/files/patch-src_Makefile
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: astro/routino/files/patch-web_Makefile
>===================================================================
>--- astro/routino/files/patch-web_Makefile	(nonexistent)
>+++ astro/routino/files/patch-web_Makefile	(working copy)
>@@ -0,0 +1,60 @@
>+--- web/Makefile.orig	2016-06-04 17:03:11 UTC
>++++ web/Makefile
>+@@ -64,8 +64,8 @@ all-bin: all-exe
>+ 	@[ -d $(WEBBINDIR) ] || mkdir -p $(WEBBINDIR)
>+ 	@for file in $(EXE_FILES); do \
>+ 	    if [ -f $(SRCDIR)/$$file -a ! -f $(WEBBINDIR)/$$file ] || [ $(SRCDIR)/$$file -nt $(WEBBINDIR)/$$file ]; then \
>+-	       echo cp $(SRCDIR)/$$file $(WEBBINDIR) ;\
>+-	       cp -f $(SRCDIR)/$$file $(WEBBINDIR) ;\
>++	       echo install $(SRCDIR)/$$file $(WEBBINDIR) ;\
>++	       install $(SRCDIR)/$$file $(WEBBINDIR) ;\
>+ 	    fi ;\
>+ 	 done
>+ 
>+@@ -75,14 +75,14 @@ all-data: all-xml
>+ 	@[ -d $(WEBDATADIR) ] || mkdir -p $(WEBDATADIR)
>+ 	@for file in $(STANDARD_XML_FILES); do \
>+ 	    if [ ! -f $(WEBDATADIR)/$$file ] || [ $(XMLDIR)/routino-$$file -nt $(WEBDATADIR)/$$file ]; then \
>+-	       echo cp $(XMLDIR)/routino-$$file $(WEBDATADIR)/$$file ;\
>+-	       cp -f $(XMLDIR)/routino-$$file $(WEBDATADIR)/$$file ;\
>++	       echo install $(XMLDIR)/routino-$$file $(WEBDATADIR)/$$file ;\
>++	       install $(XMLDIR)/routino-$$file $(WEBDATADIR)/$$file ;\
>+ 	    fi ;\
>+ 	 done
>+ 	@for file in $(SPECIAL_XML_FILES); do \
>+ 	    if [ ! -f $(WEBDATADIR)/$$file ] || [ $(XMLDIR)/$$file -nt $(WEBDATADIR)/$$file ]; then \
>+-	       echo cp $(XMLDIR)/$$file $(WEBDATADIR)/$$file ;\
>+-	       cp -f $(XMLDIR)/$$file $(WEBDATADIR)/$$file ;\
>++	       echo install $(XMLDIR)/$$file $(WEBDATADIR)/$$file ;\
>++	       install $(XMLDIR)/$$file $(WEBDATADIR)/$$file ;\
>+ 	    fi ;\
>+ 	 done
>+ 
>+@@ -92,8 +92,8 @@ all-doc:
>+ 	@[ -d $(WEBDOCDIR) ] || mkdir -p $(WEBDOCDIR)
>+ 	@for file in $(DOC_FILES); do \
>+ 	    if [ ! -f $(WEBDOCDIR)/$$file ] || [ $(DOCDIR)/html/$$file -nt $(WEBDOCDIR)/$$file ]; then \
>+-	       echo cp $(DOCDIR)/html/$$file $(WEBDOCDIR) ;\
>+-	       cp -f $(DOCDIR)/html/$$file $(WEBDOCDIR) ;\
>++	       echo install $(DOCDIR)/html/$$file $(WEBDOCDIR) ;\
>++	       install $(DOCDIR)/html/$$file $(WEBDOCDIR) ;\
>+ 	    fi ;\
>+ 	 done
>+ 
>+@@ -116,12 +116,12 @@ all-translations: $(WEBWWWDIR)/router.ht
>+ ifeq ($(HOST),MINGW)
>+ 
>+ $(WEBWWWDIR)/router.html: $(WEBWWWDIR)/router.html.en
>+-	@echo cp $< $@
>+-	@cp -f $< $@
>++	@echo install $< $@
>++	@install $< $@
>+ 
>+ $(WEBWWWDIR)/visualiser.html: $(WEBWWWDIR)/visualiser.html.en
>+-	@echo cp $< $@
>+-	@cp -f $< $@
>++	@echo install $< $@
>++	@install $< $@
>+ 
>+ else
>+ 
>
>Property changes on: astro/routino/files/patch-web_Makefile
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: astro/routino/files/patch-xml_Makefile
>===================================================================
>--- astro/routino/files/patch-xml_Makefile	(nonexistent)
>+++ astro/routino/files/patch-xml_Makefile	(working copy)
>@@ -0,0 +1,19 @@
>+--- xml/Makefile.orig	2016-06-04 17:08:07 UTC
>++++ xml/Makefile
>+@@ -56,12 +56,12 @@ test:
>+ install: all
>+ 	@[ -d $(DESTDIR)$(datadir) ] || mkdir -p $(DESTDIR)$(datadir)
>+ 	@for file in $(STANDARD_FILES) ; do \
>+-	    echo cp routino-$$file $(DESTDIR)$(datadir)/$$file ;\
>+-	    cp -f routino-$$file $(DESTDIR)$(datadir)/$$file ;\
>++	    echo install routino-$$file $(DESTDIR)$(datadir)/$$file ;\
>++	    install routino-$$file $(DESTDIR)$(datadir)/$$file ;\
>+ 	 done
>+ 	@for file in $(SPECIAL_FILES); do \
>+-	    echo cp $$file $(DESTDIR)$(datadir)/$$file ;\
>+-	    cp -f $$file $(DESTDIR)$(datadir)/$$file ;\
>++	    echo install $$file $(DESTDIR)$(datadir)/$$file ;\
>++	    install $$file $(DESTDIR)$(datadir)/$$file ;\
>+ 	 done
>+ 
>+ ########
>
>Property changes on: astro/routino/files/patch-xml_Makefile
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: astro/routino/pkg-plist
>===================================================================
>--- astro/routino/pkg-plist	(revision 416394)
>+++ astro/routino/pkg-plist	(working copy)
>@@ -7,6 +7,12 @@
> bin/router+lib
> bin/router+lib-slim
> bin/router-slim
>+lib/libroutino-slim.so
>+lib/libroutino-slim.so.0
>+lib/libroutino-slim.so.0.0.0
>+lib/libroutino.so
>+lib/libroutino.so.0
>+lib/libroutino.so.0.0.0
> %%PORTDOCS%%%%DOCSDIR%%/ALGORITHM.txt
> %%PORTDOCS%%%%DOCSDIR%%/CONFIGURATION.txt
> %%PORTDOCS%%%%DOCSDIR%%/DATA.txt

Actions: View | Diff

Attachments on bug 210062: 171073 | 171074