diff options
| author | rillig <rillig@pkgsrc.org> | 2007-01-06 16:45:17 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2007-01-06 16:45:17 +0000 |
| commit | 329aab50ee2e9f193f5f0263912667a21304499b (patch) | |
| tree | e91d4837707b2cac2c1ac62f125ce85c963b5714 | |
| parent | d2a917fbbe7e70401a7c1d07913555ce7f6995cc (diff) | |
| download | pkgsrc-329aab50ee2e9f193f5f0263912667a21304499b.tar.gz | |
Fixed some pkglint warnings.
| -rw-r--r-- | graphics/xpm/Makefile | 19 | ||||
| -rw-r--r-- | graphics/xpm/buildlink3.mk | 4 | ||||
| -rw-r--r-- | graphics/xpm/builtin.mk | 6 |
3 files changed, 12 insertions, 17 deletions
diff --git a/graphics/xpm/Makefile b/graphics/xpm/Makefile index 88fe7131620..3cbee558490 100644 --- a/graphics/xpm/Makefile +++ b/graphics/xpm/Makefile @@ -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" diff --git a/graphics/xpm/buildlink3.mk b/graphics/xpm/buildlink3.mk index 9e24c00335c..cc8ff134f2c 100644 --- a/graphics/xpm/buildlink3.mk +++ b/graphics/xpm/buildlink3.mk @@ -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 diff --git a/graphics/xpm/builtin.mk b/graphics/xpm/builtin.mk index 286b0968344..955049252f0 100644 --- a/graphics/xpm/builtin.mk +++ b/graphics/xpm/builtin.mk @@ -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; \ |