ports/170813: [MAINTAINER PATCH] x11-fm/doublecmd: optionsng, lib_depends, debug
Beñat Gonzalez Etxepare
bbtruk at users.sourceforge.net
Tue Aug 21 07:10:10 UTC 2012
>Number: 170813
>Category: ports
>Synopsis: [MAINTAINER PATCH] x11-fm/doublecmd: optionsng, lib_depends, debug
>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: Tue Aug 21 07:10:10 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Beñat Gonzalez Etxepare
>Release:
>Organization:
>Environment:
>Description:
Changes:
- Switch to OptionsNG
- Remove ABI version from LIB_DEPENDS
- Add option to compile with debug symbols
Patch tested in RedPorts (rev. 6214):
http://redports.org/buildarchive/20120820152752-4852/
http://redports.org/buildarchive/20120820173534-36210/
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
===> Generating patch
===> Viewing diff with more
diff -ruN --exclude=CVS /usr/ports/x11-fm/doublecmd/Makefile ./Makefile
--- /usr/ports/x11-fm/doublecmd/Makefile 2012-06-05 17:04:26.000000000 +0200
+++ ./Makefile 2012-08-20 17:17:04.000000000 +0200
@@ -33,28 +33,37 @@
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
DOCSRC= ${WRKDIR}/${PORTNAME}-help-0.5.1
-OPTIONS= GTK2 "Use gtk20 interface" on \
- QT4 "Use qt4 interface" off
+OPTIONS_DEFINE= DEBUG
+OPTIONS_SINGLE= LCL
+OPTIONS_SINGLE_LCL= GTK2 QT4
+
+GTK2_DESC= Use gtk20 interface
+QT4_DESC= Use qt4 interface
+DEBUG_DESC= Build with complete symbolic debug information
-.include <bsd.port.pre.mk>
+OPTIONS_DEFAULT= GTK2
-.if (defined(WITH_GTK2) && defined(WITH_QT4)) || (!defined(WITH_GTK2) && !defined(WITH_QT4))
-IGNORE= please select one option: QT4 or GTK2
-.endif
+.include <bsd.port.pre.mk>
-.if defined(WITH_GTK2)
+.if ${PORT_OPTIONS:MGTK2}
USE_FPC+= gtk2
USE_GNOME= gtk20 gdkpixbuf
LCL_PLATFORM= gtk2
BUILD_DEPENDS+= ${LOCALBASE}/share/lazarus/lcl/units/${BUILDNAME}/${LCL_PLATFORM}/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-gtk2
.endif
-.if defined(WITH_QT4)
-LIB_DEPENDS+= Qt4Pas.5:${PORTSDIR}/x11-toolkits/qt4pas
+.if ${PORT_OPTIONS:MQT4}
+LIB_DEPENDS+= Qt4Pas:${PORTSDIR}/x11-toolkits/qt4pas
LCL_PLATFORM= qt
BUILD_DEPENDS+= ${LOCALBASE}/share/lazarus/lcl/units/${BUILDNAME}/${LCL_PLATFORM}/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-qt
.endif
+.if ${PORT_OPTIONS:MDEBUG}
+BUILD_MODE= Debug
+.else
+BUILD_MODE= NoDebug Full Optimizations
+.endif
+
post-patch:
@${REINPLACE_CMD} -e 's|%%DOCSDIR%%|${DOCSDIR}|g' ${WRKSRC}/src/dmhelpmanager.pas
@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' -e 's|%%DATADIR%%|${DATADIR}|g' \
@@ -65,7 +74,7 @@
@cd ${WRKSRC}/components && \
${FIND} * -name *.lpk -exec ${LAZBUILD_CMD} --ws=${LCL_PLATFORM} "{}" \;
@cd ${WRKSRC} && \
- ${LAZBUILD_CMD} --ws=${LCL_PLATFORM} ${PROJECT_FILE}
+ ${LAZBUILD_CMD} --ws=${LCL_PLATFORM} --bm="${BUILD_MODE}" ${PROJECT_FILE}
post-build:
@${RM} -rf ${DOCSRC}/*/dev-help
===> Done
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list