Date: Thu, 31 Aug 2006 17:31:48 +0200 (CEST) From: Karel Miklav <karel@lovetemple.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/102727: Patch: lang/gnat-gcc34, problems installing FSF manuals Message-ID: <200608311531.k7VFVmuo030950@tp.unitedpeople.info> Resent-Message-ID: <200608311700.k7VH0g06001572@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 102727
>Category: ports
>Synopsis: Patch: lang/gnat-gcc34, problems installing FSF manuals
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Aug 31 17:00:36 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Karel Miklav
>Release: FreeBSD 6.1-STABLE i386
>Organization:
>Environment:
System: FreeBSD tp.unitedpeople.info 6.1-STABLE FreeBSD 6.1-STABLE #2: Mon Jul 31 00:49:01 CEST 2006 lino@tp.unitedpeople.info:/usr/obj/usr/src/sys/TPX40 i386
>Description:
Current lang/gnat-gcc34 port installs FSF manuals in a way that causes
potential conflicts with other ports and real conflicts with incoming
versions of this port.
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/lang/gnat-gcc34/Makefile gnat-gcc34/Makefile
--- /usr/ports/lang/gnat-gcc34/Makefile Mon Aug 28 21:59:52 2006
+++ gnat-gcc34/Makefile Thu Aug 31 17:06:26 2006
@@ -8,6 +8,7 @@
PORTNAME= gnat-gcc
PORTVERSION= 3.4.6
+PORTREVISION= 1
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_GCC}
MASTER_SITE_SUBDIR= releases/gcc-${PORTVERSION}
@@ -17,6 +18,8 @@
MAINTAINER= karel@lovetemple.net
COMMENT= The GNU Ada Compiler system
+ONLY_FOR_ARCHS= i386
+
USE_GMAKE= yes
USE_PERL5= yes
USE_BISON= yes
@@ -27,7 +30,7 @@
MAN1= cpp${gcc_suffix}.1 \
gcc${gcc_suffix}.1 \
gcov${gcc_suffix}.1
-MAN7= fsf-funding.7 gfdl.7 gpl.7
+MAN7= ${fsf_mans:S/$/${fsf_suffix}.7/}
NOMANCOMPRESS= yes # too hard to deal with differences on 5-cur and releng4
INFO= gcc${gcc_suffix}/cpp \
gcc${gcc_suffix}/cppinternals \
@@ -38,6 +41,8 @@
gcc${gcc_suffix}/gnat_rm \
gcc${gcc_suffix}/gnat_ugn_unw
+LATEST_LINK= ${PORTNAME}${gcc_suffix}
+
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500000
@@ -45,6 +50,8 @@
.endif
gcc_suffix= 34
+fsf_mans= fsf-funding gfdl gpl
+fsf_suffix= -${PORTNAME}${gcc_suffix}
targlib= ${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION}
PATCH_WRKSRC= ${WRKSRC}
@@ -65,15 +72,12 @@
BUILD_WRKSRC= ${WRKDIR}/build
INSTALL_WRKSRC= ${WRKDIR}/build
-INSTALLS_SHLIB= yes
-
-USE_LDCONFIG= ${targlib}
PLIST_SUB= GCC_VER=${PORTVERSION} \
GNU_HOST=${CONFIGURE_TARGET} \
SUFFIX=${gcc_suffix}
-ONLY_FOR_ARCHS= i386
+USE_LDCONFIG= ${targlib}
# You need a compiler who calls an existing GNAT compiler (3.15 or greater).
# By default, we'll look for one in the path. If we can't find one, we'll
@@ -108,7 +112,6 @@
.endif
.if empty(bootstrap_path)
-ONLY_FOR_ARCHS= i386
DISTFILES+= gnat-3.15p-boot.tar.gz:boot
MASTER_SITES+= ${MASTER_SITE_LOCAL}:boot
MASTER_SITE_SUBDIR+= deischen/gcc/:boot
@@ -154,10 +157,14 @@
post-install:
${LN} -s ${PREFIX}/bin/gcc${gcc_suffix}/gcc${gcc_suffix} \
${PREFIX}/bin/gcc${gcc_suffix}/gcc
- # Man pages can only be generated if Perl >= 5.6 is installed;
- # fake them otherwise.
+ # Man pages can only be generated if Perl >= 5.6 is installed; fake them otherwise.
for mp in ${_MANPAGES}; do \
${TEST} -e $${mp} || ${TOUCH} ${TOUCH_FLAGS} $${mp}; \
+ done
+ # Version FSF funding and licensing manuals.
+ for mp in ${fsf_mans}; do \
+ ${MV} -f ${PREFIX}/man/man7/$${mp}.7 \
+ ${PREFIX}/man/man7/$${mp}${fsf_suffix}.7; \
done
# Add target libraries and include files to packaging list.
${RM} -f ${WRKDIR}/PLIST.lib
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200608311531.k7VFVmuo030950>