mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00
Code Issues Releases Activity

- Remove CONFLICTS between x11-toolkits/fox16 and x11-toolkits/fox17 by

Browse Source 
installing FOX-1.7 binaries in bin/fox-1.7 and suffixing its manpages
  with -17 (e.g., shutterbug -> shutterbug-17)
- Bump PORTREVISION on both ports
This commit is contained in:
Pietro Cerutti 2012-08-13 10:46:26 +00:00
parent e835f4e22e
commit 1ebd8e8929
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=302463
3 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11-toolkits/fox16/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= fox
PORTVERSION= ${MAJORVER}.${SHVER}
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.fox-toolkit.org/pub/
@ -19,8 +19,6 @@ LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff \
Xft.2:${PORTSDIR}/x11-fonts/libXft
CONFLICTS= fox-1.4.* fox-1.7.*
LATEST_LINK= fox16
MAJORVER= 1.6

20
x11-toolkits/fox17/Makefile
View File

@ -7,6 +7,7 @@
PORTNAME= fox
PORTVERSION= 1.7.35
PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= http://ftp.fox-toolkit.org/pub/ \
ftp://ftp.fox-toolkit.org/pub/
@ -16,8 +17,6 @@ COMMENT= Fast and extensive C++ GUI toolkit -- devel version
LIB_DEPENDS= Xft:${PORTSDIR}/x11-fonts/libXft
CONFLICTS= fox-1.4.* fox-1.6.*
OPTIONS_DEFINE= JPEG PNG TIFF WEBP
OPTIONS_DEFAULT=JPEG PNG TIFF WEBP
@ -34,13 +33,17 @@ USE_GNOME= gnomehack
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-opengl=yes
CONFIGURE_ARGS= --with-opengl=yes \
--bindir=${PREFIX}/bin/${PORTNAME}-${MAJORVER}
CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
MAN1= reswrap.1 shutterbug.1 adie.1 PathFinder.1 calculator.1 \
ControlPanel.1
MAN1= reswrap-17.1 shutterbug-17.1 adie-17.1 PathFinder-17.1 \
calculator-17.1 ControlPanel-17.1
.for man1 in ${MAN1}
MAN_REPLACE+= s|${man1:S/-17//}|${man1}|;
.endfor
.include <bsd.port.options.mk>
@ -73,6 +76,13 @@ BROKEN= Does not link on powerpc
.endif
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; \
done
${FIND} ${WRKSRC} -name Makefile.am -o -name Makefile.in | ${XARGS} \
${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

15
x11-toolkits/fox17/pkg-plist
View File

@ -1,10 +1,10 @@
bin/reswrap
bin/shutterbug
bin/adie
bin/Adie.stx
bin/PathFinder
bin/calculator
bin/ControlPanel
bin/fox-%%MAJORVER%%/reswrap
bin/fox-%%MAJORVER%%/shutterbug
bin/fox-%%MAJORVER%%/adie
bin/fox-%%MAJORVER%%/Adie.stx
bin/fox-%%MAJORVER%%/PathFinder
bin/fox-%%MAJORVER%%/calculator
bin/fox-%%MAJORVER%%/ControlPanel
libdata/pkgconfig/fox17.pc
lib/libCHART-%%MAJORVER%%.a
lib/libCHART-%%MAJORVER%%.la
@ -350,6 +350,7 @@ include/fox-%%MAJORVER%%/fxver.h
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