Fixed some pkglint warnings.

This commit is contained in:
rillig 2007-01-06 16:45:17 +00:00
parent d2a917fbbe
commit 329aab50ee
3 changed files with 12 additions and 17 deletions

View file

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.53 2006/12/27 13:37:38 joerg Exp $
# $NetBSD: Makefile,v 1.54 2007/01/06 16:45:17 rillig Exp $
DISTNAME= xpm-3.4k
DISTNAME= xpm-3.4k
PKGREVISION= 7
CATEGORIES= graphics x11
MASTER_SITES= http://koala.ilog.fr/ftp/pub/xpm/ \
@ -18,11 +18,11 @@ USE_IMAKE= yes
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "SunOS"
.if ${OPSYS} == "SunOS" || !empty(LOWER_OPSYS:Mirix5*)
post-install:
cd ${PREFIX}/lib && \
${RM} -f libXpm.so.4 && \
${LN} -f libXpm.so.4.11 libXpm.so.4
rm -f libXpm.so.4 && \
ln -s libXpm.so.4.11 libXpm.so.4
.endif
.if !empty(LOWER_OPSYS:Mirix5*)
@ -30,19 +30,14 @@ SUBST_CLASSES+= sodots
SUBST_STAGE.sodots= post-configure
SUBST_FILES.sodots= lib/Makefile
SUBST_SED.sodots= -e 's,\.so$$(SOXPMLIBREV),.so.$$(SOXPMLIBREV),g'
# needs snprintf()
. include "../../pkgtools/libnbcompat/buildlink3.mk"
IMAKEOPTS+= -DExtraLibraries=${BUILDLINK_LDADD.libnbcompat:Q}
IMAKEOPTS+= -DInstallCmd=${INSTALL:Q}
post-configure:
${MKDIR} ${WRKSRC}/usrlib
post-install:
cd ${PREFIX}/lib && \
${RM} -f libXpm.so.4 && \
${LN} -sf libXpm.so.4.11 libXpm.so.4
mkdir ${WRKSRC}/usrlib
.endif
.include "../../x11/libXext/buildlink3.mk"

View file

@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.23 2006/07/08 23:10:53 jlam Exp $
# $NetBSD: buildlink3.mk,v 1.24 2007/01/06 16:45:17 rillig Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XPM_BUILDLINK3_MK:= ${XPM_BUILDLINK3_MK}+
@ -13,7 +13,7 @@ BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xpm
.if !empty(XPM_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.xpm+= xpm>=3.4k
BUILDLINK_ABI_DEPENDS.xpm?= xpm>=3.4knb6
BUILDLINK_ABI_DEPENDS.xpm+= xpm>=3.4knb6
BUILDLINK_PKGSRCDIR.xpm?= ../../graphics/xpm
.endif # XPM_BUILDLINK3_MK

View file

@ -1,4 +1,4 @@
# $NetBSD: builtin.mk,v 1.12 2006/04/06 06:22:06 reed Exp $
# $NetBSD: builtin.mk,v 1.13 2007/01/06 16:45:17 rillig Exp $
BUILTIN_PKG:= xpm
@ -63,10 +63,10 @@ USE_BUILTIN.xpm= ${IS_BUILTIN.xpm}
. if defined(BUILTIN_PKG.xpm) && \
!empty(IS_BUILTIN.xpm:M[yY][eE][sS])
USE_BUILTIN.xpm= yes
. for _dep_ in ${BUILDLINK_API_DEPENDS.xpm}
. for dep in ${BUILDLINK_API_DEPENDS.xpm}
. if !empty(USE_BUILTIN.xpm:M[yY][eE][sS])
USE_BUILTIN.xpm!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.xpm:Q}; then \
if ${PKG_ADMIN} pmatch ${dep:Q} ${BUILTIN_PKG.xpm:Q}; then \
${ECHO} yes; \
else \
${ECHO} no; \