Date: Wed, 27 Nov 2013 17:12:45 +0000 (UTC) From: Koop Mast <kwm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r335038 - in head/devel: goffice goffice010 Message-ID: <201311271712.rARHCj7Z055414@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kwm Date: Wed Nov 27 17:12:44 2013 New Revision: 335038 URL: http://svnweb.freebsd.org/changeset/ports/335038 Log: Resolve pkgname conflict. Stageify and switch to libtool-less ltverhack. Modified: head/devel/goffice/Makefile head/devel/goffice/pkg-plist head/devel/goffice010/Makefile head/devel/goffice010/pkg-plist Modified: head/devel/goffice/Makefile ============================================================================== --- head/devel/goffice/Makefile Wed Nov 27 17:12:03 2013 (r335037) +++ head/devel/goffice/Makefile Wed Nov 27 17:12:44 2013 (r335038) @@ -4,9 +4,10 @@ PORTNAME= goffice PORTVERSION= 0.8.17 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel gnome MASTER_SITES= GNOME +PKGNAMESUFFIX= 08 MAINTAINER= gnome@FreeBSD.org COMMENT= GLib/GTK+ set of document centric objects and utilities @@ -16,24 +17,21 @@ LICENSE_FILE= ${WRKSRC}/COPYING PORTSCOUT= ignore -LIB_DEPENDS= pcre:${PORTSDIR}/devel/pcre +LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre USE_XZ= yes -USE_GMAKE= yes USE_GNOME= gnomeprefix intlhack gtk20 libgsf ltverhack -USES= gettext pathfix pkgconfig -USE_AUTOTOOLS= libtool +USES= gettext gmake pathfix pkgconfig +GNU_CONFIGURE= yes USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib PLIST_SUB= VERSION=${PORTVERSION} \ SHORT_VER=0.8 - OPTIONS_DEFINE= GCONF OPTIONS_DEFAULT=GCONF -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MGCONF} @@ -42,4 +40,8 @@ USE_GNOME+= gconf2 CONFIGURE_ARGS+=--with-config-backend=keyfile .endif +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgoffice-0.8.so.8 + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/goffice/*/plugins/*/*.so + .include <bsd.port.mk> Modified: head/devel/goffice/pkg-plist ============================================================================== --- head/devel/goffice/pkg-plist Wed Nov 27 17:12:03 2013 (r335037) +++ head/devel/goffice/pkg-plist Wed Nov 27 17:12:44 2013 (r335038) @@ -163,7 +163,6 @@ include/libgoffice-%%SHORT_VER%%/goffice include/libgoffice-%%SHORT_VER%%/goffice/utils/go-units.h include/libgoffice-%%SHORT_VER%%/goffice/utils/goffice-utils.h include/libgoffice-%%SHORT_VER%%/goffice/utils/regutf8.h -lib/goffice/%%VERSION%%/plugins/plot_barcol/barcol.a lib/goffice/%%VERSION%%/plugins/plot_barcol/barcol.la lib/goffice/%%VERSION%%/plugins/plot_barcol/barcol.so lib/goffice/%%VERSION%%/plugins/plot_barcol/gog-area-prefs.ui @@ -171,7 +170,6 @@ lib/goffice/%%VERSION%%/plugins/plot_bar lib/goffice/%%VERSION%%/plugins/plot_barcol/gog-minmax-prefs.ui lib/goffice/%%VERSION%%/plugins/plot_barcol/plot-types.xml lib/goffice/%%VERSION%%/plugins/plot_barcol/plugin.xml -lib/goffice/%%VERSION%%/plugins/plot_distrib/distrib.a lib/goffice/%%VERSION%%/plugins/plot_distrib/distrib.la lib/goffice/%%VERSION%%/plugins/plot_distrib/distrib.so lib/goffice/%%VERSION%%/plugins/plot_distrib/gog-boxplot-prefs.ui @@ -182,7 +180,6 @@ lib/goffice/%%VERSION%%/plugins/plot_dis lib/goffice/%%VERSION%%/plugins/plot_pie/gog-pie-prefs.ui lib/goffice/%%VERSION%%/plugins/plot_pie/gog-pie-series.ui lib/goffice/%%VERSION%%/plugins/plot_pie/gog-ring-prefs.ui -lib/goffice/%%VERSION%%/plugins/plot_pie/pie.a lib/goffice/%%VERSION%%/plugins/plot_pie/pie.la lib/goffice/%%VERSION%%/plugins/plot_pie/pie.so lib/goffice/%%VERSION%%/plugins/plot_pie/plot-types.xml @@ -191,14 +188,12 @@ lib/goffice/%%VERSION%%/plugins/plot_rad lib/goffice/%%VERSION%%/plugins/plot_radar/gog-polar-prefs.ui lib/goffice/%%VERSION%%/plugins/plot_radar/plot-types.xml lib/goffice/%%VERSION%%/plugins/plot_radar/plugin.xml -lib/goffice/%%VERSION%%/plugins/plot_radar/radar.a lib/goffice/%%VERSION%%/plugins/plot_radar/radar.la lib/goffice/%%VERSION%%/plugins/plot_radar/radar.so lib/goffice/%%VERSION%%/plugins/plot_surface/gog-xyz-prefs.ui lib/goffice/%%VERSION%%/plugins/plot_surface/gog-xyz-surface-prefs.ui lib/goffice/%%VERSION%%/plugins/plot_surface/plot-types.xml lib/goffice/%%VERSION%%/plugins/plot_surface/plugin.xml -lib/goffice/%%VERSION%%/plugins/plot_surface/surface.a lib/goffice/%%VERSION%%/plugins/plot_surface/surface.la lib/goffice/%%VERSION%%/plugins/plot_surface/surface.so lib/goffice/%%VERSION%%/plugins/plot_xy/gog-bubble-prefs.ui @@ -208,15 +203,12 @@ lib/goffice/%%VERSION%%/plugins/plot_xy/ lib/goffice/%%VERSION%%/plugins/plot_xy/gog-xy-series-prefs.ui lib/goffice/%%VERSION%%/plugins/plot_xy/plot-types.xml lib/goffice/%%VERSION%%/plugins/plot_xy/plugin.xml -lib/goffice/%%VERSION%%/plugins/plot_xy/xy.a lib/goffice/%%VERSION%%/plugins/plot_xy/xy.la lib/goffice/%%VERSION%%/plugins/plot_xy/xy.so -lib/goffice/%%VERSION%%/plugins/reg_linear/linreg.a lib/goffice/%%VERSION%%/plugins/reg_linear/linreg.la lib/goffice/%%VERSION%%/plugins/reg_linear/linreg.so lib/goffice/%%VERSION%%/plugins/reg_linear/plugin.xml lib/goffice/%%VERSION%%/plugins/reg_linear/reg-types.xml -lib/goffice/%%VERSION%%/plugins/reg_logfit/logfit.a lib/goffice/%%VERSION%%/plugins/reg_logfit/logfit.la lib/goffice/%%VERSION%%/plugins/reg_logfit/logfit.so lib/goffice/%%VERSION%%/plugins/reg_logfit/plugin.xml @@ -224,11 +216,9 @@ lib/goffice/%%VERSION%%/plugins/reg_logf lib/goffice/%%VERSION%%/plugins/smoothing/gog-exp-smooth.ui lib/goffice/%%VERSION%%/plugins/smoothing/gog-moving-avg.ui lib/goffice/%%VERSION%%/plugins/smoothing/plugin.xml -lib/goffice/%%VERSION%%/plugins/smoothing/smoothing.a lib/goffice/%%VERSION%%/plugins/smoothing/smoothing.la lib/goffice/%%VERSION%%/plugins/smoothing/smoothing.so lib/goffice/%%VERSION%%/plugins/smoothing/types.xml -lib/libgoffice-%%SHORT_VER%%.a lib/libgoffice-%%SHORT_VER%%.la lib/libgoffice-%%SHORT_VER%%.so lib/libgoffice-%%SHORT_VER%%.so.8 Modified: head/devel/goffice010/Makefile ============================================================================== --- head/devel/goffice010/Makefile Wed Nov 27 17:12:03 2013 (r335037) +++ head/devel/goffice010/Makefile Wed Nov 27 17:12:44 2013 (r335038) @@ -4,8 +4,10 @@ PORTNAME= goffice PORTVERSION= 0.10.7 +PORTREVISION= 1 CATEGORIES= devel gnome MASTER_SITES= GNOME +PKGNAMESUFFIX= 010 MAINTAINER= gnome@FreeBSD.org COMMENT= GLib/GTK+ set of document centric objects and utilities @@ -13,11 +15,10 @@ COMMENT= GLib/GTK+ set of document centr LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -LATEST_LINK= goffice010 USE_XZ= yes USE_GNOME= gnomeprefix gtk30 intlhack libgsf librsvg2 ltverhack USES= gettext gmake pathfix pkgconfig -USE_AUTOTOOLS= libtool +GNU_CONFIGURE= yes USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -26,8 +27,9 @@ CONFIGURE_ARGS= --with-lasem=no --with-c PLIST_SUB= VERSION=${PORTVERSION} SHORT_VER=${SHORT_VER} SHORT_VER= 0.10 -NO_STAGE= yes post-install: - @${MKDIR} ${PREFIX}/lib/goffice/${SHORT_VER}/plugins + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/goffice/${SHORT_VER}/plugins + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgoffice-0.10.so.10 + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/goffice/*/plugins/*/*.so .include <bsd.port.mk> Modified: head/devel/goffice010/pkg-plist ============================================================================== --- head/devel/goffice010/pkg-plist Wed Nov 27 17:12:03 2013 (r335037) +++ head/devel/goffice010/pkg-plist Wed Nov 27 17:12:44 2013 (r335038) @@ -161,52 +161,42 @@ include/libgoffice-%%SHORT_VER%%/goffice include/libgoffice-%%SHORT_VER%%/goffice/utils/go-units.h include/libgoffice-%%SHORT_VER%%/goffice/utils/goffice-utils.h include/libgoffice-%%SHORT_VER%%/goffice/utils/regutf8.h -lib/goffice/%%VERSION%%/plugins/plot_barcol/barcol.a lib/goffice/%%VERSION%%/plugins/plot_barcol/barcol.la lib/goffice/%%VERSION%%/plugins/plot_barcol/barcol.so lib/goffice/%%VERSION%%/plugins/plot_barcol/plot-types.xml lib/goffice/%%VERSION%%/plugins/plot_barcol/plugin.xml -lib/goffice/%%VERSION%%/plugins/plot_distrib/distrib.a lib/goffice/%%VERSION%%/plugins/plot_distrib/distrib.la lib/goffice/%%VERSION%%/plugins/plot_distrib/distrib.so lib/goffice/%%VERSION%%/plugins/plot_distrib/plot-types.xml lib/goffice/%%VERSION%%/plugins/plot_distrib/plugin.xml -lib/goffice/%%VERSION%%/plugins/plot_pie/pie.a lib/goffice/%%VERSION%%/plugins/plot_pie/pie.la lib/goffice/%%VERSION%%/plugins/plot_pie/pie.so lib/goffice/%%VERSION%%/plugins/plot_pie/plot-types.xml lib/goffice/%%VERSION%%/plugins/plot_pie/plugin.xml lib/goffice/%%VERSION%%/plugins/plot_radar/plot-types.xml lib/goffice/%%VERSION%%/plugins/plot_radar/plugin.xml -lib/goffice/%%VERSION%%/plugins/plot_radar/radar.a lib/goffice/%%VERSION%%/plugins/plot_radar/radar.la lib/goffice/%%VERSION%%/plugins/plot_radar/radar.so lib/goffice/%%VERSION%%/plugins/plot_surface/plot-types.xml lib/goffice/%%VERSION%%/plugins/plot_surface/plugin.xml -lib/goffice/%%VERSION%%/plugins/plot_surface/surface.a lib/goffice/%%VERSION%%/plugins/plot_surface/surface.la lib/goffice/%%VERSION%%/plugins/plot_surface/surface.so lib/goffice/%%VERSION%%/plugins/plot_xy/plot-types.xml lib/goffice/%%VERSION%%/plugins/plot_xy/plugin.xml -lib/goffice/%%VERSION%%/plugins/plot_xy/xy.a lib/goffice/%%VERSION%%/plugins/plot_xy/xy.la lib/goffice/%%VERSION%%/plugins/plot_xy/xy.so -lib/goffice/%%VERSION%%/plugins/reg_linear/linreg.a lib/goffice/%%VERSION%%/plugins/reg_linear/linreg.la lib/goffice/%%VERSION%%/plugins/reg_linear/linreg.so lib/goffice/%%VERSION%%/plugins/reg_linear/plugin.xml lib/goffice/%%VERSION%%/plugins/reg_linear/reg-types.xml -lib/goffice/%%VERSION%%/plugins/reg_logfit/logfit.a lib/goffice/%%VERSION%%/plugins/reg_logfit/logfit.la lib/goffice/%%VERSION%%/plugins/reg_logfit/logfit.so lib/goffice/%%VERSION%%/plugins/reg_logfit/plugin.xml lib/goffice/%%VERSION%%/plugins/reg_logfit/reg-types.xml lib/goffice/%%VERSION%%/plugins/smoothing/plugin.xml -lib/goffice/%%VERSION%%/plugins/smoothing/smoothing.a lib/goffice/%%VERSION%%/plugins/smoothing/smoothing.la lib/goffice/%%VERSION%%/plugins/smoothing/smoothing.so lib/goffice/%%VERSION%%/plugins/smoothing/types.xml -lib/libgoffice-%%SHORT_VER%%.a lib/libgoffice-%%SHORT_VER%%.la lib/libgoffice-%%SHORT_VER%%.so lib/libgoffice-%%SHORT_VER%%.so.10
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311271712.rARHCj7Z055414>