Date: Sun, 21 Jan 2024 17:53:41 GMT From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: b3b6cbfbdc79 - main - cad/gdsreader: Sanitize MANPREFIX Message-ID: <202401211753.40LHrfJX016943@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=b3b6cbfbdc79fa289bee1e2ed72f127060143b88 commit b3b6cbfbdc79fa289bee1e2ed72f127060143b88 Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> AuthorDate: 2024-01-21 15:59:26 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> CommitDate: 2024-01-21 17:53:27 +0000 cad/gdsreader: Sanitize MANPREFIX Approved by: portmgr (blanket) --- cad/gdsreader/Makefile | 4 ++-- cad/gdsreader/files/patch-Makefile | 26 ++++++++++++++++++-------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/cad/gdsreader/Makefile b/cad/gdsreader/Makefile index dbf3391df80a..65f0340727ff 100644 --- a/cad/gdsreader/Makefile +++ b/cad/gdsreader/Makefile @@ -1,6 +1,6 @@ PORTNAME= gdsreader PORTVERSION= 0.3.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= cad MASTER_SITES= LOCAL/hrs DISTNAME= GDSreader.${PORTVERSION} @@ -14,7 +14,7 @@ PORTDOCS= README README.povray ChangeLog PORTEXAMPLES= layers.config test.gds layers.config.7HP.5ML \ layers.config.5AM.4ML PLIST_FILES= bin/gdsreader bin/maptolayer \ - man/man1/gdsreader.1.gz man/man1/maptolayer.1.gz + share/man/man1/gdsreader.1.gz share/man/man1/maptolayer.1.gz INSTALL_TARGET= install install-data install-docs diff --git a/cad/gdsreader/files/patch-Makefile b/cad/gdsreader/files/patch-Makefile index 458b595c30fb..38d61b0e393d 100644 --- a/cad/gdsreader/files/patch-Makefile +++ b/cad/gdsreader/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig Thu Feb 24 12:15:23 2005 -+++ Makefile Sun Apr 29 01:04:11 2007 -@@ -1,10 +1,15 @@ +--- Makefile.orig 2005-02-24 03:15:23 UTC ++++ Makefile +@@ -1,11 +1,16 @@ -CC = gcc -INSTROOT=/usr/local @@ -8,18 +8,21 @@ +INSTROOT?=${PREFIX} BINDIR=$(INSTROOT)/bin -DOCDIR=$(INSTROOT)/doc/gdsreader-0.3.2 +-MANDIR=$(INSTROOT)/man/man1 +DOCDIR=$(INSTROOT)/share/doc/gdsreader +EXDIR=$(INSTROOT)/share/examples/gdsreader - MANDIR=$(INSTROOT)/man/man1 ++MANDIR=$(INSTROOT)/share/man/man1 +-#CFLAGS = -I. +INSTALL_PROGRAM?= ${BSD_INSTALL_PROGRAM} +INSTALL_DATA?= ${BSD_INSTALL_DATA} +INSTALL_MAN?= ${BSD_INSTALL_MAN} + - #CFLAGS = -I. ++#CFLAGS = -I. CFLAGS = -I. -Wall -g #-pg LDFLAGS = #-pg -@@ -19,11 +24,16 @@ + +@@ -19,18 +24,20 @@ install: gdsreader maptolayer ${CC} ${LDFLAGS} -o gdsreader ${OBJS} -lm install: gdsreader maptolayer @@ -30,7 +33,7 @@ - mkdir -p $(MANDIR) && cp -f maptolayer.1 gdsreader.1 $(MANDIR) + mkdir -p $(DESTDIR)$(BINDIR) && ${INSTALL_PROGRAM} maptolayer gdsreader $(DESTDIR)$(BINDIR) + mkdir -p $(DESTDIR)$(MANDIR) && ${INSTALL_MAN} maptolayer.1 gdsreader.1 $(DESTDIR)$(MANDIR) -+ + +install-docs: + mkdir -p $(DESTDIR)$(DOCDIR) && ${INSTALL_DATA} README README.povray \ + ChangeLog $(DESTDIR)$(DOCDIR) @@ -38,6 +41,13 @@ +install-data: + mkdir -p $(DESTDIR)$(EXDIR) && ${INSTALL_DATA} layers.config test.gds \ + layers.config.7HP.5ML layers.config.5AM.4ML $(DESTDIR)$(EXDIR) - ++ maptolayer: maptolayer.c $(CC) -o maptolayer maptolayer.c + + clean: + rm -f *.o *.bak core out result.xg result.txt result.ps gdsreader \ + maptolayer result.pov +- +- +-
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401211753.40LHrfJX016943>