Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 9 Jun 2016 20:50:14 +0000 (UTC)
From:      Muhammad Moinur Rahman <bofh@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r416629 - in head/astro/routino: . files
Message-ID:  <201606092050.u59KoEhs043416@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bofh
Date: Thu Jun  9 20:50:14 2016
New Revision: 416629
URL: https://svnweb.freebsd.org/changeset/ports/416629

Log:
  astro/routino: Install shared library
  
  PR:		210062
  Submitted by:	cmt

Added:
  head/astro/routino/files/
  head/astro/routino/files/patch-doc_Makefile   (contents, props changed)
  head/astro/routino/files/patch-extras_find-fixme_Makefile   (contents, props changed)
  head/astro/routino/files/patch-src_Makefile   (contents, props changed)
  head/astro/routino/files/patch-web_Makefile   (contents, props changed)
  head/astro/routino/files/patch-xml_Makefile   (contents, props changed)
Modified:
  head/astro/routino/Makefile
  head/astro/routino/pkg-plist

Modified: head/astro/routino/Makefile
==============================================================================
--- head/astro/routino/Makefile	Thu Jun  9 20:43:54 2016	(r416628)
+++ head/astro/routino/Makefile	Thu Jun  9 20:50:14 2016	(r416629)
@@ -13,20 +13,29 @@ LICENSE=	AGPLv3
 
 OPTIONS_DEFINE=	DOCS
 USES=		gmake perl5 tar:tgz
-#USE_GCC=	any
 USE_LDCONFIG=	yes
-#MAKE_JOBS_UNSAFE=	yes
 
 post-patch:
 	${REINPLACE_CMD} 's|doc/routino|share/doc/routino|' \
 		${WRKSRC}/Makefile.conf
 	${REINPLACE_CMD} 's|gcc|${CC}|' \
 		${WRKSRC}/Makefile.conf
+
 post-install:
 	${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>

Added: head/astro/routino/files/patch-doc_Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/astro/routino/files/patch-doc_Makefile	Thu Jun  9 20:50:14 2016	(r416629)
@@ -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
+ 
+ ########

Added: head/astro/routino/files/patch-extras_find-fixme_Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/astro/routino/files/patch-extras_find-fixme_Makefile	Thu Jun  9 20:50:14 2016	(r416629)
@@ -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
+ 

Added: head/astro/routino/files/patch-src_Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/astro/routino/files/patch-src_Makefile	Thu Jun  9 20:50:14 2016	(r416629)
@@ -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
+ 

Added: head/astro/routino/files/patch-web_Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/astro/routino/files/patch-web_Makefile	Thu Jun  9 20:50:14 2016	(r416629)
@@ -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
+ 

Added: head/astro/routino/files/patch-xml_Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/astro/routino/files/patch-xml_Makefile	Thu Jun  9 20:50:14 2016	(r416629)
@@ -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
+ 
+ ########

Modified: head/astro/routino/pkg-plist
==============================================================================
--- head/astro/routino/pkg-plist	Thu Jun  9 20:43:54 2016	(r416628)
+++ head/astro/routino/pkg-plist	Thu Jun  9 20:50:14 2016	(r416629)
@@ -35,6 +35,12 @@ bin/router-slim
 %%PORTDOCS%%%%DOCSDIR%%/html/tagging.html
 %%PORTDOCS%%%%DOCSDIR%%/html/usage.html
 include/routino.h
+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
 %%DATADIR%%/profiles.xml
 %%DATADIR%%/tagging-drive.xml
 %%DATADIR%%/tagging-ride.xml



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606092050.u59KoEhs043416>