From ae7fa599535d705d8e53e260a07fe669ac9b3bbe Mon Sep 17 00:00:00 2001 From: sebastia Date: Thu, 29 Jul 2010 11:42:56 +0000 Subject: [PATCH] Style cleanup, and get rid of expensive SUBST_CMD in pre-configure. OK, landry@ --- graphics/tkpng/Makefile | 62 ++++++++++++-------------- graphics/tkpng/patches/patch-configure | 4 +- graphics/tkpng/pkg/PFRAG.shared | 2 - graphics/tkpng/pkg/PLIST | 4 +- 4 files changed, 32 insertions(+), 40 deletions(-) delete mode 100644 graphics/tkpng/pkg/PFRAG.shared diff --git a/graphics/tkpng/Makefile b/graphics/tkpng/Makefile index 8c704422099..06f8ab5b17d 100644 --- a/graphics/tkpng/Makefile +++ b/graphics/tkpng/Makefile @@ -1,47 +1,41 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2010/07/09 16:46:50 sebastia Exp $ +# $OpenBSD: Makefile,v 1.2 2010/07/29 11:42:56 sebastia Exp $ -SHARED_ONLY= Yes +SHARED_ONLY = Yes -COMMENT= PNG photo image extension for Tcl/Tk +COMMENT = PNG photo image extension for Tcl/Tk -V= 0.9 -DISTNAME= tkpng$V -PKGNAME= tkpng-$V -SHLIB_VERSION= 0.0 -SHARED_LIBS= tkpng09 ${SHLIB_VERSION} -CATEGORIES= graphics +V = 0.9 +REVISION = 0 +DISTNAME = tkpng$V +PKGNAME = tkpng-$V +SHARED_LIBS = tkpng09 0.0 +CATEGORIES = graphics -HOMEPAGE= http://www.muonics.com/FreeStuff/TkPNG/ +HOMEPAGE = http://www.muonics.com/FreeStuff/TkPNG/ -MAINTAINER= Sebastian Reitenbach +MAINTAINER = Sebastian Reitenbach # BSD -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes -WANTLIB= z +PERMIT_PACKAGE_CDROM = Yes +PERMIT_PACKAGE_FTP = Yes +PERMIT_DISTFILES_CDROM = Yes +PERMIT_DISTFILES_FTP = Yes -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tkpng/} -EXTRACT_SUFX= .tgz +MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=tkpng/} +EXTRACT_SUFX = .tgz -MODULES= x11/tk -BUILD_DEPENDS= ${MODTK_BUILD_DEPENDS} -RUN_DEPENDS= ${MODTK_RUN_DEPENDS} +MODULES = x11/tk +BUILD_DEPENDS = ${MODTK_BUILD_DEPENDS} +RUN_DEPENDS = ${MODTK_RUN_DEPENDS} -SEPARATE_BUILD= simple -CONFIGURE_STYLE= gnu -CONFIGURE_ARGS= --with-tcl=${MODTCL_LIBDIR} \ - --with-tk=${MODTK_LIBDIR} \ - --with-tkinclude=${MODTK_INCDIR} \ - --enable-64bit \ - --enable-64bit-vis \ - --enable-threads -NO_REGRESS= Yes -SUBST_VARS= SHLIB_VERSION - -pre-configure: - ${SUBST_CMD} ${WRKSRC}/configure +SEPARATE_BUILD = simple +CONFIGURE_STYLE = gnu +CONFIGURE_ARGS = --with-tcl=${MODTCL_LIBDIR} \ + --with-tk=${MODTK_LIBDIR} \ + --with-tkinclude=${MODTK_INCDIR} +NO_REGRESS = Yes +SUBST_VARS = SHLIB_VERSION +CONFIGURE_ENV = LIBtkpng09_VERSION=${LIBtkpng09_VERSION} post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tkpng diff --git a/graphics/tkpng/patches/patch-configure b/graphics/tkpng/patches/patch-configure index fd6a66b18ea..2d5be5c9152 100644 --- a/graphics/tkpng/patches/patch-configure +++ b/graphics/tkpng/patches/patch-configure @@ -1,4 +1,4 @@ -$OpenBSD: patch-configure,v 1.1.1.1 2010/07/09 16:46:50 sebastia Exp $ +$OpenBSD: patch-configure,v 1.2 2010/07/29 11:42:56 sebastia Exp $ --- configure.orig Mon Dec 7 15:26:35 2009 +++ configure Mon Dec 7 15:25:27 2009 @@ -8671,7 +8671,7 @@ fi @@ -6,7 +6,7 @@ $OpenBSD: patch-configure,v 1.1.1.1 2010/07/09 16:46:50 sebastia Exp $ LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} - SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0' -+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}' ++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${LIBtkpng09_VERSION}' echo "$as_me:$LINENO: checking for ELF" >&5 echo $ECHO_N "checking for ELF... $ECHO_C" >&6 if test "${tcl_cv_ld_elf+set}" = set; then diff --git a/graphics/tkpng/pkg/PFRAG.shared b/graphics/tkpng/pkg/PFRAG.shared deleted file mode 100644 index c858e4ab254..00000000000 --- a/graphics/tkpng/pkg/PFRAG.shared +++ /dev/null @@ -1,2 +0,0 @@ -@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2010/07/09 16:46:50 sebastia Exp $ -@lib lib/tkpng0.9/libtkpng09.so.${LIBtkpng09_VERSION} diff --git a/graphics/tkpng/pkg/PLIST b/graphics/tkpng/pkg/PLIST index 8e0aa2ee576..f4c47d4842b 100644 --- a/graphics/tkpng/pkg/PLIST +++ b/graphics/tkpng/pkg/PLIST @@ -1,6 +1,6 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2010/07/09 16:46:50 sebastia Exp $ -%%SHARED%% +@comment $OpenBSD: PLIST,v 1.2 2010/07/29 11:42:56 sebastia Exp $ lib/tkpng0.9/ +@lib lib/tkpng0.9/libtkpng09.so.${LIBtkpng09_VERSION} lib/tkpng0.9/pkgIndex.tcl share/doc/tkpng/ share/doc/tkpng/README