From owner-svn-ports-all@FreeBSD.ORG Tue Apr 29 08:19:07 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 810C5B72; Tue, 29 Apr 2014 08:19:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 611051EA; Tue, 29 Apr 2014 08:19:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3T8J71M019868; Tue, 29 Apr 2014 08:19:07 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3T8J7Zt019866; Tue, 29 Apr 2014 08:19:07 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201404290819.s3T8J7Zt019866@svn.freebsd.org> From: Pawel Pekala Date: Tue, 29 Apr 2014 08:19:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r352585 - head/graphics/xmedcon X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Apr 2014 08:19:07 -0000 Author: pawel Date: Tue Apr 29 08:19:06 2014 New Revision: 352585 URL: http://svnweb.freebsd.org/changeset/ports/352585 QAT: https://qat.redports.org/buildarchive/r352585/ Log: - Add staging support - Use options helpers, subs Modified: head/graphics/xmedcon/Makefile head/graphics/xmedcon/pkg-plist Modified: head/graphics/xmedcon/Makefile ============================================================================== --- head/graphics/xmedcon/Makefile Tue Apr 29 08:06:35 2014 (r352584) +++ head/graphics/xmedcon/Makefile Tue Apr 29 08:19:06 2014 (r352585) @@ -12,20 +12,7 @@ COMMENT= Medical image conversion utilit LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi -OPTIONS_DEFINE= X11 GLIB ACR_NEMA ANALYZE CONCORDE DICOM DICOM_LJPEG ECAT GIF INTERFILE INW PNG -OPTIONS_DEFAULT=X11 GLIB ACR_NEMA ANALYZE CONCORDE DICOM DICOM_LJPEG ECAT GIF INTERFILE INW PNG -GLIB_DESC= With Glib -ACR_NEMA_DESC= With Acr/Nema 2.0 -ANALYZE_DESC= With Analyze (SPM) -CONCORDE_DESC= With Concorde __ET -DICOM_DESC= With DICOM 3.0 -DICOM_LJPEG_DESC= With DICOM 3.0 Lossless JPEG -ECAT_DESC= With CTI ECAT 6/7 -INTERFILE_DESC= With InterFile 3.3 -INW_DESC= With INW (RUG) - -USE_BZIP2= yes -USES= pkgconfig +USES= pkgconfig tar:bzip2 USE_AUTOTOOLS= libtool CONFIGURE_ARGS= --includedir=${PREFIX}/include/xmedcon \ --enable-llcheck @@ -34,69 +21,58 @@ USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -MAN1= medcon.1 xmedcon-config.1 -MAN3= medcon.3 -MAN4= m-acr.4 m-anlz.4 m-ecat.4 m-gif.4 m-intf.4 m-inw.4 +OPTIONS_DEFINE= X11 GLIB ACR_NEMA ANALYZE CONCORDE DICOM DICOM_LJPEG ECAT GIF \ + INTERFILE INW PNG +OPTIONS_DEFAULT=X11 GLIB ACR_NEMA ANALYZE CONCORDE DICOM DICOM_LJPEG ECAT GIF \ + INTERFILE INW PNG +OPTIONS_SUB= yes -NO_STAGE= yes -.include +X11_CONFIGURE_ENABLE= gui +X11_USE= GNOME=gtk20 -.if ${PORT_OPTIONS:MX11} -USE_GNOME+= gtk20 -PLIST_SUB+= X11="" -MAN1+= xmedcon.1 -DESKTOP_ENTRIES="XMedCon" "" "${PREFIX}/etc/xmedcon.png" "${PORTNAME}" "" "" -.else -CONFIGURE_ARGS+= --disable-gui -PLIST_SUB+= X11="@comment " -.endif +GLIB_DESC= With Glib +GLIB_CONFIGURE_ENABLE= glib +GLIB_USE= GNOME=glib20 -.if ${PORT_OPTIONS:MGLIB} -USE_GNOME+= glib20 -.else -CONFIGURE_ARGS+= --disable-glib -.endif +ACR_NEMA_DESC= With Acr/Nema 2.0 -.if empty(PORT_OPTIONS:MACR_NEMA) || empty(PORT_OPTIONS:MDICOM) -CONFIGURE_ARGS+= --disable-acr -.endif +ANALYZE_DESC= With Analyze (SPM) +ANALYZE_CONFIGURE_ENABLE= anlz -.if empty(PORT_OPTIONS:MGIF) -CONFIGURE_ARGS+= --disable-gif -.endif +CONCORDE_DESC= With Concorde __ET +CONCORDE_CONFIGURE_ENABLE= conc -.if empty(PORT_OPTIONS:MINW) -CONFIGURE_ARGS+= --disable-inw -.endif +DICOM_DESC= With DICOM 3.0 -.if empty(PORT_OPTIONS:MANALYZE) -CONFIGURE_ARGS+= --disable-anlz -.endif +DICOM_LJPEG_DESC= With DICOM 3.0 Lossless JPEG +DICOM_LJPEG_CONFIGURE_ENABLE= ljpg -.if empty(PORT_OPTIONS:MCONCORDE) -CONFIGURE_ARGS+= --disable-conc -.endif +ECAT_DESC= With CTI ECAT 6/7 +ECAT_CONFIGURE_ENABLE= ecat -.if empty(PORT_OPTIONS:MECAT) -CONFIGURE_ARGS+= --disable-ecat -.endif +INTERFILE_DESC= With InterFile 3.3 +INTERFILE_CONFIGURE_ENABLE= intf -.if empty(PORT_OPTIONS:MINTERFILE) -CONFIGURE_ARGS+= --disable-intf -.endif +INW_DESC= With INW (RUG) +INW_CONFIGURE_ENABLE= inw -.if empty(PORT_OPTIONS:MDICOM) || empty(PORT_OPTIONS:MDICOM_LJPEG) -CONFIGURE_ARGS+= --disable-dicom +GIF_CONFIGURE_OFF= --disable-gif + +PNG_CONFIGURE_ENABLE= png +PNG_LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png + +.include + +.if ${PORT_OPTIONS:MX11} +DESKTOP_ENTRIES="XMedCon" "" "${PREFIX}/etc/xmedcon.png" "${PORTNAME}" "" "" .endif -.if empty(PORT_OPTIONS:MDICOM_LJPEG) -CONFIGURE_ARGS+= --disable-ljpg +.if empty(PORT_OPTIONS:MACR_NEMA) || empty(PORT_OPTIONS:MDICOM) +CONFIGURE_ARGS+= --disable-acr .endif -.if ${PORT_OPTIONS:MPNG} -LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png -.else -CONFIGURE_ARGS+= --disable-png +.if empty(PORT_OPTIONS:MDICOM) || empty(PORT_OPTIONS:MDICOM_LJPEG) +CONFIGURE_ARGS+= --disable-dicom .endif post-patch: @@ -110,9 +86,9 @@ post-patch: post-install: .if ${PORT_OPTIONS:MX11} .for file in xmedcon.png xmedconrc xmedconrc.linux - ${INSTALL_DATA} ${WRKSRC}/etc/${file} ${PREFIX}/etc + ${INSTALL_DATA} ${WRKSRC}/etc/${file} ${STAGEDIR}${PREFIX}/etc .endfor - ${INSTALL_MAN} ${WRKSRC}/man/xmedcon.1 ${MANPREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/man/xmedcon.1 ${STAGEDIR}${MANPREFIX}/man/man1 .endif .include Modified: head/graphics/xmedcon/pkg-plist ============================================================================== --- head/graphics/xmedcon/pkg-plist Tue Apr 29 08:06:35 2014 (r352584) +++ head/graphics/xmedcon/pkg-plist Tue Apr 29 08:19:06 2014 (r352585) @@ -45,4 +45,14 @@ lib/libmdc.a lib/libmdc.la lib/libmdc.so lib/libmdc.so.2 +man/man1/medcon.1.gz +%%X11%%man/man1/xmedcon.1.gz +man/man1/xmedcon-config.1.gz +man/man3/medcon.3.gz +man/man4/m-acr.4.gz +man/man4/m-anlz.4.gz +man/man4/m-ecat.4.gz +man/man4/m-gif.4.gz +man/man4/m-intf.4.gz +man/man4/m-inw.4.gz share/aclocal/xmedcon.m4