git: fd7dc420e3c8 - main - misc/getopt: Moved man to share/man

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Muhammad Moinur Rahman <bofh_at_FreeBSD.org>
Date: Sat, 27 Jan 2024 16:27:35 UTC
The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=fd7dc420e3c82dfe5066ed48fa0b08a218c41f5e

commit fd7dc420e3c82dfe5066ed48fa0b08a218c41f5e
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2024-01-27 16:11:45 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2024-01-27 16:27:04 +0000

    misc/getopt: Moved man to share/man
    
    Approved by:    portmgr (blanket)
---
 misc/getopt/Makefile             |  1 +
 misc/getopt/files/patch-Makefile | 35 +++++++++++++++++++++++++++--------
 misc/getopt/pkg-plist            |  2 +-
 3 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/misc/getopt/Makefile b/misc/getopt/Makefile
index 04fdbc597ca4..2c49cff00b61 100644
--- a/misc/getopt/Makefile
+++ b/misc/getopt/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	getopt
 PORTVERSION=	1.1.6
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	http://frodo.looijaard.name/system/files/software/getopt/ \
 		LOCAL/sunpoet
diff --git a/misc/getopt/files/patch-Makefile b/misc/getopt/files/patch-Makefile
index a3160ae26b0e..3383ee09c28f 100644
--- a/misc/getopt/files/patch-Makefile
+++ b/misc/getopt/files/patch-Makefile
@@ -1,24 +1,29 @@
---- ./Makefile.orig	2013-03-02 19:04:01.590723827 -0500
-+++ ./Makefile	2013-03-02 19:06:02.492723812 -0500
-@@ -1,7 +1,7 @@
+--- Makefile.orig	2014-11-24 12:33:39 UTC
++++ Makefile
+@@ -1,9 +1,9 @@ DESTDIR=
  .SUFFIXES:
  
  DESTDIR=
 -prefix=/usr/local
 +prefix=$(PREFIX)
  bindir=$(prefix)/bin
- mandir=$(prefix)/man
+-mandir=$(prefix)/man
++mandir=$(prefix)/share/man
  man1dir=$(mandir)/man1
-@@ -32,7 +32,7 @@
- LANGUAGES = ca cs da de es et eu fi fr gl hu id it ja nl pl pt_BR ru sl sv tr uk vi zh_CN zh_TW
+ sharedir=$(prefix)/share
+ getoptdir=$(sharedir)/getopt
+@@ -32,18 +32,15 @@ MOFILES:=$(patsubst %,po/%.mo,$(LANGUAGES))
+ LANGUAGES = ca cs da de es et eu fi fr gl hr hu id it ja nl pl pt_BR ru sl sv tr uk vi zh_CN zh_TW
  MOFILES:=$(patsubst %,po/%.mo,$(LANGUAGES))
  
 -CPPFLAGS=-DLIBCGETOPT=$(LIBCGETOPT) -DWITHOUT_GETTEXT=$(WITHOUT_GETTEXT) -DLOCALEDIR=\"$(localedir)\" -DNOT_UTIL_LINUX -Dprogram_invocation_short_name=\"$(PACKAGE)\"  -Dprogram_version=\"$(VERSION)\"
 +CPPFLAGS+=-DLIBCGETOPT=$(LIBCGETOPT) -DWITHOUT_GETTEXT=$(WITHOUT_GETTEXT) -DLOCALEDIR=\"$(localedir)\" -DNOT_UTIL_LINUX -Dprogram_invocation_short_name=\"$(PACKAGE)\"  -Dprogram_version=\"$(VERSION)\"
  ifeq ($(LIBCGETOPT),0)
- CPPFLAGS+=-I./gnu 
+-CPPFLAGS+=-I./gnu 
++CPPFLAGS+=-I./gnu
  endif
-@@ -41,9 +41,6 @@
+ WARNINGS=-Wall \
+          -W -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual \
           -Wcast-align -Wmissing-declarations \
           -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \
           -Wnested-externs -Winline
@@ -28,3 +33,17 @@
  
  sources=getopt.c
  ifeq ($(LIBCGETOPT),0)
+@@ -54,11 +51,11 @@ binaries=getopt
+ 
+ binaries=getopt
+ 
+-.PHONY: all clean realclean 
++.PHONY: all clean realclean
+ all: $(binaries) all_po
+ 
+ clean: clean_po
+-	-$(RM) $(objects) $(binaries) 
++	-$(RM) $(objects) $(binaries)
+ 
+ getopt: $(objects)
+ 	$(CC) $(LDFLAGS) -o $@ $(objects)
diff --git a/misc/getopt/pkg-plist b/misc/getopt/pkg-plist
index 2136ebe6e0af..11fb45cc30a2 100644
--- a/misc/getopt/pkg-plist
+++ b/misc/getopt/pkg-plist
@@ -1,5 +1,5 @@
 bin/getopt
-man/man1/getopt.1.gz
+share/man/man1/getopt.1.gz
 %%NLS%%share/locale/ca/LC_MESSAGES/getopt.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/getopt.mo
 %%NLS%%share/locale/da/LC_MESSAGES/getopt.mo