Date: Mon, 17 Sep 2012 01:42:05 +0200 From: nemysis <nemysis@gmx.ch> To: FreeBSD-gnats-submit@FreeBSD.org Cc: gahr@FreeBSD.org Subject: ports/171695: [PATCH] x11-toolkits/fox17: Wrong install in /usr/local/bin/fox-1.7 Message-ID: <20120916234214.154291065672@hub.freebsd.org> Resent-Message-ID: <201209162350.q8GNo97C024865@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 171695
>Category: ports
>Synopsis: [PATCH] x11-toolkits/fox17: Wrong install in /usr/local/bin/fox-1.7
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Sep 16 23:50:09 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: nemysis
>Release: FreeBSD 9.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan 3 07:46:30 UTC
>Description:
Makefile changed:
Install in /usr/local/bin
+ --bindir=${PREFIX}/bin
Wrong install in /usr/local/bin/fox-1.7 where is not in Path
- --bindir=${PREFIX}/bin/${PORTNAME}-${MAJORVER}
- pkg-plist changed
Port maintainer (gahr@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports)
>How-To-Repeat:
>Fix:
--- fox-1.7.36_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/x11-toolkits/fox17/Makefile ./Makefile
--- /usr/ports/x11-toolkits/fox17/Makefile 2012-08-30 16:17:38.000000000 +0200
+++ ./Makefile 2012-09-17 01:19:14.000000000 +0200
@@ -7,9 +7,10 @@
PORTNAME= fox
PORTVERSION= 1.7.36
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= http://ftp.fox-toolkit.org/pub/ \
- ftp://ftp.fox-toolkit.org/pub/
+ ftp://ftp.fox-toolkit.org/pub/
MAINTAINER= gahr@FreeBSD.org
COMMENT= Fast and extensive C++ GUI toolkit -- devel version
@@ -33,7 +34,7 @@
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-opengl=yes \
- --bindir=${PREFIX}/bin/${PORTNAME}-${MAJORVER}
+ --bindir=${PREFIX}/bin
CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
@@ -76,13 +77,14 @@
post-patch:
for f in ${MAN1}; do \
- old=$$(echo $$f | sed -e 's|-17||'); \
- dir=$$(dirname $$(find ${WRKSRC} -name $$old)); \
- mv $$dir/$$old $$dir/$$f; \
+ old=$$(echo $$f | sed -e 's|-17||'); \
+ dir=$$(dirname $$(find ${WRKSRC} -name $$old)); \
+ mv $$dir/$$old $$dir/$$f; \
done
${FIND} ${WRKSRC} -name Makefile.am -o -name Makefile.in | ${XARGS} \
- ${REINPLACE_CMD} -i '' -e '${MAN_REPLACE}'
+ ${REINPLACE_CMD} -i '' -e '${MAN_REPLACE}'
${REINPLACE_CMD} -e '/^Libs:/s|$$| ${PTHREAD_LIBS}|; s|"||g' ${WRKSRC}/fox17.pc.in
+
.if defined(NOPORTDOCS)
${REINPLACE_CMD} -e '/^SUBDIRS/s/ doc//' ${WRKSRC}/Makefile.am ${WRKSRC}/Makefile.in
.endif
diff -ruN --exclude=CVS /usr/ports/x11-toolkits/fox17/pkg-plist ./pkg-plist
--- /usr/ports/x11-toolkits/fox17/pkg-plist 2012-08-30 16:17:38.000000000 +0200
+++ ./pkg-plist 2012-09-17 01:24:33.000000000 +0200
@@ -1,11 +1,11 @@
-bin/fox-%%MAJORVER%%/Adie.stx
-bin/fox-%%MAJORVER%%/ControlPanel
-bin/fox-%%MAJORVER%%/PathFinder
-bin/fox-%%MAJORVER%%/adie
-bin/fox-%%MAJORVER%%/calculator
-bin/fox-%%MAJORVER%%/fox-config
-bin/fox-%%MAJORVER%%/reswrap
-bin/fox-%%MAJORVER%%/shutterbug
+bin/Adie.stx
+bin/ControlPanel
+bin/PathFinder
+bin/adie
+bin/calculator
+bin/fox-config
+bin/reswrap
+bin/shutterbug
libdata/pkgconfig/fox17.pc
lib/libCHART-%%MAJORVER%%.a
lib/libCHART-%%MAJORVER%%.la
@@ -351,7 +351,6 @@
include/fox-%%MAJORVER%%/xincs.h
@dirrm include/fox-%%MAJORVER%%/chart
@dirrm include/fox-%%MAJORVER%%
-@dirrm bin/fox-%%MAJORVER%%
%%PORTDOCS%%%%DOCSDIR%%/html/adie.html
%%PORTDOCS%%%%DOCSDIR%%/html/app.html
%%PORTDOCS%%%%DOCSDIR%%/html/art/bigpenguin.png
--- fox-1.7.36_1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120916234214.154291065672>