diff options
author | salo <salo@pkgsrc.org> | 2006-02-25 01:25:46 +0000 |
---|---|---|
committer | salo <salo@pkgsrc.org> | 2006-02-25 01:25:46 +0000 |
commit | 2bd1884e1998a5de6f5216fc1aacd4978fcc90a4 (patch) | |
tree | c82b022bba229bd944fcc34b9340c5465ad328ee | |
parent | 8e8ceb4747b48bf395436e922329c28437fa3d86 (diff) | |
download | pkgsrc-2bd1884e1998a5de6f5216fc1aacd4978fcc90a4.tar.gz |
Pullup ticket 1153 - requested by Martti Kuparinen
PLIST fix for xfce4-print
Revisions pulled up:
- pkgsrc/print/xfce4-print/Makefile 1.16
- pkgsrc/print/xfce4-print/PLIST 1.13
Module Name: pkgsrc
Committed By: martti
Date: Mon Feb 20 08:17:09 UTC 2006
Modified Files:
pkgsrc/print/xfce4-print: Makefile PLIST
Log Message:
Fix build problems on Solaris (pkg/32875).
This change does not affect other platforms and as it was not building
correctly on Solaris I see no reason for PKGREVISION bump.
-rw-r--r-- | print/xfce4-print/Makefile | 8 | ||||
-rw-r--r-- | print/xfce4-print/PLIST | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/print/xfce4-print/Makefile b/print/xfce4-print/Makefile index 78e44397840..2ca2a3bc23a 100644 --- a/print/xfce4-print/Makefile +++ b/print/xfce4-print/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/12/01 18:21:52 wiz Exp $ +# $NetBSD: Makefile,v 1.13.2.1 2006/02/25 01:25:46 salo Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" @@ -11,6 +11,12 @@ CONFIGURE_ARGS+= --with-printcap=/etc/printcap .include "options.mk" +.if ${OPSYS} == "SunOS" +PLIST_SUBST+= SOLARIS="@comment " +.else +PLIST_SUBST+= SOLARIS="" +.endif + .include "../../print/a2ps/buildlink3.mk" .include "../../x11/xfce4-mcs-plugins/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/xfce4-print/PLIST b/print/xfce4-print/PLIST index 12b8cc38e25..3b993e3fa93 100644 --- a/print/xfce4-print/PLIST +++ b/print/xfce4-print/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.12 2005/11/09 06:42:58 martti Exp $ +@comment $NetBSD: PLIST,v 1.12.2.1 2006/02/25 01:25:46 salo Exp $ ${PKGLOCALEDIR}/locale/af/LC_MESSAGES/xfprint.mo ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/xfprint.mo ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/xfprint.mo @@ -47,7 +47,7 @@ ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/xfprint.mo bin/xfprint-manager bin/xfprint4 lib/xfce4/mcs-plugins/xfprint_plugin.la -lib/xfce4/xfprint-plugins/bsdlpr_plugin.la +${SOLARIS}lib/xfce4/xfprint-plugins/bsdlpr_plugin.la share/applications/xfce-xfprint-settings.desktop share/applications/xfprint-manager.desktop share/applications/xfprint.desktop |